From 8b0dd174285faed9afdd7341a177df4e60d98192 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期五, 25 八月 2023 01:56:25 +0800
Subject: [PATCH] 优化代码
---
java110-bean/src/main/java/com/java110/dto/machine/MachineDto.java | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 46 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
index ddf81c4..7c22c3d 100755
--- a/java110-bean/src/main/java/com/java110/dto/machine/MachineDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/machine/MachineDto.java
@@ -15,10 +15,18 @@
**/
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_TYPE_ATTENDANCE = "9997"; // 鑰冨嫟鏈�
+ public static final String MACHINE_TYPE_MONITOR = "9998"; // 鐩戞帶
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"; //鍑哄満
+
+ public static final String HM_HK = "16";// 娴峰悍骞冲彴
private String machineMac;
private String machineId;
@@ -28,6 +36,7 @@
private String communityId;
private String machineName;
private String machineTypeCd;
+ private String[] machineTypeCds;
private String locationType;
private String machineTypeCdName;
private String machineIp;
@@ -47,6 +56,10 @@
private String locationObjName;
private String direction;//璁惧鏂瑰悜
private String directionName;
+ private String typeId;
+ private String domain;
+
+ private String hmId;
private List<MachineAttrDto> machineAttrs;
@@ -306,4 +319,36 @@
public void setHeartbeatTime(String heartbeatTime) {
this.heartbeatTime = heartbeatTime;
}
+
+ public String getTypeId() {
+ return typeId;
+ }
+
+ public void setTypeId(String typeId) {
+ this.typeId = typeId;
+ }
+
+ public String getDomain() {
+ return domain;
+ }
+
+ public void setDomain(String domain) {
+ this.domain = domain;
+ }
+
+ public String[] getMachineTypeCds() {
+ return machineTypeCds;
+ }
+
+ public void setMachineTypeCds(String[] machineTypeCds) {
+ this.machineTypeCds = machineTypeCds;
+ }
+
+ public String getHmId() {
+ return hmId;
+ }
+
+ public void setHmId(String hmId) {
+ this.hmId = hmId;
+ }
}
--
Gitblit v1.8.0