From 9f86ecd1435f386b778538df5eb0d769c3171db0 Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 21 七月 2017 15:12:13 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Device.java |  199 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 194 insertions(+), 5 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 eb25ec1..60b2154 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
@@ -75,7 +75,60 @@
 		 */
 		public static final String belongId = "belongId";
 
-		public  static final String  installAdress= "installAdress";
+		/**
+		 * 璐熻矗浜�
+		 */
+		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="update_time";
+
+		/**
+		 * 鏄惁鍚屾
+		 */
+		public static final String  isSynchron="is_synchron";
+
+		/**
+		 * 璁惧鎵�鍦ㄦ満鏋刬d
+		 */
+		private static final String  deviceCompanyId="device_company_id";
 	}
 
 	// 璁惧涓婚敭
@@ -108,10 +161,147 @@
 	private String sn;
 	// 鎵�灞炶澶噄d
 	private String belongId;
-    //瀹夎鍦板潃
-	private String installAdress;
 
-	public  String getInstallAdress(){return installAdress;}
+	/**
+	 * 璐熻矗浜�
+	 */
+	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;
+
+	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 璁惧涓婚敭
 	 */
@@ -324,7 +514,6 @@
 		this.belongId = belongId;
 	}
 
-	public void setInstallAdress(String installAdress){this.installAdress=installAdress;}
 	public String toString() {
 		return 
 			 ",璁惧涓婚敭 =" + deviceId   +  ",璁惧鎵�灞炲叕鍙� ="+ companyId  +  ",璁惧鍚嶇О =" + deviceName + 

--
Gitblit v1.8.0