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

发送给设备的指令要加/r/n

Browse Source
This commit is contained in:
sunyuehai 2024-08-15 21:03:19 +08:00
parent 9e7f6b4736
commit ad0ece16b0
5 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.run/ruoyi-monitor-admin.run.xml
View File

@ -1,5 +1,5 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="ruoyi-monitor-admin" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
<configuration default="false" name="ruoyi-monitor-admin" type="docker-deploy" factoryName="dockerfile" server-name="卷帘门docker">
<deployment type="dockerfile">
<settings>
<option name="imageTag" value="ruoyi/ruoyi-monitor-admin:5.2.1" />
@ -9,4 +9,4 @@
</deployment>
<method v="2" />
</configuration>
</component>
</component>

4
.run/ruoyi-server.run.xml
View File

@ -1,5 +1,5 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="ruoyi-server" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
<configuration default="false" name="ruoyi-server" type="docker-deploy" factoryName="dockerfile" server-name="卷帘门docker">
<deployment type="dockerfile">
<settings>
<option name="imageTag" value="ruoyi/ruoyi-server:5.2.1" />
@ -9,4 +9,4 @@
</deployment>
<method v="2" />
</configuration>
</component>
</component>

4
.run/ruoyi-snailjob-server.run.xml
View File

@ -1,5 +1,5 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="ruoyi-snailjob-server" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
<configuration default="false" name="ruoyi-snailjob-server" type="docker-deploy" factoryName="dockerfile" server-name="卷帘门docker">
<deployment type="dockerfile">
<settings>
<option name="imageTag" value="ruoyi/ruoyi-snailjob-server:5.2.1" />
@ -9,4 +9,4 @@
</deployment>
<method v="2" />
</configuration>
</component>
</component>

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

@ -21,22 +21,22 @@ public class DeviceCtlCmd {
* //照明灯开关 开 URC+ECTPS=GarageDoorLightControl,LightSwitch,0,true,{},98
*/
//开门 URC+ECTAS=GarageDoor,OpenGarage,100,{},73
public final static String OPT_OPEN_GARAGE = "URC+ECTAS=GarageDoor,OpenGarage,100,{},73";
public final static String OPT_OPEN_GARAGE = "URC+ECTAS=GarageDoor,OpenGarage,100,{},73/r/n";
//半开门 URC+ECTAS=GarageDoor,PartOpenGarage,{},{},83
public final static String OPT_PART_OPEN_GARAGE = "URC+ECTAS=GarageDoor,PartOpenGarage,{},{},83";
public final static String OPT_PART_OPEN_GARAGE = "URC+ECTAS=GarageDoor,PartOpenGarage,{},{},83/r/n";
//门体停止 URC+ECTAS=GarageDoor,StopGarage,{},{},f5
public final static String OPT_STOP_GARAGE = "URC+ECTAS=GarageDoor,StopGarage,{},{},f5";
public final static String OPT_STOP_GARAGE = "URC+ECTAS=GarageDoor,StopGarage,{},{},f5/r/n";
//关门 URC+ECTAS=GarageDoor,OpenGarage,0,{},30
public final static String OPT_CLOSE_GARAGE = "URC+ECTAS=GarageDoor,OpenGarage,0,{},30";
public final static String OPT_CLOSE_GARAGE = "URC+ECTAS=GarageDoor,OpenGarage,0,{},30/r/n";
//门体运行状态循环切换 URC+ECTAS=GarageDoor,ToggleGarage,0,{}
public final static String OPT_TOGGLE_GARAGE = "URC+ECTAS=GarageDoor,ToggleGarage,0,{}";
public final static String OPT_TOGGLE_GARAGE = "URC+ECTAS=GarageDoor,ToggleGarage,0,{}/r/n";
//复位照明时长 URC+ECTAS=GarageDoor,ResumeCountDown,{},{},1b
public final static String OPT_RESUME_COUNTDOWN = "URC+ECTAS=GarageDoor,ResumeCountDown,{},{},1b";
public final static String OPT_RESUME_COUNTDOWN = "URC+ECTAS=GarageDoor,ResumeCountDown,{},{},1b/r/n";
//照明灯开关 URC+ECTPS=GarageDoorLightControl,LightSwitch,0,false,{},4d
public static final String LightSwitch_false = "URC+ECTPS=GarageDoorLightControl,LightSwitch,0,false,{},4d";
public static final String LightSwitch_false = "URC+ECTPS=GarageDoorLightControl,LightSwitch,0,false,{},4d/r/n";
//照明灯开关 URC+ECTPS=GarageDoorLightControl,LightSwitch,0,true,{},98
public static final String LightSwitch_true = "URC+ECTPS=GarageDoorLightControl,LightSwitch,0,true,{},98";
public static final String LightSwitch_true = "URC+ECTPS=GarageDoorLightControl,LightSwitch,0,true,{},98/r/n";
}

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";
//自动关门功能开关 URC+ECTPS=GarageDoorLightControl,AutomaticDoorClosingSwitch,0,false,{},b2
public static final String AutomaticDoorClosingSwitch_false = "URC+ECTPS=GarageDoorLightControl,AutomaticDoorClosingSwitch,0,false,{},b2";
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";
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";//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";
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";
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";//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";
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";
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";
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";
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";
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";
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,{}";
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";
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";
public static final String IRSwitch_false = "URC+ECTPS=GarageDoor,IRSwitch,0,false,{},f9/r/n";