From 1172a7b7bf0a75861e1e3f419563cbc891f3dfc6 Mon Sep 17 00:00:00 2001 From: sunyuehai <1486744867@qq.com> Date: Mon, 16 Sep 2024 21:08:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=81=A5=E6=8E=A7=E5=99=A8?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E9=97=B4=E5=B1=9E=E6=80=A7=EF=BC=8C=E5=92=8C?= =?UTF-8?q?=E9=81=A5=E6=8E=A7=E5=99=A8=E5=88=B7=E6=96=B0=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/dromara/web/device/iot/DeviceMsgDto.java | 4 ++++ .../src/main/java/org/dromara/web/service/IotService.java | 1 + .../org/dromara/web/service/impl/EqEquipmentServiceImpl.java | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ruoyi-admin/src/main/java/org/dromara/web/device/iot/DeviceMsgDto.java b/ruoyi-admin/src/main/java/org/dromara/web/device/iot/DeviceMsgDto.java index 7ef30306f..e1c539d5d 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/device/iot/DeviceMsgDto.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/device/iot/DeviceMsgDto.java @@ -204,5 +204,9 @@ public class DeviceMsgDto { * 4.遥控器擦除完成 */ private String checkCodeStatusStr; + /** + * 已配对遥控器数量 + */ + private Integer rfcNumber; } diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/IotService.java b/ruoyi-admin/src/main/java/org/dromara/web/service/IotService.java index b78783756..118449f51 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/IotService.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/IotService.java @@ -93,6 +93,7 @@ public class IotService { result.setCheckCodeStatus(Integer.valueOf(resultMap.get("checkCodeStatus")==null?"-1":resultMap.get("checkCodeStatus"))); result.setCheckCodeStatusStr(MessageUtils.message("checkCodeStatusStr.name"+result.getCheckCodeStatus())); + result.setRfcNumber(Integer.valueOf(resultMap.get("RFControllorNumber")==null?"-1":resultMap.get("RFControllorNumber"))); return result; } diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java index 1620d4244..a07acbe8d 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java @@ -220,7 +220,7 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService { switch (operateType){ case 1: cmd = DeviceSetCmd.AutomaticDoorClosingSwitch_false; break;//自动关门功能开关 关 case 2: cmd = DeviceSetCmd.AutomaticDoorClosingSwitch_true; break;//自动关门功能开关 开 - case 3: cmd = DeviceSetCmd.AutomaticDoorClosingTime; break;//延时自动关门的延时时长 + case 3: cmd = DeviceSetCmd.AutomaticDoorClosingTime; break;//延时自动关门的延时时长(刷新倒计时时间) case 4: cmd = DeviceSetCmd.DoorRunningTimesSwitch_true; break;//运行次数开关 case 5: cmd = DeviceSetCmd.DoorRunningTimesSwitch_false; break;//运行次数开关 case 6: cmd = DeviceSetCmd.CountDownConfig; break;//倒计时设置时间