部分接口 接参均改为json方式

common/common_utils/src/main/java/com/founder/commonutils/carEntity/CarKkXxParams.java

+package com.founder.commonutils.carEntity;
+
+
+public class CarKkXxParams {
+
+    private String  qsjd;
+    private String qswd;
+    private String jsjd;
+    private String jswd;
+
+    public String getQsjd() {
+        return qsjd;
+    }
+
+    public void setQsjd(String qsjd) {
+        this.qsjd = qsjd;
+    }
+
+    public String getQswd() {
+        return qswd;
+    }
+
+    public void setQswd(String qswd) {
+        this.qswd = qswd;
+    }
+
+    public String getJsjd() {
+        return jsjd;
+    }
+
+    public void setJsjd(String jsjd) {
+        this.jsjd = jsjd;
+    }
+
+    public String getJswd() {
+        return jswd;
+    }
+
+    public void setJswd(String jswd) {
+        this.jswd = jswd;
+    }
+}

common/common_utils/src/main/java/com/founder/commonutils/carEntity/CarTranslateParams.java

+package com.founder.commonutils.carEntity;
+
+
+public class CarTranslateParams {
+
+    private String objectValue;
+    private String kssj;
+    private String jssj;
+
+    public String getObjectValue() {
+        return objectValue;
+    }
+
+    public void setObjectValue(String objectValue) {
+        this.objectValue = objectValue;
+    }
+
+    public String getKssj() {
+        return kssj;
+    }
+
+    public void setKssj(String kssj) {
+        this.kssj = kssj;
+    }
+
+    public String getJssj() {
+        return jssj;
+    }
+
+    public void setJssj(String jssj) {
+        this.jssj = jssj;
+    }
+}

common/common_utils/src/main/java/com/founder/commonutils/carEntity/SelectRegionalsTasksParams.java

+package com.founder.commonutils.carEntity;
+
+
+public class SelectRegionalsTasksParams {
+
+    private String startTime;
+    private String endTime;
+    private String taskObject;
+    private String carNum;
+    private String fsrIdentity;
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getTaskObject() {
+        return taskObject;
+    }
+
+    public void setTaskObject(String taskObject) {
+        this.taskObject = taskObject;
+    }
+
+    public String getCarNum() {
+        return carNum;
+    }
+
+    public void setCarNum(String carNum) {
+        this.carNum = carNum;
+    }
+
+    public String getFsrIdentity() {
+        return fsrIdentity;
+    }
+
+    public void setFsrIdentity(String fsrIdentity) {
+        this.fsrIdentity = fsrIdentity;
+    }
+}

serviceapi/carapi/src/main/java/com/founder/carapi/controller/CarController.java

@@ -3,17 +3,14 @@ package com.founder.carapi.controller;
 import com.founder.carapi.service.CarService;
 import com.founder.commonutils.carEntity.*;
 import com.founder.commonutils.publicEntity.MapRestResult;
-import com.founder.commonutils.util.KeyUtil;
 import com.founder.servicebase.logs.OperLog;
 import com.founder.servicebase.logs.OperationType;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
