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-08-15 23:46:38 +08:00
parent 8094e85d97
commit 0710caa975
5 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ruoyi-admin/src/main/java/org/dromara/web/device/DeviceSetCmd.java
View File

@ -33,33 +33,33 @@ public class DeviceSetCmd {
public static final String MODEL = "MODEL"; public static final String MODEL = "MODEL";
//自动关门功能开关 URC+ECTPS=GarageDoorLightControl,AutomaticDoorClosingSwitch,0,false,{},b2 //自动关门功能开关 URC+ECTPS=GarageDoorLightControl,AutomaticDoorClosingSwitch,0,false,{},b2
public static final String AutomaticDoorClosingSwitch_false = "URC+ECTPS=GarageDoorLightControl,AutomaticDoorClosingSwitch,0,false,{},b2\\r\\n"; public static final String AutomaticDoorClosingSwitch_false = "URC+ECTPS=GarageDoorLightControl,AutomaticDoorClosingSwitch,0,false,{},b2\r\n";
//自动关门功能开关 URC+ECTPS=GarageDoorLightControl,AutomaticDoorClosingSwitch,0,true,{},a7 //自动关门功能开关 URC+ECTPS=GarageDoorLightControl,AutomaticDoorClosingSwitch,0,true,{},a7
public static final String AutomaticDoorClosingSwitch_true = "URC+ECTPS=GarageDoorLightControl,AutomaticDoorClosingSwitch,0,true,{},a7\\r\\n"; public static final String AutomaticDoorClosingSwitch_true = "URC+ECTPS=GarageDoorLightControl,AutomaticDoorClosingSwitch,0,true,{},a7\r\n";
//延时自动关门的延时时长 URC+ECTPS=GarageDoorLightControl,AutomaticDoorClosingTime,1,1,{},98 //延时自动关门的延时时长 URC+ECTPS=GarageDoorLightControl,AutomaticDoorClosingTime,1,1,{},98
public static final String AutomaticDoorClosingTime = "URC+ECTPS=GarageDoorLightControl,AutomaticDoorClosingTime,1,MODEL,{},98\\r\\n";//MODEL public static final String AutomaticDoorClosingTime = "URC+ECTPS=GarageDoorLightControl,AutomaticDoorClosingTime,1,MODEL,{},98\r\n";//MODEL
//运行次数开关 URC+ECTPS=GarageDoorLightControl,DoorRunningTimesSwitch,0,true,{},ae //运行次数开关 URC+ECTPS=GarageDoorLightControl,DoorRunningTimesSwitch,0,true,{},ae
public static final String DoorRunningTimesSwitch_true = "URC+ECTPS=GarageDoorLightControl,DoorRunningTimesSwitch,0,true,{},ae\\r\\n"; public static final String DoorRunningTimesSwitch_true = "URC+ECTPS=GarageDoorLightControl,DoorRunningTimesSwitch,0,true,{},ae\r\n";
//运行次数开关 URC+ECTPS=GarageDoorLightControl,DoorRunningTimesSwitch,0,false,{},2e //运行次数开关 URC+ECTPS=GarageDoorLightControl,DoorRunningTimesSwitch,0,false,{},2e
public static final String DoorRunningTimesSwitch_false = "URC+ECTPS=GarageDoorLightControl,DoorRunningTimesSwitch,0,false,{},2e\\r\\n"; public static final String DoorRunningTimesSwitch_false = "URC+ECTPS=GarageDoorLightControl,DoorRunningTimesSwitch,0,false,{},2e\r\n";
//倒计时设置时间 URC+ECTPS=GarageDoorLightControl,CountDownConfig,1,50,{} //倒计时设置时间 URC+ECTPS=GarageDoorLightControl,CountDownConfig,1,50,{}
public static final String CountDownConfig = "URC+ECTPS=GarageDoorLightControl,CountDownConfig,1,MODEL,{},98\\r\\n";//MODEL public static final String CountDownConfig = "URC+ECTPS=GarageDoorLightControl,CountDownConfig,1,MODEL,{},98\r\n";//MODEL
//提醒关门时间设置 URC+ECTPS=CustomGarageDoor,RemindCloseDoorConfig,1,1,{},ee //提醒关门时间设置 URC+ECTPS=CustomGarageDoor,RemindCloseDoorConfig,1,1,{},ee
public static final String RemindCloseDoorConfig = "URC+ECTPS=CustomGarageDoor,RemindCloseDoorConfig,1,MODEL,{},ee\\r\\n"; public static final String RemindCloseDoorConfig = "URC+ECTPS=CustomGarageDoor,RemindCloseDoorConfig,1,MODEL,{},ee\r\n";
//提醒关门功能开关 URC+ECTPS=CustomGarageDoor,RemindCloseDoorSwitch,0,true,{},7c //提醒关门功能开关 URC+ECTPS=CustomGarageDoor,RemindCloseDoorSwitch,0,true,{},7c
public static final String RemindCloseDoorSwitch_true = "URC+ECTPS=CustomGarageDoor,RemindCloseDoorSwitch,0,true,{},7c\\r\\n"; public static final String RemindCloseDoorSwitch_true = "URC+ECTPS=CustomGarageDoor,RemindCloseDoorSwitch,0,true,{},7c\r\n";
//提醒关门功能开关 URC+ECTPS=CustomGarageDoor,RemindCloseDoorSwitch,0,false,{},c5 //提醒关门功能开关 URC+ECTPS=CustomGarageDoor,RemindCloseDoorSwitch,0,false,{},c5
public static final String RemindCloseDoorSwitch_false = "URC+ECTPS=CustomGarageDoor,RemindCloseDoorSwitch,0,false,{},c5\\r\\n"; public static final String RemindCloseDoorSwitch_false = "URC+ECTPS=CustomGarageDoor,RemindCloseDoorSwitch,0,false,{},c5\r\n";
//半开门高度设置 URC+ECTPS=CustomGarageDoor,PartOpenConfig,1,10,{},aa //半开门高度设置 URC+ECTPS=CustomGarageDoor,PartOpenConfig,1,10,{},aa
public static final String PartOpenConfig = "URC+ECTPS=CustomGarageDoor,PartOpenConfig,1,MODEL,{},aa\\r\\n"; public static final String PartOpenConfig = "URC+ECTPS=CustomGarageDoor,PartOpenConfig,1,MODEL,{},aa\r\n";
//半开门功能开关：关 URC+ECTPS=CustomGarageDoor,PartOpenSwitch,0,false,{},f9 //半开门功能开关：关 URC+ECTPS=CustomGarageDoor,PartOpenSwitch,0,false,{},f9
public static final String PartOpenSwitch_false = "URC+ECTPS=CustomGarageDoor,PartOpenSwitch,0,false,{},f9\\r\\n"; public static final String PartOpenSwitch_false = "URC+ECTPS=CustomGarageDoor,PartOpenSwitch,0,false,{},f9\r\n";
//半开门功能开关：开 URC+ECTPS=CustomGarageDoor,PartOpenSwitch,0,true,{},52 //半开门功能开关：开 URC+ECTPS=CustomGarageDoor,PartOpenSwitch,0,true,{},52
public static final String PartOpenSwitch_true = "URC+ECTPS=CustomGarageDoor,PartOpenSwitch,0,true,{},52\\r\\n"; public static final String PartOpenSwitch_true = "URC+ECTPS=CustomGarageDoor,PartOpenSwitch,0,true,{},52\r\n";
/*//门体运行状态：停止中 URC+ECTPS=CustomGarageDoor,WorkState,3,stop,{} /*//门体运行状态：停止中 URC+ECTPS=CustomGarageDoor,WorkState,3,stop,{}
public static final String WorkState_stop = "URC+ECTPS=CustomGarageDoor,WorkState,3,stop,{}"; public static final String WorkState_stop = "URC+ECTPS=CustomGarageDoor,WorkState,3,stop,{}";
@ -70,11 +70,11 @@ public class DeviceSetCmd {
//遇阻回弹的阻力设置 URC+ECTPS=GarageDoor,BounceSensitivity,1,5,{} //遇阻回弹的阻力设置 URC+ECTPS=GarageDoor,BounceSensitivity,1,5,{}
public static final String BounceSensitivity = "URC+ECTPS=GarageDoor,BounceSensitivity,1,MODEL,{}\\r\\n"; public static final String BounceSensitivity = "URC+ECTPS=GarageDoor,BounceSensitivity,1,MODEL,{}\r\n";
//红外感应开关开启 URC+ECTPS=GarageDoor,IRSwitch,0,true,{},52 //红外感应开关开启 URC+ECTPS=GarageDoor,IRSwitch,0,true,{},52
public static final String IRSwitch_true = "URC+ECTPS=GarageDoor,IRSwitch,0,true,{},52\\r\\n"; public static final String IRSwitch_true = "URC+ECTPS=GarageDoor,IRSwitch,0,true,{},52\r\n";
//红外感应开关关闭 URC+ECTPS=GarageDoor,IRSwitch,0,false,{},f9 (该指令协议目前没有) //红外感应开关关闭 URC+ECTPS=GarageDoor,IRSwitch,0,false,{},f9 (该指令协议目前没有)
public static final String IRSwitch_false = "URC+ECTPS=GarageDoor,IRSwitch,0,false,{},f9\\r\\n"; public static final String IRSwitch_false = "URC+ECTPS=GarageDoor,IRSwitch,0,false,{},f9\r\n";

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

@ -86,7 +86,7 @@ public class DeviceMsgDto {
* //运行次数开关 关 false * //运行次数开关 关 false
* //运行次数开关 开 true * //运行次数开关 开 true
*/ */
private Integer DoorRunningTimesSwitch; private Boolean DoorRunningTimesSwitch;
/** /**
* //倒计时剩余时间 * //倒计时剩余时间

12
ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqDeviceSetBo.java
View File

@ -29,15 +29,15 @@ public class EqDeviceSetBo implements Serializable {
*/ */
private String equipmentCode; private String equipmentCode;
/** /**
* 1.自动关门功能开关 * 1.自动关门功能开关 关
* 2.自动关门功能开关 * 2.自动关门功能开关 开
* 3.延时自动关门的延时时长 value * 3.延时自动关门的延时时长 value
* 4.运行次数开关 * 4.运行次数开关 开
* 5.运行次数开关 * 5.运行次数开关 关
* 6.倒计时设置时间 value * 6.倒计时设置时间 value
* 7.提醒关门时间设置 value * 7.提醒关门时间设置 value
* 8.提醒关门功能开关 * 8.提醒关门功能开关 开
* 9.提醒关门功能开关 * 9.提醒关门功能开关 关
* 10.半开门高度设置 value * 10.半开门高度设置 value
* 11.半开门功能开关：关 * 11.半开门功能开关：关
* 12.半开门功能开关：开 * 12.半开门功能开关：开

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

@ -72,10 +72,10 @@ public class IotService {
result.setAutomaticDoorClosingSwitch(Boolean.valueOf(resultMap.get("AutomaticDoorClosingSwitch"))); result.setAutomaticDoorClosingSwitch(Boolean.valueOf(resultMap.get("AutomaticDoorClosingSwitch")));
result.setAutomaticDoorClosingTime(Integer.valueOf(resultMap.get("AutomaticDoorClosingTime"))); result.setAutomaticDoorClosingTime(Integer.valueOf(resultMap.get("AutomaticDoorClosingTime")));
result.setDoorRunningTimesSwitch(Integer.valueOf(resultMap.get("DoorRunningTimesSwitch"))); result.setDoorRunningTimesSwitch(Boolean.valueOf(resultMap.get("DoorRunningTimesSwitch")));
result.setResidualCountDown(Integer.valueOf(resultMap.get("ResidualCountDown"))); result.setResidualCountDown(Integer.valueOf(resultMap.get("ResidualCountDown")));
result.setDoorRunningTimes(Integer.valueOf(resultMap.get("DoorRunningTimes"))); result.setDoorRunningTimes(Integer.valueOf(resultMap.get("DoorRunningTimes")));
result.setGarageException(Integer.valueOf(resultMap.get("GarageException"))); result.setGarageException(Integer.valueOf(resultMap.get("GarageException")==null?"-1":resultMap.get("GarageException")));
result.setCountDownConfig(Integer.valueOf(resultMap.get("CountDownConfig"))); result.setCountDownConfig(Integer.valueOf(resultMap.get("CountDownConfig")));
result.setLightSwitch(Boolean.valueOf(resultMap.get("LightSwitch"))); result.setLightSwitch(Boolean.valueOf(resultMap.get("LightSwitch")));
result.setRemindCloseDoorConfig(Integer.valueOf(resultMap.get("RemindCloseDoorConfig"))); result.setRemindCloseDoorConfig(Integer.valueOf(resultMap.get("RemindCloseDoorConfig")));
@ -83,11 +83,11 @@ public class IotService {
result.setPartOpenConfig(Integer.valueOf(resultMap.get("PartOpenConfig"))); result.setPartOpenConfig(Integer.valueOf(resultMap.get("PartOpenConfig")));
result.setPartOpenSwitch(Boolean.valueOf(resultMap.get("PartOpenSwitch"))); result.setPartOpenSwitch(Boolean.valueOf(resultMap.get("PartOpenSwitch")));
result.setOpenPercentage(Integer.valueOf(resultMap.get("OpenPercentage"))); result.setOpenPercentage(Integer.valueOf(resultMap.get("OpenPercentage")));
result.setWorkState(Integer.valueOf(resultMap.get("WorkState"))); result.setWorkState(Integer.valueOf(resultMap.get("WorkState")==null?"-1":resultMap.get("WorkState")));
result.setRouteCorrectStatus(Boolean.valueOf(resultMap.get("RouteCorrectStatus"))); result.setRouteCorrectStatus(Boolean.valueOf(resultMap.get("RouteCorrectStatus")));
result.setBounceSensitivity(Integer.valueOf(resultMap.get("BounceSensitivity"))); result.setBounceSensitivity(Integer.valueOf(resultMap.get("BounceSensitivity")));
result.setIRSwitch(Boolean.valueOf(resultMap.get("IRSwitch"))); result.setIRSwitch(Boolean.valueOf(resultMap.get("IRSwitch")));
result.setWarningStatus(Integer.valueOf(resultMap.get("warningStatus"))); result.setWarningStatus(Integer.valueOf(resultMap.get("warningStatus")==null?"-1":resultMap.get("warningStatus")));
return result; return result;
} }

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

@ -261,6 +261,7 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService {
eqEquipmentBo.setStatus(deviceMsgDto.getOpenPercentage());//使用半开作为状态值 eqEquipmentBo.setStatus(deviceMsgDto.getOpenPercentage());//使用半开作为状态值
eqEquipmentBo.setFaultStatus(deviceMsgDto.getGarageException()); eqEquipmentBo.setFaultStatus(deviceMsgDto.getGarageException());
eqEquipmentBo.setLineStatus(1);//在线
//判断是否获取到信息 无信息会抛异常 无需判断 //判断是否获取到信息 无信息会抛异常 无需判断
EqEquipment add = MapstructUtils.convert(eqEquipmentBo, EqEquipment.class); EqEquipment add = MapstructUtils.convert(eqEquipmentBo, EqEquipment.class);