增加设备信息

This commit is contained in:
zzc 2024-07-25 00:47:42 +08:00
parent cf3ab013a2
commit bd8befdd69
3 changed files with 187 additions and 25 deletions

View File

@ -0,0 +1,122 @@
package org.dromara.web.device;
/**
* @ClassName : DeviceCmd
* @Author : ZZC
* @Date : 2024/7/25 0:07
* @Description : 设备命令
**/
public class DeviceCmd {
/**
* 设备控制
* 命令格式URC+ECTAS=设备类型,设备命令,设备参数,设备参数,设备参数
* 开门 URC+ECTAS=GarageDoor,OpenGarage,100,{},73
* 半开门 URC+ECTAS=GarageDoor,PartOpenGarage,{},{},83
* 门体停止 URC+ECTAS=GarageDoor,StopGarage,{},{},f5
* 关门 URC+ECTAS=GarageDoor,OpenGarage,0,{},30
* 门体运行状态循环切换 URC+ECTAS=GarageDoor,ToggleGarage,0,{}
* 复位照明时长 URC+ECTAS=GarageDoor,ResumeCountDown,{},{},1b
*/
//开门 URC+ECTAS=GarageDoor,OpenGarage,100,{},73
public final static String OPT_OPEN_GARAGE = "URC+ECTAS=GarageDoor,OpenGarage,100,{},73";
//半开门 URC+ECTAS=GarageDoor,PartOpenGarage,{},{},83
public final static String OPT_PART_OPEN_GARAGE = "URC+ECTAS=GarageDoor,PartOpenGarage,{},{},83";
//门体停止 URC+ECTAS=GarageDoor,StopGarage,{},{},f5
public final static String OPT_STOP_GARAGE = "URC+ECTAS=GarageDoor,StopGarage,{},{},f5";
//关门 URC+ECTAS=GarageDoor,OpenGarage,0,{},30
public final static String OPT_CLOSE_GARAGE = "URC+ECTAS=GarageDoor,OpenGarage,0,{},30";
//门体运行状态循环切换 URC+ECTAS=GarageDoor,ToggleGarage,0,{}
public final static String OPT_TOGGLE_GARAGE = "URC+ECTAS=GarageDoor,ToggleGarage,0,{}";
//复位照明时长 URC+ECTAS=GarageDoor,ResumeCountDown,{},{},1b
public final static String OPT_RESUME_COUNTDOWN = "URC+ECTAS=GarageDoor,ResumeCountDown,{},{},1b";
/**
* 设备设置
*/
//自动关门功能开关 URC+ECTPS=GarageDoorLightControl,AutomaticDoorClosingSwitch,0,false,{},b2
//自动关门功能开关 URC+ECTPS=GarageDoorLightControl,AutomaticDoorClosingSwitch,0,true,{},a7
//延时自动关门的延时时长 URC+ECTPS=GarageDoorLightControl,AutomaticDoorClosingTime,1,1,{},98
//运行次数开关 URC+ECTPS=GarageDoorLightControl,DoorRunningTimesSwitch,0,true,{},ae
//运行次数开关 URC+ECTPS=GarageDoorLightControl,DoorRunningTimesSwitch,0,false,{},2e
//倒计时设置时间 URC+ECTPS=GarageDoorLightControl,CountDownConfig,1,50,{}
//照明灯开关 URC+ECTPS=GarageDoorLightControl,LightSwitch,0,false,{},4d
//照明灯开关 URC+ECTPS=GarageDoorLightControl,LightSwitch,0,true,{},98
//提醒关门时间设置 URC+ECTPS=CustomGarageDoor,RemindCloseDoorConfig,1,1,{},ee
//提醒关门功能开关 URC+ECTPS=CustomGarageDoor,RemindCloseDoorSwitch,0,true,{},7c
//提醒关门功能开关 URC+ECTPS=CustomGarageDoor,RemindCloseDoorSwitch,0,false,{},c5
//半开门高度设置 URC+ECTPS=CustomGarageDoor,PartOpenConfig,1,10,{},aa
//半开门功能开关 URC+ECTPS=CustomGarageDoor,PartOpenSwitch,0,false,{},f9
//半开门功能开关 URC+ECTPS=CustomGarageDoor,PartOpenSwitch,0,true,{},52
//门体运行状态停止中 URC+ECTPS=CustomGarageDoor,WorkState,3,stop,{}
//门体运行状态关闭中 URC+ECTPS=CustomGarageDoor,WorkState,3,closing,{}
//门体运行状态开启中 URC+ECTPS=CustomGarageDoor,WorkState,3,openning,{}
//遇阻回弹的阻力设置 URC+ECTPS=GarageDoor,BounceSensitivity,1,5,{}
//红外感应开关开启 URC+ECTPS=GarageDoor,IRSwitch,0,true,{},52
//自动关门功能开关 URC+ECTPS=GarageDoorLightControl,AutomaticDoorClosingSwitch,0,false,{},b2
public static final String AutomaticDoorClosingSwitch_false = "URC+ECTPS=GarageDoorLightControl,AutomaticDoorClosingSwitch,0,false,{},b2";
//自动关门功能开关 URC+ECTPS=GarageDoorLightControl,AutomaticDoorClosingSwitch,0,true,{},a7
public static final String AutomaticDoorClosingSwitch_true = "URC+ECTPS=GarageDoorLightControl,AutomaticDoorClosingSwitch,0,true,{},a7";
//延时自动关门的延时时长 URC+ECTPS=GarageDoorLightControl,AutomaticDoorClosingTime,1,1,{},98
public static final String AutomaticDoorClosingTime = "URC+ECTPS=GarageDoorLightControl,AutomaticDoorClosingTime,1,MODEL,{},98";//MODEL
//运行次数开关 URC+ECTPS=GarageDoorLightControl,DoorRunningTimesSwitch,0,true,{},ae
public static final String DoorRunningTimesSwitch_true = "URC+ECTPS=GarageDoorLightControl,DoorRunningTimesSwitch,0,true,{},ae";
//运行次数开关 URC+ECTPS=GarageDoorLightControl,DoorRunningTimesSwitch,0,false,{},2e
public static final String DoorRunningTimesSwitch_false = "URC+ECTPS=GarageDoorLightControl,DoorRunningTimesSwitch,0,false,{},2e";
//倒计时设置时间 URC+ECTPS=GarageDoorLightControl,CountDownConfig,1,50,{}
public static final String CountDownConfig = "URC+ECTPS=GarageDoorLightControl,CountDownConfig,1,MODEL,{},98";//MODEL
//照明灯开关 URC+ECTPS=GarageDoorLightControl,LightSwitch,0,false,{},4d
public static final String LightSwitch_false = "URC+ECTPS=GarageDoorLightControl,LightSwitch,0,false,{},4d";
//照明灯开关 URC+ECTPS=GarageDoorLightControl,LightSwitch,0,true,{},98
public static final String LightSwitch_true = "URC+ECTPS=GarageDoorLightControl,LightSwitch,0,true,{},98";
//提醒关门时间设置 URC+ECTPS=CustomGarageDoor,RemindCloseDoorConfig,1,1,{},ee
public static final String RemindCloseDoorConfig = "URC+ECTPS=CustomGarageDoor,RemindCloseDoorConfig,1,MODEL,{},ee";
//提醒关门功能开关 URC+ECTPS=CustomGarageDoor,RemindCloseDoorSwitch,0,true,{},7c
public static final String RemindCloseDoorSwitch_true = "URC+ECTPS=CustomGarageDoor,RemindCloseDoorSwitch,0,true,{},7c";
//提醒关门功能开关 URC+ECTPS=CustomGarageDoor,RemindCloseDoorSwitch,0,false,{},c5
public static final String RemindCloseDoorSwitch_false = "URC+ECTPS=CustomGarageDoor,RemindCloseDoorSwitch,0,false,{},c5";
//半开门高度设置 URC+ECTPS=CustomGarageDoor,PartOpenConfig,1,10,{},aa
public static final String PartOpenConfig = "URC+ECTPS=CustomGarageDoor,PartOpenConfig,1,MODEL,{},aa";
//半开门功能开关 URC+ECTPS=CustomGarageDoor,PartOpenSwitch,0,false,{},f9
public static final String PartOpenSwitch_false = "URC+ECTPS=CustomGarageDoor,PartOpenSwitch,0,false,{},f9";
//半开门功能开关 URC+ECTPS=CustomGarageDoor,PartOpenSwitch,0,true,{},52
public static final String PartOpenSwitch_true = "URC+ECTPS=CustomGarageDoor,PartOpenSwitch,0,true,{},52";
//门体运行状态停止中 URC+ECTPS=CustomGarageDoor,WorkState,3,stop,{}
public static final String WorkState_stop = "URC+ECTPS=CustomGarageDoor,WorkState,3,stop,{}";
//门体运行状态关闭中 URC+ECTPS=CustomGarageDoor,WorkState,3,closing,{}
public static final String WorkState_closing = "URC+ECTPS=CustomGarageDoor,WorkState,3,closing,{}";
//门体运行状态开启中 URC+ECTPS=CustomGarageDoor,WorkState,3,openning,{}
public static final String WorkState_openning = "URC+ECTPS=CustomGarageDoor,WorkState,3,openning,{}";
//遇阻回弹的阻力设置 URC+ECTPS=GarageDoor,BounceSensitivity,1,5,{}
public static final String BounceSensitivity = "URC+ECTPS=GarageDoor,BounceSensitivity,1,MODEL,{}";
//红外感应开关开启 URC+ECTPS=GarageDoor,IRSwitch,0,true,{},52
public static final String IRSwitch_true = "URC+ECTPS=GarageDoor,IRSwitch,0,true,{},52";
//红外感应开关关闭 URC+ECTPS=GarageDoor,IRSwitch,0,false,{},f9 (该指令协议目前没有)
public static final String IRSwitch_false = "URC+ECTPS=GarageDoor,IRSwitch,0,false,{},f9";
//属性获取 todo 该指令是用于触发属性状态的发送
//自动关门功能开关 URC+ECTPG=GarageDoorLightControl,AutomaticDoorClosingSwitch
//延时自动关门的延时时长 URC+ECTPG=GarageDoorLightControl,AutomaticDoorClosingTime
//运行次数开关 URC+ECTPG=GarageDoorLightControl,DoorRunningTimesSwitch
//倒计时剩余时间 URC+ECTPG=GarageDoorLightControl,ResidualCountDown
//运行次数 URC+ECTPG=GarageDoorLightControl,DoorRunningTimes
//车库门异常状态 URC+ECTPG=GarageDoorLightControl,GarageException
//倒计时设置时间 URC+ECTPG=GarageDoorLightControl,CountDownConfig
//照明灯开关 URC+ECTPG=GarageDoorLightControl,LightSwitch
//提醒关门时间设置 URC+ECTPG=CustomGarageDoor,RemindCloseDoorConfig
//提醒关门功能开关 URC+ECTPG=CustomGarageDoor,RemindCloseDoorSwitch
//半开门高度设置 URC+ECTPG=CustomGarageDoor,PartOpenConfig
//半开门功能开关 URC+ECTPG=CustomGarageDoor,PartOpenSwitch
//开合度百分比 URC+ECTPG=CustomGarageDoor,OpenPercentage
//门体运行状态 URC+ECTPG=CustomGarageDoor,WorkState
//是否已经校准行程 URC+ECTPG=GarageDoor,RouteCorrectStatus
//遇阻回弹的阻力设置 URC+ECTPG=GarageDoor,BounceSensitivity
//红外感应开关 URC+ECTPG=GarageDoor,IRSwitch
}

