From 7b6628f2efb53e8246663f50267cacb35f577051 Mon Sep 17 00:00:00 2001 From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674> Date: 星期六, 22 七月 2017 12:24:22 +0800 Subject: [PATCH] --- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Company.java | 88 +- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/OperateLog.java | 230 ++++++ VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/PhoneCall.java | 98 +- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/VisitTableSynchronRecord.java | 86 ++ VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Attendance.java | 95 +- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Employee.java | 135 ++- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/VisitDetail.java | 92 +- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Device.java | 375 ++++++----- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Visit.java | 107 +- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Department.java | 123 ++- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Register.java | 306 ++++++--- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Dictionary.java | 94 +- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Post.java | 94 +- 13 files changed, 1,250 insertions(+), 673 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 343c9d6..acfdb7b 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 @@ -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; @@ -33,27 +34,22 @@ /** * 绛惧埌浣嶇疆 */ - public static final String deviceId = "deviceId"; - + public static final String deviceId = "deviceId"; /** * 鍚屾鏃堕棿 */ - 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"; } // 绛惧埌浜嬩欢涓婚敭 - private String attendanceId; // 浜哄憳涓婚敭 private String registerId; @@ -63,42 +59,13 @@ private String time; // 绛惧埌浣嶇疆 private String deviceId; - - //鍚屾鏃堕棿 + // 鍚屾鏃堕棿 private String updateTime; - - //鏄惁鍚屾 + // 鏄惁鍚屾 private String isSynchron; - - //璁惧鎵�鍦ㄦ満鏋刬d + // 璁惧鎵�鍦ㄦ満鏋刬d private String deviceCompanyId; - - 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; - } - - - + /** * Get 绛惧埌浜嬩欢涓婚敭 */ @@ -168,6 +135,50 @@ public void setDeviceId(String deviceId) { this.deviceId = deviceId; } + + /** + * 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 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 d5370dc..4be342e 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 @@ -22,62 +22,31 @@ * 鍏徃鍚嶇О */ public static final String companyName = "companyName"; - /** * 鍚屾鏃堕棿 */ - 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"; } // 鍏徃涓婚敭 private String companyId; // 鍏徃鍚嶇О private String companyName; - - //鍚屾鏃堕棿 + // 鍚屾鏃堕棿 private String updateTime; - - //鏄惁鍚屾 + // 鏄惁鍚屾 private String isSynchron; - - //璁惧鎵�鍦ㄦ満鏋刬d + // 璁惧鎵�鍦ㄦ満鏋刬d private String deviceCompanyId; - - 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; - } - + /** * Get 鍏徃涓婚敭 */ @@ -105,6 +74,49 @@ public void setCompanyName(String companyName) { this.companyName = companyName; } + /** + * 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 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 3871af3..dce31f5 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 @@ -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; /** - * Department + * 鍚戜笅 */ public class Department extends BaseEntity implements Serializable { @@ -26,26 +27,22 @@ * 閮ㄩ棬棣栧瓧姣� */ public static final String deptNameEn = "deptNameEn"; - /** - * 鎵�鍦ㄥ叕鍙竔d + * 鎵�鍦ㄥ叕鍙� */ - private static final String companyId="companyId"; - + public static final String companyId = "companyId"; /** * 鍚屾鏃堕棿 */ - 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"; } // 閮ㄩ棬涓婚敭 @@ -54,49 +51,14 @@ private String deptName; // 閮ㄩ棬棣栧瓧姣� private String deptNameEn; - + // 鎵�鍦ㄥ叕鍙� private String companyId; - - //鍚屾鏃堕棿 + // 鍚屾鏃堕棿 private String updateTime; - - //鏄惁鍚屾 + // 鏄惁鍚屾 private String isSynchron; - - //璁惧鎵�鍦ㄦ満鏋刬d + // 璁惧鎵�鍦ㄦ満鏋刬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; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getIsSynchron() { - return isSynchron; - } - - public void setIsSynchron(String isSynchron) { - this.isSynchron = isSynchron; - } /** * Get 閮ㄩ棬涓婚敭 @@ -140,9 +102,68 @@ this.deptNameEn = deptNameEn; } + /** + * Get 鎵�鍦ㄥ叕鍙� + */ + public String getCompanyId() { + return companyId; + } + + /** + * Set 鎵�鍦ㄥ叕鍙� + */ + public void setCompanyId(String companyId) { + this.companyId = companyId; + } + + /** + * 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 - ",閮ㄩ棬涓婚敭 =" + deptId + ",閮ㄩ棬鍚嶇О =" + deptName + ",閮ㄩ棬棣栧瓧姣� ="+ deptNameEn - ; + ",閮ㄩ棬涓婚敭 =" + deptId + ",閮ㄩ棬鍚嶇О =" + deptName + ",閮ㄩ棬棣栧瓧姣� ="+ deptNameEn + + ",鎵�鍦ㄥ叕鍙� =" + companyId + ",鍚屾鏃堕棿 =" + updateTime + ",鏄惁鍚屾 =" + isSynchron + + ",璁惧鎵�鍦ㄦ満鏋刬d ="+ deviceCompanyId; } } 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; } } 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 a6803b6..43c17f0 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 @@ -1,11 +1,13 @@ package cn.com.basic.face.discern.entity; import java.io.Serializable; +import java.util.Date; import cn.com.basic.face.discern.common.BaseEntity; /** * 鏁版嵁瀛楀吀 + * 锛屽弻鍚� */ public class Dictionary extends BaseEntity implements Serializable { @@ -46,21 +48,18 @@ * 鍏徃涓婚敭 */ public static final String compnayId = "compnayId"; - /** * 鍚屾鏃堕棿 */ - 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"; } // 涓婚敭 @@ -79,42 +78,12 @@ private String remark; // 鍏徃涓婚敭 private String compnayId; - - - //鍚屾鏃堕棿 + // 鍚屾鏃堕棿 private String updateTime; - - //鏄惁鍚屾 + // 鏄惁鍚屾 private String isSynchron; - - //璁惧鎵�鍦ㄦ満鏋刬d + // 璁惧鎵�鍦ㄦ満鏋刬d private String deviceCompanyId; - - 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; - } - - /** * Get 涓婚敭 @@ -228,10 +197,55 @@ this.compnayId = compnayId; } + /** + * 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 ",涓婚敭 =" + dictId + ",缂栫爜 =" + sn + ",鍚嶇О =" + name + ",绫诲瀷 =" + type + ",鎺掑簭 =" + orderBy + ",鐖剁骇id =" + pid + - ",澶囨敞 =" + remark + ",鍏徃涓婚敭 =" + compnayId ; + ",澶囨敞 =" + remark + ",鍏徃涓婚敭 =" + compnayId + ",鍚屾鏃堕棿 =" + updateTime + + ",鏄惁鍚屾 =" + isSynchron + ",璁惧鎵�鍦ㄦ満鏋刬d ="+ deviceCompanyId; } } diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Employee.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Employee.java index cf6e7c8..c40d18f 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Employee.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Employee.java @@ -1,69 +1,108 @@ package cn.com.basic.face.discern.entity; - import java.io.Serializable; +import java.util.Date; import cn.com.basic.face.discern.common.BaseEntity; -/** - * Created by SJW on 2017/7/21 0021. - */ +/** + * 鍙屽悜 + */ public class Employee extends BaseEntity implements Serializable { - public static final class FieldNames { - //浜哄憳涓婚敭 - private static final String registerId="registerId"; - //璁惧鎵�鍦ㄦ満鏋刬d - private static final String deviceCompanyId="deviceCompanyId"; + private static final long serialVersionUID = 1L; - //鍚屾鏃堕棿 - private static final String updateTime="updateTime"; + public static final String MODEL_NAME = "Employee"; - //鏄惁鍚屾 - private static final String isSynchron="isSynchron"; + public static final class FieldNames { + /** + * 浜哄憳涓婚敭 + */ + public static final String registerId = "registerId"; + /** + * 鍏徃涓婚敭 + */ + public static final String deviceCompanyId = "deviceCompanyId"; + /** + * 鍚屾鏃堕棿 + */ + public static final String updateTime = "updateTime"; + /** + * 鏄惁鍚屾 + */ + public static final String isSynchron = "isSynchron"; + } + // 浜哄憳涓婚敭 + private String registerId; + // 鍏徃涓婚敭 + private String deviceCompanyId; + // 鍚屾鏃堕棿 + private String updateTime; + // 鏄惁鍚屾 + private String isSynchron; - } - //浜哄憳涓婚敭 - private String registerId ; - //璁惧鎵�鍦ㄦ満鏋刬d - private String deviceCompanyId; + /** + * Get 浜哄憳涓婚敭 + */ + public String getRegisterId() { + return registerId; + } - //鍚屾鏃堕棿 - private String updateTime; + /** + * Set 浜哄憳涓婚敭 + */ + public void setRegisterId(String registerId) { + this.registerId = registerId; + } - //鏄惁鍚屾 - private String isSynchron; + /** + * Get 鍏徃涓婚敭 + */ + public String getDeviceCompanyId() { + return deviceCompanyId; + } - public String getRegisterId() { - return registerId; - } + /** + * Set 鍏徃涓婚敭 + */ + public void setDeviceCompanyId(String deviceCompanyId) { + this.deviceCompanyId = deviceCompanyId; + } - public void setRegisterId(String registerId) { - this.registerId = registerId; - } + /** + * Get 鍚屾鏃堕棿 + */ + public String getUpdateTime() { + return updateTime; + } - public String getDeviceCompanyId() { - return deviceCompanyId; - } + /** + * Set 鍚屾鏃堕棿 + */ + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } - public void setDeviceCompanyId(String deviceCompanyId) { - this.deviceCompanyId = deviceCompanyId; - } + /** + * Get 鏄惁鍚屾 + * 锛孻--宸插悓姝ワ紝N--鏈悓姝� + */ + public String getIsSynchron() { + return isSynchron; + } - public String getUpdateTime() { - return updateTime; - } + /** + * Set 鏄惁鍚屾 + * 锛孻--宸插悓姝ワ紝N--鏈悓姝� + */ + public void setIsSynchron(String isSynchron) { + this.isSynchron = isSynchron; + } - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getIsSynchron() { - return isSynchron; - } - - public void setIsSynchron(String isSynchron) { - this.isSynchron = isSynchron; - } + public String toString() { + return + ",浜哄憳涓婚敭 =" + registerId + ",鍏徃涓婚敭 =" + deviceCompanyId + ",鍚屾鏃堕棿 =" + updateTime + + ",鏄惁鍚屾 =" + isSynchron; + } } diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/OperateLog.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/OperateLog.java new file mode 100644 index 0000000..51f0166 --- /dev/null +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/OperateLog.java @@ -0,0 +1,230 @@ +package cn.com.basic.face.discern.entity; + +import java.io.Serializable; +import java.util.Date; + +import cn.com.basic.face.discern.common.BaseEntity; + +/** + * OperateLog + */ +public class OperateLog extends BaseEntity implements Serializable { + + private static final long serialVersionUID = 1L; + + public static final String MODEL_NAME = "OperateLog"; + + public static final class FieldNames { + /** + * 涓婚敭 + */ + public static final String operateLogId = "operateLogId"; + /** + * 鎿嶄綔鑰� + */ + public static final String operator = "operator"; + /** + * 鎿嶄綔鏃堕棿 + */ + public static final String operateTime = "operateTime"; + /** + * 鍐呭 + */ + public static final String content = "content"; + /** + * 鎿嶄綔 + */ + public static final String operate = "operate"; + /** + * 鎿嶄綔浜篿d + */ + public static final String operatorId = "operatorId"; + /** + * 璇︾粏淇℃伅 + */ + public static final String fullDetail = "fullDetail"; + /** + * 鍚屾鏃堕棿 + */ + public static final String updateTime = "updateTime"; + /** + * 鏄惁鍚屾 + */ + public static final String isSynchron = "isSynchron"; + /** + * 璁惧鎵�鍦ㄦ満鏋刬d + */ + public static final String deviceCompanyId = "deviceCompanyId"; + } + + // 涓婚敭 + private String operateLogId; + // 鎿嶄綔鑰� + private String operator; + // 鎿嶄綔鏃堕棿 + private String operateTime; + // 鍐呭 + private String content; + // 鎿嶄綔 + private String operate; + // 鎿嶄綔浜篿d + private String operatorId; + // 璇︾粏淇℃伅 + private String fullDetail; + // 鍚屾鏃堕棿 + private String updateTime; + // 鏄惁鍚屾 + private String isSynchron; + // 璁惧鎵�鍦ㄦ満鏋刬d + private String deviceCompanyId; + + /** + * Get 涓婚敭 + */ + public String getOperateLogId() { + return operateLogId; + } + + /** + * Set 涓婚敭 + */ + public void setOperateLogId(String operateLogId) { + this.operateLogId = operateLogId; + } + + /** + * Get 鎿嶄綔鑰� + */ + public String getOperator() { + return operator; + } + + /** + * Set 鎿嶄綔鑰� + */ + public void setOperator(String operator) { + this.operator = operator; + } + + /** + * Get 鎿嶄綔鏃堕棿 + */ + public String getOperateTime() { + return operateTime; + } + + /** + * Set 鎿嶄綔鏃堕棿 + */ + public void setOperateTime(String operateTime) { + this.operateTime = operateTime; + } + + /** + * Get 鍐呭 + */ + public String getContent() { + return content; + } + + /** + * Set 鍐呭 + */ + public void setContent(String content) { + this.content = content; + } + + /** + * Get 鎿嶄綔 + */ + public String getOperate() { + return operate; + } + + /** + * Set 鎿嶄綔 + */ + public void setOperate(String operate) { + this.operate = operate; + } + + /** + * Get 鎿嶄綔浜篿d + */ + public String getOperatorId() { + return operatorId; + } + + /** + * Set 鎿嶄綔浜篿d + */ + public void setOperatorId(String operatorId) { + this.operatorId = operatorId; + } + + /** + * Get 璇︾粏淇℃伅 + */ + public String getFullDetail() { + return fullDetail; + } + + /** + * Set 璇︾粏淇℃伅 + */ + public void setFullDetail(String fullDetail) { + this.fullDetail = fullDetail; + } + + /** + * 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 + ",涓婚敭 =" + operateLogId + ",鎿嶄綔鑰� =" + operator + ",鎿嶄綔鏃堕棿 =" + operateTime + + ",鍐呭 =" + content + ",鎿嶄綔 =" + operate + ",鎿嶄綔浜篿d ="+ operatorId + + ",璇︾粏淇℃伅 =" + fullDetail + ",鍚屾鏃堕棿 =" + updateTime + ",鏄惁鍚屾 =" + isSynchron + + ",璁惧鎵�鍦ㄦ満鏋刬d ="+ deviceCompanyId; + } +} 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 c3843b5..b3c005a 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 @@ -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; /** - * PhoneCall + * 涓嶅悓姝� */ public class PhoneCall extends BaseEntity implements Serializable { @@ -34,21 +35,18 @@ * 鍛煎彨鍙戠敓鎵�鍦ㄨ澶�(鍦扮偣) */ public static final String deviceId = "deviceId"; - /** * 鍚屾鏃堕棿 */ - 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"; } // 绛惧埌浜嬩欢涓婚敭 @@ -61,41 +59,12 @@ private String calleeId; // 鍛煎彨鍙戠敓鎵�鍦ㄨ澶�(鍦扮偣) private String deviceId; - - - //鍚屾鏃堕棿 + // 鍚屾鏃堕棿 private String updateTime; - - //鏄惁鍚屾 + // 鏄惁鍚屾 private String isSynchron; - - - //璁惧鎵�鍦ㄦ満鏋刬d + // 璁惧鎵�鍦ㄦ満鏋刬d private String deviceCompanyId; - - 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; - } /** * Get 绛惧埌浜嬩欢涓婚敭 @@ -167,9 +136,54 @@ this.deviceId = deviceId; } + /** + * 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 - ",绛惧埌浜嬩欢涓婚敭 ="+ phoneCallId + ",鍛煎彨鏃堕棿 =" + date + ",鍛煎彨浜哄憳涓婚敭 ="+ callerId + - ",琚懠鍙汉鍛樹富閿� ="+ calleeId + ",鍛煎彨鍙戠敓鎵�鍦ㄨ澶�(鍦扮偣) ="+ deviceId ; + return + ",绛惧埌浜嬩欢涓婚敭 ="+ phoneCallId + ",鍛煎彨鏃堕棿 =" + date + ",鍛煎彨浜哄憳涓婚敭 ="+ callerId + + ",琚懠鍙汉鍛樹富閿� ="+ calleeId + ",鍛煎彨鍙戠敓鎵�鍦ㄨ澶�(鍦扮偣) ="+ deviceId + ",鍚屾鏃堕棿 =" + updateTime + + ",鏄惁鍚屾 =" + isSynchron + ",璁惧鎵�鍦ㄦ満鏋刬d ="+ deviceCompanyId; } } 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 85eed61..3384bf2 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 @@ -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; /** - * Post + * 鍚戜笅 */ public class Post extends BaseEntity implements Serializable { @@ -22,62 +23,30 @@ * 鑱屼綅鍚嶇О */ public static final String postName = "postName"; - /** * 鍚屾鏃堕棿 */ - 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"; } // 鑱屼綅涓婚敭 private String postId; // 鑱屼綅鍚嶇О private String postName; - - //鍚屾鏃堕棿 + // 鍚屾鏃堕棿 private String updateTime; - - //鏄惁鍚屾 + // 鏄惁鍚屾 private String isSynchron; - - - //璁惧鎵�鍦ㄦ満鏋刬d + // 璁惧鎵�鍦ㄦ満鏋刬d private String deviceCompanyId; - - 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; - } - /** * Get 鑱屼綅涓婚敭 @@ -107,8 +76,53 @@ this.postName = postName; } + /** + * 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 - ",鑱屼綅涓婚敭 =" + postId + ",鑱屼綅鍚嶇О =" + postName ; + ",鑱屼綅涓婚敭 =" + postId + ",鑱屼綅鍚嶇О =" + postName + ",鍚屾鏃堕棿 =" + updateTime + + ",鏄惁鍚屾 =" + isSynchron + ",璁惧鎵�鍦ㄦ満鏋刬d ="+ deviceCompanyId; } } 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 01f5bbb..c47dda2 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 @@ -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; /** - * Register + * 浜哄憳琛� */ public class Register extends BaseEntity implements Serializable { @@ -98,44 +99,54 @@ * 鐩戞帶鍥剧墖id */ 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 authentication = "authentication"; + /** + * idCardHeadPhoto + */ + public static final String idCardHeadPhoto = "idCardHeadPhoto"; /** * 鑰冨嫟浜哄憳绫诲瀷 */ - public static final String attenderTypeId="attenderTypeId"; - + 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"; - + public static final String cardNumber = "cardNumber"; /** * 鍚屾鏃堕棿 */ - 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"; + /** + * 涓存椂鍘熺洃鎺ф枃浠惰矾寰� + */ + public static final String rawSurveillancePhotoPath = "rawSurveillancePhotoPath"; + /** + * 涓存椂鍘熺洃鎺ф枃浠跺搴� + */ + public static final String rawSurveillancePhotoWidth = "rawSurveillancePhotoWidth"; + /** + * 涓存椂鍘熺洃鎺ф枃浠堕珮搴� + */ + public static final String rawSurveillancePhotoHeight = "rawSurveillancePhotoHeight"; + /** + * 涓存椂鍘熺洃鎺ф枃浠跺垱寤烘椂闂� + */ + public static final String createTime = "createTime"; } // 浜哄憳涓婚敭 @@ -182,73 +193,28 @@ private String surveillancePhotoId; // 璁垮绫诲瀷 private String visitorTypeId; - private String department; - private String post; - /** - * 韬唤璁よ瘉 锛�0--鏈璇侊紝1--宸茶璇� - */ - public String authentication ; - - public String idCardHeadPhoto; - /** - * 鑰冨嫟浜哄憳绫诲瀷 - */ - public String attenderTypeId; - - /** - * 鍗″彿 - */ - public String card_number; - - //鍚屾鏃堕棿 + // 韬唤璁よ瘉 + private String authentication; + // idCardHeadPhoto + private String idCardHeadPhoto; + // 鑰冨嫟浜哄憳绫诲瀷 + private String attenderTypeId; + // 鍗″彿 + private String cardNumber; + // 鍚屾鏃堕棿 private String updateTime; - - //鏄惁鍚屾 + // 鏄惁鍚屾 private String isSynchron; - - //璁惧鎵�鍦ㄦ満鏋刬d + // 璁惧鎵�鍦ㄦ満鏋刬d private String deviceCompanyId; - - 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 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; - } + // 涓存椂鍘熺洃鎺ф枃浠惰矾寰� + private String rawSurveillancePhotoPath; + // 涓存椂鍘熺洃鎺ф枃浠跺搴� + private String rawSurveillancePhotoWidth; + // 涓存椂鍘熺洃鎺ф枃浠堕珮搴� + private String rawSurveillancePhotoHeight; + // 涓存椂鍘熺洃鎺ф枃浠跺垱寤烘椂闂� + private String createTime; /** * Get 浜哄憳涓婚敭 @@ -544,55 +510,191 @@ this.surveillancePhotoId = surveillancePhotoId; } + /** + * Get 璁垮绫诲瀷 + */ public String getVisitorTypeId() { return visitorTypeId; } + /** + * Set 璁垮绫诲瀷 + */ public void setVisitorTypeId(String visitorTypeId) { this.visitorTypeId = visitorTypeId; } + /** + * Get 韬唤璁よ瘉 + * 锛�0鏈璇侊紝1宸茶璇� + */ public String getAuthentication() { return authentication; } + /** + * Set 韬唤璁よ瘉 + * 锛�0鏈璇侊紝1宸茶璇� + */ public void setAuthentication(String authentication) { this.authentication = authentication; } + /** + * Get idCardHeadPhoto + */ public String getIdCardHeadPhoto() { return idCardHeadPhoto; } + /** + * Set idCardHeadPhoto + */ public void setIdCardHeadPhoto(String idCardHeadPhoto) { this.idCardHeadPhoto = idCardHeadPhoto; } - public String getDepartment() { - return department; + /** + * Get 鑰冨嫟浜哄憳绫诲瀷 + */ + public String getAttenderTypeId() { + return attenderTypeId; } - public void setDepartment(String department) { - this.department = department; + /** + * Set 鑰冨嫟浜哄憳绫诲瀷 + */ + public void setAttenderTypeId(String attenderTypeId) { + this.attenderTypeId = attenderTypeId; } - public String getPost() { - return post; + /** + * Get 鍗″彿 + */ + public String getCardNumber() { + return cardNumber; } - public void setPost(String post) { - this.post = post; + /** + * Set 鍗″彿 + */ + public void setCardNumber(String cardNumber) { + this.cardNumber = cardNumber; + } + + /** + * 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; + } + + /** + * Get 涓存椂鍘熺洃鎺ф枃浠惰矾寰� + */ + public String getRawSurveillancePhotoPath() { + return rawSurveillancePhotoPath; + } + + /** + * Set 涓存椂鍘熺洃鎺ф枃浠惰矾寰� + */ + public void setRawSurveillancePhotoPath(String rawSurveillancePhotoPath) { + this.rawSurveillancePhotoPath = rawSurveillancePhotoPath; + } + + /** + * Get 涓存椂鍘熺洃鎺ф枃浠跺搴� + */ + public String getRawSurveillancePhotoWidth() { + return rawSurveillancePhotoWidth; + } + + /** + * Set 涓存椂鍘熺洃鎺ф枃浠跺搴� + */ + public void setRawSurveillancePhotoWidth(String rawSurveillancePhotoWidth) { + this.rawSurveillancePhotoWidth = rawSurveillancePhotoWidth; + } + + /** + * Get 涓存椂鍘熺洃鎺ф枃浠堕珮搴� + */ + public String getRawSurveillancePhotoHeight() { + return rawSurveillancePhotoHeight; + } + + /** + * Set 涓存椂鍘熺洃鎺ф枃浠堕珮搴� + */ + public void setRawSurveillancePhotoHeight(String rawSurveillancePhotoHeight) { + this.rawSurveillancePhotoHeight = rawSurveillancePhotoHeight; + } + + /** + * Get 涓存椂鍘熺洃鎺ф枃浠跺垱寤烘椂闂� + */ + public String getCreateTime() { + return createTime; + } + + /** + * Set 涓存椂鍘熺洃鎺ф枃浠跺垱寤烘椂闂� + */ + public void setCreateTime(String createTime) { + this.createTime = createTime; } public String toString() { - return - ",浜哄憳涓婚敭 =" + registerId + ",浜哄憳鍚嶅瓧 =" + username + ",浜哄憳鍚嶉瀛楁瘝 ="+ nameEn + - ",鎬у埆 =" + genderId + ",鍥界睄 =" + countryId + ",鐪� =" + province + - ",甯� =" + city + ",鍑虹敓鏃ユ湡 =" + birthday + ",搴ф満鐢佃瘽 =" + tel + - ",绉诲姩鐢佃瘽 =" + mobilePhone + ",璇佷欢绫诲瀷 =" + identityTypeId + ",璇佷欢缂栧彿 =" + identifyNum + - ",鍏徃涓婚敭 =" + companyId + ",閮ㄩ棬涓婚敭 =" + departmentId + ",鑱屽姟涓婚敭 =" + postId + - ",浜哄憳澶囨敞娑堟伅 ="+ remark + ",鍗遍櫓浜哄憳璀﹀憡娑堟伅 ="+ warning + ",璇佷欢鐓� =" + idCardPhoto + - ",涓婁紶鑷畾涔夌収鐗� ="+ uploadCustomPhoto + ",鐩戞帶鍥剧墖 =" + surveillancePhoto + ",鐩戞帶鍥剧墖id ="+ surveillancePhotoId - ; + return + ",浜哄憳涓婚敭 =" + registerId + ",浜哄憳鍚嶅瓧 =" + username + ",浜哄憳鍚嶉瀛楁瘝 ="+ nameEn + + ",鎬у埆 =" + genderId + ",鍥界睄 =" + countryId + ",鐪� =" + province + + ",甯� =" + city + ",鍑虹敓鏃ユ湡 =" + birthday + ",搴ф満鐢佃瘽 =" + tel + + ",绉诲姩鐢佃瘽 =" + mobilePhone + ",璇佷欢绫诲瀷 =" + identityTypeId + ",璇佷欢缂栧彿 =" + identifyNum + + ",鍏徃涓婚敭 =" + companyId + ",閮ㄩ棬涓婚敭 =" + departmentId + ",鑱屽姟涓婚敭 =" + postId + + ",浜哄憳澶囨敞娑堟伅 ="+ remark + ",鍗遍櫓浜哄憳璀﹀憡娑堟伅 ="+ warning + ",璇佷欢鐓� =" + idCardPhoto + + ",涓婁紶鑷畾涔夌収鐗� ="+ uploadCustomPhoto + ",鐩戞帶鍥剧墖 =" + surveillancePhoto + ",鐩戞帶鍥剧墖id ="+ surveillancePhotoId + + ",璁垮绫诲瀷 =" + visitorTypeId + ",韬唤璁よ瘉 =" + authentication + ",idCardHeadPhoto ="+ idCardHeadPhoto + + ",鑰冨嫟浜哄憳绫诲瀷 ="+ attenderTypeId + ",鍗″彿 =" + cardNumber + ",鍚屾鏃堕棿 =" + updateTime + + ",鏄惁鍚屾 =" + isSynchron + ",璁惧鎵�鍦ㄦ満鏋刬d ="+ deviceCompanyId + ",涓存椂鍘熺洃鎺ф枃浠惰矾寰� ="+ rawSurveillancePhotoPath + + ",涓存椂鍘熺洃鎺ф枃浠跺搴� ="+ rawSurveillancePhotoWidth + ",涓存椂鍘熺洃鎺ф枃浠堕珮搴� ="+ rawSurveillancePhotoHeight + ",涓存椂鍘熺洃鎺ф枃浠跺垱寤烘椂闂� ="+ createTime + ; } } 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 a051bd2..3ad8477 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 @@ -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; @@ -22,10 +23,6 @@ * 璁块棶浜嬬敱涓婚敭 */ public static final String visitReasonId = "visitReasonId"; - /** - * 璁块棶浜嬬敱涓婚敭 - */ - public static final String visitReason = "visitReason"; /** * 璁块棶澶囨敞 */ @@ -66,27 +63,22 @@ * 褰撳墠璁块棶鐨勮鍛婄姸鎬� */ public static final String warning = "warning"; - /** * 鍚屾鏃堕棿 */ - 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"; } // 璁块棶浜嬩欢涓婚敭 private String visitId; - // 璁块棶浜嬬敱涓婚敭 - private String visitReason; // 璁块棶浜嬬敱涓婚敭 private String visitReasonId; // 璁块棶澶囨敞 @@ -109,41 +101,12 @@ private String currentStateId; // 褰撳墠璁块棶鐨勮鍛婄姸鎬� private String warning; - - //鍚屾鏃堕棿 + // 鍚屾鏃堕棿 private String updateTime; - - //鏄惁鍚屾 + // 鏄惁鍚屾 private String isSynchron; - - - //璁惧鎵�鍦ㄦ満鏋刬d + // 璁惧鎵�鍦ㄦ満鏋刬d private String deviceCompanyId; - - 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; - } - /** * Get 璁块棶浜嬩欢涓婚敭 @@ -313,21 +276,57 @@ this.warning = warning; } + /** + * 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 ",璁块棶浜嬩欢涓婚敭 ="+ visitId + ",璁块棶浜嬬敱涓婚敭 ="+ visitReasonId + ",璁块棶澶囨敞 =" + remark + ",鏉ヨ鏃堕棿 =" + enterTime + ",绛剧鏃堕棿 =" + exitTime + ",璁垮绫诲瀷 =" + visitorTypeId + ",璁块棶浜哄憳涓婚敭 ="+ visitorId + ",visitorCompanyId ="+ visitorCompanyId + ",琚闂汉鍛樹富閿� ="+ visiteeId + - ",visiteeCompanyId ="+ visiteeCompanyId + ",鏈�鏂扮殑璁块棶鐘舵�� ="+ currentStateId + ",褰撳墠璁块棶鐨勮鍛婄姸鎬� ="+ warning + ",visiteeCompanyId ="+ visiteeCompanyId + ",鏈�鏂扮殑璁块棶鐘舵�� ="+ currentStateId + ",褰撳墠璁块棶鐨勮鍛婄姸鎬� ="+ warning + + ",鍚屾鏃堕棿 =" + updateTime + ",鏄惁鍚屾 =" + isSynchron + ",璁惧鎵�鍦ㄦ満鏋刬d ="+ deviceCompanyId ; } - - public String getVisitReason() { - return visitReason; - } - - public void setVisitReason(String visitReason) { - this.visitReason = visitReason; - } - } 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 8e414cb..4be44fc 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 @@ -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; @@ -34,22 +35,18 @@ * 璁惧浣嶇疆涓婚敭 */ public static final String deviceId = "deviceId"; - /** * 鍚屾鏃堕棿 */ - 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"; } // 璁块棶浜嬩欢娴佹按id @@ -62,40 +59,12 @@ private String createTime; // 璁惧浣嶇疆涓婚敭 private String deviceId; - - //鍚屾鏃堕棿 + // 鍚屾鏃堕棿 private String updateTime; - - //鏄惁鍚屾 + // 鏄惁鍚屾 private String isSynchron; - - //璁惧鎵�鍦ㄦ満鏋刬d + // 璁惧鎵�鍦ㄦ満鏋刬d private String deviceCompanyId; - - 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; - } /** * Get 璁块棶浜嬩欢娴佹按id @@ -167,9 +136,54 @@ this.deviceId = deviceId; } + /** + * 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 ",璁块棶浜嬩欢娴佹按id ="+ id + ",璁块棶浜嬩欢id ="+ visitId + ",褰撳墠璁块棶鐘舵�� ="+ stateId + - ",鏇存柊鐘舵�佹椂闂� ="+ createTime + ",璁惧浣嶇疆涓婚敭 ="+ deviceId ; + ",鏇存柊鐘舵�佹椂闂� ="+ createTime + ",璁惧浣嶇疆涓婚敭 ="+ deviceId + ",鍚屾鏃堕棿 =" + updateTime + + ",鏄惁鍚屾 =" + isSynchron + ",璁惧鎵�鍦ㄦ満鏋刬d ="+ deviceCompanyId; } } diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/VisitTableSynchronRecord.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/VisitTableSynchronRecord.java new file mode 100644 index 0000000..5a9072b --- /dev/null +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/VisitTableSynchronRecord.java @@ -0,0 +1,86 @@ +package cn.com.basic.face.discern.entity; + +import java.io.Serializable; +import java.util.Date; + +import cn.com.basic.face.discern.common.BaseEntity; + +/** + * 璁垮绯荤粺鍚屾璁板綍琛� + */ +public class VisitTableSynchronRecord extends BaseEntity implements Serializable { + + private static final long serialVersionUID = 1L; + + public static final String MODEL_NAME = "VisitTableSynchronRecord"; + + public static final class FieldNames { + /** + * 涓婚敭 + */ + public static final String id = "id"; + /** + * 琛ㄥ悕 + */ + public static final String tableName = "tableName"; + /** + * 鏈�杩戜竴娆″悓姝ユ椂闂� + */ + public static final String synchronTime = "synchronTime"; + } + + // 涓婚敭 + private String id; + // 琛ㄥ悕 + private String tableName; + // 鏈�杩戜竴娆″悓姝ユ椂闂� + private String synchronTime; + + /** + * Get 涓婚敭 + */ + public String getId() { + return id; + } + + /** + * Set 涓婚敭 + */ + public void setId(String id) { + this.id = id; + } + + /** + * Get 琛ㄥ悕 + */ + public String getTableName() { + return tableName; + } + + /** + * Set 琛ㄥ悕 + */ + public void setTableName(String tableName) { + this.tableName = tableName; + } + + /** + * Get 鏈�杩戜竴娆″悓姝ユ椂闂� + */ + public String getSynchronTime() { + return synchronTime; + } + + /** + * Set 鏈�杩戜竴娆″悓姝ユ椂闂� + */ + public void setSynchronTime(String synchronTime) { + this.synchronTime = synchronTime; + } + + public String toString() { + return + ",涓婚敭 =" + id + ",琛ㄥ悕 =" + tableName + ",鏈�杩戜竴娆″悓姝ユ椂闂� ="+ synchronTime + ; + } +} -- Gitblit v1.8.0