From 785fd3c3e9984f301018b3b5deb91ecc2c8da124 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 01 八月 2017 17:44:35 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Device.java | 125 +++++++++++++++++++++++++++++++----------
1 files changed, 95 insertions(+), 30 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Device.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Device.java
index 4f5bb95..3b32896 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Device.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Device.java
@@ -1,6 +1,7 @@
package cn.com.basic.face.discern.entity;
import java.io.Serializable;
+import java.util.Date;
import cn.com.basic.face.discern.common.BaseEntity;
@@ -118,6 +119,22 @@
* 璁惧鎵�鍦ㄦ満鏋刬d
*/
public static final String deviceCompanyId = "deviceCompanyId";
+ /**
+ * 鏁版嵁鏄惁鏈夋晥
+ */
+ public static final String isValid = "isValid";
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ public static final String createTime = "createTime";
+ /**
+ * 鎽勫儚澶村搧鐗�
+ */
+ public static final String brand = "brand";
+ /**
+ * 鍒嗚鲸鐜�
+ */
+ public static final String resolution = "resolution";
}
// 璁惧涓婚敭
@@ -172,26 +189,14 @@
private String isSynchron;
// 璁惧鎵�鍦ㄦ満鏋刬d
private String deviceCompanyId;
-
+ // 鏁版嵁鏄惁鏈夋晥
private String isValid;
-
+ // 鍒涘缓鏃堕棿
private String createTime;
-
- public String getIsValid() {
- return isValid;
- }
-
- public void setIsValid(String isValid) {
- this.isValid = isValid;
- }
-
- public String getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(String createTime) {
- this.createTime = createTime;
- }
+ // 鎽勫儚澶村搧鐗�
+ private String brand;
+ // 鍒嗚鲸鐜�
+ private String resolution;
/**
* Get 璁惧涓婚敭
@@ -533,7 +538,7 @@
/**
* Get 鏄惁鍚屾
- * 锛孻--宸插悓姝ワ紝N--鏈悓姝�
+ * 锛孻-宸插悓姝ワ紝N-鏈悓姝�
*/
public String getIsSynchron() {
return isSynchron;
@@ -541,7 +546,7 @@
/**
* Set 鏄惁鍚屾
- * 锛孻--宸插悓姝ワ紝N--鏈悓姝�
+ * 锛孻-宸插悓姝ワ紝N-鏈悓姝�
*/
public void setIsSynchron(String isSynchron) {
this.isSynchron = isSynchron;
@@ -561,16 +566,76 @@
this.deviceCompanyId = deviceCompanyId;
}
+ /**
+ * Get 鏁版嵁鏄惁鏈夋晥
+ * 锛屼綔涓鸿蒋鍒犻櫎鐨勫垽鏂潯浠讹紝1-鏈夋晥锛�0-鏃犳晥
+ */
+ public String getIsValid() {
+ return isValid;
+ }
+
+ /**
+ * Set 鏁版嵁鏄惁鏈夋晥
+ * 锛屼綔涓鸿蒋鍒犻櫎鐨勫垽鏂潯浠讹紝1-鏈夋晥锛�0-鏃犳晥
+ */
+ public void setIsValid(String isValid) {
+ this.isValid = isValid;
+ }
+
+ /**
+ * Get 鍒涘缓鏃堕棿
+ */
+ public String getCreateTime() {
+ return createTime;
+ }
+
+ /**
+ * Set 鍒涘缓鏃堕棿
+ */
+ public void setCreateTime(String createTime) {
+ this.createTime = createTime;
+ }
+
+ /**
+ * Get 鎽勫儚澶村搧鐗�
+ */
+ public String getBrand() {
+ return brand;
+ }
+
+ /**
+ * Set 鎽勫儚澶村搧鐗�
+ */
+ public void setBrand(String brand) {
+ this.brand = brand;
+ }
+
+ /**
+ * Get 鍒嗚鲸鐜�
+ */
+ public String getResolution() {
+ return resolution;
+ }
+
+ /**
+ * Set 鍒嗚鲸鐜�
+ */
+ public void setResolution(String resolution) {
+ this.resolution = resolution;
+ }
+
public String toString() {
- return
- ",璁惧涓婚敭 =" + deviceId + ",璁惧鎵�灞炲叕鍙� ="+ companyId + ",璁惧鍚嶇О =" + deviceName +
- ",璁惧绫诲瀷 =" + type + ",璁惧鍦板潃 =" + installAddress + ",瀛︽牎鍚嶇О =" + schoolName +
- ",鍝佺墝 =" + brandId + ",IP =" + ip + ",绔彛 =" + port +
- ",鍒嗚鲸鐜� =" + resolutionId + ",鐢ㄦ埛鍚� =" + username + ",瀵嗙爜 =" + password +
- ",閫氳鍗忚 =" + protocolId + ",搴忓垪鍙� =" + sn + ",鎵�灞炶澶噄d ="+ belongId +
- ",璐熻矗浜� =" + principal + ",瀹夎鏃堕棿 =" + installTime + ",瀹夎鍏徃 =" + installCompany +
- ",鐢熶骇鍘傚 =" + manufacturer + ",鐢熶骇鏃ユ湡 =" + productionDate + ",澶囨敞 =" + remark +
- ",鎶ュ簾鏃ユ湡 =" + scrappedDate + ",璁惧id =" + snId + ",鍚屾鏃堕棿 =" + updateTime +
- ",鏄惁鍚屾 =" + isSynchron + ",璁惧鎵�鍦ㄦ満鏋刬d ="+ deviceCompanyId;
+ return
+ ",璁惧涓婚敭 =" + deviceId + ",璁惧鎵�灞炲叕鍙� ="+ companyId + ",璁惧鍚嶇О =" + deviceName +
+ ",璁惧绫诲瀷 =" + type + ",璁惧鍦板潃 =" + installAddress + ",瀛︽牎鍚嶇О =" + schoolName +
+ ",鍝佺墝 =" + brandId + ",IP =" + ip + ",绔彛 =" + port +
+ ",鍒嗚鲸鐜� =" + resolutionId + ",鐢ㄦ埛鍚� =" + username + ",瀵嗙爜 =" + password +
+ ",閫氳鍗忚 =" + protocolId + ",搴忓垪鍙� =" + sn + ",鎵�灞炶澶噄d ="+ belongId +
+ ",璐熻矗浜� =" + principal + ",瀹夎鏃堕棿 =" + installTime + ",瀹夎鍏徃 =" + installCompany +
+ ",鐢熶骇鍘傚 =" + manufacturer + ",鐢熶骇鏃ユ湡 =" + productionDate + ",澶囨敞 =" + remark +
+ ",鎶ュ簾鏃ユ湡 =" + scrappedDate + ",璁惧id =" + snId + ",鍚屾鏃堕棿 =" + updateTime +
+ ",鏄惁鍚屾 =" + isSynchron + ",璁惧鎵�鍦ㄦ満鏋刬d ="+ deviceCompanyId + ",鏁版嵁鏄惁鏈夋晥 ="+ isValid +
+ ",鍒涘缓鏃堕棿 =" + createTime + ",鎽勫儚澶村搧鐗� ="+ brand + ",鍒嗚鲸鐜� =" + resolution
+ ;
}
}
--
Gitblit v1.8.0