From 117e18fedf48e401043e9538732d0d9e6f7ef080 Mon Sep 17 00:00:00 2001 From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674> Date: 星期三, 22 三月 2017 16:25:46 +0800 Subject: [PATCH] --- VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/com/bsk/zhangbo/demoforbsk/service/CompanyMng.java | 45 +++ VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Image.java | 12 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/PersonExt.java | 6 VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/com/bsk/zhangbo/demoforbsk/service/BaseMng.java | 49 ++++ VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Visiting.java | 30 +- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/VistorTypeQueryItem.java | 6 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/VisitMatter.java | 18 VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/widget/CountrySelectionPopup.java | 25 - VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java | 2 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/ResultBean.java | 3 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/PlaceQueryItem.java | 12 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Place.java | 12 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/VisitPersonType.java | 18 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Checking.java | 30 +- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Visit.java | 66 ++-- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/VisitStat.java | 18 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Calling.java | 30 +- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Dictionary.java | 18 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Company.java | 6 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/FaceImage.java | 24 +- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/PersonQueryItem.java | 62 ++-- VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/base/BaseApplication.java | 9 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/CheckingCompany.java | 12 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Person.java | 48 ++-- VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/RegisterFragment.java | 53 ++-- VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/VisitorType.java | 18 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Department.java | 6 VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/com/bsk/zhangbo/demoforbsk/service/DictionaryMng.java | 55 +--- VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/com/bsk/zhangbo/demoforbsk/service/VisitorTypeMng.java | 17 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/Post.java | 6 30 files changed, 391 insertions(+), 325 deletions(-) diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java index 5e9f42e..8cceb85 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java @@ -43,7 +43,7 @@ public class DictionaryType { public static final String SEX = "sex"; public static final String CREDENTIALS = "credentials"; - public static final String NATION = "nation"; + public static final String COUNTRY = "country"; } diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/ResultBean.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/ResultBean.java index 3ff1c74..4a295a4 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/ResultBean.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/ResultBean.java @@ -60,4 +60,7 @@ } } + public List getDataObject(Class requiredType) { + return null; + } } 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/Calling.java index beaf4eb..71118dd 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/Calling.java @@ -38,83 +38,83 @@ } // 绛惧埌浜嬩欢涓婚敭 - private Integer id; + private String id; // 鍛煎彨鏃堕棿 - private Date callDt; + private String callDt; // 鍛煎彨浜哄憳涓婚敭 - private Integer callerPersonId; + private String callerPersonId; // 琚懠鍙汉鍛樹富閿� - private Integer calleePersonId; + private String calleePersonId; // 鍛煎彨鍙戠敓鎵�鍦ㄨ澶�(鍦扮偣) - private Integer placeId; + private String placeId; /** * Get 绛惧埌浜嬩欢涓婚敭 */ - public Integer getId() { + public String getId() { return id; } /** * Set 绛惧埌浜嬩欢涓婚敭 */ - public void setId(Integer id) { + public void setId(String id) { this.id = id; } /** * Get 鍛煎彨鏃堕棿 */ - public Date getCallDt() { + public String getCallDt() { return callDt; } /** * Set 鍛煎彨鏃堕棿 */ - public void setCallDt(Date callDt) { + public void setCallDt(String callDt) { this.callDt = callDt; } /** * Get 鍛煎彨浜哄憳涓婚敭 */ - public Integer getCallerPersonId() { + public String getCallerPersonId() { return callerPersonId; } /** * Set 鍛煎彨浜哄憳涓婚敭 */ - public void setCallerPersonId(Integer callerPersonId) { + public void setCallerPersonId(String callerPersonId) { this.callerPersonId = callerPersonId; } /** * Get 琚懠鍙汉鍛樹富閿� */ - public Integer getCalleePersonId() { + public String getCalleePersonId() { return calleePersonId; } /** * Set 琚懠鍙汉鍛樹富閿� */ - public void setCalleePersonId(Integer calleePersonId) { + public void setCalleePersonId(String calleePersonId) { this.calleePersonId = calleePersonId; } /** * Get 鍛煎彨鍙戠敓鎵�鍦ㄨ澶�(鍦扮偣) */ - public Integer getPlaceId() { + public String getPlaceId() { return placeId; } /** * Set 鍛煎彨鍙戠敓鎵�鍦ㄨ澶�(鍦扮偣) */ - public void setPlaceId(Integer placeId) { + public void setPlaceId(String placeId) { this.placeId = placeId; } 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 index 7b912f2..2f337cc 100644 --- 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 @@ -38,83 +38,83 @@ } // 绛惧埌浜嬩欢涓婚敭 - private Integer id; + private String id; // 绛惧埌鐘舵�� - private Integer statusId; + private String statusId; // 绛惧埌鏃堕棿 - private Date statusDt; + private String statusDt; // 浜哄憳涓婚敭 - private Integer personId; + private String personId; // 绛惧埌浣嶇疆 - private Integer placeId; + private String placeId; /** * Get 绛惧埌浜嬩欢涓婚敭 */ - public Integer getId() { + public String getId() { return id; } /** * Set 绛惧埌浜嬩欢涓婚敭 */ - public void setId(Integer id) { + public void setId(String id) { this.id = id; } /** * Get 绛惧埌鐘舵�� */ - public Integer getStatusId() { + public String getStatusId() { return statusId; } /** * Set 绛惧埌鐘舵�� */ - public void setStatusId(Integer statusId) { + public void setStatusId(String statusId) { this.statusId = statusId; } /** * Get 绛惧埌鏃堕棿 */ - public Date getStatusDt() { + public String getStatusDt() { return statusDt; } /** * Set 绛惧埌鏃堕棿 */ - public void setStatusDt(Date statusDt) { + public void setStatusDt(String statusDt) { this.statusDt = statusDt; } /** * Get 浜哄憳涓婚敭 */ - public Integer getPersonId() { + public String getPersonId() { return personId; } /** * Set 浜哄憳涓婚敭 */ - public void setPersonId(Integer personId) { + public void setPersonId(String personId) { this.personId = personId; } /** * Get 绛惧埌浣嶇疆 */ - public Integer getPlaceId() { + public String getPlaceId() { return placeId; } /** * Set 绛惧埌浣嶇疆 */ - public void setPlaceId(Integer placeId) { + public void setPlaceId(String placeId) { this.placeId = 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 index 8acb5d1..0f2e149 100644 --- 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 @@ -25,35 +25,35 @@ } // 浜哄憳涓婚敭 - private Integer personId; + private String personId; // 鍏徃涓婚敭 - private Integer companyId; + private String companyId; /** * Get 浜哄憳涓婚敭 */ - public Integer getPersonId() { + public String getPersonId() { return personId; } /** * Set 浜哄憳涓婚敭 */ - public void setPersonId(Integer personId) { + public void setPersonId(String personId) { this.personId = personId; } /** * Get 鍏徃涓婚敭 */ - public Integer getCompanyId() { + public String getCompanyId() { return companyId; } /** * Set 鍏徃涓婚敭 */ - public void setCompanyId(Integer companyId) { + public void setCompanyId(String companyId) { this.companyId = 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 d4ec8cc..7ae5468 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 @@ -25,21 +25,21 @@ } // 鍏徃涓婚敭 - private Integer id; + private String id; // 鍏徃鍚嶇О private String name; /** * Get 鍏徃涓婚敭 */ - public Integer getId() { + public String getId() { return id; } /** * Set 鍏徃涓婚敭 */ - public void setId(Integer id) { + public void setId(String id) { this.id = id; } 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 e4b7a52..1e4c6f5 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 @@ -29,7 +29,7 @@ } // 閮ㄩ棬涓婚敭 - private Integer id; + private String id; // 閮ㄩ棬鍚嶇О private String label; // 閮ㄩ棬棣栧瓧姣� @@ -38,14 +38,14 @@ /** * Get 閮ㄩ棬涓婚敭 */ - public Integer getId() { + public String getId() { return id; } /** * Set 閮ㄩ棬涓婚敭 */ - public void setId(Integer id) { + public void setId(String id) { this.id = id; } 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 3513b49..19cc0f0 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 @@ -45,7 +45,7 @@ } // 涓婚敭 - private Integer id; + private String id; // 缂栫爜 private String sn; // 鍚嶇О @@ -53,23 +53,23 @@ // 绫诲瀷 private String type; // 鎺掑簭 - private Integer orderBy; + private String orderBy; // 鐖剁骇id - private Integer pid; + private String pid; // 澶囨敞 private String remark; /** * Get 涓婚敭 */ - public Integer getId() { + public String getId() { return id; } /** * Set 涓婚敭 */ - public void setId(Integer id) { + public void setId(String id) { this.id = id; } @@ -118,28 +118,28 @@ /** * Get 鎺掑簭 */ - public Integer getOrderBy() { + public String getOrderBy() { return orderBy; } /** * Set 鎺掑簭 */ - public void setOrderBy(Integer orderBy) { + public void setOrderBy(String orderBy) { this.orderBy = orderBy; } /** * Get 鐖剁骇id */ - public Integer getPid() { + public String getPid() { return pid; } /** * Set 鐖剁骇id */ - public void setPid(Integer pid) { + public void setPid(String pid) { this.pid = pid; } 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 index 64680d4..671c225 100644 --- 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 @@ -37,55 +37,55 @@ } // 鍛樺伐鍥剧墖涓婚敭 - private Integer faceId; + private String faceId; // 娉ㄥ唽鍏徃涓婚敭 - private Integer registerCompanyId; + private String registerCompanyId; // 浜哄憳涓婚敭 - private Integer personId; + private String personId; // 鍥剧墖鍦板潃 private String imagePath; // 鍥剧墖绫诲瀷 - private Integer imageTypeId; + private String imageTypeId; /** * Get 鍛樺伐鍥剧墖涓婚敭 */ - public Integer getFaceId() { + public String getFaceId() { return faceId; } /** * Set 鍛樺伐鍥剧墖涓婚敭 */ - public void setFaceId(Integer faceId) { + public void setFaceId(String faceId) { this.faceId = faceId; } /** * Get 娉ㄥ唽鍏徃涓婚敭 */ - public Integer getRegisterCompanyId() { + public String getRegisterCompanyId() { return registerCompanyId; } /** * Set 娉ㄥ唽鍏徃涓婚敭 */ - public void setRegisterCompanyId(Integer registerCompanyId) { + public void setRegisterCompanyId(String registerCompanyId) { this.registerCompanyId = registerCompanyId; } /** * Get 浜哄憳涓婚敭 */ - public Integer getPersonId() { + public String getPersonId() { return personId; } /** * Set 浜哄憳涓婚敭 */ - public void setPersonId(Integer personId) { + public void setPersonId(String personId) { this.personId = personId; } @@ -106,14 +106,14 @@ /** * Get 鍥剧墖绫诲瀷 */ - public Integer getImageTypeId() { + public String getImageTypeId() { return imageTypeId; } /** * Set 鍥剧墖绫诲瀷 */ - public void setImageTypeId(Integer imageTypeId) { + public void setImageTypeId(String imageTypeId) { this.imageTypeId = 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 index f1590e7..194945f 100644 --- 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 @@ -29,37 +29,37 @@ } // 浜哄憳涓婚敭 - private Integer personId; + private String personId; // 鍥剧墖绫诲瀷 - private Integer imageType; + private String imageType; // 鍥剧墖鍦板潃 private String imagePath; /** * Get 浜哄憳涓婚敭 */ - public Integer getPersonId() { + public String getPersonId() { return personId; } /** * Set 浜哄憳涓婚敭 */ - public void setPersonId(Integer personId) { + public void setPersonId(String personId) { this.personId = personId; } /** * Get 鍥剧墖绫诲瀷 */ - public Integer getImageType() { + public String getImageType() { return imageType; } /** * Set 鍥剧墖绫诲瀷 */ - public void setImageType(Integer imageType) { + public void setImageType(String imageType) { this.imageType = imageType; } 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/Person.java index c606ec0..01f6f62 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/Person.java @@ -86,13 +86,13 @@ } // 浜哄憳涓婚敭 - private Integer id; + private String id; // 浜哄憳鍚嶅瓧 private String name; // 浜哄憳鍚嶉瀛楁瘝 private String nameSpell; // 鎬у埆 - private Integer gender; + private String gender; // 鍥界睄 private String country; // 鐪� @@ -100,37 +100,37 @@ // 甯� private String city; // 鍑虹敓鏃ユ湡 - private Date birthday; + private String birthday; // 搴ф満鐢佃瘽 private String phone; // 绉诲姩鐢佃瘽 private String mobilePhone; // 璇佷欢绫诲瀷 - private Integer identityType; + private String identityType; // 璇佷欢缂栧彿 private String identify; // 鍏徃涓婚敭 - private Integer companyId; + private String companyId; // 閮ㄩ棬涓婚敭 - private Integer departmentId; + private String departmentId; // 鑱屽姟涓婚敭 - private Integer postId; + private String postId; // 浜哄憳澶囨敞娑堟伅 private String remark; // 鍗遍櫓浜哄憳璀﹀憡娑堟伅 - private Integer warning; + private String warning; /** * Get 浜哄憳涓婚敭 */ - public Integer getId() { + public String getId() { return id; } /** * Set 浜哄憳涓婚敭 */ - public void setId(Integer id) { + public void setId(String id) { this.id = id; } @@ -165,14 +165,14 @@ /** * Get 鎬у埆 */ - public Integer getGender() { + public String getGender() { return gender; } /** * Set 鎬у埆 */ - public void setGender(Integer gender) { + public void setGender(String gender) { this.gender = gender; } @@ -221,14 +221,14 @@ /** * Get 鍑虹敓鏃ユ湡 */ - public Date getBirthday() { + public String getBirthday() { return birthday; } /** * Set 鍑虹敓鏃ユ湡 */ - public void setBirthday(Date birthday) { + public void setBirthday(String birthday) { this.birthday = birthday; } @@ -263,14 +263,14 @@ /** * Get 璇佷欢绫诲瀷 */ - public Integer getIdentityType() { + public String getIdentityType() { return identityType; } /** * Set 璇佷欢绫诲瀷 */ - public void setIdentityType(Integer identityType) { + public void setIdentityType(String identityType) { this.identityType = identityType; } @@ -291,42 +291,42 @@ /** * Get 鍏徃涓婚敭 */ - public Integer getCompanyId() { + public String getCompanyId() { return companyId; } /** * Set 鍏徃涓婚敭 */ - public void setCompanyId(Integer companyId) { + public void setCompanyId(String companyId) { this.companyId = companyId; } /** * Get 閮ㄩ棬涓婚敭 */ - public Integer getDepartmentId() { + public String getDepartmentId() { return departmentId; } /** * Set 閮ㄩ棬涓婚敭 */ - public void setDepartmentId(Integer departmentId) { + public void setDepartmentId(String departmentId) { this.departmentId = departmentId; } /** * Get 鑱屽姟涓婚敭 */ - public Integer getPostId() { + public String getPostId() { return postId; } /** * Set 鑱屽姟涓婚敭 */ - public void setPostId(Integer postId) { + public void setPostId(String postId) { this.postId = postId; } @@ -347,14 +347,14 @@ /** * Get 鍗遍櫓浜哄憳璀﹀憡娑堟伅 */ - public Integer getWarning() { + public String getWarning() { return warning; } /** * Set 鍗遍櫓浜哄憳璀﹀憡娑堟伅 */ - public void setWarning(Integer warning) { + public void setWarning(String warning) { this.warning = warning; } 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 index 6ae5546..da3e567 100644 --- 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 @@ -21,19 +21,19 @@ } // 浜哄憳涓婚敭 - private Integer personId; + private String personId; /** * Get 浜哄憳涓婚敭 */ - public Integer getPersonId() { + public String getPersonId() { return personId; } /** * Set 浜哄憳涓婚敭 */ - public void setPersonId(Integer personId) { + public void setPersonId(String personId) { this.personId = personId; } 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/Place.java index cffab7d..01a2666 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/Place.java @@ -33,9 +33,9 @@ } // 璁惧涓婚敭 - private Integer id; + private String id; // 鍏徃涓婚敭 - private Integer companyId; + private String companyId; // 璁惧鍦扮偣 private String label; // 璁惧鎺堟潈鐮� @@ -44,28 +44,28 @@ /** * Get 璁惧涓婚敭 */ - public Integer getId() { + public String getId() { return id; } /** * Set 璁惧涓婚敭 */ - public void setId(Integer id) { + public void setId(String id) { this.id = id; } /** * Get 鍏徃涓婚敭 */ - public Integer getCompanyId() { + public String getCompanyId() { return companyId; } /** * Set 鍏徃涓婚敭 */ - public void setCompanyId(Integer companyId) { + public void setCompanyId(String companyId) { this.companyId = companyId; } 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 537794e..b443b23 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 @@ -25,21 +25,21 @@ } // 鑱屼綅涓婚敭 - private Integer id; + private String id; // 鑱屼綅鍚嶇О private String label; /** * Get 鑱屼綅涓婚敭 */ - public Integer getId() { + public String getId() { return id; } /** * Set 鑱屼綅涓婚敭 */ - public void setId(Integer id) { + public void setId(String id) { this.id = id; } 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 69cd4b5..3412d20 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 @@ -66,83 +66,83 @@ } // 璁块棶浜嬩欢涓婚敭 - private Integer id; + private String id; // 璁块棶浜哄憳涓婚敭 - private Integer visitorPersonId; + private String visitorPersonId; // 琚闂汉鍛樹富閿� - private Integer visiteePersonId; + private String visiteePersonId; // 璁块棶浜嬬敱涓婚敭 - private Integer matterId; + private String matterId; // 璁块棶澶囨敞 private String remark; // 鏈�鏂扮殑璁块棶鐘舵�� - private Integer lastStatus; + private String lastStatus; // 鏉ヨ鏃堕棿 - private Date startTime; + private String startTime; // 绛剧鏃堕棿 - private Date lastTime; + private String lastTime; // visitorCompanyId - private Integer visitorCompanyId; + private String visitorCompanyId; // visiteeCompanyId - private Integer visiteeCompanyId; + private String visiteeCompanyId; // 璁垮绫诲瀷 - private Integer visitorTypeId; + private String visitorTypeId; // 褰撳墠璁块棶鐨勮鍛婄姸鎬� - private Integer warning; + private String warning; /** * Get 璁块棶浜嬩欢涓婚敭 */ - public Integer getId() { + public String getId() { return id; } /** * Set 璁块棶浜嬩欢涓婚敭 */ - public void setId(Integer id) { + public void setId(String id) { this.id = id; } /** * Get 璁块棶浜哄憳涓婚敭 */ - public Integer getVisitorPersonId() { + public String getVisitorPersonId() { return visitorPersonId; } /** * Set 璁块棶浜哄憳涓婚敭 */ - public void setVisitorPersonId(Integer visitorPersonId) { + public void setVisitorPersonId(String visitorPersonId) { this.visitorPersonId = visitorPersonId; } /** * Get 琚闂汉鍛樹富閿� */ - public Integer getVisiteePersonId() { + public String getVisiteePersonId() { return visiteePersonId; } /** * Set 琚闂汉鍛樹富閿� */ - public void setVisiteePersonId(Integer visiteePersonId) { + public void setVisiteePersonId(String visiteePersonId) { this.visiteePersonId = visiteePersonId; } /** * Get 璁块棶浜嬬敱涓婚敭 */ - public Integer getMatterId() { + public String getMatterId() { return matterId; } /** * Set 璁块棶浜嬬敱涓婚敭 */ - public void setMatterId(Integer matterId) { + public void setMatterId(String matterId) { this.matterId = matterId; } @@ -163,98 +163,98 @@ /** * Get 鏈�鏂扮殑璁块棶鐘舵�� */ - public Integer getLastStatus() { + public String getLastStatus() { return lastStatus; } /** * Set 鏈�鏂扮殑璁块棶鐘舵�� */ - public void setLastStatus(Integer lastStatus) { + public void setLastStatus(String lastStatus) { this.lastStatus = lastStatus; } /** * Get 鏉ヨ鏃堕棿 */ - public Date getStartTime() { + public String getStartTime() { return startTime; } /** * Set 鏉ヨ鏃堕棿 */ - public void setStartTime(Date startTime) { + public void setStartTime(String startTime) { this.startTime = startTime; } /** * Get 绛剧鏃堕棿 */ - public Date getLastTime() { + public String getLastTime() { return lastTime; } /** * Set 绛剧鏃堕棿 */ - public void setLastTime(Date lastTime) { + public void setLastTime(String lastTime) { this.lastTime = lastTime; } /** * Get visitorCompanyId */ - public Integer getVisitorCompanyId() { + public String getVisitorCompanyId() { return visitorCompanyId; } /** * Set visitorCompanyId */ - public void setVisitorCompanyId(Integer visitorCompanyId) { + public void setVisitorCompanyId(String visitorCompanyId) { this.visitorCompanyId = visitorCompanyId; } /** * Get visiteeCompanyId */ - public Integer getVisiteeCompanyId() { + public String getVisiteeCompanyId() { return visiteeCompanyId; } /** * Set visiteeCompanyId */ - public void setVisiteeCompanyId(Integer visiteeCompanyId) { + public void setVisiteeCompanyId(String visiteeCompanyId) { this.visiteeCompanyId = visiteeCompanyId; } /** * Get 璁垮绫诲瀷 */ - public Integer getVisitorTypeId() { + public String getVisitorTypeId() { return visitorTypeId; } /** * Set 璁垮绫诲瀷 */ - public void setVisitorTypeId(Integer visitorTypeId) { + public void setVisitorTypeId(String visitorTypeId) { this.visitorTypeId = visitorTypeId; } /** * Get 褰撳墠璁块棶鐨勮鍛婄姸鎬� */ - public Integer getWarning() { + public String getWarning() { return warning; } /** * Set 褰撳墠璁块棶鐨勮鍛婄姸鎬� */ - public void setWarning(Integer warning) { + public void setWarning(String warning) { this.warning = warning; } 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 index d14ce7b..1d47fa0 100644 --- 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 @@ -33,39 +33,39 @@ } // 璁块棶浜嬬敱涓婚敭 - private Integer id; + private String id; // 鍏徃涓婚敭 - private Integer companyId; + private String companyId; // 璁块棶浜嬬敱 private String label; // 鏄惁鏄彲鐢� - private Integer available; + private String available; /** * Get 璁块棶浜嬬敱涓婚敭 */ - public Integer getId() { + public String getId() { return id; } /** * Set 璁块棶浜嬬敱涓婚敭 */ - public void setId(Integer id) { + public void setId(String id) { this.id = id; } /** * Get 鍏徃涓婚敭 */ - public Integer getCompanyId() { + public String getCompanyId() { return companyId; } /** * Set 鍏徃涓婚敭 */ - public void setCompanyId(Integer companyId) { + public void setCompanyId(String companyId) { this.companyId = companyId; } @@ -86,14 +86,14 @@ /** * Get 鏄惁鏄彲鐢� */ - public Integer getAvailable() { + public String getAvailable() { return available; } /** * Set 鏄惁鏄彲鐢� */ - public void setAvailable(Integer available) { + public void setAvailable(String available) { this.available = 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 index ef27643..38daa01 100644 --- 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 @@ -29,51 +29,51 @@ } // registerCompanyId - private Integer registerCompanyId; + private String registerCompanyId; // personId - private Integer personId; + private String personId; // visitorTypeId - private Integer visitorTypeId; + private String visitorTypeId; /** * Get registerCompanyId */ - public Integer getRegisterCompanyId() { + public String getRegisterCompanyId() { return registerCompanyId; } /** * Set registerCompanyId */ - public void setRegisterCompanyId(Integer registerCompanyId) { + public void setRegisterCompanyId(String registerCompanyId) { this.registerCompanyId = registerCompanyId; } /** * Get personId */ - public Integer getPersonId() { + public String getPersonId() { return personId; } /** * Set personId */ - public void setPersonId(Integer personId) { + public void setPersonId(String personId) { this.personId = personId; } /** * Get visitorTypeId */ - public Integer getVisitorTypeId() { + public String getVisitorTypeId() { return visitorTypeId; } /** * Set visitorTypeId */ - public void setVisitorTypeId(Integer visitorTypeId) { + public void setVisitorTypeId(String visitorTypeId) { this.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 index b435376..40ee8cf 100644 --- 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 @@ -29,51 +29,51 @@ } // 浜哄憳涓婚敭 - private Integer personId; + private String personId; // 娉ㄥ唽鍏徃涓婚敭 - private Integer registerCompanyId; + private String registerCompanyId; // 鏉ヨ鍏徃娆℃暟 - private Integer totalCount; + private String totalCount; /** * Get 浜哄憳涓婚敭 */ - public Integer getPersonId() { + public String getPersonId() { return personId; } /** * Set 浜哄憳涓婚敭 */ - public void setPersonId(Integer personId) { + public void setPersonId(String personId) { this.personId = personId; } /** * Get 娉ㄥ唽鍏徃涓婚敭 */ - public Integer getRegisterCompanyId() { + public String getRegisterCompanyId() { return registerCompanyId; } /** * Set 娉ㄥ唽鍏徃涓婚敭 */ - public void setRegisterCompanyId(Integer registerCompanyId) { + public void setRegisterCompanyId(String registerCompanyId) { this.registerCompanyId = registerCompanyId; } /** * Get 鏉ヨ鍏徃娆℃暟 */ - public Integer getTotalCount() { + public String getTotalCount() { return totalCount; } /** * Set 鏉ヨ鍏徃娆℃暟 */ - public void setTotalCount(Integer totalCount) { + public void setTotalCount(String totalCount) { this.totalCount = totalCount; } 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/Visiting.java index 54fb9d5..7c31c35 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/Visiting.java @@ -38,83 +38,83 @@ } // 璁块棶浜嬩欢娴佹按id - private Integer id; + private String id; // 璁块棶浜嬩欢id - private Integer visitId; + private String visitId; // 褰撳墠璁块棶鐘舵�� - private Integer statusId; + private String statusId; // 鏇存柊鐘舵�佹椂闂� - private Date statusDt; + private String statusDt; // 璁惧浣嶇疆涓婚敭 - private Integer placeId; + private String placeId; /** * Get 璁块棶浜嬩欢娴佹按id */ - public Integer getId() { + public String getId() { return id; } /** * Set 璁块棶浜嬩欢娴佹按id */ - public void setId(Integer id) { + public void setId(String id) { this.id = id; } /** * Get 璁块棶浜嬩欢id */ - public Integer getVisitId() { + public String getVisitId() { return visitId; } /** * Set 璁块棶浜嬩欢id */ - public void setVisitId(Integer visitId) { + public void setVisitId(String visitId) { this.visitId = visitId; } /** * Get 褰撳墠璁块棶鐘舵�� */ - public Integer getStatusId() { + public String getStatusId() { return statusId; } /** * Set 褰撳墠璁块棶鐘舵�� */ - public void setStatusId(Integer statusId) { + public void setStatusId(String statusId) { this.statusId = statusId; } /** * Get 鏇存柊鐘舵�佹椂闂� */ - public Date getStatusDt() { + public String getStatusDt() { return statusDt; } /** * Set 鏇存柊鐘舵�佹椂闂� */ - public void setStatusDt(Date statusDt) { + public void setStatusDt(String statusDt) { this.statusDt = statusDt; } /** * Get 璁惧浣嶇疆涓婚敭 */ - public Integer getPlaceId() { + public String getPlaceId() { return placeId; } /** * Set 璁惧浣嶇疆涓婚敭 */ - public void setPlaceId(Integer placeId) { + public void setPlaceId(String placeId) { this.placeId = placeId; } 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 index a387dc6..8c8aa9c 100644 --- 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 @@ -33,25 +33,25 @@ } // 璁垮绫诲瀷涓婚敭 - private Integer id; + private String id; // 璁垮绫诲瀷 private String label; // 娉ㄥ唽鍏徃涓婚敭 - private Integer registerCompanyId; + private String registerCompanyId; // 鏄惁鏄彲鐢� - private Integer available; + private String available; /** * Get 璁垮绫诲瀷涓婚敭 */ - public Integer getId() { + public String getId() { return id; } /** * Set 璁垮绫诲瀷涓婚敭 */ - public void setId(Integer id) { + public void setId(String id) { this.id = id; } @@ -72,28 +72,28 @@ /** * Get 娉ㄥ唽鍏徃涓婚敭 */ - public Integer getRegisterCompanyId() { + public String getRegisterCompanyId() { return registerCompanyId; } /** * Set 娉ㄥ唽鍏徃涓婚敭 */ - public void setRegisterCompanyId(Integer registerCompanyId) { + public void setRegisterCompanyId(String registerCompanyId) { this.registerCompanyId = registerCompanyId; } /** * Get 鏄惁鏄彲鐢� */ - public Integer getAvailable() { + public String getAvailable() { return available; } /** * Set 鏄惁鏄彲鐢� */ - public void setAvailable(Integer available) { + public void setAvailable(String available) { this.available = available; } diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/PersonQueryItem.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/PersonQueryItem.java index c85584c..ba3d4e6 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/PersonQueryItem.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/PersonQueryItem.java @@ -1,18 +1,16 @@ package cn.com.basic.face.discern.query.item; -import java.util.Date; - public class PersonQueryItem { // 娉ㄥ唽鍏徃涓婚敭 - private Integer aaId; + private String aaId; // 鍛樺伐鍥剧墖涓婚敭 - private Integer faceId; + private String faceId; // 鍥剧墖鍦板潃 private String imagePath; // 鍥剧墖绫诲瀷 - private Integer imageTypeId; + private String imageTypeId; // 浜哄憳鍚嶅瓧 private String name; // 浜哄憳鍚嶉瀛楁瘝 @@ -26,55 +24,55 @@ // 甯� private String city; // 鍑虹敓鏃ユ湡 - private Date birthday; + private String birthday; // 搴ф満鐢佃瘽 private String phone; // 绉诲姩鐢佃瘽 private String mobilePhone; // 璇佷欢绫诲瀷 - private Integer identityType; + private String identityType; // 璇佷欢缂栧彿 private String identify; // 鍏徃涓婚敭 - private Integer companyId; + private String companyId; // 閮ㄩ棬涓婚敭 - private Integer departmentId; + private String departmentId; // 鑱屽姟涓婚敭 - private Integer postId; + private String postId; // 浜哄憳澶囨敞娑堟伅 private String remark; // 鍗遍櫓浜哄憳璀﹀憡娑堟伅 private String warning; // 浜哄憳涓婚敭 - private Integer personId; + private String personId; // 浜哄憳涓婚敭 - private Integer id; + private String id; /** * Get 娉ㄥ唽鍏徃涓婚敭 */ - public Integer getAaId() { + public String getAaId() { return aaId; } /** * Set 娉ㄥ唽鍏徃涓婚敭 */ - public void setAaId(Integer aaId) { + public void setAaId(String aaId) { this.aaId = aaId; } /** * Get 鍛樺伐鍥剧墖涓婚敭 */ - public Integer getFaceId() { + public String getFaceId() { return faceId; } /** * Set 鍛樺伐鍥剧墖涓婚敭 */ - public void setFaceId(Integer faceId) { + public void setFaceId(String faceId) { this.faceId = faceId; } @@ -95,14 +93,14 @@ /** * Get 鍥剧墖绫诲瀷 */ - public Integer getImageTypeId() { + public String getImageTypeId() { return imageTypeId; } /** * Set 鍥剧墖绫诲瀷 */ - public void setImageTypeId(Integer imageTypeId) { + public void setImageTypeId(String imageTypeId) { this.imageTypeId = imageTypeId; } @@ -193,14 +191,14 @@ /** * Get 鍑虹敓鏃ユ湡 */ - public Date getBirthday() { + public String getBirthday() { return birthday; } /** * Set 鍑虹敓鏃ユ湡 */ - public void setBirthday(Date birthday) { + public void setBirthday(String birthday) { this.birthday = birthday; } @@ -235,14 +233,14 @@ /** * Get 璇佷欢绫诲瀷 */ - public Integer getIdentityType() { + public String getIdentityType() { return identityType; } /** * Set 璇佷欢绫诲瀷 */ - public void setIdentityType(Integer identityType) { + public void setIdentityType(String identityType) { this.identityType = identityType; } @@ -263,42 +261,42 @@ /** * Get 鍏徃涓婚敭 */ - public Integer getCompanyId() { + public String getCompanyId() { return companyId; } /** * Set 鍏徃涓婚敭 */ - public void setCompanyId(Integer companyId) { + public void setCompanyId(String companyId) { this.companyId = companyId; } /** * Get 閮ㄩ棬涓婚敭 */ - public Integer getDepartmentId() { + public String getDepartmentId() { return departmentId; } /** * Set 閮ㄩ棬涓婚敭 */ - public void setDepartmentId(Integer departmentId) { + public void setDepartmentId(String departmentId) { this.departmentId = departmentId; } /** * Get 鑱屽姟涓婚敭 */ - public Integer getPostId() { + public String getPostId() { return postId; } /** * Set 鑱屽姟涓婚敭 */ - public void setPostId(Integer postId) { + public void setPostId(String postId) { this.postId = postId; } @@ -333,28 +331,28 @@ /** * Get 浜哄憳涓婚敭 */ - public Integer getPersonId() { + public String getPersonId() { return personId; } /** * Set 浜哄憳涓婚敭 */ - public void setPersonId(Integer personId) { + public void setPersonId(String personId) { this.personId = personId; } /** * Get 浜哄憳涓婚敭 */ - public Integer getId() { + public String getId() { return id; } /** * Set 浜哄憳涓婚敭 */ - public void setId(Integer id) { + public void setId(String id) { this.id = id; } diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/PlaceQueryItem.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/PlaceQueryItem.java index ba2df53..2bfefef 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/PlaceQueryItem.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/PlaceQueryItem.java @@ -4,9 +4,9 @@ public class PlaceQueryItem { // 鍏徃涓婚敭 - private Integer companyId; + private String companyId; // 璁惧涓婚敭 - private Integer placeId; + private String placeId; // 鍏徃鍚嶇О private String companyName; // 璁惧鍦扮偣 @@ -15,28 +15,28 @@ /** * Get 鍏徃涓婚敭 */ - public Integer getCompanyId() { + public String getCompanyId() { return companyId; } /** * Set 鍏徃涓婚敭 */ - public void setCompanyId(Integer companyId) { + public void setCompanyId(String companyId) { this.companyId = companyId; } /** * Get 璁惧涓婚敭 */ - public Integer getPlaceId() { + public String getPlaceId() { return placeId; } /** * Set 璁惧涓婚敭 */ - public void setPlaceId(Integer placeId) { + public void setPlaceId(String placeId) { this.placeId = placeId; } diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/VistorTypeQueryItem.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/VistorTypeQueryItem.java index 77683f3..a16b35e 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/VistorTypeQueryItem.java +++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/query/item/VistorTypeQueryItem.java @@ -4,21 +4,21 @@ public class VistorTypeQueryItem { // 璁垮绫诲瀷涓婚敭 - private Integer id; + private String id; // 璁垮绫诲瀷 private String label; /** * Get 璁垮绫诲瀷涓婚敭 */ - public Integer getId() { + public String getId() { return id; } /** * Set 璁垮绫诲瀷涓婚敭 */ - public void setId(Integer id) { + public void setId(String id) { this.id = id; } diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/base/BaseApplication.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/base/BaseApplication.java index c18185a..f07ad2f 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/base/BaseApplication.java +++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/base/BaseApplication.java @@ -2,9 +2,8 @@ import android.app.Application; -import com.bsk.zhangbo.demoforbsk.com.bsk.zhangbo.demoforbsk.service.DictionaryService; -import com.bsk.zhangbo.demoforbsk.com.bsk.zhangbo.demoforbsk.service.VisitorTypeService; -import com.bsk.zhangbo.demoforbsk.util.RtspFaceNative; +import com.bsk.zhangbo.demoforbsk.com.bsk.zhangbo.demoforbsk.service.DictionaryMng; +import com.bsk.zhangbo.demoforbsk.com.bsk.zhangbo.demoforbsk.service.VisitorTypeMng; import com.facebook.drawee.backends.pipeline.Fresco; import com.lzy.okhttputils.OkHttpUtils; import com.lzy.okhttputils.model.HttpHeaders; @@ -31,8 +30,8 @@ Fresco.initialize(this); initOkHttpUtils(); application = this; - DictionaryService.loadAllDictionaryData(); - VisitorTypeService.loadAll(); + DictionaryMng.getInstance().loadAllDictionaryData(); + //VisitorTypeMng.getInstance().loadAll(); } diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/com/bsk/zhangbo/demoforbsk/service/BaseMng.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/com/bsk/zhangbo/demoforbsk/service/BaseMng.java new file mode 100644 index 0000000..1d4e600 --- /dev/null +++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/com/bsk/zhangbo/demoforbsk/service/BaseMng.java @@ -0,0 +1,49 @@ +package com.bsk.zhangbo.demoforbsk.com.bsk.zhangbo.demoforbsk.service; + +import com.alibaba.fastjson.JSON; +import com.bsk.zhangbo.demoforbsk.util.AppApi; + +import org.xutils.http.RequestParams; +import org.xutils.x; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import cn.com.basic.face.discern.common.BaseCommonCallBack; +import cn.com.basic.face.discern.common.CommonVariables; +import cn.com.basic.face.discern.common.ResultBean; +import cn.com.basic.face.discern.entity.Dictionary; + +public class BaseMng { + + public Map<String, String> idMap = new HashMap<String, String>(); + + public String getId(String name) { + return idMap.get(name); + } +/* + public <T> List<T> getSyncList(String url, Map<String, String> condition, Class<T> requiredType){ + RequestParams params = new RequestParams(AppApi.BASEURL+url); + addParameters(params, condition); + try { + ResultBean resultBean = x.http().getSync(params, ResultBean.class); + return resultBean.getListBeanOfType(requiredType); + } catch (Throwable throwable) { + throwable.printStackTrace(); + } + return null; + } + + private void addParameters(RequestParams params, Map<String, String> condition) { + try { + for (Map.Entry<String, String> entry : condition.entrySet()) { + params.addParameter(entry.getKey(), entry.getValue()); + } + } catch (Exception e) { + e.printStackTrace(); + } + }*/ + +} diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/com/bsk/zhangbo/demoforbsk/service/CompanyMng.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/com/bsk/zhangbo/demoforbsk/service/CompanyMng.java new file mode 100644 index 0000000..35de9c6 --- /dev/null +++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/com/bsk/zhangbo/demoforbsk/service/CompanyMng.java @@ -0,0 +1,45 @@ +package com.bsk.zhangbo.demoforbsk.com.bsk.zhangbo.demoforbsk.service; + +import java.util.ArrayList; +import java.util.List; + +import cn.com.basic.face.discern.entity.Company; + +/** + * Created by xiuxi on 2017/3/22. + */ + +public class CompanyMng extends BaseMng { + + private static CompanyMng instance = new CompanyMng(); + + public static CompanyMng getInstance() { + return instance; + } + + + public static List<Company> companies = new ArrayList<Company>(); + + public void loadAll() { + loadCompanies(); + } + + private void loadCompanies() { + /*RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.COMPANY_LIST); + x.http().get(params, new BaseCommonCallBack() { + public void success() { + List<Company> items = getList(Company.class); + mVisitorTypeList = new ArrayList<String>(); + for (Company item : items) { + mVisitorTypeList.add(item.getLabel()); + idMap.put(item.getLabel(), item.getId()+""); + } + } + + }); + */ + + } + + +} diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/com/bsk/zhangbo/demoforbsk/service/DictionaryService.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/com/bsk/zhangbo/demoforbsk/service/DictionaryMng.java similarity index 67% rename from VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/com/bsk/zhangbo/demoforbsk/service/DictionaryService.java rename to VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/com/bsk/zhangbo/demoforbsk/service/DictionaryMng.java index 03cf499..d9d13bf 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/com/bsk/zhangbo/demoforbsk/service/DictionaryService.java +++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/com/bsk/zhangbo/demoforbsk/service/DictionaryMng.java @@ -2,57 +2,41 @@ import com.bsk.zhangbo.demoforbsk.util.AppApi; -import net.sourceforge.pinyin4j.PinyinHelper; - import org.xutils.http.RequestParams; import org.xutils.x; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import java.util.Map; import cn.com.basic.face.discern.common.BaseCommonCallBack; import cn.com.basic.face.discern.common.CommonVariables; import cn.com.basic.face.discern.entity.Dictionary; -import cn.com.basic.face.discern.query.item.VistorTypeQueryItem; -public class DictionaryService { +public class DictionaryMng extends BaseMng { + + public static DictionaryMng instance = new DictionaryMng(); + + public static DictionaryMng getInstance() { + return instance; + } public static List<String> nationList = new ArrayList<String>(); public static List<String> mCredentialsList = new ArrayList<String>(); public static List<String> mSexList = new ArrayList<String>(); - public static Map<String, String> idMap = new HashMap<String, String>(); public static List<String> countryWordList = new ArrayList<String>(); public static HashMap<String,List<String>> countryData = new HashMap<String,List<String>>(); public static String[] countryWordData = new String[]{}; - public static void loadAllDictionaryData() { - loadNation(); + public void loadAllDictionaryData() { + loadCountries(); loadCredentialsList(); loadSexList(); } - public static String getPinYinFirstLetter(String str) { - StringBuffer sb = new StringBuffer(); - try { - sb.setLength(0); - char c = str.charAt(0); - String[] pinyinArray = PinyinHelper.toHanyuPinyinStringArray(c); - if (pinyinArray != null) { - sb.append(pinyinArray[0].charAt(0)); - } else { - sb.append(c); - } - } catch (Exception e) { - e.printStackTrace(); - } - return sb.toString(); - } - - public static void loadNation() { + public void loadCountries() { RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.DICTIONARY_TYPE_LIST); - params.addParameter(Dictionary.FieldNames.type, CommonVariables.DictionaryType.NATION); + params.addParameter(Dictionary.FieldNames.type, CommonVariables.DictionaryType.COUNTRY); x.http().get(params, new BaseCommonCallBack() { public void success() { List<Dictionary> items = getList(Dictionary.class); @@ -61,12 +45,12 @@ for (Dictionary item : items) { idMap.put(item.getName(), item.getId()+""); nationList.add(item.getName()); - String captialLetter = item.getRemark();//getPinYinFirstLetter(nation.getName()).toUpperCase(); - List list = countryData.get(captialLetter); + String firstLetter = item.getRemark(); + List list = countryData.get(firstLetter); if (list == null) { list = new ArrayList(); - countryData.put(captialLetter, list); - countryWordList.add(0, captialLetter); + countryData.put(firstLetter, list); + countryWordList.add(0, firstLetter); } list.add(item.getName()); countryWordData[i] = item.getName(); @@ -74,9 +58,10 @@ } } }); + } - public static void loadCredentialsList() { + public void loadCredentialsList() { RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.DICTIONARY_TYPE_LIST); params.addParameter(Dictionary.FieldNames.type, CommonVariables.DictionaryType.CREDENTIALS); x.http().get(params, new BaseCommonCallBack() { @@ -90,7 +75,7 @@ }); } - private static void loadSexList() { + private void loadSexList() { RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.DICTIONARY_TYPE_LIST); params.addParameter(Dictionary.FieldNames.type, CommonVariables.DictionaryType.SEX); x.http().get(params, new BaseCommonCallBack() { @@ -103,10 +88,6 @@ } }); - } - - public static String getId(String name) { - return idMap.get(name); } } diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/com/bsk/zhangbo/demoforbsk/service/VisitorTypeService.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/com/bsk/zhangbo/demoforbsk/service/VisitorTypeMng.java similarity index 79% rename from VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/com/bsk/zhangbo/demoforbsk/service/VisitorTypeService.java rename to VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/com/bsk/zhangbo/demoforbsk/service/VisitorTypeMng.java index 761e8da..434835a 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/com/bsk/zhangbo/demoforbsk/service/VisitorTypeService.java +++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/com/bsk/zhangbo/demoforbsk/service/VisitorTypeMng.java @@ -11,22 +11,29 @@ import java.util.Map; import cn.com.basic.face.discern.common.BaseCommonCallBack; +import cn.com.basic.face.discern.entity.VisitorType; import cn.com.basic.face.discern.query.item.VistorTypeQueryItem; /** * Created by xiuxi on 2017/3/22. */ -public class VisitorTypeService { +public class VisitorTypeMng extends BaseMng { + + public static VisitorType instance = new VisitorType(); + + public static VisitorType getInstance() { + return instance; + } public static List<String> mVisitorTypeList; public static Map<String, String> idMap = new HashMap<String, String>(); - public static void loadAll() { + public void loadAll() { loadVisitorTypeList(); } - private static void loadVisitorTypeList() { + private void loadVisitorTypeList() { RequestParams params = new RequestParams(AppApi.BASEURL+AppApi.VISITOR_TYPE_LIST); x.http().get(params, new BaseCommonCallBack() { public void success() { @@ -39,10 +46,6 @@ } }); - } - - public static String getId(String name) { - return idMap.get(name); } } diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/RegisterFragment.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/RegisterFragment.java index 7fe037d..535202d 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/RegisterFragment.java +++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/RegisterFragment.java @@ -10,26 +10,18 @@ import com.bsk.zhangbo.demoforbsk.R; import com.bsk.zhangbo.demoforbsk.base.BaseFragment; -import com.bsk.zhangbo.demoforbsk.com.bsk.zhangbo.demoforbsk.service.DictionaryService; -import com.bsk.zhangbo.demoforbsk.com.bsk.zhangbo.demoforbsk.service.VisitorTypeService; +import com.bsk.zhangbo.demoforbsk.com.bsk.zhangbo.demoforbsk.service.DictionaryMng; +import com.bsk.zhangbo.demoforbsk.com.bsk.zhangbo.demoforbsk.service.VisitorTypeMng; import com.bsk.zhangbo.demoforbsk.listeners.OkButtonClickedListener; -import com.bsk.zhangbo.demoforbsk.util.AppApi; import com.bsk.zhangbo.demoforbsk.widget.BirthdayPickerDialog; import com.bsk.zhangbo.demoforbsk.widget.CountrySelectionPopup; import com.bsk.zhangbo.demoforbsk.widget.SingleSelectionPopup; -import org.xutils.http.RequestParams; -import org.xutils.x; - -import java.util.ArrayList; import java.util.Calendar; import java.util.Date; import java.util.List; -import cn.com.basic.face.discern.common.BaseCommonCallBack; -import cn.com.basic.face.discern.common.CommonVariables; -import cn.com.basic.face.discern.entity.Dictionary; -import cn.com.basic.face.discern.query.item.VistorTypeQueryItem; +import cn.com.basic.face.discern.entity.Person; /** * Created by Administrator on 2017/2/20 0020. @@ -38,8 +30,8 @@ public class RegisterFragment extends BaseFragment implements View.OnClickListener{ private View mViewName,mViewSex,mViewNation,mViewBirthday,mViewVisitorClass,mViewPhone,mViewIdClass,mViewIdNumber,mViewCompayName,mViewRemark; - private TextView mViewNameTitle,mViewSexTitle,mViewNationTitle,mViewBirthdyTitle,mViewIdClassContent,mViewSexContent,mViewNationContent,mViewBirthdyContent,mViewVisitorClassContent,mViewVisitorClassTitle,mViewPhoneTitle,mViewIdClassTitle,mViewIdNumberTitle,mViewCompanyNameTitle,mViewRemarkTitle; - private EditText mViewNameContent,mViewPhoneContent,mViewIdNumberContent,mViewCompanyNameContent,mViewRemarkContent; + private TextView mViewNameTitle,mViewSexTitle,mViewNationTitle,mViewBirthdyTitle, mViewIdentityTypeContent, mViewGenderContent, mViewCountryContent,mViewBirthdyContent,mViewVisitorClassContent,mViewVisitorClassTitle,mViewPhoneTitle,mViewIdClassTitle,mViewIdNumberTitle,mViewCompanyNameTitle,mViewRemarkTitle; + private EditText mViewNameContent,mViewPhoneContent, mViewIdentityContent,mViewCompanyNameContent,mViewRemarkContent; private List mSexList; private List mVisitorTypeList; private List mCredentialsList; @@ -81,16 +73,16 @@ mViewIdNumberTitle = (TextView) mViewIdNumber.findViewById(R.id.register_et_title); mViewCompanyNameTitle = (TextView) mViewCompayName.findViewById(R.id.register_et_title); mViewRemarkTitle = (TextView) mViewRemark.findViewById(R.id.register_et_title); - mViewSexContent = (TextView) mViewSex.findViewById(R.id.register_tv_content); - mViewNationContent = (TextView) mViewNation.findViewById(R.id.register_tv_content); + mViewGenderContent = (TextView) mViewSex.findViewById(R.id.register_tv_content); + mViewCountryContent = (TextView) mViewNation.findViewById(R.id.register_tv_content); mViewBirthdyContent= (TextView) mViewBirthday.findViewById(R.id.register_tv_content); mViewVisitorClassContent = (TextView) mViewVisitorClass.findViewById(R.id.register_tv_content); - mViewIdClassContent= (TextView) mViewIdClass.findViewById(R.id.register_tv_content); + mViewIdentityTypeContent = (TextView) mViewIdClass.findViewById(R.id.register_tv_content); mViewNameContent = (EditText) mViewName.findViewById(R.id.register_et_content); mViewPhoneContent = (EditText) mViewPhone.findViewById(R.id.register_et_content); - mViewIdNumberContent = (EditText) mViewIdNumber.findViewById(R.id.register_et_content); + mViewIdentityContent = (EditText) mViewIdNumber.findViewById(R.id.register_et_content); mViewCompanyNameContent = (EditText) mViewCompayName.findViewById(R.id.register_et_content); mViewRemarkContent = (EditText) mViewRemark.findViewById(R.id.register_et_content); @@ -111,6 +103,19 @@ mNowDay = calendar.get(Calendar.DAY_OF_MONTH); } + public void save() { + Person person = new Person(); +// person.setBirthday(mViewBirthdyContent.getText()); + person.setName(mViewNameContent.getText().toString()); + person.setPhone(mViewPhoneContent.getText().toString()); + person.setGender(DictionaryMng.getInstance().getId(mViewGenderContent.getText().toString())); + person.setIdentityType(DictionaryMng.getInstance().getId(mViewIdentityTypeContent.getText().toString())); + person.setCountry(DictionaryMng.getInstance().getId(mViewCountryContent.getText().toString())); + person.setIdentify(mViewIdentityContent.getText().toString()); + person.setBirthday(mViewBirthdyContent.getText().toString()); + //person.setCompanyId(); + } + @Override protected void initToolbar(Bundle savedInstanceState) { @@ -127,10 +132,10 @@ @Override protected void initData() { - mVisitorTypeList = VisitorTypeService.mVisitorTypeList; - mSexList = DictionaryService.mSexList; - mCredentialsList = DictionaryService.mCredentialsList; - mNationList = DictionaryService.nationList; + mVisitorTypeList = VisitorTypeMng.mVisitorTypeList; + mSexList = DictionaryMng.mSexList; + mCredentialsList = DictionaryMng.mCredentialsList; + mNationList = DictionaryMng.nationList; } @Override @@ -142,7 +147,7 @@ popup.addOkButtonClickedListener(new OkButtonClickedListener() { @Override public void onItemSelected(int position, Object o, String item) { - mViewSexContent.setText(item); + mViewGenderContent.setText(item); } }); break; @@ -152,7 +157,7 @@ countrySelectionPopup.addOkButtonClickedListener(new OkButtonClickedListener() { @Override public void onItemSelected(int position, Object o, String item) { - mViewNationContent.setText(item); + mViewCountryContent.setText(item); } }); break; @@ -175,7 +180,7 @@ popup2.addOkButtonClickedListener(new OkButtonClickedListener() { @Override public void onItemSelected(int position, Object o, String item) { - mViewIdClassContent.setText(item); + mViewIdentityTypeContent.setText(item); } }); break; diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/widget/CountrySelectionPopup.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/widget/CountrySelectionPopup.java index 2eef314..9b22f5e 100644 --- a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/widget/CountrySelectionPopup.java +++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/widget/CountrySelectionPopup.java @@ -1,44 +1,27 @@ package com.bsk.zhangbo.demoforbsk.widget; import android.content.Context; -import android.content.res.AssetManager; -import android.graphics.Bitmap; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; -import android.os.Handler; -import android.os.Message; import android.support.v7.widget.AppCompatTextView; -import android.util.Log; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; import android.widget.PopupWindow; import android.widget.RelativeLayout; import android.widget.TextView; -import android.widget.Toast; import com.bsk.zhangbo.demoforbsk.R; import com.bsk.zhangbo.demoforbsk.adapter.MyWheelAdapter; -import com.bsk.zhangbo.demoforbsk.com.bsk.zhangbo.demoforbsk.service.DictionaryService; +import com.bsk.zhangbo.demoforbsk.com.bsk.zhangbo.demoforbsk.service.DictionaryMng; import com.bsk.zhangbo.demoforbsk.listeners.OkButtonClickedListener; -import com.bsk.zhangbo.demoforbsk.util.AppApi; import com.bsk.zhangbo.demoforbsk.util.CountryPresenter; import com.wx.wheelview.widget.WheelView; -import net.sourceforge.pinyin4j.PinyinHelper; - -import org.xutils.http.RequestParams; -import org.xutils.x; - import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.List; - -import cn.com.basic.face.discern.common.BaseCommonCallBack; -import cn.com.basic.face.discern.common.CommonVariables; -import cn.com.basic.face.discern.entity.Dictionary; /** * Created by Sinoe on 2017/2/28. @@ -68,9 +51,9 @@ mTvCancel.setOnClickListener(this); mTvConfirm.setOnClickListener(this); - String[] countryWordData = DictionaryService.countryWordData; - countryWordList = DictionaryService.countryWordList; - countryData = DictionaryService.countryData; + String[] countryWordData = DictionaryMng.countryWordData; + countryWordList = DictionaryMng.countryWordList; + countryData = DictionaryMng.countryData; countryList = countryData.get(countryWordList.get(mWheelViewTitle.getSelection())); -- Gitblit v1.8.0