预警模型调整

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,6 +83,7 @@ public class DataStatisticsServiceImpl implements DataStatisticsService {
 
         WaringVo waringVo = DetialBymxbh(params.getMxbh());
 
+        if(StringUtils.isNotBlank(waringVo.getZcjddm())){
             String[] split = waringVo.getZcjddm().split(",");
             List<String> zcdmList = new ArrayList<>();
             for (String code : split) {
@@ -101,7 +102,9 @@ public class DataStatisticsServiceImpl implements DataStatisticsService {
             if (zcdmList.size()>0){
                 params.setAjztdm( String.join(",", zcdmList));//实体设置侦察阶段代码
             }
+        }
 
+        if(StringUtils.isNotBlank(waringVo.getAjlbdm())){
             String[] split1 = waringVo.getAjlbdm().split(",");
             List<String> ajlbdmList = new ArrayList<>();
             for (String code : split1) {
@@ -118,7 +121,9 @@ public class DataStatisticsServiceImpl implements DataStatisticsService {
             if (ajlbdmList.size()>0){
                 params.setAjlbdm(String.join(",", ajlbdmList));//实体设置案件类别代码
             }
+        }
 
+        if(StringUtils.isNotBlank(waringVo.getXlabdm())){
             String[] split2 = waringVo.getXlabdm().split(",");
             List<String> xlabdmList = new ArrayList<>();
             for (String code : split2) {
@@ -135,7 +140,7 @@ public class DataStatisticsServiceImpl implements DataStatisticsService {
             if (xlabdmList.size()>0){
                 params.setXzlb(String.join(",", xlabdmList));//实体设置小案类别代码
             }
-
+        }
         params.setTlms(waringVo.getTlms());//图例描述
         params.setTlys(waringVo.getTlys());//图例颜色
         params.setTjjs(waringVo.getTjjs());//图例颜色