From 1a10d546c76f474d33e23c5958c08aa0afcdae67 Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 24 七月 2017 11:46:45 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Device.java | 375 ++++++++++++++++++++++++++++-------------------------
1 files changed, 198 insertions(+), 177 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 b85df11..4b97b52 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,11 +1,12 @@
package cn.com.basic.face.discern.entity;
import java.io.Serializable;
+import java.util.Date;
import cn.com.basic.face.discern.common.BaseEntity;
/**
- * Device
+ * 鍙屽悜
*/
public class Device extends BaseEntity implements Serializable {
@@ -33,7 +34,7 @@
/**
* 璁惧鍦板潃
*/
- public static final String address = "address";
+ public static final String installAddress = "installAddress";
/**
* 瀛︽牎鍚嶇О
*/
@@ -74,61 +75,50 @@
* 鎵�灞炶澶噄d
*/
public static final String belongId = "belongId";
-
/**
* 璐熻矗浜�
*/
- public static final String principal="principal";
-
+ public static final String principal = "principal";
/**
* 瀹夎鏃堕棿
*/
- public static final String installTime="installTime";
-
+ public static final String installTime = "installTime";
/**
* 瀹夎鍏徃
*/
- public static final String installCompany="installCompany";
-
+ public static final String installCompany = "installCompany";
/**
* 鐢熶骇鍘傚
*/
- public static final String manufacturer="manufacturer";
-
+ public static final String manufacturer = "manufacturer";
/**
* 鐢熶骇鏃ユ湡
*/
- public static final String productionDate="productionDate";
-
+ public static final String productionDate = "productionDate";
/**
* 澶囨敞
*/
- public static final String remark="remark";
-
+ public static final String remark = "remark";
/**
* 鎶ュ簾鏃ユ湡
*/
- public static final String scrappedDate="scrappedDate";
-
+ public static final String scrappedDate = "scrappedDate";
/**
- *璁惧id
+ * 璁惧id
*/
- public static final String snId="snId";
-
+ public static final String snId = "snId";
/**
* 鍚屾鏃堕棿
*/
- public static final String updateTime="update_time";
-
+ public static final String updateTime = "updateTime";
/**
* 鏄惁鍚屾
*/
- public static final String isSynchron="is_synchron";
-
+ public static final String isSynchron = "isSynchron";
/**
* 璁惧鎵�鍦ㄦ満鏋刬d
*/
- private static final String deviceCompanyId="device_company_id";
+ public static final String deviceCompanyId = "deviceCompanyId";
}
// 璁惧涓婚敭
@@ -140,7 +130,7 @@
// 璁惧绫诲瀷
private String type;
// 璁惧鍦板潃
- private String address;
+ private String installAddress;
// 瀛︽牎鍚嶇О
private String schoolName;
// 鍝佺墝
@@ -161,148 +151,28 @@
private String sn;
// 鎵�灞炶澶噄d
private String belongId;
-
- /**
- * 璐熻矗浜�
- */
- private String principal;
-
- /**
- * 瀹夎鏃堕棿
- */
- private String installTime;
-
- /**
- * 瀹夎鍏徃
- */
- private String installCompany;
-
- /**
- * 鐢熶骇鍘傚
- */
- private String manufacturer;
-
- /**
- * 鐢熶骇鏃ユ湡
- */
+ // 璐熻矗浜�
+ private String principal;
+ // 瀹夎鏃堕棿
+ private String installTime;
+ // 瀹夎鍏徃
+ private String installCompany;
+ // 鐢熶骇鍘傚
+ private String manufacturer;
+ // 鐢熶骇鏃ユ湡
private String productionDate;
-
- /**
- * 澶囨敞
- */
+ // 澶囨敞
private String remark;
-
- /**
- * 鎶ュ簾鏃ユ湡
- */
- private String scrappedDate;
-
- /**
- * 璁惧id
-
- */
+ // 鎶ュ簾鏃ユ湡
+ private String scrappedDate;
+ // 璁惧id
private String snId;
-
- private String installAdress;
-
- //鍚屾鏃堕棿
+ // 鍚屾鏃堕棿
private String updateTime;
-
- //鏄惁鍚屾
+ // 鏄惁鍚屾
private String isSynchron;
-
- //璁惧鎵�鍦ㄦ満鏋刬d
+ // 璁惧鎵�鍦ㄦ満鏋刬d
private String deviceCompanyId;
-
- public void setPrincipal(String principal) {
- this.principal = principal;
- }
-
- public void setInstallTime(String installTime) {
- this.installTime = installTime;
- }
-
- public void setInstallCompany(String installCompany) {
- this.installCompany = installCompany;
- }
-
- public void setManufacturer(String manufacturer) {
- this.manufacturer = manufacturer;
- }
-
- public void setProductionDate(String productionDate) {
- this.productionDate = productionDate;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public void setScrappedDate(String scrappedDate) {
- this.scrappedDate = scrappedDate;
- }
-
- public void setSnId(String snId) {
- this.snId = snId;
- }
-
- public String getDeviceCompanyId() {
- return deviceCompanyId;
- }
-
- public void setDeviceCompanyId(String deviceCompanyId) {
- this.deviceCompanyId = deviceCompanyId;
- }
-
-
- public String getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(String updateTime) {
- this.updateTime = updateTime;
- }
-
- public String getIsSynchron() {
- return isSynchron;
- }
-
- public void setIsSynchron(String isSynchron) {
- this.isSynchron = isSynchron;
- }
-
-
- public String getPrincipal() {
- return principal;
- }
-
- public String getInstallTime() {
- return installTime;
- }
-
- public String getInstallCompany() {
- return installCompany;
- }
-
- public String getManufacturer() {
- return manufacturer;
- }
-
- public String getProductionDate() {
- return productionDate;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public String getScrappedDate() {
- return scrappedDate;
- }
-
- public String getSnId() {
- return snId;
- }
/**
* Get 璁惧涓婚敭
@@ -365,15 +235,15 @@
/**
* Get 璁惧鍦板潃
*/
- public String getAddress() {
- return address;
+ public String getInstallAddress() {
+ return installAddress;
}
/**
* Set 璁惧鍦板潃
*/
- public void setAddress(String address) {
- this.address = address;
+ public void setInstallAddress(String installAddress) {
+ this.installAddress = installAddress;
}
/**
@@ -509,14 +379,6 @@
return belongId;
}
- public String getInstallAdress() {
- return installAdress;
- }
-
- public void setInstallAdress(String installAdress) {
- this.installAdress = installAdress;
- }
-
/**
* Set 鎵�灞炶澶噄d
*/
@@ -524,13 +386,172 @@
this.belongId = belongId;
}
+ /**
+ * Get 璐熻矗浜�
+ */
+ public String getPrincipal() {
+ return principal;
+ }
+
+ /**
+ * Set 璐熻矗浜�
+ */
+ public void setPrincipal(String principal) {
+ this.principal = principal;
+ }
+
+ /**
+ * Get 瀹夎鏃堕棿
+ */
+ public String getInstallTime() {
+ return installTime;
+ }
+
+ /**
+ * Set 瀹夎鏃堕棿
+ */
+ public void setInstallTime(String installTime) {
+ this.installTime = installTime;
+ }
+
+ /**
+ * Get 瀹夎鍏徃
+ */
+ public String getInstallCompany() {
+ return installCompany;
+ }
+
+ /**
+ * Set 瀹夎鍏徃
+ */
+ public void setInstallCompany(String installCompany) {
+ this.installCompany = installCompany;
+ }
+
+ /**
+ * Get 鐢熶骇鍘傚
+ */
+ public String getManufacturer() {
+ return manufacturer;
+ }
+
+ /**
+ * Set 鐢熶骇鍘傚
+ */
+ public void setManufacturer(String manufacturer) {
+ this.manufacturer = manufacturer;
+ }
+
+ /**
+ * Get 鐢熶骇鏃ユ湡
+ */
+ public String getProductionDate() {
+ return productionDate;
+ }
+
+ /**
+ * Set 鐢熶骇鏃ユ湡
+ */
+ public void setProductionDate(String productionDate) {
+ this.productionDate = productionDate;
+ }
+
+ /**
+ * Get 澶囨敞
+ */
+ public String getRemark() {
+ return remark;
+ }
+
+ /**
+ * Set 澶囨敞
+ */
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ /**
+ * Get 鎶ュ簾鏃ユ湡
+ */
+ public String getScrappedDate() {
+ return scrappedDate;
+ }
+
+ /**
+ * Set 鎶ュ簾鏃ユ湡
+ */
+ public void setScrappedDate(String scrappedDate) {
+ this.scrappedDate = scrappedDate;
+ }
+
+ /**
+ * Get 璁惧id
+ */
+ public String getSnId() {
+ return snId;
+ }
+
+ /**
+ * Set 璁惧id
+ */
+ public void setSnId(String snId) {
+ this.snId = snId;
+ }
+
+ /**
+ * Get 鍚屾鏃堕棿
+ */
+ public String getUpdateTime() {
+ return updateTime;
+ }
+
+ /**
+ * Set 鍚屾鏃堕棿
+ */
+ public void setUpdateTime(String updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ /**
+ * Get 鏄惁鍚屾
+ * 锛孻--宸插悓姝ワ紝N--鏈悓姝�
+ */
+ public String getIsSynchron() {
+ return isSynchron;
+ }
+
+ /**
+ * Set 鏄惁鍚屾
+ * 锛孻--宸插悓姝ワ紝N--鏈悓姝�
+ */
+ public void setIsSynchron(String isSynchron) {
+ this.isSynchron = isSynchron;
+ }
+
+ /**
+ * Get 璁惧鎵�鍦ㄦ満鏋刬d
+ */
+ public String getDeviceCompanyId() {
+ return deviceCompanyId;
+ }
+
+ /**
+ * Set 璁惧鎵�鍦ㄦ満鏋刬d
+ */
+ public void setDeviceCompanyId(String deviceCompanyId) {
+ this.deviceCompanyId = deviceCompanyId;
+ }
+
public String toString() {
return
",璁惧涓婚敭 =" + deviceId + ",璁惧鎵�灞炲叕鍙� ="+ companyId + ",璁惧鍚嶇О =" + deviceName +
- ",璁惧绫诲瀷 =" + type + ",璁惧鍦板潃 =" + address + ",瀛︽牎鍚嶇О =" + schoolName +
+ ",璁惧绫诲瀷 =" + type + ",璁惧鍦板潃 =" + installAddress + ",瀛︽牎鍚嶇О =" + schoolName +
",鍝佺墝 =" + brandId + ",IP =" + ip + ",绔彛 =" + port +
",鍒嗚鲸鐜� =" + resolutionId + ",鐢ㄦ埛鍚� =" + username + ",瀵嗙爜 =" + password +
- ",閫氳鍗忚 =" + protocolId + ",搴忓垪鍙� =" + sn + ",鎵�灞炶澶噄d ="+ belongId
- ;
+ ",閫氳鍗忚 =" + protocolId + ",搴忓垪鍙� =" + sn + ",鎵�灞炶澶噄d ="+ belongId +
+ ",璐熻矗浜� =" + principal + ",瀹夎鏃堕棿 =" + installTime + ",瀹夎鍏徃 =" + installCompany +
+ ",鐢熶骇鍘傚 =" + manufacturer + ",鐢熶骇鏃ユ湡 =" + productionDate + ",澶囨敞 =" + remark +
+ ",鎶ュ簾鏃ユ湡 =" + scrappedDate + ",璁惧id =" + snId + ",鍚屾鏃堕棿 =" + updateTime +
+ ",鏄惁鍚屾 =" + isSynchron + ",璁惧鎵�鍦ㄦ満鏋刬d ="+ deviceCompanyId;
}
}
--
Gitblit v1.8.0