处理语音广播控制，播放错误，没有记录日志问题

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

@@ -225,6 +225,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService {
             dcExecuteAction.setRecoverConfig(recoverConfig.toJSONString());
         }
     }
+
     /**
      * 自定义发布数据格式处理
      */
@@ -265,6 +266,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService {
 
     /**
      * 交通事件-根据事件、单个执行操作筛选设备
+     *
      * @param dcEventAnDcEmergencyPlans
      * @return
      */
@@ -283,6 +285,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService {
 
     /**
      * 设备管控-确认按钮生成内容
+     *
      * @param dcEventAnDcEmergencyPlans
      * @return
      */
@@ -636,6 +639,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService {
 
     /**
      * 根据事件id-查询预案事件关联表
+     *
      * @param eventId 事件id
      * @return
      */
@@ -648,6 +652,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService {
 
     /**
      * 根据id-查询预案事件关联表
+     *
      * @param id id
      * @return
      */
@@ -887,8 +892,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService {
                     resultArray.add(result);
 
 
-                    }
+                } else if (device.getDeviceType().equals(DeviceTypeConstants.VARIABLE_INFORMATION_FLAG.toString())) {
-                    else if (device.getDeviceType().equals(DeviceTypeConstants.VARIABLE_INFORMATION_FLAG.toString())) {
                     if (operationType == 2 && otherConfig.getString("operationType").equals("2")) {
                         // 还原上次  恢复操作
                         props.put("fileId", "10");
@@ -940,8 +944,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService {
 
                     }
 
-                    }
+                } else if (device.getDeviceType().equals(DeviceTypeConstants.ROAD_SECTION_VOICE_BROADCASTING.toString())
-                    else if (device.getDeviceType().equals(DeviceTypeConstants.ROAD_SECTION_VOICE_BROADCASTING.toString())
                         && operationType.equals(1)) {
                     // 路段广播
                     JSONObject params = new JSONObject();
@@ -985,8 +988,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService {
                     JSONObject returnResult = broadcastController.nearCamListDistance(params);
                     result.put("result", returnResult);
                     resultArray.add(result);
-
+                    if (Objects.equals(returnResult.getString("retCode"), "0")) {
-                        if (returnResult.get("retCode").equals("0")) {
                         status = 0;
                         remark.append("成功");
                     } else {
@@ -995,8 +997,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService {
                     }
 
 
-                    }
+                } else if (device.getDeviceType().equals(DeviceTypeConstants.LASER_FATIGUE_AWAKENING.toString())) {
-                    else if (device.getDeviceType().equals(DeviceTypeConstants.LASER_FATIGUE_AWAKENING.toString())) {
                     // 激光疲劳唤醒
                     HashMap<String, Object> map = new HashMap<>();
                     map.put("SET", otherConfig.get("operationType").toString());
@@ -1333,8 +1334,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService {
                             config.put("operationType", "智能发布");
                         }
 
-                    }
+                    } else if (dcExecuteAction.getDeviceType() == DeviceTypeConstants.ROAD_SECTION_VOICE_BROADCASTING) {
-                    else if (dcExecuteAction.getDeviceType() == DeviceTypeConstants.ROAD_SECTION_VOICE_BROADCASTING) {
                         // 语音广播
                         if (jsonObject.getString("operationType").equals("1")) {
                             config.put("content", jsonObject.get("content"));
@@ -1342,8 +1342,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService {
                             config.put("operationType", "智能发布");
                         }
 
-                    }
+                    } else if (dcExecuteAction.getDeviceType() == DeviceTypeConstants.LASER_FATIGUE_AWAKENING) {
-                    else if (dcExecuteAction.getDeviceType() == DeviceTypeConstants.LASER_FATIGUE_AWAKENING) {
                         // 激光疲劳唤醒
                         config.put("name", jsonObject.get("name"));
                         config.put("operationDuration", jsonObject.get("operationDuration") + "分钟");