View File

@ -0,0 +1,65 @@
package org.dromara.web.device;
/**
* @ClassName : DeviceMsg
* @Author : ZZC
* @Date : 2024/7/25 0:44
* @Description : 设备信息
**/
public class DeviceMsg {
//属性上报 todo 该属性上报 无需解析指令 需要调用api 当前需要创建属性用来装载
//自动关门功能开关 AT+ECTPP=GarageDoorLightControl,AutomaticDoorClosingSwitch,0,false,{},b2
//自动关门功能开关 AT+ECTPP=GarageDoorLightControl,AutomaticDoorClosingSwitch,0,true,{},a7
//延时自动关门的延时时长 AT+ECTPP=GarageDoorLightControl,AutomaticDoorClosingTime,1,1,{},98
//运行次数开关 AT+ECTPP=GarageDoorLightControl,DoorRunningTimesSwitch,0,true,{},ae
//运行次数开关 AT+ECTPP=GarageDoorLightControl,DoorRunningTimesSwitch,0,false,{},2e
//倒计时剩余时间 AT+ECTPP=GarageDoorLightControl,ResidualCountDown,1,180
//运行次数 AT+ECTPP=GarageDoorLightControl,DoorRunningTimes,1,0
//车库门异常状态无异常 AT+ECTPP=GarageDoorLightControl,GarageException,3,none,{}
//车库门异常状态电机运行故障 AT+ECTPP=GarageDoorLightControl,GarageException,3,motorRunException,{}
//倒计时设置时间 AT+ECTPP=GarageDoorLightControl,CountDownConfig,1,188
//照明灯开关 AT+ECTPP=GarageDoorLightControl,LightSwitch,0,false,{},4d
//照明灯开关 AT+ECTPP=GarageDoorLightControl,LightSwitch,0,true,{},98
//提醒关门时间设置 AT+ECTPP=CustomGarageDoor,RemindCloseDoorConfig,1,1,{},ee
//提醒关门功能开关 AT+ECTPP=CustomGarageDoor,RemindCloseDoorSwitch,0,true,{},7c
//提醒关门功能开关 AT+ECTPP=CustomGarageDoor,RemindCloseDoorSwitch,0,false,{},c5
//半开门高度设置 AT+ECTPP=CustomGarageDoor,PartOpenConfig,1,10,{},aa
//半开门功能开关 AT+ECTPP=CustomGarageDoor,PartOpenSwitch,0,false,{},f9
//半开门功能开关 AT+ECTPP=CustomGarageDoor,PartOpenSwitch,0,true,{},52
//开合度百分比 AT+ECTPP=CustomGarageDoor,OpenPercentage,1,50
//门体运行状态停止中 AT+ECTPP=CustomGarageDoor,WorkState,3,stop,{}
//门体运行状态关闭中 AT+ECTPP=CustomGarageDoor,WorkState,3,closing,{}
//门体运行状态开启中 AT+ECTPP=CustomGarageDoor,WorkState,3,openning,{}
//是否已经校准行程 AT+ECTPP=GarageDoor,RouteCorrectStatus,0,true
//遇阻回弹的阻力设置 AT+ECTPP=GarageDoor,BounceSensitivity,1,3
//红外感应开关开启 AT+ECTPP=GarageDoor,IRSwitch,0,true,{},52
////枚举型属性枚举值
//车库门异常状态 AT+ECTPP=GarageDoorLightControl,GarageException, = {"3,none"}; //车库门异常状态//无故障
// = {"3,irException"}; //车库门异常状态//红外故障
// = {"3,motorRunException"}; //车库门异常状态//电机运转故障
// = {"3,motorMaintainException"}; //车库门异常状态//电机维护故障
// = {"3,deviceException"}; //车库门异常状态//设备故障
//
//门体开合状态 AT+ECTPP=CustomGarageDoor,WorkState, = {"3,stop"}; //车库门工作状态//车库门停止中
// = {"3,closing"}; //车库门工作状态//车库门正在关闭
// = {"3,openning"}; //车库门工作状态//车库门正在开启
//事件上报
//烟雾报警 AT+ECTEP=GarageDoorLightControl,SmokeAlarm,{}
//红外触发报警 AT+ECTEP=GarageDoorLightControl,InfraredTrig,{}
//电机运行报警 AT+ECTEP=GarageDoorLightControl,MotorAbnormal,{}
//电机维修报警 AT+ECTEP=GarageDoorLightControl,MotorMaintenance,{}
//非APP开门提醒 AT+ECTEP=GarageDoorLightControl,NonAppOpen,{}
//非APP关门提醒 AT+ECTEP=GarageDoorLightControl,NonAppClose,{}
//关门故障报警 AT+ECTEP=GarageDoorLightControl,CloseFault,{}
//开门故障报警 AT+ECTEP=GarageDoorLightControl,OpenFault,{}
//开门运行提醒 AT+ECTEP=GarageDoorLightControl,OpenGarage,{}
//关门运行提醒 AT+ECTEP=GarageDoorLightControl,CloseGarage,{}
//忘记关门提醒 AT+ECTEP=GarageDoorLightControl,CloseDoorRemind,{}
//门体手动开启提醒 AT+ECTEP=GarageDoorLightControl,OpenManual,{}
//半开门运行提醒 AT+ECTEP=GarageDoorLightControl,PartOpenGarage,{}
//门体停止运行提醒 AT+ECTEP=GarageDoorLightControl,StopGarage,{}
}

View File

@ -33,31 +33,6 @@ public class EqEquipmentStatusVo implements Serializable {
@ExcelProperty(value = "主键ID") @ExcelProperty(value = "主键ID")
private Long equipmentId; private Long equipmentId;
/**
* 分布id
*/
@ExcelProperty(value = "分布id")
private Long areaId;
/**
* 设备类型
*/
@ExcelProperty(value = "设备类型", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "eq_equipment_type")
private Integer type;
/**
* 登录账号
*/
@ExcelProperty(value = "登录账号")
private String userName;
/**
* 账号昵称
*/
@ExcelProperty(value = "账号昵称")
private String nickName;
/** /**
* 设备编码 * 设备编码
*/ */