预警模型调整

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

@@ -3,6 +3,7 @@ package com.founder.publicapi.mapper.mysqlMapper;
 import com.founder.commonutils.model.newPublicEntity.SysDictitem;
 import com.founder.commonutils.model.newPublicEntity.WarningEntity.DataStatisticsParams;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -19,7 +20,7 @@ public interface DataStatisticsMapperCqxz {
 
 
     //是否是父级
-    String  getIsParent(String code,String type);
+    String  getIsParent(@Param(value = "code")String code,@Param(value = "type") String type);
 
     //如果是父级 获取所有pid为父级代码的code
     List<String> getCodeList(String code, String type);

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

@@ -83,59 +83,64 @@ public class DataStatisticsServiceImpl implements DataStatisticsService {
 
         WaringVo waringVo = DetialBymxbh(params.getMxbh());
 
-        String[] split = waringVo.getZcjddm().split(",");
-        List<String> zcdmList = new ArrayList<>();
-        for (String code : split) {
-            //遍历每一个代码是否是父级
-            String isParent = dataStatisticsMapperCqxz.getIsParent(code, "CODE_ZCJDDM");
-            if (isParent.equals("true")){
-                //如果是父级，查询底下所有的子级
-                List<String> code_zcjddm = dataStatisticsMapperCqxz.getCodeList(code, "CODE_ZCJDDM");
-                code_zcjddm.forEach(s -> {
-                    zcdmList.add(s);
-                });
-            }else {
-                zcdmList.add(code);
+        if(StringUtils.isNotBlank(waringVo.getZcjddm())){
+            String[] split = waringVo.getZcjddm().split(",");
+            List<String> zcdmList = new ArrayList<>();
+            for (String code : split) {
+                //遍历每一个代码是否是父级
+                String isParent = dataStatisticsMapperCqxz.getIsParent(code, "CODE_ZCJDDM");
+                if (isParent.equals("true")){
+                    //如果是父级，查询底下所有的子级
+                    List<String> code_zcjddm = dataStatisticsMapperCqxz.getCodeList(code, "CODE_ZCJDDM");
+                    code_zcjddm.forEach(s -> {
+                        zcdmList.add(s);
+                    });
+                }else {
+                    zcdmList.add(code);
+                }
+            }
+            if (zcdmList.size()>0){
+                params.setAjztdm( String.join(",", zcdmList));//实体设置侦察阶段代码
             }
-        }
-        if (zcdmList.size()>0){
-            params.setAjztdm( String.join(",", zcdmList));//实体设置侦察阶段代码
         }
 
-        String[] split1 = waringVo.getAjlbdm().split(",");
-        List<String> ajlbdmList = new ArrayList<>();
-        for (String code : split1) {
-            String isParent = dataStatisticsMapperCqxz.getIsParent(code, "CODE_AJLB");
-            if (isParent.equals("true")) {
-                List<String> code_ajlb = dataStatisticsMapperCqxz.getCodeList(code, "CODE_AJLB");
-                code_ajlb.forEach(s -> {
-                    ajlbdmList.add(s);
-                });
-            }else {
-                ajlbdmList.add(code);
+        if(StringUtils.isNotBlank(waringVo.getAjlbdm())){
+            String[] split1 = waringVo.getAjlbdm().split(",");
+            List<String> ajlbdmList = new ArrayList<>();
+            for (String code : split1) {
+                String isParent = dataStatisticsMapperCqxz.getIsParent(code, "CODE_AJLB");
+                if (isParent.equals("true")) {
+                    List<String> code_ajlb = dataStatisticsMapperCqxz.getCodeList(code, "CODE_AJLB");
+                    code_ajlb.forEach(s -> {
+                        ajlbdmList.add(s);
+                    });
+                }else {
+                    ajlbdmList.add(code);
+                }
+            }
+            if (ajlbdmList.size()>0){
+                params.setAjlbdm(String.join(",", ajlbdmList));//实体设置案件类别代码
             }
-        }
-        if (ajlbdmList.size()>0){
-            params.setAjlbdm(String.join(",", ajlbdmList));//实体设置案件类别代码
         }
 
-        String[] split2 = waringVo.getXlabdm().split(",");
-        List<String> xlabdmList = new ArrayList<>();
-        for (String code : split2) {
-            String isParent = dataStatisticsMapperCqxz.getIsParent(code, "CODE_XALB");
-            if (isParent.equals("true")) {
-                List<String> code_xalb = dataStatisticsMapperCqxz.getCodeList(code, "CODE_XALB");
-                code_xalb.forEach(s -> {
-                    xlabdmList.add(s);
-                });
-            }else {
-                xlabdmList.add(code);
+        if(StringUtils.isNotBlank(waringVo.getXlabdm())){
+            String[] split2 = waringVo.getXlabdm().split(",");
+            List<String> xlabdmList = new ArrayList<>();
+            for (String code : split2) {
+                String isParent = dataStatisticsMapperCqxz.getIsParent(code, "CODE_XALB");
+                if (isParent.equals("true")) {
+                    List<String> code_xalb = dataStatisticsMapperCqxz.getCodeList(code, "CODE_XALB");
+                    code_xalb.forEach(s -> {
+                        xlabdmList.add(s);
+                    });
+                }else {
+                    xlabdmList.add(code);
+                }
+            }
+            if (xlabdmList.size()>0){
+                params.setXzlb(String.join(",", xlabdmList));//实体设置小案类别代码
             }
         }
-        if (xlabdmList.size()>0){
-            params.setXzlb(String.join(",", xlabdmList));//实体设置小案类别代码
-        }
-
         params.setTlms(waringVo.getTlms());//图例描述
         params.setTlys(waringVo.getTlys());//图例颜色
         params.setTjjs(waringVo.getTjjs());//图例颜色