diff --git a/ruoyi-admin/src/main/java/org/dromara/web/device/DeviceSetCmd.java b/ruoyi-admin/src/main/java/org/dromara/web/device/DeviceSetCmd.java index 3fe93bf9b..21ccc982c 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/device/DeviceSetCmd.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/device/DeviceSetCmd.java @@ -33,33 +33,33 @@ public class DeviceSetCmd { public static final String MODEL = "MODEL"; //自动关门功能开关 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 - 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 - 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 - 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 - 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,{} - 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 - 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 - 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 - 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 - 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 - 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 - 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,{} 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,{} - 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 - 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 (该指令协议目前没有) - 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"; 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 e8ef47f4e..339e41060 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 @@ -86,7 +86,7 @@ public class DeviceMsgDto { * //运行次数开关 关 false * //运行次数开关 开 true */ - private Integer DoorRunningTimesSwitch; + private Boolean DoorRunningTimesSwitch; /** * //倒计时剩余时间 diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqDeviceSetBo.java b/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqDeviceSetBo.java index 545534aee..dbfc38435 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqDeviceSetBo.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqDeviceSetBo.java @@ -29,15 +29,15 @@ public class EqDeviceSetBo implements Serializable { */ private String equipmentCode; /** - * 1.自动关门功能开关 - * 2.自动关门功能开关 + * 1.自动关门功能开关 关 + * 2.自动关门功能开关 开 * 3.延时自动关门的延时时长 value - * 4.运行次数开关 - * 5.运行次数开关 + * 4.运行次数开关 开 + * 5.运行次数开关 关 * 6.倒计时设置时间 value * 7.提醒关门时间设置 value - * 8.提醒关门功能开关 - * 9.提醒关门功能开关 + * 8.提醒关门功能开关 开 + * 9.提醒关门功能开关 关 * 10.半开门高度设置 value * 11.半开门功能开关：关 * 12.半开门功能开关：开 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 4803f09af..13765377e 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 @@ -72,10 +72,10 @@ public class IotService { result.setAutomaticDoorClosingSwitch(Boolean.valueOf(resultMap.get("AutomaticDoorClosingSwitch"))); 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.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.setLightSwitch(Boolean.valueOf(resultMap.get("LightSwitch"))); result.setRemindCloseDoorConfig(Integer.valueOf(resultMap.get("RemindCloseDoorConfig"))); @@ -83,11 +83,11 @@ public class IotService { result.setPartOpenConfig(Integer.valueOf(resultMap.get("PartOpenConfig"))); result.setPartOpenSwitch(Boolean.valueOf(resultMap.get("PartOpenSwitch"))); 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.setBounceSensitivity(Integer.valueOf(resultMap.get("BounceSensitivity"))); 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; } 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 0517b5c23..156a5c3f3 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 @@ -261,6 +261,7 @@ public class EqEquipmentServiceImpl implements IEqEquipmentService { eqEquipmentBo.setStatus(deviceMsgDto.getOpenPercentage());//使用半开作为状态值 eqEquipmentBo.setFaultStatus(deviceMsgDto.getGarageException()); + eqEquipmentBo.setLineStatus(1);//在线 //判断是否获取到信息 无信息会抛异常 无需判断 EqEquipment add = MapstructUtils.convert(eqEquipmentBo, EqEquipment.class);