diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java index 8f7e2f0c..7f81b72f 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java @@ -2025,6 +2025,10 @@ public class DcEventServiceImpl extends ServiceImpl impl JSONArray control = JSONArray.parseArray(planAssoc.getControl()); for (Object o : control) { JSONObject controlItem = (JSONObject) o; + // 判断是否有设备列表,如果没有则跳过当前循环 + if (!controlItem.containsKey("deviceList") || controlItem.get("deviceList") == null) { + continue; + } String[] deviceList = controlItem.getString("deviceList").split(","); JSONObject recoverConfig = controlItem.getJSONObject("recoverConfig"); int deviceType = controlItem.getIntValue("deviceType"); @@ -2038,8 +2042,13 @@ public class DcEventServiceImpl extends ServiceImpl impl } } else if (deviceType == 10){ - //激光疲劳唤醒 - + //激光疲劳唤醒"recoverConfig": "{\"operationDuration\":1,\"operationType\":\"0\",\"name\":\"激光关闭\"}", + for (String deviceId : deviceList) { + HashMap propsTime = new HashMap<>(); + propsTime.put(UniversalEnum.SET.getValue(), recoverConfig.getString("operationDuration")); + String functionId = DeviceFunctionIdConstants.VARIABLE_INFORMATION_FLAG_SETTM; + deviceController.getAjaxResult(deviceId, functionId, propsTime); + } } else if (deviceType == 12){ //行车诱导