From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
java110-bean/src/main/java/com/java110/dto/machine/MachineDto.java | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/java110-bean/src/main/java/com/java110/dto/machine/MachineDto.java b/java110-bean/src/main/java/com/java110/dto/machine/MachineDto.java
old mode 100644
new mode 100755
index 6268b67..b5bd9e4
--- a/java110-bean/src/main/java/com/java110/dto/machine/MachineDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/machine/MachineDto.java
@@ -3,6 +3,7 @@
import com.java110.dto.PageDto;
import java.io.Serializable;
+import java.util.List;
/**
* @ClassName FloorDto
@@ -14,7 +15,14 @@
**/
public class MachineDto extends PageDto implements Serializable {
- public static final String MACHINE_TYPE_CAR = "9996";
+ public static final String MACHINE_TYPE_CAR = "9996";//鑷湁閬撻椄璁惧閬撻椄
+ public static final String MACHINE_TYPE_CAR_THIRD = "9995";//绗笁鏂归亾闂稿钩鍙�
+ public static final String MACHINE_TYPE_ACCESS_CONTROL = "9999";
+ public static final String MACHINE_STATE_ON = "1200";
+ public static final String MACHINE_STATE_OFF = "1300";
+
+ public static final String DIRECTION_IN = "3306"; //杩涘満
+ public static final String DIRECTION_OUT = "3307"; //鍑哄満
private String machineMac;
private String machineId;
@@ -43,12 +51,16 @@
private String locationObjName;
private String direction;//璁惧鏂瑰悜
private String directionName;
+ private String typeId;
+
+ private List<MachineAttrDto> machineAttrs;
private String createTime;
private String statusCd = "0";
+ private String heartbeatTime;
public String getMachineMac() {
@@ -283,4 +295,28 @@
public void setLocationType(String locationType) {
this.locationType = locationType;
}
+
+ public List<MachineAttrDto> getMachineAttrs() {
+ return machineAttrs;
+ }
+
+ public void setMachineAttrs(List<MachineAttrDto> machineAttrs) {
+ this.machineAttrs = machineAttrs;
+ }
+
+ public String getHeartbeatTime() {
+ return heartbeatTime;
+ }
+
+ public void setHeartbeatTime(String heartbeatTime) {
+ this.heartbeatTime = heartbeatTime;
+ }
+
+ public String getTypeId() {
+ return typeId;
+ }
+
+ public void setTypeId(String typeId) {
+ this.typeId = typeId;
+ }
}
--
Gitblit v1.8.0