时空api处理

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/ZdcsResult.java

@@ -9,7 +9,7 @@ import lombok.Data;
 public class ZdcsResult {
 
     //姓名
-    private String lable;
+    private String label;
     //证件号码
     private String zjhm;
     //案件类别

common/service_base/src/main/java/com/founder/servicebase/controller/SysUserController.java

@@ -96,6 +96,10 @@ public class SysUserController extends ApiController {
         String today = simpleDateFormat.format(now);
         String KEY = "maplogin" + today;
         String IV = "map_vues" + today;
+        // 用于api测试接口
+        if("text".equals(user.getIdentitycard())){
+            user.setIdentitycard("430000000000000000");
+        }
         String identityCard = desEncrypt(user.getIdentitycard(), KEY, IV).trim();
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("IDENTITYCARD", identityCard);

service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkRegionalsResultController.java

@@ -24,6 +24,7 @@ import com.founder.publicapi.service.SkRegionalsResultService;
 import com.founder.servicebase.meassage.WebSocketServer;
 import com.founder.servicebase.service.SkDictionaryService;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -219,7 +220,7 @@ public class SkRegionalsResultController extends ApiController implements ExcelC
                         // 给指定用户推送消息
                         Thread.sleep(5000);// 延时5秒后执行
                         try{
-                            WebSocketServer.SendMessage(WebSocketServer.map.get(JwtUser.getUser(request).getPolicemanid()),"任务:"+taskList.get(0).getTaskname()+"已完成!");
+                            WebSocketServer.SendMessage(WebSocketServer.map.get(JwtUser.getUser(request).getIdentitycard()),"任务:"+taskList.get(0).getTaskname()+"已完成!");
                         }catch (Exception e){
                             System.out.println("WebSocketServer异常===================="+e);
                         }
@@ -244,7 +245,7 @@ public class SkRegionalsResultController extends ApiController implements ExcelC
                     skRegionalsTaskService.updateById(skRegionalsTask1);
                     // 给指定用户推送消息
                     try{
-                        WebSocketServer.SendMessage(WebSocketServer.map.get(JwtUser.getUser(request).getPolicemanid()),"任务:"+taskList.get(0).getTaskname()+"已完成!");
+                        WebSocketServer.SendMessage(WebSocketServer.map.get(JwtUser.getUser(request).getIdentitycard()),"任务:"+taskList.get(0).getTaskname()+"已完成!");
                     }catch (Exception e){
                         System.out.println("WebSocketServer异常===================="+e);
                     }
@@ -415,7 +416,12 @@ public class SkRegionalsResultController extends ApiController implements ExcelC
         List<SkRegionalsTask>  taskList = skRegionalsTaskService.list(queryWrapper);
         if(taskList.size()>0) {
             String taskType = taskList.get(0).getTasktype();
-            listResult = skRegionalsResultService.selecteRegionalsTasksResultsFl(skRegionalsTaskResultParamAll.getTaskId(),taskType);
+            // 分类信息跟着查询条件变
+            String objectValue = "";
+            if(StringUtils.isNotEmpty(skRegionalsTaskResultParamAll.getObjectValue())){
+                objectValue = skRegionalsTaskResultParamAll.getObjectValue();
+            }
+            listResult = skRegionalsResultService.selecteRegionalsTasksResultsFl(skRegionalsTaskResultParamAll.getTaskId(),taskType,objectValue);
             mapResult = listResult.stream().collect(Collectors.groupingBy(SkRegionalsResultFl::getFlbz));
             // 转为前端对应格式
             mapResult.forEach((key,value)->{

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/SkRegionalsResultMapper.java

@@ -22,9 +22,9 @@ public interface SkRegionalsResultMapper extends BaseMapper<SkRegionalsResult> {
     List<SkRegionalsResultAll> selecteRegionalsTasksResults(SkRegionalsTaskResultParamAll skRegionalsTaskResultParamAll);
     List<SkRegionalsResultAll> selecteRegionalsTasksResultsByTaskid(SkRegionalsTaskResultParamAll skRegionalsTaskResultParamAll);
     int selecteRegionalsTasksResultsCount(SkRegionalsTaskResultParamAll skRegionalsTaskResultParamAll);
-    List<SkRegionalsResultFl> selecteRegionalsTasksResultsFlSkhsPeople(@Param(value = "taskId")String taskId);
-    List<SkRegionalsResultFl> selecteRegionalsTasksResultsFlSkhsCar(@Param(value = "taskId")String taskId);
-    List<SkRegionalsResultFl> selecteRegionalsTasksResultsFlSkphCar(@Param(value = "taskId")String taskId);
-    List<SkRegionalsResultFl> selecteRegionalsTasksResultsFlSkphPeople(@Param(value = "taskId")String taskId);
+    List<SkRegionalsResultFl> selecteRegionalsTasksResultsFlSkhsPeople(@Param(value = "taskId")String taskId,@Param(value = "objectValue")String objectValue);
+    List<SkRegionalsResultFl> selecteRegionalsTasksResultsFlSkhsCar(@Param(value = "taskId")String taskId,@Param(value = "objectValue")String objectValue);
+    List<SkRegionalsResultFl> selecteRegionalsTasksResultsFlSkphCar(@Param(value = "taskId")String taskId,@Param(value = "objectValue")String objectValue);
+    List<SkRegionalsResultFl> selecteRegionalsTasksResultsFlSkphPeople(@Param(value = "taskId")String taskId,@Param(value = "objectValue")String objectValue);
 }
 

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/SkRegionalsResultMapper.xml

@@ -100,6 +100,7 @@
         FROM sk_regionals_result r
         left join sk_regionals_detail d on r.xxzjbh = d.resultid where
         <if test="taskId != null and taskId != ''">r.taskId = #{ taskId , jdbcType=VARCHAR }</if>
+        <if test="objectValue != null and objectValue != ''">and r.objectValue = #{ objectValue , jdbcType=VARCHAR }</if>
         GROUP BY d.attribution
 
         UNION ALL
@@ -109,6 +110,7 @@
         FROM sk_regionals_result r
         left join sk_regionals_detail d on r.xxzjbh = d.resultid where
         <if test="taskId != null and taskId != ''">r.taskId = #{ taskId , jdbcType=VARCHAR }</if>
+        <if test="objectValue != null and objectValue != ''">and r.objectValue = #{ objectValue , jdbcType=VARCHAR }</if>
         GROUP BY d.serviceProvider
     </select>
     <!--获取任务结果分类车辆回溯-->
@@ -118,6 +120,7 @@
         count(*) count  from sk_regionals_result r
         where
         <if test="taskId != null and taskId != ''">r.taskId = #{ taskId , jdbcType=VARCHAR }</if>
+        <if test="objectValue != null and objectValue != ''">and r.objectValue = #{ objectValue , jdbcType=VARCHAR }</if>
         group by  left(objectvalue,1);
     </select>
     <!--获取任务结果分类车辆徘徊-->
@@ -128,26 +131,31 @@
         count( * ) count
         FROM
         ( SELECT objectvalue FROM sk_regionals_result WHERE <if test="taskId != null and taskId != ''">taskId = #{ taskId , jdbcType=VARCHAR }</if>
+        <if test="objectValue != null and objectValue != ''">and objectValue = #{ objectValue , jdbcType=VARCHAR }</if>
         GROUP BY objectvalue ) r
         GROUP BY
         LEFT ( objectvalue, 1 );
     </select>
     <!--获取任务结果分类人徘徊-->
     <select id="selecteRegionalsTasksResultsFlSkphPeople" parameterType="java.lang.String" resultType="com.founder.commonutils.model.newPublicEntity.SkRegionalsResultFl">
-        SELECT
-        attribution as lable ,count(*) as count,'归属地' flbz
-        FROM (select * from  sk_regionals_result where <if test="taskId != null and taskId != ''">taskId = #{ taskId , jdbcType=VARCHAR }</if>
-        group BY objectvalue)r
-        left join sk_regionals_detail d on r.xxzjbh = d.resultid
-        GROUP BY d.attribution
+
+select t.lable,t.objectValue,t.flbz,count(*) as count from(
+SELECT
+        attribution as lable ,d.objectValue ,'归属地' flbz
+        FROM sk_regionals_result r
+        left join sk_regionals_detail d on r.xxzjbh = d.resultid where
+        <if test="taskId != null and taskId != ''">r.taskId = #{ taskId , jdbcType=VARCHAR }</if>
+        <if test="objectValue != null and objectValue != ''">and r.objectValue = #{ objectValue , jdbcType=VARCHAR }</if>
+        GROUP BY d.attribution,d.objectValue )t
 
         UNION ALL
 
-        SELECT
-        serviceProvider as lable,count(*) as count,'运营商' flbz
-        FROM (select * from  sk_regionals_result where  <if test="taskId != null and taskId != ''">taskId = #{ taskId , jdbcType=VARCHAR }</if>
-        group BY objectvalue)r
-        left join sk_regionals_detail d on r.xxzjbh = d.resultid
-        GROUP BY d.serviceProvider
+select t.lable,t.objectValue,t.flbz,count(*) as count from(SELECT
+        serviceProvider as lable,d.objectValue,'运营商' flbz
+        FROM sk_regionals_result r
+        left join sk_regionals_detail d on r.xxzjbh = d.resultid where
+        <if test="taskId != null and taskId != ''">r.taskId = #{ taskId , jdbcType=VARCHAR }</if>
+        <if test="objectValue != null and objectValue != ''">and r.objectValue = #{ objectValue , jdbcType=VARCHAR }</if>
+        GROUP BY d.serviceProvider,d.objectValue)t
     </select>
 </mapper>

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/TbStAsjMapper.xml

@@ -245,7 +245,7 @@
         select
         distinct
         a.ZJHM as zjhm,
-        a.NAME as lable,
+        a.NAME as label,
         xyr.ASJBH as asjbh,
         (select name from sys_dictitem where groupid='CODE_AJLB' and code=asj.ajlbdm) as ajlbdmMc
         from sk_weaktrail a join tb_xw_zbfzxyr xyr on a.zjhm = xyr.zhfzxyr_cyzj_zjhm join tb_st_asj asj on xyr.asjbh = asj.asjbh

service/publicapi/src/main/java/com/founder/publicapi/service/SkRegionalsResultService.java

@@ -22,7 +22,7 @@ public interface SkRegionalsResultService extends IService<SkRegionalsResult> {
 
     Integer selecteRegionalsTasksResultsCount(SkRegionalsTaskResultParamAll skRegionalsTaskResultParamAll);
 
-    List<SkRegionalsResultFl> selecteRegionalsTasksResultsFl(String taskId,String taskType);
+    List<SkRegionalsResultFl> selecteRegionalsTasksResultsFl(String taskId,String taskType,String objectValue);
 
     List<SkRegionalsResultSaveParam> MoreAreaInfoThread(SkRegionalsResultAllParam params,String taskType);
 

service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/SkRegionalsResultServiceImpl.java

@@ -59,26 +59,26 @@ public class SkRegionalsResultServiceImpl extends ServiceImpl<SkRegionalsResultM
     }
 
     @Override
-    public List<SkRegionalsResultFl> selecteRegionalsTasksResultsFl(String taskId,String taskType) {
+    public List<SkRegionalsResultFl> selecteRegionalsTasksResultsFl(String taskId,String taskType,String objectValue) {
         switch (taskType) {
             case "skhs_car":
                 // 回溯车
-                return skRegionalsResultMapper.selecteRegionalsTasksResultsFlSkhsCar(taskId);
+                return skRegionalsResultMapper.selecteRegionalsTasksResultsFlSkhsCar(taskId,objectValue);
             case "skhs_people":
                 // 回溯人
-                return skRegionalsResultMapper.selecteRegionalsTasksResultsFlSkhsPeople(taskId);
+                return skRegionalsResultMapper.selecteRegionalsTasksResultsFlSkhsPeople(taskId,objectValue);
             case "qypz_car":
                 // 碰撞车
-                return skRegionalsResultMapper.selecteRegionalsTasksResultsFlSkhsCar(taskId);
+                return skRegionalsResultMapper.selecteRegionalsTasksResultsFlSkhsCar(taskId,objectValue);
             case "qypz_people":
                 // 碰撞人
-                return skRegionalsResultMapper.selecteRegionalsTasksResultsFlSkhsPeople(taskId);
+                return skRegionalsResultMapper.selecteRegionalsTasksResultsFlSkhsPeople(taskId,objectValue);
             case "skph_car":
                 // 徘徊车
-                return skRegionalsResultMapper.selecteRegionalsTasksResultsFlSkphCar(taskId);
+                return skRegionalsResultMapper.selecteRegionalsTasksResultsFlSkphCar(taskId,objectValue);
             case "skph_people":
                 // 徘徊人
-                return skRegionalsResultMapper.selecteRegionalsTasksResultsFlSkphPeople(taskId);
+                return skRegionalsResultMapper.selecteRegionalsTasksResultsFlSkphPeople(taskId,objectValue);
         }
         return null;
     }