opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-19 01:48:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

对码清码控制及其状态添加

Browse Source
This commit is contained in:
zzc 2024-09-06 23:28:09 +08:00
parent 129f764499
commit eefb984ec4
4 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-admin/src/main/java/org/dromara/web/device/DeviceCtlCmd.java
View File

@ -38,5 +38,8 @@ public class DeviceCtlCmd {
//照明灯开关 URC+ECTPS=GarageDoorLightControl,LightSwitch,0,true,{},98 //照明灯开关 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 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";
} }

9
ruoyi-admin/src/main/java/org/dromara/web/device/iot/DeviceMsgDto.java
View File

@ -187,5 +187,14 @@ public class DeviceMsgDto {
* 114.门体停止运行提醒 * 114.门体停止运行提醒
*/ */
private Integer warningStatus; private Integer warningStatus;
/**
* 1.遥控器对码中
* 2.遥控器对码完成
* 3.遥控器擦除中
* 4.遥控器擦除完成
*/
private Integer checkCodeStatus;
} }

2
ruoyi-admin/src/main/java/org/dromara/web/service/IotService.java
View File

@ -90,6 +90,8 @@ public class IotService {
result.setBounceSensitivity(Integer.valueOf(resultMap.get("BounceSensitivity")==null?"-1":resultMap.get("BounceSensitivity"))); 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.setIRSwitch(Boolean.valueOf(resultMap.get("IRSwitch")==null?"false":resultMap.get("IRSwitch")));
result.setWarningStatus(Integer.valueOf(resultMap.get("warningStatus")==null?"-1":resultMap.get("warningStatus"))); 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; return result;
} }

2
ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentServiceImpl.java
View File

@ -204,6 +204,8 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService {
case 6: cmd = DeviceCtlCmd.OPT_RESUME_COUNTDOWN; break;//复位照明时长 case 6: cmd = DeviceCtlCmd.OPT_RESUME_COUNTDOWN; break;//复位照明时长
case 7: cmd = DeviceCtlCmd.LightSwitch_true; break;//照明灯开关 开 case 7: cmd = DeviceCtlCmd.LightSwitch_true; break;//照明灯开关 开
case 8: cmd = DeviceCtlCmd.LightSwitch_false; break;//照明灯开关 关 case 8: cmd = DeviceCtlCmd.LightSwitch_false; break;//照明灯开关 关
case 9: cmd = DeviceCtlCmd.RFControllorPair; break;//对码
case 10: cmd = DeviceCtlCmd.RFControllorErase; break;//清码
default: default:
return "指令类型错误"; return "指令类型错误";
} }