From 46a8044f3449c6e9a884c90477ada5a5e6879367 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 01 八月 2017 17:37:39 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Device.java |  525 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 498 insertions(+), 27 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 8fcd35e..4f5bb95 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
@@ -5,7 +5,7 @@
 import cn.com.basic.face.discern.common.BaseEntity;
 
 /**
- * Device
+ * 鍙屽悜
  */
 public class Device extends BaseEntity implements Serializable {
 
@@ -19,27 +19,179 @@
 		 */
 		public static final String deviceId = "deviceId";
 		/**
-		 * 鍏徃涓婚敭
+		 * 璁惧鎵�灞炲叕鍙�
 		 */
-		public static final String deviceCompanyId = "deviceCompanyId";
+		public static final String companyId = "companyId";
 		/**
-		 * 璁惧鍦扮偣
+		 * 璁惧鍚嶇О
 		 */
 		public static final String deviceName = "deviceName";
 		/**
-		 * 璁惧鎺堟潈鐮�
+		 * 璁惧绫诲瀷
 		 */
-		public static final String authorizationId = "authorizationId";
+		public static final String type = "type";
+		/**
+		 * 璁惧鍦板潃
+		 */
+		public static final String installAddress = "installAddress";
+		/**
+		 * 瀛︽牎鍚嶇О
+		 */
+		public static final String schoolName = "schoolName";
+		/**
+		 * 鍝佺墝
+		 */
+		public static final String brandId = "brandId";
+		/**
+		 * IP
+		 */
+		public static final String ip = "ip";
+		/**
+		 * 绔彛
+		 */
+		public static final String port = "port";
+		/**
+		 * 鍒嗚鲸鐜�
+		 */
+		public static final String resolutionId = "resolutionId";
+		/**
+		 * 鐢ㄦ埛鍚�
+		 */
+		public static final String username = "username";
+		/**
+		 * 瀵嗙爜
+		 */
+		public static final String password = "password";
+		/**
+		 * 閫氳鍗忚
+		 */
+		public static final String protocolId = "protocolId";
+		/**
+		 * 搴忓垪鍙�
+		 */
+		public static final String sn = "sn";
+		/**
+		 * 鎵�灞炶澶噄d
+		 */
+		public static final String belongId = "belongId";
+		/**
+		 * 璐熻矗浜�
+		 */
+		public static final String principal = "principal";
+		/**
+		 * 瀹夎鏃堕棿
+		 */
+		public static final String installTime = "installTime";
+		/**
+		 * 瀹夎鍏徃
+		 */
+		public static final String installCompany = "installCompany";
+		/**
+		 * 鐢熶骇鍘傚
+		 */
+		public static final String manufacturer = "manufacturer";
+		/**
+		 * 鐢熶骇鏃ユ湡
+		 */
+		public static final String productionDate = "productionDate";
+		/**
+		 * 澶囨敞
+		 */
+		public static final String remark = "remark";
+		/**
+		 * 鎶ュ簾鏃ユ湡
+		 */
+		public static final String scrappedDate = "scrappedDate";
+		/**
+		 * 璁惧id
+		 */
+		public static final String snId = "snId";
+		/**
+		 * 鍚屾鏃堕棿
+		 */
+		public static final String updateTime = "updateTime";
+		/**
+		 * 鏄惁鍚屾
+		 */
+		public static final String isSynchron = "isSynchron";
+		/**
+		 * 璁惧鎵�鍦ㄦ満鏋刬d
+		 */
+		public static final String deviceCompanyId = "deviceCompanyId";
 	}
 
 	// 璁惧涓婚敭
 	private String deviceId;
-	// 鍏徃涓婚敭
-	private String deviceCompanyId;
-	// 璁惧鍦扮偣
+	// 璁惧鎵�灞炲叕鍙�
+	private String companyId;
+	// 璁惧鍚嶇О
 	private String deviceName;
-	// 璁惧鎺堟潈鐮�
-	private String authorizationId;
+	// 璁惧绫诲瀷
+	private String type;
+	// 璁惧鍦板潃
+	private String installAddress;
+	// 瀛︽牎鍚嶇О
+	private String schoolName;
+	// 鍝佺墝
+	private String brandId;
+	// IP
+	private String ip;
+	// 绔彛
+	private String port;
+	// 鍒嗚鲸鐜�
+	private String resolutionId;
+	// 鐢ㄦ埛鍚�
+	private String username;
+	// 瀵嗙爜
+	private String password;
+	// 閫氳鍗忚
+	private String protocolId;
+	// 搴忓垪鍙�
+	private String sn;
+	// 鎵�灞炶澶噄d
+	private String belongId;
+	// 璐熻矗浜�
+	private String principal;
+	// 瀹夎鏃堕棿
+	private String installTime;
+	// 瀹夎鍏徃
+	private String installCompany;
+	// 鐢熶骇鍘傚
+	private String manufacturer;
+	// 鐢熶骇鏃ユ湡
+	private String productionDate;
+	// 澶囨敞
+	private String remark;
+	// 鎶ュ簾鏃ユ湡
+	private String scrappedDate;
+	// 璁惧id
+	private String snId;
+	// 鍚屾鏃堕棿
+	private String updateTime;
+	// 鏄惁鍚屾
+	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;
+	}
 
 	/**
 	 * Get 璁惧涓婚敭
@@ -56,50 +208,369 @@
 	}
 
 	/**
-	 * Get 鍏徃涓婚敭
+	 * Get 璁惧鎵�灞炲叕鍙�
 	 */
