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/PhoneCall.java | 16 ++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Attendance.java | 15 +
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Company.java | 16 ++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/VisitDetail.java | 17 ++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Device.java | 199 ++++++++++++++++++++++++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Visit.java | 16 ++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Department.java | 30 +++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Register.java | 67 ++++++++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Dictionary.java | 15 +
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/RegisterDetail.java | 16 ++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Post.java | 16 ++
11 files changed, 416 insertions(+), 7 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Attendance.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Attendance.java
index c98f731..343c9d6 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Attendance.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Attendance.java
@@ -45,6 +45,11 @@
*/
public static final String isSynchron="is_synchron";
+ /**
+ * 璁惧鎵�鍦ㄦ満鏋刬d
+ */
+ private static final String deviceCompanyId="device_company_id";
+
}
// 绛惧埌浜嬩欢涓婚敭
@@ -65,6 +70,16 @@
//鏄惁鍚屾
private String isSynchron;
+ //璁惧鎵�鍦ㄦ満鏋刬d
+ private String deviceCompanyId;
+
+ public String getDeviceCompanyId() {
+ return deviceCompanyId;
+ }
+
+ public void setDeviceCompanyId(String deviceCompanyId) {
+ this.deviceCompanyId = deviceCompanyId;
+ }
public String getUpdateTime() {
return updateTime;
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Company.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Company.java
index 2c846e3..d5370dc 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Company.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Company.java
@@ -32,6 +32,11 @@
* 鏄惁鍚屾
*/
public static final String isSynchron="is_synchron";
+
+ /**
+ * 璁惧鎵�鍦ㄦ満鏋刬d
+ */
+ private static final String deviceCompanyId="device_company_id";
}
// 鍏徃涓婚敭
@@ -45,6 +50,17 @@
//鏄惁鍚屾
private String isSynchron;
+ //璁惧鎵�鍦ㄦ満鏋刬d
+ private String deviceCompanyId;
+
+ public String getDeviceCompanyId() {
+ return deviceCompanyId;
+ }
+
+ public void setDeviceCompanyId(String deviceCompanyId) {
+ this.deviceCompanyId = deviceCompanyId;
+ }
+
public String getUpdateTime() {
return updateTime;
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Department.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Department.java
index be07f29..3871af3 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Department.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Department.java
@@ -28,6 +28,11 @@
public static final String deptNameEn = "deptNameEn";
/**
+ * 鎵�鍦ㄥ叕鍙竔d
+ */
+ private static final String companyId="companyId";
+
+ /**
* 鍚屾鏃堕棿
*/
public static final String updateTime="update_time";
@@ -36,6 +41,11 @@
* 鏄惁鍚屾
*/
public static final String isSynchron="is_synchron";
+
+ /**
+ * 璁惧鎵�鍦ㄦ満鏋刬d
+ */
+ private static final String deviceCompanyId="device_company_id";
}
// 閮ㄩ棬涓婚敭
@@ -45,12 +55,32 @@
// 閮ㄩ棬棣栧瓧姣�
private String deptNameEn;
+ private String companyId;
+
//鍚屾鏃堕棿
private String updateTime;
//鏄惁鍚屾
private String isSynchron;
+ //璁惧鎵�鍦ㄦ満鏋刬d
+ private String deviceCompanyId;
+
+ public String getDeviceCompanyId() {
+ return deviceCompanyId;
+ }
+
+ public void setDeviceCompanyId(String deviceCompanyId) {
+ this.deviceCompanyId = deviceCompanyId;
+ }
+
+ public String getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(String companyId) {
+ this.companyId = companyId;
+ }
public String getUpdateTime() {
return updateTime;
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 +
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Dictionary.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Dictionary.java
index 4c89ba0..a6803b6 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Dictionary.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Dictionary.java
@@ -56,6 +56,11 @@
* 鏄惁鍚屾
*/
public static final String isSynchron="is_synchron";
+
+ /**
+ * 璁惧鎵�鍦ㄦ満鏋刬d
+ */
+ private static final String deviceCompanyId="device_company_id";
}
// 涓婚敭
@@ -82,6 +87,16 @@
//鏄惁鍚屾
private String isSynchron;
+ //璁惧鎵�鍦ㄦ満鏋刬d
+ private String deviceCompanyId;
+
+ public String getDeviceCompanyId() {
+ return deviceCompanyId;
+ }
+
+ public void setDeviceCompanyId(String deviceCompanyId) {
+ this.deviceCompanyId = deviceCompanyId;
+ }
public String getUpdateTime() {
return updateTime;
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/PhoneCall.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/PhoneCall.java
index 9e02ac9..c3843b5 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/PhoneCall.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/PhoneCall.java
@@ -44,6 +44,11 @@
* 鏄惁鍚屾
*/
public static final String isSynchron="is_synchron";
+
+ /**
+ * 璁惧鎵�鍦ㄦ満鏋刬d
+ */
+ private static final String deviceCompanyId="device_company_id";
}
// 绛惧埌浜嬩欢涓婚敭
@@ -65,6 +70,17 @@
private String isSynchron;
+ //璁惧鎵�鍦ㄦ満鏋刬d
+ private String deviceCompanyId;
+
+ public String getDeviceCompanyId() {
+ return deviceCompanyId;
+ }
+
+ public void setDeviceCompanyId(String deviceCompanyId) {
+ this.deviceCompanyId = deviceCompanyId;
+ }
+
public String getUpdateTime() {
return updateTime;
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Post.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Post.java
index 21c3810..85eed61 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Post.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Post.java
@@ -32,6 +32,11 @@
* 鏄惁鍚屾
*/
public static final String isSynchron="is_synchron";
+
+ /**
+ * 璁惧鎵�鍦ㄦ満鏋刬d
+ */
+ private static final String deviceCompanyId="device_company_id";
}
// 鑱屼綅涓婚敭
@@ -46,6 +51,17 @@
private String isSynchron;
+ //璁惧鎵�鍦ㄦ満鏋刬d
+ private String deviceCompanyId;
+
+ public String getDeviceCompanyId() {
+ return deviceCompanyId;
+ }
+
+ public void setDeviceCompanyId(String deviceCompanyId) {
+ this.deviceCompanyId = deviceCompanyId;
+ }
+
public String getUpdateTime() {
return updateTime;
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Register.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Register.java
index c35e3c7..01f5bbb 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Register.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Register.java
@@ -100,6 +100,24 @@
public static final String surveillancePhotoId = "surveillancePhotoId";
public static final String visitorTypeId = "visitorTypeId";
+ /**
+ * 韬唤璁よ瘉 锛�0--鏈璇侊紝1--宸茶璇�
+ */
+ public static final String authentication="authentication";
+
+ public static final String idCardHeadPhoto="idCardHeadPhoto";
+ /**
+ * 鑰冨嫟浜哄憳绫诲瀷
+ */
+ public static final String attenderTypeId="attenderTypeId";
+
+ /**
+ * 鍗″彿
+ */
+ public static final String card_number="cardNumber";
+
+
+
public static final String department = "department";
public static final String post = "post";
@@ -112,6 +130,11 @@
* 鏄惁鍚屾
*/
public static final String isSynchron="is_synchron";
+
+ /**
+ * 璁惧鎵�鍦ㄦ満鏋刬d
+ */
+ private static final String deviceCompanyId="device_company_id";
}
@@ -159,16 +182,40 @@
private String surveillancePhotoId;
// 璁垮绫诲瀷
private String visitorTypeId;
- private String authentication;
- private String idCardHeadPhoto;
private String department;
private String post;
+ /**
+ * 韬唤璁よ瘉 锛�0--鏈璇侊紝1--宸茶璇�
+ */
+ public String authentication ;
+
+ public String idCardHeadPhoto;
+ /**
+ * 鑰冨嫟浜哄憳绫诲瀷
+ */
+ public String attenderTypeId;
+
+ /**
+ * 鍗″彿
+ */
+ public String card_number;
//鍚屾鏃堕棿
private String updateTime;
//鏄惁鍚屾
private String isSynchron;
+
+ //璁惧鎵�鍦ㄦ満鏋刬d
+ private String deviceCompanyId;
+
+ public String getDeviceCompanyId() {
+ return deviceCompanyId;
+ }
+
+ public void setDeviceCompanyId(String deviceCompanyId) {
+ this.deviceCompanyId = deviceCompanyId;
+ }
public String getUpdateTime() {
@@ -187,6 +234,22 @@
this.isSynchron = isSynchron;
}
+ public String getAttenderTypeId() {
+ return attenderTypeId;
+ }
+
+ public void setAttenderTypeId(String attenderTypeId) {
+ this.attenderTypeId = attenderTypeId;
+ }
+
+ public String getCard_number() {
+ return card_number;
+ }
+
+ public void setCard_number(String card_number) {
+ this.card_number = card_number;
+ }
+
/**
* Get 浜哄憳涓婚敭
*/
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/RegisterDetail.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/RegisterDetail.java
index f8d4235..a63805e 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/RegisterDetail.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/RegisterDetail.java
@@ -40,6 +40,11 @@
* 鏄惁鍚屾
*/
public static final String isSynchron="is_synchron";
+
+ /**
+ * 璁惧鎵�鍦ㄦ満鏋刬d
+ */
+ private static final String deviceCompanyId="device_company_id";
}
// 鍛樺伐鍥剧墖涓婚敭
@@ -57,6 +62,17 @@
//鏄惁鍚屾
private String isSynchron;
+ //璁惧鎵�鍦ㄦ満鏋刬d
+ private String deviceCompanyId;
+
+ public String getDeviceCompanyId() {
+ return deviceCompanyId;
+ }
+
+ public void setDeviceCompanyId(String deviceCompanyId) {
+ this.deviceCompanyId = deviceCompanyId;
+ }
+
public String getUpdateTime() {
return updateTime;
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Visit.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Visit.java
index f425e92..a051bd2 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Visit.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Visit.java
@@ -76,6 +76,11 @@
* 鏄惁鍚屾
*/
public static final String isSynchron="is_synchron";
+
+ /**
+ * 璁惧鎵�鍦ㄦ満鏋刬d
+ */
+ private static final String deviceCompanyId="device_company_id";
}
// 璁块棶浜嬩欢涓婚敭
@@ -112,6 +117,17 @@
private String isSynchron;
+ //璁惧鎵�鍦ㄦ満鏋刬d
+ private String deviceCompanyId;
+
+ public String getDeviceCompanyId() {
+ return deviceCompanyId;
+ }
+
+ public void setDeviceCompanyId(String deviceCompanyId) {
+ this.deviceCompanyId = deviceCompanyId;
+ }
+
public String getUpdateTime() {
return updateTime;
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/VisitDetail.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/VisitDetail.java
index dabf72d..8e414cb 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/VisitDetail.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/VisitDetail.java
@@ -44,6 +44,12 @@
* 鏄惁鍚屾
*/
public static final String isSynchron="is_synchron";
+
+ /**
+ * 璁惧鎵�鍦ㄦ満鏋刬d
+ */
+ private static final String deviceCompanyId="device_company_id";
+
}
// 璁块棶浜嬩欢娴佹按id
@@ -63,6 +69,17 @@
//鏄惁鍚屾
private String isSynchron;
+ //璁惧鎵�鍦ㄦ満鏋刬d
+ private String deviceCompanyId;
+
+ public String getDeviceCompanyId() {
+ return deviceCompanyId;
+ }
+
+ public void setDeviceCompanyId(String deviceCompanyId) {
+ this.deviceCompanyId = deviceCompanyId;
+ }
+
public String getUpdateTime() {
return updateTime;
--
Gitblit v1.8.0