From fa4a052c5bf7f62c5d5988c9efea13c7c63fc898 Mon Sep 17 00:00:00 2001
From: "Mr.Wang" <wang@qq.com>
Date: Thu, 16 May 2024 10:58:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=A4=E9=80=9A=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6-=E5=88=87=E6=8D=A2=E6=99=BA=E8=83=BD=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E7=94=9F=E6=88=90=E5=86=85=E5=AE=B9=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DcEmergencyPlansController.java           | 15 +++++++
 .../impl/DcEmergencyPlansServiceImpl.java     | 44 +++++++++----------
 2 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/zc-business/src/main/java/com/zc/business/controller/DcEmergencyPlansController.java b/zc-business/src/main/java/com/zc/business/controller/DcEmergencyPlansController.java
index e21493ce..73989533 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcEmergencyPlansController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcEmergencyPlansController.java
@@ -14,6 +14,8 @@ import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -67,6 +69,19 @@ public class DcEmergencyPlansController extends BaseController {
         return AjaxResult.success(dcEmergencyPlansList);
     }
 
+    /**
+     * 交通事件-切换智能发布生成内容
+     */
+    @ApiOperation("交通事件-切换智能发布生成内容")
+//    @PreAuthorize("@ss.hasPermi('business:plans:list')")
+    @PostMapping("/list/event/emergencyPlans")
+    public AjaxResult switchIntelligentPublishingToContent(@RequestBody DcEventAnDcEmergencyPlans dcEventAnDcEmergencyPlans) {
+        List<DcEmergencyPlans> dcEmergencyPlansList = new ArrayList<>();
+        dcEmergencyPlansList.add(dcEventAnDcEmergencyPlans.getDcEmergencyPlans());
+        dcEmergencyPlansService.dispositionDeviceContent(dcEmergencyPlansList,dcEventAnDcEmergencyPlans.getDcEvent());
+        return AjaxResult.success(dcEmergencyPlansList);
+    }
+
     /**
      * 感知事件-根据事件数据查询事件预案列表
      */
diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcEmergencyPlansServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcEmergencyPlansServiceImpl.java
index e21de6a3..68a62719 100644
--- a/zc-business/src/main/java/com/zc/business/service/impl/DcEmergencyPlansServiceImpl.java
+++ b/zc-business/src/main/java/com/zc/business/service/impl/DcEmergencyPlansServiceImpl.java
@@ -720,28 +720,28 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService {
                 .forEach(dcExecuteAction -> {
                     List<DcDevice> dcDevices = ruleFiltering(dcExecuteAction, markArray, direction);
 
-                    // 此代码 是为了防止事件没有匹配到预案，但是还执行了设备控制，并且执行操作中带有智能发布
-                    boolean isIdEmpty = ObjectUtils.isEmpty(dcEmergencyPlans.getId());
-                    Set<Integer> targetDeviceTypes = new HashSet<>(Arrays.asList(
-                            DeviceTypeEnum.ROAD_SECTION_VOICE_BROADCASTING.getCode(),
-                            DeviceTypeEnum.VARIABLE_INFORMATION_FLAG.getCode()
-                    ));
-                    boolean isTargetDeviceType = targetDeviceTypes.contains(dcExecuteAction.getDeviceType());
-                    if (isIdEmpty && isTargetDeviceType) {
-                        String configJson = operationType.equals(1) ? dcExecuteAction.getExecuteConfig() : dcExecuteAction.getRecoverConfig();
-                        JSONObject config = JSON.parseObject(configJson);
-                        if (config.getString("operationType").equals("2")) {
-                            DcEvent dcEvent = dcEventAnDcEmergencyPlans.getDcEvent();
-                            String content = intelligentPublishingOfInformation(dcEvent);
-                            updateIntelligentPublishingContent(
-                                    dcExecuteAction,
-                                    markArray,
-                                    dcEvent,
-                                    content,
-                                    dcEvent.getDirection()
-                            );
-                        }
-                    }
+//                    // 此代码 是为了防止事件没有匹配到预案，但是还执行了设备控制，并且执行操作中带有智能发布
+//                    boolean isIdEmpty = ObjectUtils.isEmpty(dcEmergencyPlans.getId());
+//                    Set<Integer> targetDeviceTypes = new HashSet<>(Arrays.asList(
+//                            DeviceTypeEnum.ROAD_SECTION_VOICE_BROADCASTING.getCode(),
+//                            DeviceTypeEnum.VARIABLE_INFORMATION_FLAG.getCode()
+//                    ));
+//                    boolean isTargetDeviceType = targetDeviceTypes.contains(dcExecuteAction.getDeviceType());
+//                    if (isIdEmpty && isTargetDeviceType) {
+//                        String configJson = operationType.equals(1) ? dcExecuteAction.getExecuteConfig() : dcExecuteAction.getRecoverConfig();
+//                        JSONObject config = JSON.parseObject(configJson);
+//                        if (config.getString("operationType").equals("2")) {
+//                            DcEvent dcEvent = dcEventAnDcEmergencyPlans.getDcEvent();
+//                            String content = intelligentPublishingOfInformation(dcEvent);
+//                            updateIntelligentPublishingContent(
+//                                    dcExecuteAction,
+//                                    markArray,
+//                                    dcEvent,
+//                                    content,
+//                                    dcEvent.getDirection()
+//                            );
+//                        }
+//                    }
 
                     JSONObject otherConfig = operationType.equals(1)?
                             JSON.parseObject(dcExecuteAction.getExecuteConfig()): JSON.parseObject(dcExecuteAction.getRecoverConfig());