From e5a0a8531a6440e1b74b61d5e043135106aaae6c Mon Sep 17 00:00:00 2001 From: "Mr.Wang" Date: Fri, 15 Mar 2024 19:25:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8B=E4=BB=B6=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E4=B8=AD=E7=9A=84=E6=BF=80=E5=85=89=E7=96=B2=E5=8A=B3?= =?UTF-8?q?=E5=94=A4=E9=86=92=E6=93=8D=E4=BD=9C=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zc/business/constant/DeviceFunctionIdConstants.java | 5 +++++ .../business/service/impl/DcEmergencyPlansServiceImpl.java | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/zc-business/src/main/java/com/zc/business/constant/DeviceFunctionIdConstants.java b/zc-business/src/main/java/com/zc/business/constant/DeviceFunctionIdConstants.java index 3231d3cd..46579be7 100644 --- a/zc-business/src/main/java/com/zc/business/constant/DeviceFunctionIdConstants.java +++ b/zc-business/src/main/java/com/zc/business/constant/DeviceFunctionIdConstants.java @@ -28,4 +28,9 @@ public class DeviceFunctionIdConstants { * 可变信息标志 1B 功能码 */ public static final String VARIABLE_INFORMATION_FLAG_1B = "1B"; + + /** + * 激光疲劳唤醒 SETTM 功能码 + */ + public static final String VARIABLE_INFORMATION_FLAG_SETTM = "SETTM"; } 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 48a6c287..500e0497 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 @@ -714,7 +714,10 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService { resultArray.add(result); // 操作时长 String operationDuration = "SETTM" + otherConfig.get("operationDuration").toString(); - AjaxResult ajaxResult = dcDeviceController.invokedFunction(iotDeviceId, operationDuration, new HashMap<>()); + HashMap propsTime = new HashMap<>(); + propsTime.put("SET",operationDuration); + functionId = DeviceFunctionIdConstants.VARIABLE_INFORMATION_FLAG_SETTM; + AjaxResult ajaxResult = dcDeviceController.invokedFunction(iotDeviceId, functionId, propsTime); JSONObject resultTime = new JSONObject(); resultTime.put("device", device.getId()); resultTime.put("result", ajaxResult);