-	public String getDeviceCompanyId() {
-		return deviceCompanyId;
+	public String getCompanyId() {
+		return companyId;
 	}
 
 	/**
-	 * Set 鍏徃涓婚敭
+	 * Set 璁惧鎵�灞炲叕鍙�
 	 */
-	public void setDeviceCompanyId(String deviceCompanyId) {
-		this.deviceCompanyId = deviceCompanyId;
+	public void setCompanyId(String companyId) {
+		this.companyId = companyId;
 	}
 
 	/**
-	 * Get 璁惧鍦扮偣
+	 * Get 璁惧鍚嶇О
 	 */
 	public String getDeviceName() {
 		return deviceName;
 	}
 
 	/**
-	 * Set 璁惧鍦扮偣
+	 * Set 璁惧鍚嶇О
 	 */
 	public void setDeviceName(String deviceName) {
 		this.deviceName = deviceName;
 	}
 
 	/**
-	 * Get 璁惧鎺堟潈鐮�
+	 * Get 璁惧绫诲瀷
+	 * 锛歝amera1, camera2, main_device
 	 */
-	public String getAuthorizationId() {
-		return authorizationId;
+	public String getType() {
+		return type;
 	}
 
 	/**
-	 * Set 璁惧鎺堟潈鐮�
+	 * Set 璁惧绫诲瀷
+	 * 锛歝amera1, camera2, main_device
 	 */
-	public void setAuthorizationId(String authorizationId) {
-		this.authorizationId = authorizationId;
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	/**
+	 * Get 璁惧鍦板潃
+	 */
+	public String getInstallAddress() {
+		return installAddress;
+	}
+
+	/**
+	 * Set 璁惧鍦板潃
+	 */
+	public void setInstallAddress(String installAddress) {
+		this.installAddress = installAddress;
+	}
+
+	/**
+	 * Get 瀛︽牎鍚嶇О
+	 */
+	public String getSchoolName() {
+		return schoolName;
+	}
+
+	/**
+	 * Set 瀛︽牎鍚嶇О
+	 */
+	public void setSchoolName(String schoolName) {
+		this.schoolName = schoolName;
+	}
+
+	/**
+	 * Get 鍝佺墝
+	 */
+	public String getBrandId() {
+		return brandId;
+	}
+
+	/**
+	 * Set 鍝佺墝
+	 */
+	public void setBrandId(String brandId) {
+		this.brandId = brandId;
+	}
+
+	/**
+	 * Get IP
+	 */
+	public String getIp() {
+		return ip;
+	}
+
+	/**
+	 * Set IP
+	 */
+	public void setIp(String ip) {
+		this.ip = ip;
+	}
+
+	/**
+	 * Get 绔彛
+	 */
+	public String getPort() {
+		return port;
+	}
+
+	/**
+	 * Set 绔彛
+	 */
+	public void setPort(String port) {
+		this.port = port;
+	}
+
+	/**
+	 * Get 鍒嗚鲸鐜�
+	 */
+	public String getResolutionId() {
+		return resolutionId;
+	}
+
+	/**
+	 * Set 鍒嗚鲸鐜�
+	 */
+	public void setResolutionId(String resolutionId) {
+		this.resolutionId = resolutionId;
+	}
+
+	/**
+	 * Get 鐢ㄦ埛鍚�
+	 */
+	public String getUsername() {
+		return username;
+	}
+
+	/**
+	 * Set 鐢ㄦ埛鍚�
+	 */
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	/**
+	 * Get 瀵嗙爜
+	 */
+	public String getPassword() {
+		return password;
+	}
+
+	/**
+	 * Set 瀵嗙爜
+	 */
+	public void setPassword(String password) {
+		this.password = password;
+	}
+
+	/**
+	 * Get 閫氳鍗忚
+	 */
+	public String getProtocolId() {
+		return protocolId;
+	}
+
+	/**
+	 * Set 閫氳鍗忚
+	 */
+	public void setProtocolId(String protocolId) {
+		this.protocolId = protocolId;
+	}
+
+	/**
+	 * Get 搴忓垪鍙�
+	 */
+	public String getSn() {
+		return sn;
+	}
+
+	/**
+	 * Set 搴忓垪鍙�
+	 */
+	public void setSn(String sn) {
+		this.sn = sn;
+	}
+
+	/**
+	 * Get 鎵�灞炶澶噄d
+	 */
+	public String getBelongId() {
+		return belongId;
+	}
+
+	/**
+	 * Set 鎵�灞炶澶噄d
+	 */
+	public void setBelongId(String belongId) {
+		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   +  ",鍏徃涓婚敭 =" + deviceCompanyId  +  ",璁惧鍦扮偣 =" + deviceName +
-			 ",璁惧鎺堟潈鐮� ="+ authorizationId;
+			 ",璁惧涓婚敭 =" + 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;
 	}
 }

--
Gitblit v1.8.0