修改自定义发布数据格式处理

zc-business/src/main/java/com/zc/business/service/impl/DcEmergencyPlansServiceImpl.java

@@ -219,22 +219,39 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService {
      */
     public void customPublishingDataFormatProcessing(List<DcDevice> deviceList, JSONObject otherConfig, int deviceType) {
         List<Map<String,Object>> contentList = new ArrayList<>();
-        deviceList.forEach(dcDevice -> {
+        if (!ObjectUtils.isEmpty(otherConfig.get("contentList"))) {
-            Map<String,Object> map = new HashMap<>();
+            contentList.addAll((List<Map<String,Object>>) otherConfig.get("contentList"));
-            map.put("dcDeviceId",dcDevice.getId());
+            contentList.removeIf(cont -> deviceList.stream().noneMatch(device -> device.getId().toString().equals(cont.get("dcDeviceId").toString())));
-            map.put("deviceName",dcDevice.getDeviceName());
+            deviceList.forEach(dcDevice -> {
-            if (deviceType == DeviceTypeEnum.VARIABLE_INFORMATION_FLAG.getCode()) {
+                boolean filter = contentList.stream().anyMatch(content ->
-                JSONObject dcInfoBoardTemplate = JSON.parseObject(otherConfig.get("dcInfoBoardTemplate").toString());
+                    content.get("dcDeviceId").toString().equals(dcDevice.getId().toString()));
-                dcInfoBoardTemplate.keySet().forEach(key -> map.put(key, dcInfoBoardTemplate.get(key)));
+                if (!filter) {
-            }else {
+                    handleContentList(dcDevice,deviceType,otherConfig,contentList);
-                // 语音广播
+                }
-                map.put("content",otherConfig.get("content"));
+            });
-            }
+        }else {
-            contentList.add(map);
+            deviceList.forEach(dcDevice -> {
-        });
+                handleContentList(dcDevice,deviceType,otherConfig,contentList);
+            });
+        }
+
         otherConfig.put("contentList",contentList);
     }
 
+    public void handleContentList(DcDevice dcDevice, int deviceType, JSONObject otherConfig, List<Map<String,Object>> contentList) {
+        Map<String,Object> map = new HashMap<>();
+        map.put("dcDeviceId",dcDevice.getId());
+        map.put("deviceName",dcDevice.getDeviceName());
+        if (deviceType == DeviceTypeEnum.VARIABLE_INFORMATION_FLAG.getCode()) {
+            JSONObject dcInfoBoardTemplate = JSON.parseObject(otherConfig.get("dcInfoBoardTemplate").toString());
+            dcInfoBoardTemplate.keySet().forEach(key -> map.put(key, dcInfoBoardTemplate.get(key)));
+        }else {
+            // 语音广播
+            map.put("content",otherConfig.get("content"));
+        }
+        contentList.add(map);
+    }
+
     /**
      * 交通事件-根据事件、单个执行操作筛选设备
      * @param dcEventAnDcEmergencyPlans