修改情报板恢复操作代码

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

@@ -397,6 +397,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService {
                     try {
                         // 根据不通设备类型，执行不通的功能操作
                         invokedFunction(
+                                dcEventAnDcEmergencyPlans.getOperationType(),
                                 dcDevices,
                                 JSON.parseObject(dcExecuteAction.getOtherConfig()),
                                 resultArray);
@@ -440,6 +441,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService {
      * 根据不通设备类型，执行不通的功能操作
      */
     public void invokedFunction(
+                                Integer operationType,
                                 List<DcDevice> dcDevices,
                                 JSONObject otherConfig,
                                 JSONArray resultArray) throws HttpException, IOException {
@@ -480,6 +482,8 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService {
 
             }
             else if (device.getDeviceType().equals(DeviceTypeConstants.VARIABLE_INFORMATION_FLAG)) {
+                if (operationType == 1) {
+                    // 执行操作
                     // 可变信息标志  分三步
                     // 1:执行11功能码
                     functionId = DeviceFunctionIdConstants.VARIABLE_INFORMATION_FLAG_11;
@@ -535,6 +539,18 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService {
                         }
                     }
                 }
+                else {
+                    // 恢复操作
+                    props.put("fileId","10");
+                    functionId = DeviceFunctionIdConstants.VARIABLE_INFORMATION_FLAG_1B;
+                    AjaxResult ajaxResult1B = dcDeviceController.invokedFunction(iotDeviceId, functionId, props);
+                    JSONObject result = new JSONObject();
+                    result.put("device", device.getId());
+                    result.put("result", ajaxResult1B);
+                    resultArray.add(result);
+                }
+
+            }
             else if (device.getDeviceType().equals(DeviceTypeConstants.ROAD_SECTION_VOICE_BROADCASTING)) {
                 // 路段广播
                 JSONObject params = new JSONObject();