From 82399d7ee4a1702c3089f0cca0c579f56f50e543 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 10 四月 2017 17:49:18 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseFragment.java | 2
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Company.java | 26
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java | 11
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java | 6
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java | 6
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/RegisterDetail.java | 105 ++++++
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/PhoneCall.java | 46 +-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Attendance.java | 126 +++++++
/dev/null | 105 ------
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java | 64 ++-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/VisitDetail.java | 46 +-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Device.java | 32
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Visit.java | 200 +++++-----
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Department.java | 38 +-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Register.java | 98 ++--
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java | 4
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Dictionary.java | 36 +
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Post.java | 26
18 files changed, 577 insertions(+), 400 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java
index 1bfb620..224269d 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseApplication.java
@@ -2,6 +2,7 @@
import android.app.Application;
+import cn.com.basic.face.discern.entity.Device;
import cn.com.basic.face.service.DictionaryMng;
import cn.com.basic.face.service.DeviceMng;
@@ -12,7 +13,7 @@
import org.xutils.x;
-import cn.com.basic.face.discern.entity.Place;
+import cn.com.basic.face.discern.entity.Device;
/**
* Created by zhangbo on 2017/2/15.
@@ -26,15 +27,15 @@
return application;
}
- private Place place;
+ private Device place;
- public void setPlace(Place place) {
+ public void setPlace(Device place) {
this.place = place;
}
- public Place getPlace() {
+ public Device getPlace() {
if (place == null) {
- place = new Place();
+ place = new Device();
}
return place;
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseFragment.java
index 511bcb2..1f12bc4 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/base/BaseFragment.java
@@ -64,7 +64,7 @@
protected abstract int getLayoutId();
- protected abstract void initViews(View view, Bundle savedInstanceState);
+ protected void initViews(View view, Bundle savedInstanceState) {};
protected void initToolbar(Bundle savedInstanceState){};
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
new file mode 100644
index 0000000..21f311f
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Attendance.java
@@ -0,0 +1,126 @@
+package cn.com.basic.face.discern.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import cn.com.basic.face.discern.common.BaseEntity;
+
+/**
+ * Attendance
+ */
+public class Attendance extends BaseEntity implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final String MODEL_NAME = "Attendance";
+
+ public static final class FieldNames {
+ /**
+ * 绛惧埌浜嬩欢涓婚敭
+ */
+ public static final String attendanceId = "attendanceId";
+ /**
+ * 浜哄憳涓婚敭
+ */
+ public static final String registerId = "registerId";
+ /**
+ * 绛惧埌鐘舵��
+ */
+ public static final String attendanceTypeId = "attendanceTypeId";
+ /**
+ * 绛惧埌鏃堕棿
+ */
+ public static final String time = "time";
+ /**
+ * 绛惧埌浣嶇疆
+ */
+ public static final String deviceId = "deviceId";
+ }
+
+ // 绛惧埌浜嬩欢涓婚敭
+ private String attendanceId;
+ // 浜哄憳涓婚敭
+ private String registerId;
+ // 绛惧埌鐘舵��
+ private String attendanceTypeId;
+ // 绛惧埌鏃堕棿
+ private String time;
+ // 绛惧埌浣嶇疆
+ private String deviceId;
+
+ /**
+ * Get 绛惧埌浜嬩欢涓婚敭
+ */
+ public String getAttendanceId() {
+ return attendanceId;
+ }
+
+ /**
+ * Set 绛惧埌浜嬩欢涓婚敭
+ */
+ public void setAttendanceId(String attendanceId) {
+ this.attendanceId = attendanceId;
+ }
+
+ /**
+ * Get 浜哄憳涓婚敭
+ */
+ public String getRegisterId() {
+ return registerId;
+ }
+
+ /**
+ * Set 浜哄憳涓婚敭
+ */
+ public void setRegisterId(String registerId) {
+ this.registerId = registerId;
+ }
+
+ /**
+ * Get 绛惧埌鐘舵��
+ */
+ public String getAttendanceTypeId() {
+ return attendanceTypeId;
+ }
+
+ /**
+ * Set 绛惧埌鐘舵��
+ */
+ public void setAttendanceTypeId(String attendanceTypeId) {
+ this.attendanceTypeId = attendanceTypeId;
+ }
+
+ /**
+ * Get 绛惧埌鏃堕棿
+ */
+ public String getTime() {
+ return time;
+ }
+
+ /**
+ * Set 绛惧埌鏃堕棿
+ */
+ public void setTime(String time) {
+ this.time = time;
+ }
+
+ /**
+ * Get 绛惧埌浣嶇疆
+ */
+ public String getDeviceId() {
+ return deviceId;
+ }
+
+ /**
+ * Set 绛惧埌浣嶇疆
+ */
+ public void setDeviceId(String deviceId) {
+ this.deviceId = deviceId;
+ }
+
+ public String toString() {
+ return
+ ",绛惧埌浜嬩欢涓婚敭 ="+ attendanceId + ",浜哄憳涓婚敭 =" + registerId + ",绛惧埌鐘舵�� =" + attendanceTypeId +
+ ",绛惧埌鏃堕棿 =" + time + ",绛惧埌浣嶇疆 =" + deviceId ;
+ }
+}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Checking.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Checking.java
deleted file mode 100644
index 2f337cc..0000000
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Checking.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package cn.com.basic.face.discern.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import cn.com.basic.face.discern.common.BaseEntity;
-
-/**
- * Checking
- */
-public class Checking extends BaseEntity implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- public static final String MODEL_NAME = "Checking";
-
- public static final class FieldNames {
- /**
- * 绛惧埌浜嬩欢涓婚敭
- */
- public static final String id = "id";
- /**
- * 绛惧埌鐘舵��
- */
- public static final String statusId = "statusId";
- /**
- * 绛惧埌鏃堕棿
- */
- public static final String statusDt = "statusDt";
- /**
- * 浜哄憳涓婚敭
- */
- public static final String personId = "personId";
- /**
- * 绛惧埌浣嶇疆
- */
- public static final String placeId = "placeId";
- }
-
- // 绛惧埌浜嬩欢涓婚敭
- private String id;
- // 绛惧埌鐘舵��
- private String statusId;
- // 绛惧埌鏃堕棿
- private String statusDt;
- // 浜哄憳涓婚敭
- private String personId;
- // 绛惧埌浣嶇疆
- private String placeId;
-
- /**
- * Get 绛惧埌浜嬩欢涓婚敭
- */
- public String getId() {
- return id;
- }
-
- /**
- * Set 绛惧埌浜嬩欢涓婚敭
- */
- public void setId(String id) {
- this.id = id;
- }
-
- /**
- * Get 绛惧埌鐘舵��
- */
- public String getStatusId() {
- return statusId;
- }
-
- /**
- * Set 绛惧埌鐘舵��
- */
- public void setStatusId(String statusId) {
- this.statusId = statusId;
- }
-
- /**
- * Get 绛惧埌鏃堕棿
- */
- public String getStatusDt() {
- return statusDt;
- }
-
- /**
- * Set 绛惧埌鏃堕棿
- */
- public void setStatusDt(String statusDt) {
- this.statusDt = statusDt;
- }
-
- /**
- * Get 浜哄憳涓婚敭
- */
- public String getPersonId() {
- return personId;
- }
-
- /**
- * Set 浜哄憳涓婚敭
- */
- public void setPersonId(String personId) {
- this.personId = personId;
- }
-
- /**
- * Get 绛惧埌浣嶇疆
- */
- public String getPlaceId() {
- return placeId;
- }
-
- /**
- * Set 绛惧埌浣嶇疆
- */
- public void setPlaceId(String placeId) {
- this.placeId = placeId;
- }
-
- public String toString() {
- return
- ",绛惧埌浜嬩欢涓婚敭 ="+ id + ",绛惧埌鐘舵�� =" + statusId + ",绛惧埌鏃堕棿 =" + statusDt +
- ",浜哄憳涓婚敭 =" + personId + ",绛惧埌浣嶇疆 =" + placeId ;
- }
-}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/CheckingCompany.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/CheckingCompany.java
deleted file mode 100644
index 0f2e149..0000000
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/CheckingCompany.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package cn.com.basic.face.discern.entity;
-
-import java.io.Serializable;
-
-import cn.com.basic.face.discern.common.BaseEntity;
-
-/**
- * CheckingCompany
- */
-public class CheckingCompany extends BaseEntity implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- public static final String MODEL_NAME = "CheckingCompany";
-
- public static final class FieldNames {
- /**
- * 浜哄憳涓婚敭
- */
- public static final String personId = "personId";
- /**
- * 鍏徃涓婚敭
- */
- public static final String companyId = "companyId";
- }
-
- // 浜哄憳涓婚敭
- private String personId;
- // 鍏徃涓婚敭
- private String companyId;
-
- /**
- * Get 浜哄憳涓婚敭
- */
- public String getPersonId() {
- return personId;
- }
-
- /**
- * Set 浜哄憳涓婚敭
- */
- public void setPersonId(String personId) {
- this.personId = personId;
- }
-
- /**
- * Get 鍏徃涓婚敭
- */
- public String getCompanyId() {
- return companyId;
- }
-
- /**
- * Set 鍏徃涓婚敭
- */
- public void setCompanyId(String companyId) {
- this.companyId = companyId;
- }
-
- public String toString() {
- return
- ",浜哄憳涓婚敭 =" + personId + ",鍏徃涓婚敭 =" + companyId ;
- }
-}
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 7ae5468..bf53faa 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
@@ -17,48 +17,48 @@
/**
* 鍏徃涓婚敭
*/
- public static final String id = "id";
+ public static final String companyId = "companyId";
/**
* 鍏徃鍚嶇О
*/
- public static final String name = "name";
+ public static final String companyName = "companyName";
}
// 鍏徃涓婚敭
- private String id;
+ private String companyId;
// 鍏徃鍚嶇О
- private String name;
+ private String companyName;
/**
* Get 鍏徃涓婚敭
*/
- public String getId() {
- return id;
+ public String getCompanyId() {
+ return companyId;
}
/**
* Set 鍏徃涓婚敭
*/
- public void setId(String id) {
- this.id = id;
+ public void setCompanyId(String companyId) {
+ this.companyId = companyId;
}
/**
* Get 鍏徃鍚嶇О
*/
- public String getName() {
- return name;
+ public String getCompanyName() {
+ return companyName;
}
/**
* Set 鍏徃鍚嶇О
*/
- public void setName(String name) {
- this.name = name;
+ public void setCompanyName(String companyName) {
+ this.companyName = companyName;
}
public String toString() {
return
- ",鍏徃涓婚敭 =" + id + ",鍏徃鍚嶇О =" + name ;
+ ",鍏徃涓婚敭 =" + companyId + ",鍏徃鍚嶇О =" + companyName;
}
}
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 1e4c6f5..52a1e19 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
@@ -17,69 +17,69 @@
/**
* 閮ㄩ棬涓婚敭
*/
- public static final String id = "id";
+ public static final String deptId = "deptId";
/**
* 閮ㄩ棬鍚嶇О
*/
- public static final String label = "label";
+ public static final String deptName = "deptName";
/**
* 閮ㄩ棬棣栧瓧姣�
*/
- public static final String labelSpell = "labelSpell";
+ public static final String deptNameEn = "deptNameEn";
}
// 閮ㄩ棬涓婚敭
- private String id;
+ private String deptId;
// 閮ㄩ棬鍚嶇О
- private String label;
+ private String deptName;
// 閮ㄩ棬棣栧瓧姣�
- private String labelSpell;
+ private String deptNameEn;
/**
* Get 閮ㄩ棬涓婚敭
*/
- public String getId() {
- return id;
+ public String getDeptId() {
+ return deptId;
}
/**
* Set 閮ㄩ棬涓婚敭
*/
- public void setId(String id) {
- this.id = id;
+ public void setDeptId(String deptId) {
+ this.deptId = deptId;
}
/**
* Get 閮ㄩ棬鍚嶇О
*/
- public String getLabel() {
- return label;
+ public String getDeptName() {
+ return deptName;
}
/**
* Set 閮ㄩ棬鍚嶇О
*/
- public void setLabel(String label) {
- this.label = label;
+ public void setDeptName(String deptName) {
+ this.deptName = deptName;
}
/**
* Get 閮ㄩ棬棣栧瓧姣�
*/
- public String getLabelSpell() {
- return labelSpell;
+ public String getDeptNameEn() {
+ return deptNameEn;
}
/**
* Set 閮ㄩ棬棣栧瓧姣�
*/
- public void setLabelSpell(String labelSpell) {
- this.labelSpell = labelSpell;
+ public void setDeptNameEn(String deptNameEn) {
+ this.deptNameEn = deptNameEn;
}
public String toString() {
return
- ",閮ㄩ棬涓婚敭 =" + id + ",閮ㄩ棬鍚嶇О =" + label + ",閮ㄩ棬棣栧瓧姣� ="+ labelSpell
+ ",閮ㄩ棬涓婚敭 =" + deptId + ",閮ㄩ棬鍚嶇О =" + deptName + ",閮ㄩ棬棣栧瓧姣� ="+ deptNameEn
;
}
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Place.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Device.java
similarity index 66%
rename from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Place.java
rename to VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Device.java
index 01a2666..6a0cce1 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Place.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Device.java
@@ -5,19 +5,19 @@
import cn.com.basic.face.discern.common.BaseEntity;
/**
- * Place
+ * Device
*/
-public class Place extends BaseEntity implements Serializable {
+public class Device extends BaseEntity implements Serializable {
private static final long serialVersionUID = 1L;
- public static final String MODEL_NAME = "Place";
+ public static final String MODEL_NAME = "Device";
public static final class FieldNames {
/**
* 璁惧涓婚敭
*/
- public static final String id = "id";
+ public static final String deviceId = "deviceId";
/**
* 鍏徃涓婚敭
*/
@@ -25,7 +25,7 @@
/**
* 璁惧鍦扮偣
*/
- public static final String label = "label";
+ public static final String deviceName = "deviceName";
/**
* 璁惧鎺堟潈鐮�
*/
@@ -33,26 +33,26 @@
}
// 璁惧涓婚敭
- private String id;
+ private String deviceId;
// 鍏徃涓婚敭
private String companyId;
// 璁惧鍦扮偣
- private String label;
+ private String deviceName;
// 璁惧鎺堟潈鐮�
private String authorizationId;
/**
* Get 璁惧涓婚敭
*/
- public String getId() {
- return id;
+ public String getDeviceId() {
+ return deviceId;
}
/**
* Set 璁惧涓婚敭
*/
- public void setId(String id) {
- this.id = id;
+ public void setDeviceId(String deviceId) {
+ this.deviceId = deviceId;
}
/**
@@ -72,15 +72,15 @@
/**
* Get 璁惧鍦扮偣
*/
- public String getLabel() {
- return label;
+ public String getDeviceName() {
+ return deviceName;
}
/**
* Set 璁惧鍦扮偣
*/
- public void setLabel(String label) {
- this.label = label;
+ public void setDeviceName(String deviceName) {
+ this.deviceName = deviceName;
}
/**
@@ -99,7 +99,7 @@
public String toString() {
return
- ",璁惧涓婚敭 =" + id + ",鍏徃涓婚敭 =" + companyId + ",璁惧鍦扮偣 =" + label +
+ ",璁惧涓婚敭 =" + deviceId + ",鍏徃涓婚敭 =" + companyId + ",璁惧鍦扮偣 =" + deviceName +
",璁惧鎺堟潈鐮� ="+ authorizationId;
}
}
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 19cc0f0..53a385f 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
@@ -17,7 +17,7 @@
/**
* 涓婚敭
*/
- public static final String id = "id";
+ public static final String dictId = "dictId";
/**
* 缂栫爜
*/
@@ -42,10 +42,14 @@
* 澶囨敞
*/
public static final String remark = "remark";
+ /**
+ * 鍏徃涓婚敭
+ */
+ public static final String compnayId = "compnayId";
}
// 涓婚敭
- private String id;
+ private String dictId;
// 缂栫爜
private String sn;
// 鍚嶇О
@@ -58,19 +62,21 @@
private String pid;
// 澶囨敞
private String remark;
+ // 鍏徃涓婚敭
+ private String compnayId;
/**
* Get 涓婚敭
*/
- public String getId() {
- return id;
+ public String getDictId() {
+ return dictId;
}
/**
* Set 涓婚敭
*/
- public void setId(String id) {
- this.id = id;
+ public void setDictId(String dictId) {
+ this.dictId = dictId;
}
/**
@@ -157,10 +163,24 @@
this.remark = remark;
}
+ /**
+ * Get 鍏徃涓婚敭
+ */
+ public String getCompnayId() {
+ return compnayId;
+ }
+
+ /**
+ * Set 鍏徃涓婚敭
+ */
+ public void setCompnayId(String compnayId) {
+ this.compnayId = compnayId;
+ }
+
public String toString() {
return
- ",涓婚敭 =" + id + ",缂栫爜 =" + sn + ",鍚嶇О =" + name +
+ ",涓婚敭 =" + dictId + ",缂栫爜 =" + sn + ",鍚嶇О =" + name +
",绫诲瀷 =" + type + ",鎺掑簭 =" + orderBy + ",鐖剁骇id =" + pid +
- ",澶囨敞 =" + remark ;
+ ",澶囨敞 =" + remark + ",鍏徃涓婚敭 =" + compnayId ;
}
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/FaceImage.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/FaceImage.java
deleted file mode 100644
index 671c225..0000000
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/FaceImage.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package cn.com.basic.face.discern.entity;
-
-import java.io.Serializable;
-
-import cn.com.basic.face.discern.common.BaseEntity;
-
-/**
- * FaceImage
- */
-public class FaceImage extends BaseEntity implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- public static final String MODEL_NAME = "FaceImage";
-
- public static final class FieldNames {
- /**
- * 鍛樺伐鍥剧墖涓婚敭
- */
- public static final String faceId = "faceId";
- /**
- * 娉ㄥ唽鍏徃涓婚敭
- */
- public static final String registerCompanyId = "registerCompanyId";
- /**
- * 浜哄憳涓婚敭
- */
- public static final String personId = "personId";
- /**
- * 鍥剧墖鍦板潃
- */
- public static final String imagePath = "imagePath";
- /**
- * 鍥剧墖绫诲瀷
- */
- public static final String imageTypeId = "imageTypeId";
- }
-
- // 鍛樺伐鍥剧墖涓婚敭
- private String faceId;
- // 娉ㄥ唽鍏徃涓婚敭
- private String registerCompanyId;
- // 浜哄憳涓婚敭
- private String personId;
- // 鍥剧墖鍦板潃
- private String imagePath;
- // 鍥剧墖绫诲瀷
- private String imageTypeId;
-
- /**
- * Get 鍛樺伐鍥剧墖涓婚敭
- */
- public String getFaceId() {
- return faceId;
- }
-
- /**
- * Set 鍛樺伐鍥剧墖涓婚敭
- */
- public void setFaceId(String faceId) {
- this.faceId = faceId;
- }
-
- /**
- * Get 娉ㄥ唽鍏徃涓婚敭
- */
- public String getRegisterCompanyId() {
- return registerCompanyId;
- }
-
- /**
- * Set 娉ㄥ唽鍏徃涓婚敭
- */
- public void setRegisterCompanyId(String registerCompanyId) {
- this.registerCompanyId = registerCompanyId;
- }
-
- /**
- * Get 浜哄憳涓婚敭
- */
- public String getPersonId() {
- return personId;
- }
-
- /**
- * Set 浜哄憳涓婚敭
- */
- public void setPersonId(String personId) {
- this.personId = personId;
- }
-
- /**
- * Get 鍥剧墖鍦板潃
- */
- public String getImagePath() {
- return imagePath;
- }
-
- /**
- * Set 鍥剧墖鍦板潃
- */
- public void setImagePath(String imagePath) {
- this.imagePath = imagePath;
- }
-
- /**
- * Get 鍥剧墖绫诲瀷
- */
- public String getImageTypeId() {
- return imageTypeId;
- }
-
- /**
- * Set 鍥剧墖绫诲瀷
- */
- public void setImageTypeId(String imageTypeId) {
- this.imageTypeId = imageTypeId;
- }
-
- public String toString() {
- return
- ",鍛樺伐鍥剧墖涓婚敭 ="+ faceId + ",娉ㄥ唽鍏徃涓婚敭 ="+ registerCompanyId + ",浜哄憳涓婚敭 =" + personId +
- ",鍥剧墖鍦板潃 =" + imagePath + ",鍥剧墖绫诲瀷 =" + imageTypeId;
- }
-}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Image.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Image.java
deleted file mode 100644
index 194945f..0000000
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Image.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package cn.com.basic.face.discern.entity;
-
-import java.io.Serializable;
-
-import cn.com.basic.face.discern.common.BaseEntity;
-
-/**
- * Image
- */
-public class Image extends BaseEntity implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- public static final String MODEL_NAME = "Image";
-
- public static final class FieldNames {
- /**
- * 浜哄憳涓婚敭
- */
- public static final String personId = "personId";
- /**
- * 鍥剧墖绫诲瀷
- */
- public static final String imageType = "imageType";
- /**
- * 鍥剧墖鍦板潃
- */
- public static final String imagePath = "imagePath";
- }
-
- // 浜哄憳涓婚敭
- private String personId;
- // 鍥剧墖绫诲瀷
- private String imageType;
- // 鍥剧墖鍦板潃
- private String imagePath;
-
- /**
- * Get 浜哄憳涓婚敭
- */
- public String getPersonId() {
- return personId;
- }
-
- /**
- * Set 浜哄憳涓婚敭
- */
- public void setPersonId(String personId) {
- this.personId = personId;
- }
-
- /**
- * Get 鍥剧墖绫诲瀷
- */
- public String getImageType() {
- return imageType;
- }
-
- /**
- * Set 鍥剧墖绫诲瀷
- */
- public void setImageType(String imageType) {
- this.imageType = imageType;
- }
-
- /**
- * Get 鍥剧墖鍦板潃
- */
- public String getImagePath() {
- return imagePath;
- }
-
- /**
- * Set 鍥剧墖鍦板潃
- */
- public void setImagePath(String imagePath) {
- this.imagePath = imagePath;
- }
-
- public String toString() {
- return
- ",浜哄憳涓婚敭 =" + personId + ",鍥剧墖绫诲瀷 =" + imageType + ",鍥剧墖鍦板潃 =" + imagePath
- ;
- }
-}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/PersonExt.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/PersonExt.java
deleted file mode 100644
index da3e567..0000000
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/PersonExt.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package cn.com.basic.face.discern.entity;
-
-import java.io.Serializable;
-
-import cn.com.basic.face.discern.common.BaseEntity;
-
-/**
- * PersonExt
- */
-public class PersonExt extends BaseEntity implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- public static final String MODEL_NAME = "PersonExt";
-
- public static final class FieldNames {
- /**
- * 浜哄憳涓婚敭
- */
- public static final String personId = "personId";
- }
-
- // 浜哄憳涓婚敭
- private String personId;
-
- /**
- * Get 浜哄憳涓婚敭
- */
- public String getPersonId() {
- return personId;
- }
-
- /**
- * Set 浜哄憳涓婚敭
- */
- public void setPersonId(String personId) {
- this.personId = personId;
- }
-
- public String toString() {
- return
- ",浜哄憳涓婚敭 =" + personId ;
- }
-}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Calling.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/PhoneCall.java
similarity index 62%
rename from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Calling.java
rename to VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/PhoneCall.java
index 71118dd..3bacef5 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Calling.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/PhoneCall.java
@@ -6,23 +6,23 @@
import cn.com.basic.face.discern.common.BaseEntity;
/**
- * Calling
+ * PhoneCall
*/
-public class Calling extends BaseEntity implements Serializable {
+public class PhoneCall extends BaseEntity implements Serializable {
private static final long serialVersionUID = 1L;
- public static final String MODEL_NAME = "Calling";
+ public static final String MODEL_NAME = "PhoneCall";
public static final class FieldNames {
/**
* 绛惧埌浜嬩欢涓婚敭
*/
- public static final String id = "id";
+ public static final String phoneCallId = "phoneCallId";
/**
* 鍛煎彨鏃堕棿
*/
- public static final String callDt = "callDt";
+ public static final String callDatetime = "callDatetime";
/**
* 鍛煎彨浜哄憳涓婚敭
*/
@@ -34,46 +34,46 @@
/**
* 鍛煎彨鍙戠敓鎵�鍦ㄨ澶�(鍦扮偣)
*/
- public static final String placeId = "placeId";
+ public static final String deviceId = "deviceId";
}
// 绛惧埌浜嬩欢涓婚敭
- private String id;
+ private String phoneCallId;
// 鍛煎彨鏃堕棿
- private String callDt;
+ private String callDatetime;
// 鍛煎彨浜哄憳涓婚敭
private String callerPersonId;
// 琚懠鍙汉鍛樹富閿�
private String calleePersonId;
// 鍛煎彨鍙戠敓鎵�鍦ㄨ澶�(鍦扮偣)
- private String placeId;
+ private String deviceId;
/**
* Get 绛惧埌浜嬩欢涓婚敭
*/
- public String getId() {
- return id;
+ public String getPhoneCallId() {
+ return phoneCallId;
}
/**
* Set 绛惧埌浜嬩欢涓婚敭
*/
- public void setId(String id) {
- this.id = id;
+ public void setPhoneCallId(String phoneCallId) {
+ this.phoneCallId = phoneCallId;
}
/**
* Get 鍛煎彨鏃堕棿
*/
- public String getCallDt() {
- return callDt;
+ public String getCallDatetime() {
+ return callDatetime;
}
/**
* Set 鍛煎彨鏃堕棿
*/
- public void setCallDt(String callDt) {
- this.callDt = callDt;
+ public void setCallDatetime(String callDatetime) {
+ this.callDatetime = callDatetime;
}
/**
@@ -107,20 +107,20 @@
/**
* Get 鍛煎彨鍙戠敓鎵�鍦ㄨ澶�(鍦扮偣)
*/
- public String getPlaceId() {
- return placeId;
+ public String getDeviceId() {
+ return deviceId;
}
/**
* Set 鍛煎彨鍙戠敓鎵�鍦ㄨ澶�(鍦扮偣)
*/
- public void setPlaceId(String placeId) {
- this.placeId = placeId;
+ public void setDeviceId(String deviceId) {
+ this.deviceId = deviceId;
}
public String toString() {
return
- ",绛惧埌浜嬩欢涓婚敭 ="+ id + ",鍛煎彨鏃堕棿 =" + callDt + ",鍛煎彨浜哄憳涓婚敭 ="+ callerPersonId +
- ",琚懠鍙汉鍛樹富閿� ="+ calleePersonId + ",鍛煎彨鍙戠敓鎵�鍦ㄨ澶�(鍦扮偣) ="+ placeId ;
+ ",绛惧埌浜嬩欢涓婚敭 ="+ phoneCallId + ",鍛煎彨鏃堕棿 =" + callDatetime + ",鍛煎彨浜哄憳涓婚敭 ="+ callerPersonId +
+ ",琚懠鍙汉鍛樹富閿� ="+ calleePersonId + ",鍛煎彨鍙戠敓鎵�鍦ㄨ澶�(鍦扮偣) ="+ deviceId ;
}
}
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 b443b23..f8cb428 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
@@ -17,48 +17,48 @@
/**
* 鑱屼綅涓婚敭
*/
- public static final String id = "id";
+ public static final String postId = "postId";
/**
* 鑱屼綅鍚嶇О
*/
- public static final String label = "label";
+ public static final String postName = "postName";
}
// 鑱屼綅涓婚敭
- private String id;
+ private String postId;
// 鑱屼綅鍚嶇О
- private String label;
+ private String postName;
/**
* Get 鑱屼綅涓婚敭
*/
- public String getId() {
- return id;
+ public String getPostId() {
+ return postId;
}
/**
* Set 鑱屼綅涓婚敭
*/
- public void setId(String id) {
- this.id = id;
+ public void setPostId(String postId) {
+ this.postId = postId;
}
/**
* Get 鑱屼綅鍚嶇О
*/
- public String getLabel() {
- return label;
+ public String getPostName() {
+ return postName;
}
/**
* Set 鑱屼綅鍚嶇О
*/
- public void setLabel(String label) {
- this.label = label;
+ public void setPostName(String postName) {
+ this.postName = postName;
}
public String toString() {
return
- ",鑱屼綅涓婚敭 =" + id + ",鑱屼綅鍚嶇О =" + label ;
+ ",鑱屼綅涓婚敭 =" + postId + ",鑱屼綅鍚嶇О =" + postName ;
}
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Person.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Register.java
similarity index 71%
rename from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Person.java
rename to VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Register.java
index 01f6f62..e450e70 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Person.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Register.java
@@ -6,23 +6,23 @@
import cn.com.basic.face.discern.common.BaseEntity;
/**
- * Person
+ * Register
*/
-public class Person extends BaseEntity implements Serializable {
+public class Register extends BaseEntity implements Serializable {
private static final long serialVersionUID = 1L;
- public static final String MODEL_NAME = "Person";
+ public static final String MODEL_NAME = "Register";
public static final class FieldNames {
/**
* 浜哄憳涓婚敭
*/
- public static final String id = "id";
+ public static final String registerId = "registerId";
/**
* 浜哄憳鍚嶅瓧
*/
- public static final String name = "name";
+ public static final String username = "username";
/**
* 浜哄憳鍚嶉瀛楁瘝
*/
@@ -30,11 +30,11 @@
/**
* 鎬у埆
*/
- public static final String gender = "gender";
+ public static final String genderId = "genderId";
/**
* 鍥界睄
*/
- public static final String country = "country";
+ public static final String countryId = "countryId";
/**
* 鐪�
*/
@@ -50,7 +50,7 @@
/**
* 搴ф満鐢佃瘽
*/
- public static final String phone = "phone";
+ public static final String tel = "tel";
/**
* 绉诲姩鐢佃瘽
*/
@@ -58,11 +58,11 @@
/**
* 璇佷欢绫诲瀷
*/
- public static final String identityType = "identityType";
+ public static final String identityTypeId = "identityTypeId";
/**
* 璇佷欢缂栧彿
*/
- public static final String identify = "identify";
+ public static final String identifyNum = "identifyNum";
/**
* 鍏徃涓婚敭
*/
@@ -86,15 +86,15 @@
}
// 浜哄憳涓婚敭
- private String id;
+ private String registerId;
// 浜哄憳鍚嶅瓧
- private String name;
+ private String username;
// 浜哄憳鍚嶉瀛楁瘝
private String nameSpell;
// 鎬у埆
- private String gender;
+ private String genderId;
// 鍥界睄
- private String country;
+ private String countryId;
// 鐪�
private String province;
// 甯�
@@ -102,13 +102,13 @@
// 鍑虹敓鏃ユ湡
private String birthday;
// 搴ф満鐢佃瘽
- private String phone;
+ private String tel;
// 绉诲姩鐢佃瘽
private String mobilePhone;
// 璇佷欢绫诲瀷
- private String identityType;
+ private String identityTypeId;
// 璇佷欢缂栧彿
- private String identify;
+ private String identifyNum;
// 鍏徃涓婚敭
private String companyId;
// 閮ㄩ棬涓婚敭
@@ -123,29 +123,29 @@
/**
* Get 浜哄憳涓婚敭
*/
- public String getId() {
- return id;
+ public String getRegisterId() {
+ return registerId;
}
/**
* Set 浜哄憳涓婚敭
*/
- public void setId(String id) {
- this.id = id;
+ public void setRegisterId(String registerId) {
+ this.registerId = registerId;
}
/**
* Get 浜哄憳鍚嶅瓧
*/
- public String getName() {
- return name;
+ public String getUsername() {
+ return username;
}
/**
* Set 浜哄憳鍚嶅瓧
*/
- public void setName(String name) {
- this.name = name;
+ public void setUsername(String username) {
+ this.username = username;
}
/**
@@ -165,29 +165,29 @@
/**
* Get 鎬у埆
*/
- public String getGender() {
- return gender;
+ public String getGenderId() {
+ return genderId;
}
/**
* Set 鎬у埆
*/
- public void setGender(String gender) {
- this.gender = gender;
+ public void setGenderId(String genderId) {
+ this.genderId = genderId;
}
/**
* Get 鍥界睄
*/
- public String getCountry() {
- return country;
+ public String getCountryId() {
+ return countryId;
}
/**
* Set 鍥界睄
*/
- public void setCountry(String country) {
- this.country = country;
+ public void setCountryId(String countryId) {
+ this.countryId = countryId;
}
/**
@@ -235,15 +235,15 @@
/**
* Get 搴ф満鐢佃瘽
*/
- public String getPhone() {
- return phone;
+ public String getTel() {
+ return tel;
}
/**
* Set 搴ф満鐢佃瘽
*/
- public void setPhone(String phone) {
- this.phone = phone;
+ public void setTel(String tel) {
+ this.tel = tel;
}
/**
@@ -263,29 +263,29 @@
/**
* Get 璇佷欢绫诲瀷
*/
- public String getIdentityType() {
- return identityType;
+ public String getIdentityTypeId() {
+ return identityTypeId;
}
/**
* Set 璇佷欢绫诲瀷
*/
- public void setIdentityType(String identityType) {
- this.identityType = identityType;
+ public void setIdentityTypeId(String identityTypeId) {
+ this.identityTypeId = identityTypeId;
}
/**
* Get 璇佷欢缂栧彿
*/
- public String getIdentify() {
- return identify;
+ public String getIdentifyNum() {
+ return identifyNum;
}
/**
* Set 璇佷欢缂栧彿
*/
- public void setIdentify(String identify) {
- this.identify = identify;
+ public void setIdentifyNum(String identifyNum) {
+ this.identifyNum = identifyNum;
}
/**
@@ -360,10 +360,10 @@
public String toString() {
return
- ",浜哄憳涓婚敭 =" + id + ",浜哄憳鍚嶅瓧 =" + name + ",浜哄憳鍚嶉瀛楁瘝 ="+ nameSpell +
- ",鎬у埆 =" + gender + ",鍥界睄 =" + country + ",鐪� =" + province +
- ",甯� =" + city + ",鍑虹敓鏃ユ湡 =" + birthday + ",搴ф満鐢佃瘽 =" + phone +
- ",绉诲姩鐢佃瘽 =" + mobilePhone + ",璇佷欢绫诲瀷 =" + identityType + ",璇佷欢缂栧彿 =" + identify +
+ ",浜哄憳涓婚敭 =" + registerId + ",浜哄憳鍚嶅瓧 =" + username + ",浜哄憳鍚嶉瀛楁瘝 ="+ nameSpell +
+ ",鎬у埆 =" + genderId + ",鍥界睄 =" + countryId + ",鐪� =" + province +
+ ",甯� =" + city + ",鍑虹敓鏃ユ湡 =" + birthday + ",搴ф満鐢佃瘽 =" + tel +
+ ",绉诲姩鐢佃瘽 =" + mobilePhone + ",璇佷欢绫诲瀷 =" + identityTypeId + ",璇佷欢缂栧彿 =" + identifyNum +
",鍏徃涓婚敭 =" + companyId + ",閮ㄩ棬涓婚敭 =" + departmentId + ",鑱屽姟涓婚敭 =" + postId +
",浜哄憳澶囨敞娑堟伅 ="+ remark + ",鍗遍櫓浜哄憳璀﹀憡娑堟伅 ="+ warning ;
}
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
new file mode 100644
index 0000000..e43d7a6
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/RegisterDetail.java
@@ -0,0 +1,105 @@
+package cn.com.basic.face.discern.entity;
+
+import java.io.Serializable;
+
+import cn.com.basic.face.discern.common.BaseEntity;
+
+/**
+ * RegisterDetail
+ */
+public class RegisterDetail extends BaseEntity implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final String MODEL_NAME = "RegisterDetail";
+
+ public static final class FieldNames {
+ /**
+ * 鍛樺伐鍥剧墖涓婚敭
+ */
+ public static final String detailId = "detailId";
+ /**
+ * 浜哄憳涓婚敭
+ */
+ public static final String registerId = "registerId";
+ /**
+ * 鍥剧墖鍦板潃
+ */
+ public static final String imagePath = "imagePath";
+ /**
+ * 鍥剧墖绫诲瀷
+ */
+ public static final String imageTypeId = "imageTypeId";
+ }
+
+ // 鍛樺伐鍥剧墖涓婚敭
+ private String detailId;
+ // 浜哄憳涓婚敭
+ private String registerId;
+ // 鍥剧墖鍦板潃
+ private String imagePath;
+ // 鍥剧墖绫诲瀷
+ private String imageTypeId;
+
+ /**
+ * Get 鍛樺伐鍥剧墖涓婚敭
+ */
+ public String getDetailId() {
+ return detailId;
+ }
+
+ /**
+ * Set 鍛樺伐鍥剧墖涓婚敭
+ */
+ public void setDetailId(String detailId) {
+ this.detailId = detailId;
+ }
+
+ /**
+ * Get 浜哄憳涓婚敭
+ */
+ public String getRegisterId() {
+ return registerId;
+ }
+
+ /**
+ * Set 浜哄憳涓婚敭
+ */
+ public void setRegisterId(String registerId) {
+ this.registerId = registerId;
+ }
+
+ /**
+ * Get 鍥剧墖鍦板潃
+ */
+ public String getImagePath() {
+ return imagePath;
+ }
+
+ /**
+ * Set 鍥剧墖鍦板潃
+ */
+ public void setImagePath(String imagePath) {
+ this.imagePath = imagePath;
+ }
+
+ /**
+ * Get 鍥剧墖绫诲瀷
+ */
+ public String getImageTypeId() {
+ return imageTypeId;
+ }
+
+ /**
+ * Set 鍥剧墖绫诲瀷
+ */
+ public void setImageTypeId(String imageTypeId) {
+ this.imageTypeId = imageTypeId;
+ }
+
+ public String toString() {
+ return
+ ",鍛樺伐鍥剧墖涓婚敭 ="+ detailId + ",浜哄憳涓婚敭 =" + registerId + ",鍥剧墖鍦板潃 =" + imagePath +
+ ",鍥剧墖绫诲瀷 =" + imageTypeId;
+ }
+}
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 3412d20..63f5395 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
@@ -18,47 +18,47 @@
/**
* 璁块棶浜嬩欢涓婚敭
*/
- public static final String id = "id";
- /**
- * 璁块棶浜哄憳涓婚敭
- */
- public static final String visitorPersonId = "visitorPersonId";
- /**
- * 琚闂汉鍛樹富閿�
- */
- public static final String visiteePersonId = "visiteePersonId";
+ public static final String visitId = "visitId";
/**
* 璁块棶浜嬬敱涓婚敭
*/
- public static final String matterId = "matterId";
+ public static final String visitReasonId = "visitReasonId";
/**
* 璁块棶澶囨敞
*/
public static final String remark = "remark";
/**
- * 鏈�鏂扮殑璁块棶鐘舵��
- */
- public static final String lastStatus = "lastStatus";
- /**
* 鏉ヨ鏃堕棿
*/
- public static final String startTime = "startTime";
+ public static final String enterTime = "enterTime";
/**
* 绛剧鏃堕棿
*/
- public static final String lastTime = "lastTime";
+ public static final String exitTime = "exitTime";
+ /**
+ * 璁垮绫诲瀷
+ */
+ public static final String visitorTypeId = "visitorTypeId";
+ /**
+ * 璁块棶浜哄憳涓婚敭
+ */
+ public static final String visitorId = "visitorId";
/**
* visitorCompanyId
*/
public static final String visitorCompanyId = "visitorCompanyId";
/**
+ * 琚闂汉鍛樹富閿�
+ */
+ public static final String visiteeId = "visiteeId";
+ /**
* visiteeCompanyId
*/
public static final String visiteeCompanyId = "visiteeCompanyId";
/**
- * 璁垮绫诲瀷
+ * 鏈�鏂扮殑璁块棶鐘舵��
*/
- public static final String visitorTypeId = "visitorTypeId";
+ public static final String currentStateId = "currentStateId";
/**
* 褰撳墠璁块棶鐨勮鍛婄姸鎬�
*/
@@ -66,84 +66,56 @@
}
// 璁块棶浜嬩欢涓婚敭
- private String id;
- // 璁块棶浜哄憳涓婚敭
- private String visitorPersonId;
- // 琚闂汉鍛樹富閿�
- private String visiteePersonId;
+ private String visitId;
// 璁块棶浜嬬敱涓婚敭
- private String matterId;
+ private String visitReasonId;
// 璁块棶澶囨敞
private String remark;
- // 鏈�鏂扮殑璁块棶鐘舵��
- private String lastStatus;
// 鏉ヨ鏃堕棿
- private String startTime;
+ private String enterTime;
// 绛剧鏃堕棿
- private String lastTime;
- // visitorCompanyId
- private String visitorCompanyId;
- // visiteeCompanyId
- private String visiteeCompanyId;
+ private String exitTime;
// 璁垮绫诲瀷
private String visitorTypeId;
+ // 璁块棶浜哄憳涓婚敭
+ private String visitorId;
+ // visitorCompanyId
+ private String visitorCompanyId;
+ // 琚闂汉鍛樹富閿�
+ private String visiteeId;
+ // visiteeCompanyId
+ private String visiteeCompanyId;
+ // 鏈�鏂扮殑璁块棶鐘舵��
+ private String currentStateId;
// 褰撳墠璁块棶鐨勮鍛婄姸鎬�
private String warning;
/**
* Get 璁块棶浜嬩欢涓婚敭
*/
- public String getId() {
- return id;
+ public String getVisitId() {
+ return visitId;
}
/**
* Set 璁块棶浜嬩欢涓婚敭
*/
- public void setId(String id) {
- this.id = id;
- }
-
- /**
- * Get 璁块棶浜哄憳涓婚敭
- */
- public String getVisitorPersonId() {
- return visitorPersonId;
- }
-
- /**
- * Set 璁块棶浜哄憳涓婚敭
- */
- public void setVisitorPersonId(String visitorPersonId) {
- this.visitorPersonId = visitorPersonId;
- }
-
- /**
- * Get 琚闂汉鍛樹富閿�
- */
- public String getVisiteePersonId() {
- return visiteePersonId;
- }
-
- /**
- * Set 琚闂汉鍛樹富閿�
- */
- public void setVisiteePersonId(String visiteePersonId) {
- this.visiteePersonId = visiteePersonId;
+ public void setVisitId(String visitId) {
+ this.visitId = visitId;
}
/**
* Get 璁块棶浜嬬敱涓婚敭
*/
- public String getMatterId() {
- return matterId;
+ public String getVisitReasonId() {
+ return visitReasonId;
}
/**
* Set 璁块棶浜嬬敱涓婚敭
*/
- public void setMatterId(String matterId) {
- this.matterId = matterId;
+ public void setVisitReasonId(String visitReasonId) {
+ this.visitReasonId = visitReasonId;
}
/**
@@ -161,45 +133,59 @@
}
/**
- * Get 鏈�鏂扮殑璁块棶鐘舵��
- */
- public String getLastStatus() {
- return lastStatus;
- }
-
- /**
- * Set 鏈�鏂扮殑璁块棶鐘舵��
- */
- public void setLastStatus(String lastStatus) {
- this.lastStatus = lastStatus;
- }
-
- /**
* Get 鏉ヨ鏃堕棿
*/
- public String getStartTime() {
- return startTime;
+ public String getEnterTime() {
+ return enterTime;
}
/**
* Set 鏉ヨ鏃堕棿
*/
- public void setStartTime(String startTime) {
- this.startTime = startTime;
+ public void setEnterTime(String enterTime) {
+ this.enterTime = enterTime;
}
/**
* Get 绛剧鏃堕棿
*/
- public String getLastTime() {
- return lastTime;
+ public String getExitTime() {
+ return exitTime;
}
/**
* Set 绛剧鏃堕棿
*/
- public void setLastTime(String lastTime) {
- this.lastTime = lastTime;
+ public void setExitTime(String exitTime) {
+ this.exitTime = exitTime;
+ }
+
+ /**
+ * Get 璁垮绫诲瀷
+ */
+ public String getVisitorTypeId() {
+ return visitorTypeId;
+ }
+
+ /**
+ * Set 璁垮绫诲瀷
+ */
+ public void setVisitorTypeId(String visitorTypeId) {
+ this.visitorTypeId = visitorTypeId;
+ }
+
+ /**
+ * Get 璁块棶浜哄憳涓婚敭
+ */
+ public String getVisitorId() {
+ return visitorId;
+ }
+
+ /**
+ * Set 璁块棶浜哄憳涓婚敭
+ */
+ public void setVisitorId(String visitorId) {
+ this.visitorId = visitorId;
}
/**
@@ -217,6 +203,20 @@
}
/**
+ * Get 琚闂汉鍛樹富閿�
+ */
+ public String getVisiteeId() {
+ return visiteeId;
+ }
+
+ /**
+ * Set 琚闂汉鍛樹富閿�
+ */
+ public void setVisiteeId(String visiteeId) {
+ this.visiteeId = visiteeId;
+ }
+
+ /**
* Get visiteeCompanyId
*/
public String getVisiteeCompanyId() {
@@ -231,17 +231,17 @@
}
/**
- * Get 璁垮绫诲瀷
+ * Get 鏈�鏂扮殑璁块棶鐘舵��
*/
- public String getVisitorTypeId() {
- return visitorTypeId;
+ public String getCurrentStateId() {
+ return currentStateId;
}
/**
- * Set 璁垮绫诲瀷
+ * Set 鏈�鏂扮殑璁块棶鐘舵��
*/
- public void setVisitorTypeId(String visitorTypeId) {
- this.visitorTypeId = visitorTypeId;
+ public void setCurrentStateId(String currentStateId) {
+ this.currentStateId = currentStateId;
}
/**
@@ -260,10 +260,10 @@
public String toString() {
return
- ",璁块棶浜嬩欢涓婚敭 ="+ id + ",璁块棶浜哄憳涓婚敭 ="+ visitorPersonId + ",琚闂汉鍛樹富閿� ="+ visiteePersonId +
- ",璁块棶浜嬬敱涓婚敭 ="+ matterId + ",璁块棶澶囨敞 =" + remark + ",鏈�鏂扮殑璁块棶鐘舵�� ="+ lastStatus +
- ",鏉ヨ鏃堕棿 =" + startTime + ",绛剧鏃堕棿 =" + lastTime + ",visitorCompanyId ="+ visitorCompanyId +
- ",visiteeCompanyId ="+ visiteeCompanyId + ",璁垮绫诲瀷 =" + visitorTypeId + ",褰撳墠璁块棶鐨勮鍛婄姸鎬� ="+ warning
+ ",璁块棶浜嬩欢涓婚敭 ="+ visitId + ",璁块棶浜嬬敱涓婚敭 ="+ visitReasonId + ",璁块棶澶囨敞 =" + remark +
+ ",鏉ヨ鏃堕棿 =" + enterTime + ",绛剧鏃堕棿 =" + exitTime + ",璁垮绫诲瀷 =" + visitorTypeId +
+ ",璁块棶浜哄憳涓婚敭 ="+ visitorId + ",visitorCompanyId ="+ visitorCompanyId + ",琚闂汉鍛樹富閿� ="+ visiteeId +
+ ",visiteeCompanyId ="+ visiteeCompanyId + ",鏈�鏂扮殑璁块棶鐘舵�� ="+ currentStateId + ",褰撳墠璁块棶鐨勮鍛婄姸鎬� ="+ warning
;
}
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Visiting.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/VisitDetail.java
similarity index 61%
rename from VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Visiting.java
rename to VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/VisitDetail.java
index 7c31c35..da94059 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Visiting.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/VisitDetail.java
@@ -6,13 +6,13 @@
import cn.com.basic.face.discern.common.BaseEntity;
/**
- * Visiting
+ * VisitDetail
*/
-public class Visiting extends BaseEntity implements Serializable {
+public class VisitDetail extends BaseEntity implements Serializable {
private static final long serialVersionUID = 1L;
- public static final String MODEL_NAME = "Visiting";
+ public static final String MODEL_NAME = "VisitDetail";
public static final class FieldNames {
/**
@@ -26,15 +26,15 @@
/**
* 褰撳墠璁块棶鐘舵��
*/
- public static final String statusId = "statusId";
+ public static final String stateId = "stateId";
/**
* 鏇存柊鐘舵�佹椂闂�
*/
- public static final String statusDt = "statusDt";
+ public static final String createTime = "createTime";
/**
* 璁惧浣嶇疆涓婚敭
*/
- public static final String placeId = "placeId";
+ public static final String deviceId = "deviceId";
}
// 璁块棶浜嬩欢娴佹按id
@@ -42,11 +42,11 @@
// 璁块棶浜嬩欢id
private String visitId;
// 褰撳墠璁块棶鐘舵��
- private String statusId;
+ private String stateId;
// 鏇存柊鐘舵�佹椂闂�
- private String statusDt;
+ private String createTime;
// 璁惧浣嶇疆涓婚敭
- private String placeId;
+ private String deviceId;
/**
* Get 璁块棶浜嬩欢娴佹按id
@@ -79,48 +79,48 @@
/**
* Get 褰撳墠璁块棶鐘舵��
*/
- public String getStatusId() {
- return statusId;
+ public String getStateId() {
+ return stateId;
}
/**
* Set 褰撳墠璁块棶鐘舵��
*/
- public void setStatusId(String statusId) {
- this.statusId = statusId;
+ public void setStateId(String stateId) {
+ this.stateId = stateId;
}
/**
* Get 鏇存柊鐘舵�佹椂闂�
*/
- public String getStatusDt() {
- return statusDt;
+ public String getCreateTime() {
+ return createTime;
}
/**
* Set 鏇存柊鐘舵�佹椂闂�
*/
- public void setStatusDt(String statusDt) {
- this.statusDt = statusDt;
+ public void setCreateTime(String createTime) {
+ this.createTime = createTime;
}
/**
* Get 璁惧浣嶇疆涓婚敭
*/
- public String getPlaceId() {
- return placeId;
+ public String getDeviceId() {
+ return deviceId;
}
/**
* Set 璁惧浣嶇疆涓婚敭
*/
- public void setPlaceId(String placeId) {
- this.placeId = placeId;
+ public void setDeviceId(String deviceId) {
+ this.deviceId = deviceId;
}
public String toString() {
return
- ",璁块棶浜嬩欢娴佹按id ="+ id + ",璁块棶浜嬩欢id ="+ visitId + ",褰撳墠璁块棶鐘舵�� ="+ statusId +
- ",鏇存柊鐘舵�佹椂闂� ="+ statusDt + ",璁惧浣嶇疆涓婚敭 ="+ placeId ;
+ ",璁块棶浜嬩欢娴佹按id ="+ id + ",璁块棶浜嬩欢id ="+ visitId + ",褰撳墠璁块棶鐘舵�� ="+ stateId +
+ ",鏇存柊鐘舵�佹椂闂� ="+ createTime + ",璁惧浣嶇疆涓婚敭 ="+ deviceId ;
}
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/VisitMatter.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/VisitMatter.java
deleted file mode 100644
index 1d47fa0..0000000
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/VisitMatter.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package cn.com.basic.face.discern.entity;
-
-import java.io.Serializable;
-
-import cn.com.basic.face.discern.common.BaseEntity;
-
-/**
- * VisitMatter
- */
-public class VisitMatter extends BaseEntity implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- public static final String MODEL_NAME = "VisitMatter";
-
- public static final class FieldNames {
- /**
- * 璁块棶浜嬬敱涓婚敭
- */
- public static final String id = "id";
- /**
- * 鍏徃涓婚敭
- */
- public static final String companyId = "companyId";
- /**
- * 璁块棶浜嬬敱
- */
- public static final String label = "label";
- /**
- * 鏄惁鏄彲鐢�
- */
- public static final String available = "available";
- }
-
- // 璁块棶浜嬬敱涓婚敭
- private String id;
- // 鍏徃涓婚敭
- private String companyId;
- // 璁块棶浜嬬敱
- private String label;
- // 鏄惁鏄彲鐢�
- private String available;
-
- /**
- * Get 璁块棶浜嬬敱涓婚敭
- */
- public String getId() {
- return id;
- }
-
- /**
- * Set 璁块棶浜嬬敱涓婚敭
- */
- public void setId(String id) {
- this.id = id;
- }
-
- /**
- * Get 鍏徃涓婚敭
- */
- public String getCompanyId() {
- return companyId;
- }
-
- /**
- * Set 鍏徃涓婚敭
- */
- public void setCompanyId(String companyId) {
- this.companyId = companyId;
- }
-
- /**
- * Get 璁块棶浜嬬敱
- */
- public String getLabel() {
- return label;
- }
-
- /**
- * Set 璁块棶浜嬬敱
- */
- public void setLabel(String label) {
- this.label = label;
- }
-
- /**
- * Get 鏄惁鏄彲鐢�
- */
- public String getAvailable() {
- return available;
- }
-
- /**
- * Set 鏄惁鏄彲鐢�
- */
- public void setAvailable(String available) {
- this.available = available;
- }
-
- public String toString() {
- return
- ",璁块棶浜嬬敱涓婚敭 ="+ id + ",鍏徃涓婚敭 =" + companyId + ",璁块棶浜嬬敱 =" + label +
- ",鏄惁鏄彲鐢� ="+ available ;
- }
-}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/VisitPersonType.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/VisitPersonType.java
deleted file mode 100644
index 38daa01..0000000
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/VisitPersonType.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package cn.com.basic.face.discern.entity;
-
-import java.io.Serializable;
-
-import cn.com.basic.face.discern.common.BaseEntity;
-
-/**
- * VisitPersonType
- */
-public class VisitPersonType extends BaseEntity implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- public static final String MODEL_NAME = "VisitPersonType";
-
- public static final class FieldNames {
- /**
- * registerCompanyId
- */
- public static final String registerCompanyId = "registerCompanyId";
- /**
- * personId
- */
- public static final String personId = "personId";
- /**
- * visitorTypeId
- */
- public static final String visitorTypeId = "visitorTypeId";
- }
-
- // registerCompanyId
- private String registerCompanyId;
- // personId
- private String personId;
- // visitorTypeId
- private String visitorTypeId;
-
- /**
- * Get registerCompanyId
- */
- public String getRegisterCompanyId() {
- return registerCompanyId;
- }
-
- /**
- * Set registerCompanyId
- */
- public void setRegisterCompanyId(String registerCompanyId) {
- this.registerCompanyId = registerCompanyId;
- }
-
- /**
- * Get personId
- */
- public String getPersonId() {
- return personId;
- }
-
- /**
- * Set personId
- */
- public void setPersonId(String personId) {
- this.personId = personId;
- }
-
- /**
- * Get visitorTypeId
- */
- public String getVisitorTypeId() {
- return visitorTypeId;
- }
-
- /**
- * Set visitorTypeId
- */
- public void setVisitorTypeId(String visitorTypeId) {
- this.visitorTypeId = visitorTypeId;
- }
-
- public String toString() {
- return
- ",registerCompanyId ="+ registerCompanyId + ",personId ="+ personId + ",visitorTypeId ="+ visitorTypeId
- ;
- }
-}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/VisitStat.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/VisitStat.java
deleted file mode 100644
index 40ee8cf..0000000
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/VisitStat.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package cn.com.basic.face.discern.entity;
-
-import java.io.Serializable;
-
-import cn.com.basic.face.discern.common.BaseEntity;
-
-/**
- * VisitStat
- */
-public class VisitStat extends BaseEntity implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- public static final String MODEL_NAME = "VisitStat";
-
- public static final class FieldNames {
- /**
- * 浜哄憳涓婚敭
- */
- public static final String personId = "personId";
- /**
- * 娉ㄥ唽鍏徃涓婚敭
- */
- public static final String registerCompanyId = "registerCompanyId";
- /**
- * 鏉ヨ鍏徃娆℃暟
- */
- public static final String totalCount = "totalCount";
- }
-
- // 浜哄憳涓婚敭
- private String personId;
- // 娉ㄥ唽鍏徃涓婚敭
- private String registerCompanyId;
- // 鏉ヨ鍏徃娆℃暟
- private String totalCount;
-
- /**
- * Get 浜哄憳涓婚敭
- */
- public String getPersonId() {
- return personId;
- }
-
- /**
- * Set 浜哄憳涓婚敭
- */
- public void setPersonId(String personId) {
- this.personId = personId;
- }
-
- /**
- * Get 娉ㄥ唽鍏徃涓婚敭
- */
- public String getRegisterCompanyId() {
- return registerCompanyId;
- }
-
- /**
- * Set 娉ㄥ唽鍏徃涓婚敭
- */
- public void setRegisterCompanyId(String registerCompanyId) {
- this.registerCompanyId = registerCompanyId;
- }
-
- /**
- * Get 鏉ヨ鍏徃娆℃暟
- */
- public String getTotalCount() {
- return totalCount;
- }
-
- /**
- * Set 鏉ヨ鍏徃娆℃暟
- */
- public void setTotalCount(String totalCount) {
- this.totalCount = totalCount;
- }
-
- public String toString() {
- return
- ",浜哄憳涓婚敭 =" + personId + ",娉ㄥ唽鍏徃涓婚敭 ="+ registerCompanyId + ",鏉ヨ鍏徃娆℃暟 ="+ totalCount
- ;
- }
-}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/VisitorType.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/VisitorType.java
deleted file mode 100644
index 8c8aa9c..0000000
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/VisitorType.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package cn.com.basic.face.discern.entity;
-
-import java.io.Serializable;
-
-import cn.com.basic.face.discern.common.BaseEntity;
-
-/**
- * VisitorType
- */
-public class VisitorType extends BaseEntity implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- public static final String MODEL_NAME = "VisitorType";
-
- public static final class FieldNames {
- /**
- * 璁垮绫诲瀷涓婚敭
- */
- public static final String id = "id";
- /**
- * 璁垮绫诲瀷
- */
- public static final String label = "label";
- /**
- * 娉ㄥ唽鍏徃涓婚敭
- */
- public static final String registerCompanyId = "registerCompanyId";
- /**
- * 鏄惁鏄彲鐢�
- */
- public static final String available = "available";
- }
-
- // 璁垮绫诲瀷涓婚敭
- private String id;
- // 璁垮绫诲瀷
- private String label;
- // 娉ㄥ唽鍏徃涓婚敭
- private String registerCompanyId;
- // 鏄惁鏄彲鐢�
- private String available;
-
- /**
- * Get 璁垮绫诲瀷涓婚敭
- */
- public String getId() {
- return id;
- }
-
- /**
- * Set 璁垮绫诲瀷涓婚敭
- */
- public void setId(String id) {
- this.id = id;
- }
-
- /**
- * Get 璁垮绫诲瀷
- */
- public String getLabel() {
- return label;
- }
-
- /**
- * Set 璁垮绫诲瀷
- */
- public void setLabel(String label) {
- this.label = label;
- }
-
- /**
- * Get 娉ㄥ唽鍏徃涓婚敭
- */
- public String getRegisterCompanyId() {
- return registerCompanyId;
- }
-
- /**
- * Set 娉ㄥ唽鍏徃涓婚敭
- */
- public void setRegisterCompanyId(String registerCompanyId) {
- this.registerCompanyId = registerCompanyId;
- }
-
- /**
- * Get 鏄惁鏄彲鐢�
- */
- public String getAvailable() {
- return available;
- }
-
- /**
- * Set 鏄惁鏄彲鐢�
- */
- public void setAvailable(String available) {
- this.available = available;
- }
-
- public String toString() {
- return
- ",璁垮绫诲瀷涓婚敭 ="+ id + ",璁垮绫诲瀷 =" + label + ",娉ㄥ唽鍏徃涓婚敭 ="+ registerCompanyId +
- ",鏄惁鏄彲鐢� ="+ available ;
- }
-}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java
index 1f722c0..2a2cd33 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/CheckInFragment.java
@@ -136,10 +136,10 @@
return;
}
RequestParams params = new RequestParams();
- params.addBodyParameter(Visit.FieldNames.matterId, DictionaryMng.getInstance().getId(CommonVariables.DictionaryType.VISIT_REASON + fragment_check_in_right_visitor_reason.getText().toString()));
+ params.addBodyParameter(Visit.FieldNames.visitReasonId, DictionaryMng.getInstance().getId(CommonVariables.DictionaryType.VISIT_REASON + fragment_check_in_right_visitor_reason.getText().toString()));
params.addBodyParameter(Visit.FieldNames.remark, fragment_check_in_right_remark.getText().toString());
- params.addBodyParameter(Visit.FieldNames.visitorPersonId, visitor.getRegisterId());
- params.addBodyParameter(Visit.FieldNames.visiteePersonId, interviewee.getRegisterId());
+ params.addBodyParameter(Visit.FieldNames.visitorId, visitor.getRegisterId());
+ params.addBodyParameter(Visit.FieldNames.visiteeId, interviewee.getRegisterId());
params.addBodyParameter(Visit.FieldNames.visitorCompanyId, visitor.getCompanyId());
params.addBodyParameter(Visit.FieldNames.visiteeCompanyId, interviewee.getCompanyId());
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java
index 357508b..4f349b0 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/RegisterFragment.java
@@ -13,6 +13,7 @@
import com.bsk.zhangbo.demoforbsk.R;
import cn.com.basic.face.base.BaseFragment;
+import cn.com.basic.face.discern.entity.Register;
import cn.com.basic.face.discern.query.item.CheckInQueryItem;
import cn.com.basic.face.service.DictionaryMng;
import cn.com.basic.face.service.RegisterMng;
@@ -37,8 +38,6 @@
import java.util.Date;
import cn.com.basic.face.base.MainActivity;
-import cn.com.basic.face.discern.entity.Person;
-import cn.com.basic.face.discern.entity.VisitPersonType;
public class RegisterFragment extends BaseFragment implements View.OnClickListener{
@@ -66,9 +65,10 @@
private SimpleDraweeView fragment_register_choose_photo;
@ViewInject(R.id.fragment_register_update__photo)
private ImageView fragment_register_update__photo;
+ @ViewInject(R.id.fragment_register_linear_layout)
+ private LinearLayout fragment_register_linear_layout;
private static final int PICK_IMAGE_REQUEST = 1;
- private LinearLayout fragment_register_linear_layout;
private static RegisterFragment instance = new RegisterFragment();
@@ -80,12 +80,6 @@
return R.layout.fragment_register;
}
- @Override
- protected void initViews(View view, Bundle savedInstanceState) {
- fragment_register_linear_layout = (LinearLayout) view.findViewById(R.id.fragment_register_linear_layout);
- //ViewUtils.inject(this, fragment_register_linear_layout);
- }
-
@OnClick(R.id.fragment_register_save)
public void fragment_register_save_click(View view) { }
@@ -93,16 +87,52 @@
public void fragment_register_add_click(View v) {
RequestParams params = new RequestParams();
- params.addBodyParameter(Person.FieldNames.name, register_name.getValue());
- params.addBodyParameter(Person.FieldNames.phone, register_phone.getValue());
- params.addBodyParameter(Person.FieldNames.gender, DictionaryMng.getInstance().getId(register_gender.getValue()));
- params.addBodyParameter(Person.FieldNames.identityType, DictionaryMng.getInstance().getId(register_id_class.getValue()));
- params.addBodyParameter(Person.FieldNames.country, DictionaryMng.getInstance().getId(register_country.getValue()));
- params.addBodyParameter(Person.FieldNames.identify, register_id_num.getValue());
- params.addBodyParameter(Person.FieldNames.birthday, register_birthday.getValue());
+ String name = register_name.getValue();
+ if (name.trim().length() < 0) {
+ Toast.makeText(MainActivity.getInstance(), "濮撳悕涓嶈兘涓虹┖", Toast.LENGTH_SHORT).show();
+ return;
+ }
+ String phone = register_phone.getValue();
+ if (phone.trim().length() < 0) {
+ Toast.makeText(MainActivity.getInstance(), "鐢佃瘽涓嶈兘涓虹┖", Toast.LENGTH_SHORT).show();
+ return;
+ }
+ String gender = register_gender.getValue();
+ if (gender.trim().length() < 0) {
+ Toast.makeText(MainActivity.getInstance(), "鎬у埆涓嶈兘涓虹┖", Toast.LENGTH_SHORT).show();
+ return;
+ }
+ String id_class = register_id_class.getValue();
+ if (id_class.trim().length() < 0) {
+ Toast.makeText(MainActivity.getInstance(), "璇佷欢绫诲瀷涓嶈兘涓虹┖", Toast.LENGTH_SHORT).show();
+ return;
+ }
+ String country = register_country.getValue();
+ if (country.trim().length() < 0) {
+ Toast.makeText(MainActivity.getInstance(), "璇佷欢绫诲瀷涓嶈兘涓虹┖", Toast.LENGTH_SHORT).show();
+ return;
+ }
+ String id_num = register_id_num.getValue();
+ if (id_num.trim().length() < 0) {
+ Toast.makeText(MainActivity.getInstance(), "璇佷欢绫诲瀷涓嶈兘涓虹┖", Toast.LENGTH_SHORT).show();
+ return;
+ }
+ String company = register_company.getValue();
+ if (company.trim().length() < 0) {
+ Toast.makeText(MainActivity.getInstance(), "璇佷欢绫诲瀷涓嶈兘涓虹┖", Toast.LENGTH_SHORT).show();
+ return;
+ }
+ params.addBodyParameter(Register.FieldNames.username, name);
+ params.addBodyParameter(Register.FieldNames.mobilePhone, phone);
+ params.addBodyParameter(Register.FieldNames.genderId, DictionaryMng.getInstance().getId(gender));
+ params.addBodyParameter(Register.FieldNames.identityTypeId, DictionaryMng.getInstance().getId(id_class));
+ params.addBodyParameter(Register.FieldNames.countryId, DictionaryMng.getInstance().getId(country));
+ params.addBodyParameter(Register.FieldNames.identifyNum, id_num);
+ params.addBodyParameter(Register.FieldNames.birthday, company);
+// params.addBodyParameter(Person.FieldNames.Re);
params.addBodyParameter("companyName", register_company.getValue());
- params.addBodyParameter(VisitPersonType.FieldNames.registerCompanyId, "0");
+ //params.addBodyParameter(VisitPersonType.FieldNames.registerCompanyId, "0");
RegisterMng.getInstance().add(params);
}
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java
index dba3afd..43af7c8 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java
@@ -11,7 +11,7 @@
import java.util.List;
import cn.com.basic.face.discern.common.BaseCommonCallBack;
-import cn.com.basic.face.discern.entity.Place;
+import cn.com.basic.face.discern.entity.Device;
public class DeviceMng {
public static DeviceMng instance = new DeviceMng();
@@ -25,10 +25,10 @@
public void findPlace() {
try {
RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.Query.DEVICE_QUERY);
- params.addBodyParameter(Place.FieldNames.authorizationId, authorationId);
+ params.addBodyParameter(Device.FieldNames.authorizationId, authorationId);
x.http().post(params, new BaseCommonCallBack() {
public void success() {
- List<Place> places = resultBean.getListBeanOfType(Place.class);
+ List<Device> places = resultBean.getListBeanOfType(Device.class);
if (places.size() > 0) {
BaseApplication.getInstance().setPlace(places.get(0));
} else {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java
index 50cf378..c2b9799 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java
@@ -50,7 +50,7 @@
List<String> uniqueFirstLetterList = new ArrayList<String>();
HashMap<String,List<String>> countriesGroupByFirstLetter = new HashMap<String,List<String>>();
for (Dictionary item : items) {
- idMap.put(item.getName(), item.getId()+"");
+ idMap.put(item.getName(), item.getDictId()+"");
String firstLetter = item.getRemark();
List list = countriesGroupByFirstLetter.get(firstLetter);
if (list == null) {
@@ -100,7 +100,7 @@
public List<String> getDictionaryNameList(List<Dictionary> dictionaryList) {
List nameList = new ArrayList();
for (Dictionary dictionary : dictionaryList) {
- idMap.put(dictionary.getName(), dictionary.getId()+"");
+ idMap.put(dictionary.getName(), dictionary.getDictId()+"");
nameList.add(dictionary.getName());
}
return nameList;
--
Gitblit v1.8.0