From eefb984ec491d65934bce6e7c0ffa9b33e1daa1d Mon Sep 17 00:00:00 2001
From: zzc <1278921369@qq.com>
Date: Fri, 6 Sep 2024 23:28:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E7=A0=81=E6=B8=85=E7=A0=81=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E5=8F=8A=E5=85=B6=E7=8A=B6=E6=80=81=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/dromara/web/device/DeviceCtlCmd.java   | 3 +++
 .../java/org/dromara/web/device/iot/DeviceMsgDto.java    | 9 +++++++++
 .../main/java/org/dromara/web/service/IotService.java    | 2 ++
 .../dromara/web/service/impl/EqEquipmentServiceImpl.java | 2 ++
 4 files changed, 16 insertions(+)

diff --git a/ruoyi-admin/src/main/java/org/dromara/web/device/DeviceCtlCmd.java b/ruoyi-admin/src/main/java/org/dromara/web/device/DeviceCtlCmd.java
index 4737b7e02..f48e1bd8d 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/device/DeviceCtlCmd.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/device/DeviceCtlCmd.java
@@ -38,5 +38,8 @@ public class DeviceCtlCmd {
     //照明灯开关	URC+ECTPS=GarageDoorLightControl,LightSwitch,0,true,{},98
     public static final String LightSwitch_true = "URC+ECTPS=GarageDoorLightControl,LightSwitch,0,true,{},98\r\n";
 
+    public static final String RFControllorPair = "URC+ECTAS=GarageDoor,RFControllorPair,{},{},\r\n";
+    public static final String RFControllorErase = "URC+ECTAS=GarageDoor,RFControllorErase,{},{},\r\n";
+
 
 }
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 339e41060..cb5d99c0a 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
@@ -187,5 +187,14 @@ public class DeviceMsgDto {
      * 114.门体停止运行提醒
      */
     private Integer warningStatus;
+
+
+    /**
+     * 1.遥控器对码中
+     * 2.遥控器对码完成
+     * 3.遥控器擦除中
+     * 4.遥控器擦除完成
+     */
+    private Integer checkCodeStatus;
 }
 
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 32d44bec1..1b7ad5c23 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
@@ -90,6 +90,8 @@ public class IotService {
         result.setBounceSensitivity(Integer.valueOf(resultMap.get("BounceSensitivity")==null?"-1":resultMap.get("BounceSensitivity")));
         result.setIRSwitch(Boolean.valueOf(resultMap.get("IRSwitch")==null?"false":resultMap.get("IRSwitch")));
         result.setWarningStatus(Integer.valueOf(resultMap.get("warningStatus")==null?"-1":resultMap.get("warningStatus")));
+
+        result.setCheckCodeStatus(Integer.valueOf(resultMap.get("checkCodeStatus")==null?"-1":resultMap.get("checkCodeStatus")));
         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 1cfe0622d..1620d4244 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
@@ -204,6 +204,8 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService {
             case 6: cmd = DeviceCtlCmd.OPT_RESUME_COUNTDOWN; break;//复位照明时长
             case 7: cmd = DeviceCtlCmd.LightSwitch_true; break;//照明灯开关 开
             case 8: cmd = DeviceCtlCmd.LightSwitch_false; break;//照明灯开关 关
+            case 9: cmd = DeviceCtlCmd.RFControllorPair; break;//对码
+            case 10: cmd = DeviceCtlCmd.RFControllorErase; break;//清码
             default:
                 return "指令类型错误";
         }