【情报二期】数据域服务 - 单人预警/聚集预警布控逻辑优化

src/main/java/com/hhwy/qbeqsjy/controller/CtrlController.java

@@ -14,10 +14,7 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
 
 
 @Slf4j
@@ -73,17 +70,32 @@ public class CtrlController {
         try {
             List<String> resourceCodeList = new ArrayList<>();
             // 将用户域传入的布控模型编号转换为烽火盘古平台数据资源编码
-            for (String modelId : modelIdList) {
+            // 1.数据资源编码值为[yhybk]：代表该模型在用户域布控，不参与数据域布控
-                resourceCodeList.add(CommonUtil.getConfValueByKeyApp(modelId));
+            // 2.数据资源编码值为[deving]：代表该模型在数据域布控，但还在开发中，目前不参与实际布控
+            Iterator<String> iterator = modelIdList.iterator();
+            while (iterator.hasNext()){
+                String modelId = iterator.next();
+                String fhResourceCode = CommonUtil.getConfValueByKeyApp(modelId);
+                // 集合中只添加数据资源编码值不为[yhybk]和[deving]的元素
+                if(!"yhybk".equals(fhResourceCode) && !"deving".equals(fhResourceCode)){
+                    resourceCodeList.add(fhResourceCode);
+                } else {   // 将集合中数据资源编码值为[yhybk]或[deving]的原始模型编号元素删除
+                    iterator.remove();
+                }
             }
-            // 对resourceCodeList集合中的元素去重
+            // 对集合中的元素去重，如 DRYJ-WSLJ-JRBDYJ和DRYJ-BSMGQY-JRMGQY两个模型对应的烽火数据资源编码值相同（134B102），均对应网安AUTH认证数据，保留一个即可
             List<String> newResourceCodeList = CommonUtil.deduplicateList(resourceCodeList);
             String modelIdListStr = modelIdList.toString();
-            if(modelIdListStr.contains("DRYJ") && !modelIdListStr.contains("JJYJ")){   // 任务仅包含单人预警
+            // 任务仅包含单人预警
+            if(modelIdListStr.contains("DRYJ") && !modelIdListStr.contains("JJYJ")){
                 ctrlService.processDRYJCtrl(taskId, clueList, newResourceCodeList, areaIdList, endCtrlTime);
-            } else if(modelIdListStr.contains("JJYJ") && !modelIdListStr.contains("DRYJ")){   // 任务仅包含聚集预警
+            }
+            // 任务仅包含聚集预警
+            else if(modelIdListStr.contains("JJYJ") && !modelIdListStr.contains("DRYJ")){
                 ctrlService.processJJYJCtrl(taskId, clueList, newResourceCodeList, areaIdList);
-            } else {   // 任务既包含单人预警，又包含聚集预警
+            }
+            // 任务既包含单人预警，又包含聚集预警
+            else {
                 // 分别筛选出单人预警和聚集预警各自所对应的布控模型编号，并转换为对应的烽火数据资源编码
                 List<String> dryjResourceCodeList = new ArrayList<>();
                 List<String> jjyjResourceCodeList = new ArrayList<>();
@@ -98,7 +110,7 @@ public class CtrlController {
                 ctrlService.processJJYJCtrl(taskId, clueList, CommonUtil.deduplicateList(jjyjResourceCodeList), areaIdList);
             }
             return AjaxResult.success(Constants.CTRL_ING_MSG);
-        }catch (Exception e){
+        } catch (Exception e){
             log.error("任务布控发生异常", e);
         }
         return AjaxResult.error(Constants.SERVER_ERROR_MSG);
@@ -149,7 +161,7 @@ public class CtrlController {
         JSONArray modelIdListInfo = reqBody.getJSONArray("modelIdListInfo");
         JSONArray clueInfo = reqBody.getJSONArray("clueInfo");
         JSONArray modelInfo = reqBody.getJSONArray("modelInfo");
-        if(taskInfo == null || modelIdListInfo.size() == 0 || clueInfo.size() == 0 || modelInfo.size() == 0){
+        if(taskInfo == null || modelIdListInfo.isEmpty() || clueInfo.isEmpty() || modelInfo.isEmpty()){
             return AjaxResult.error(Constants.PARAMS_EMPTY_MSG);
         }
         try{
@@ -167,7 +179,7 @@ public class CtrlController {
      * @return
      */
     @PostMapping("/getCtrlWarningInfo")
-    public AjaxResult getCtrlWarningInfo(){
+    public AjaxResult getCtrlWarningInfo(@RequestBody JSONObject reqBody){
         try{
             return AjaxResult.success(ctrlService.getWarningInfoByInc());
         } catch (Exception e){

src/main/resources/application.properties

@@ -136,49 +136,54 @@ tx.query.max.count=5000
 
 
 # \uFF08\u60C5\u62A5\u4E8C\u671F\uFF09\u7528\u6237\u57DF\u6A21\u578B\u7F16\u53F7\u4E0E\u70FD\u706B\u76D8\u53E4\u5E73\u53F0\u6570\u636E\u8D44\u6E90\u7F16\u7801\u5B57\u5178
-#DRYJ-BSJJ-TLDP=991C1398
+DRYJ-BSJJ-TLDP=yhybk
 DRYJ-BSJJ-KYCC=991C1516
 DRYJ-BSJJ-HCZRLGZ=991C2304
 DRYJ-BSJJ-HCZDW=991C1356
 DRYJ-BSJJ-ZDJC=01C1200002316
-DRYJ-BSJJ-GSSFZ=
+DRYJ-BSJJ-GSSFZ=deving
 DRYJ-BSJJ-XLPC=01C1200001942
-DRYJ-BSJJ-JJJZ=
+DRYJ-BSJJ-JJJZ=deving
 DRYJ-BSJJ-SJRD=01C1200002597
-DRYJ-BSJJ-BJWiFi=
+DRYJ-BSJJ-BJWiFi=deving
-DRYJ-BSJJ-ZJTL=
+DRYJ-BSJJ-ZJTL=deving
 DRYJ-BSJJ-LKZD=991C1223
-DRYJ-BSJJ-YKRL=
+DRYJ-BSJJ-YKRL=deving
-DRYJ-BSJJ-YKGJ=
+DRYJ-BSJJ-YKGJ=deving
-#DRYJ-KSGJ-TLDP=991C1398
+DRYJ-KSGJ-TLDP=yhybk
 DRYJ-KSGJ-MHDP=991C1233
-#DRYJ-WSLJ-TLDP=991C1398
+DRYJ-KSGJ-LKBDYJ=yhybk
+DRYJ-KSGJ-MGCSQX=yhybk
+DRYJ-WSLJ-TLDP=yhybk
 DRYJ-WSLJ-MHDP=991C1233
 DRYJ-WSLJ-HCZRLGZ=991C2304
 DRYJ-WSLJ-HCZDW=991C1356
+DRYJ-WSLJ-JRBDYJ=134B102
 DRYJ-BSMGQY-BSRL=991C2304
-DRYJ-BSMGQY-BSJZ=
+DRYJ-BSMGQY-BSJZ=deving
-DRYJ-BSMGQY-DZJC=
+DRYJ-BSMGQY-DZJC=deving
 DRYJ-BSMGQY-DT=01C1200002598
 DRYJ-BSMGQY-WBSW=991C1071
 DRYJ-BSMGQY-LKZD=991C1223
-DRYJ-FXXW-GMSZY=
+DRYJ-BSMGQY-JRMGQY=134B102
-#DRYJ-FXXW-SSGJCY=
+DRYJ-BSMGQY-MGQYDL=yhybk
-#DRYJ-FXXW-SYTDYY=
+DRYJ-FXXW-GMSZY=deving
-#DRYJ-FXXW-WSHD=
+DRYJ-FXXW-SSGJCY=yhybk
-#DRYJ-FXXW-HHHJYJ=
+DRYJ-FXXW-SYTDYY=yhybk
+DRYJ-FXXW-WSHD=yhybk
+DRYJ-FXXW-HHHJYJ=yhybk
 JJYJ-TCX-HC=01A1201001039
 JJYJ-TCX-KY=01A1201001040
 JJYJ-TCX-FJ=01A1200002658
-JJYJ-TCX-DT=
+JJYJ-TCX-DT=deving
 JJYJ-TMDD-TLDP=01A1201001039
 JJYJ-TMDD-MHDP=01A1200002658
 JJYJ-TMDD-KYCC=01A1201001040
-JJYJ-TMGQY-BSRL=
+JJYJ-TMGQY-BSRL=deving
-JJYJ-TMGQY-WAYJ=
+JJYJ-TMGQY-WAYJ=deving
-JJYJ-TMGQY-BSJZ=
+JJYJ-TMGQY-BSJZ=deving
-JJYJ-TMGQY-DZJC=
+JJYJ-TMGQY-DZJC=deving
-JJYJ-TLWIFI-WiFi=
+JJYJ-TLWIFI-WiFi=deving
 JJYJ-TRZ-LG=01A1200002660