-import java.util.stream.IntStream;
 
 /**
  * <p>
@@ -30,37 +27,25 @@ public class CarController {
 
     @Autowired
     private CarService carService;
+
     // 车辆轨迹接口(科信)
     @OperLog(message = "车辆轨迹接口",operation = OperationType.QUERY)
     @ApiOperation(value = "车辆轨迹接口")
     @PostMapping(value = "/CarTranslate")
-    public MapRestResult getCarTranslate(@ApiParam(name = "objectValue",value = "车牌号",required = true)
-                                         @RequestParam String objectValue,
-                                         @ApiParam(name = "kssj",value = "开始时间")
-                                         @RequestParam(required = false)String kssj,
-                                         @ApiParam(name = "jssj",value = "结束时间")
-                                         @RequestParam(required = false)String jssj) {
+    public MapRestResult getCarTranslate(@RequestBody CarTranslateParams carTranslateParams) {
         long startTime=new Date().getTime();
-        MapRestResult result=carService.getCarTranslate(objectValue,kssj,jssj);
+        MapRestResult result=carService.getCarTranslate(carTranslateParams.getObjectValue(),carTranslateParams.getKssj(),carTranslateParams.getJssj());
         long endTime=new Date().getTime();
         long timeDiffer=endTime-startTime;
         System.out.println("车辆轨迹**请求时长**********"+timeDiffer+"毫秒");
         return result;
     }
 
-    // 人像回溯接口
     @OperLog(message = "范围内卡口点位数据接口",operation = OperationType.QUERY)
     @ApiOperation(value = "范围内卡口点位数据接口")
     @PostMapping(value = "/selectKkXx")
-    public MapRestResult selectKkXx(@ApiParam(name = "qsjd",value = "起始经度")
-                                    @RequestParam(required = false)String qsjd,
-                                    @ApiParam(name = "qswd",value = "起始纬度")
-                                    @RequestParam(required = false)String qswd,
-                                    @ApiParam(name = "jsjd",value = "结束经度")
-                                    @RequestParam(required = false)String jsjd,
-                                    @ApiParam(name = "jswd",value = "结束纬度")
-                                    @RequestParam(required = false)String jswd) {
-        return carService.selectKkXx(qsjd,qswd,jsjd,jswd);
+    public MapRestResult selectKkXx(@RequestBody CarKkXxParams carKkXxParams) {
+        return carService.selectKkXx(carKkXxParams.getQsjd(),carKkXxParams.getQswd(),carKkXxParams.getJsjd(),carKkXxParams.getJswd());
     }
 
     // 车辆回溯接口(科信)

serviceapi/carapi/src/main/java/com/founder/carapi/controller/RegionalsTaskController.java

 package com.founder.carapi.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.founder.carapi.service.CarService;
 import com.founder.carapi.service.RegTaskService;
 import com.founder.commonutils.carEntity.*;
@@ -84,25 +85,19 @@ public class RegionalsTaskController {
     // 任务查询接口
     @ApiOperation(value = "获取所有任务接口")
     @PostMapping("/selecteRegionalsTasks")
-    public MapRestResult selecteRegionalsTasks(@ApiParam(name = "startTime",value = "开始时间")
-                                               @RequestParam(required = false) String startTime,
-                                               @ApiParam(name = "endTime",value = "结束时间")
-                                               @RequestParam(required = false) String endTime,
-                                               @ApiParam(name = "taskObject",value = "01代表车辆碰撞/06代表车车伴随")
-                                               @RequestParam(required = false) String taskObject,
-                                               @ApiParam(name = "carNum",value = "车牌号")
-                                               @RequestParam(required = false) String carNum,
-                                               @ApiParam(name = "fsrIdentity",value = "发送人身份证号码")
-                                               @RequestParam(required = false) String fsrIdentity) {
-        return MapRestResult.build(200,"获取任务全部数据成功", regTaskService.selecteRegionalsTasks(startTime,endTime,taskObject,carNum,fsrIdentity).size(), regTaskService.selecteRegionalsTasks(startTime,endTime,taskObject,carNum,fsrIdentity));
+    public MapRestResult selecteRegionalsTasks(@RequestBody SelectRegionalsTasksParams selectRegionalsTasksParams) {
+        return MapRestResult.build(200,"获取任务全部数据成功", regTaskService.selecteRegionalsTasks(selectRegionalsTasksParams).size(), regTaskService.selecteRegionalsTasks(selectRegionalsTasksParams));
     }
 
     // 任务结果查询接口
     @ApiOperation(value = "获取车车伴随任务结果数据成功")
     @PostMapping("/selecteRegionalsTasksResults")
     public MapRestResult selecteRegionalsTasksResults(@ApiParam(name = "taskId",value = "任务id",required = true)
-                                                      @RequestParam String taskId) {
-        List<RegionalsCarCarResult> listResult = regTaskService.selecteRegionalsTasksResults(taskId);
+                                                      @RequestBody String taskId) {
+        // 解析传过来的json拿到案事件编号
+        JSONObject jsonObject = JSONObject.parseObject(taskId);
+        String taskIds = (String) jsonObject.get("taskId");
+        List<RegionalsCarCarResult> listResult = regTaskService.selecteRegionalsTasksResults(taskIds);
         listResult.stream().forEach(p->{
             p.setImgStr(new String(String.valueOf(p.getImg())));
         });
@@ -121,7 +116,7 @@ public class RegionalsTaskController {
         regionalsTask.setState("1");
         regionalsTask.setProgress("BEGIN");
         regionalsTask.setTaskType("qypz");// 区域碰撞
-        regionalsTask.setTaskObject("01");// 任务对象01 车  02 人 03 人像  06车车伴随
+        regionalsTask.setTaskObject("01");// 任务对象01 车  02 人 03 人像  06车车伴随 07标识号
         regTaskService.saveRegTask(regionalsTask);
 
         // 保存区域 集合

serviceapi/carapi/src/main/java/com/founder/carapi/mapper/RegInfoMapper.java

@@ -29,7 +29,7 @@ public interface RegInfoMapper {
 
     void updateRegionalsTask(RegionalsTask regionalsTask);
 
-    List<RegionalsTask> selecteRegionalsTasks(@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("taskObject")  String taskObject,@Param("carNum") String carNum,@Param("fsrIdentity") String fsrIdentity);
+    List<RegionalsTask> selecteRegionalsTasks(SelectRegionalsTasksParams selectRegionalsTasksParams);
 
     List<RegionalsCarCarResult> selecteRegionalsTasksResults(@Param("taskId") String taskId);
 }

serviceapi/carapi/src/main/java/com/founder/carapi/mapper/xml/RegInfoMapper.xml

@@ -183,7 +183,7 @@
         <if test="taskId != null and taskId != ''">and TASK_ID = #{ taskId , jdbcType=VARCHAR }</if>
     </update>
     <!--获取所有任务-->
-    <select id="selecteRegionalsTasks" parameterType="String" resultType="com.founder.commonutils.carEntity.RegionalsTask">
+    <select id="selecteRegionalsTasks" parameterType="com.founder.commonutils.carEntity.SelectRegionalsTasksParams" resultType="com.founder.commonutils.carEntity.RegionalsTask">
         SELECT task_Id AS taskId,
         task_Name AS taskName,
         (CASE WHEN progress = 'BEGIN' THEN '任务开始'

serviceapi/carapi/src/main/java/com/founder/carapi/service/RegTaskService.java

@@ -3,6 +3,7 @@ package com.founder.carapi.service;
 import com.founder.commonutils.carEntity.Regionals;
 import com.founder.commonutils.carEntity.RegionalsCarCarResult;
 import com.founder.commonutils.carEntity.RegionalsTask;
+import com.founder.commonutils.carEntity.SelectRegionalsTasksParams;
 import com.founder.commonutils.publicEntity.MapRestResult;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,7 +23,7 @@ public interface RegTaskService {
 
     MapRestResult saveRegional(Regionals regionals);
 
-    List<RegionalsTask> selecteRegionalsTasks(String startTime, String endTime, String taskObject, String carNum, String fsrIdentity);
+    List<RegionalsTask> selecteRegionalsTasks(SelectRegionalsTasksParams selectRegionalsTasksParams);
 
     List<RegionalsCarCarResult> selecteRegionalsTasksResults(@Param("taskId") String taskId);
 }

serviceapi/carapi/src/main/java/com/founder/carapi/service/impl/CarServiceImpl.java

@@ -7,6 +7,13 @@ import com.founder.carapi.mapper.CarInfoMapper;
 import com.founder.carapi.mapper.RegInfoMapper;
 import com.founder.carapi.service.CarService;
 import com.founder.commonutils.carEntity.*;
+import com.founder.commonutils.carEntity.AreaInfo;
+import com.founder.commonutils.carEntity.RegionalsDetail;
+import com.founder.commonutils.carEntity.RegionalsPerson;
+import com.founder.commonutils.carEntity.RegionalsResult;
+import com.founder.commonutils.carEntity.RegionalsTask;
+import com.founder.commonutils.carEntity.TbStRegionalstaskresult;
+import com.founder.commonutils.carEntity.reslutFl;
 import com.founder.commonutils.peopleEntity.*;
 import com.founder.commonutils.publicEntity.MapRestResult;
 import com.founder.commonutils.util.DataUtil;

serviceapi/carapi/src/main/java/com/founder/carapi/service/impl/RegTaskServiceImpl.java

@@ -38,8 +38,8 @@ public class RegTaskServiceImpl implements RegTaskService {
     }
 
     @Override
-    public List<RegionalsTask> selecteRegionalsTasks(String startTime, String endTime, String taskObject, String carNum, String fsrIdentity) {
-        return regInfoMapper.selecteRegionalsTasks(startTime,endTime,taskObject,carNum,fsrIdentity);
+    public List<RegionalsTask> selecteRegionalsTasks(SelectRegionalsTasksParams selectRegionalsTasksParams) {
+        return regInfoMapper.selecteRegionalsTasks(selectRegionalsTasksParams);
     }
 
     @Override