From 000065556ba3ef2e59a76b1bdd1803f3f0c089b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com> Date: Fri, 31 May 2024 16:20:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A0=90=E6=A1=88=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E5=9F=B7=E8=A1=8C=E5=91=BD=E4=BB=A4=E5=AD=98=E5=84=B2?= =?UTF-8?q?=E6=95=B8=E6=93=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DcEmergencyPlansServiceImpl.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) 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 0cee3846..bdd65b4e 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 @@ -1178,9 +1178,18 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService { config.put("time",jsonObject.get("startTime").toString() +"-"+jsonObject.get("endTime").toString()); } - }else if (dcExecuteAction.getDeviceType() == DeviceTypeConstants.VARIABLE_INFORMATION_FLAG || - dcExecuteAction.getDeviceType() == DeviceTypeConstants.ROAD_SECTION_VOICE_BROADCASTING) { - // 情报板/语音广播 + }else if (dcExecuteAction.getDeviceType() == DeviceTypeConstants.VARIABLE_INFORMATION_FLAG ) { + // 情报板 + if (jsonObject.getString("operationType").equals("1")) { + JSONObject dcInfoBoardTemplate = JSON.parseObject(jsonObject.get("dcInfoBoardTemplate").toString()) ; + config.put("content",dcInfoBoardTemplate.get("content")); + }else { + config.put("operationType","智能发布"); + } + + } + else if (dcExecuteAction.getDeviceType() == DeviceTypeConstants.ROAD_SECTION_VOICE_BROADCASTING) { + // 语音广播 if (jsonObject.getString("operationType").equals("1")) { config.put("content",jsonObject.get("content")); }else {