diff --git a/common-lib/src/main/java/com/mortals/xhx/common/pdu/user/UserPdu.java b/common-lib/src/main/java/com/mortals/xhx/common/pdu/user/UserPdu.java
new file mode 100644
index 0000000000000000000000000000000000000000..d914c64596d7371af6981296698bb9289e867db8
--- /dev/null
+++ b/common-lib/src/main/java/com/mortals/xhx/common/pdu/user/UserPdu.java
@@ -0,0 +1,1403 @@
+package com.mortals.xhx.common.pdu.user;
+import java.util.Date;
+import java.util.List;
+import com.mortals.framework.model.BaseEntityLong;
+
+/**
+* 鐢ㄦ埛淇℃伅涓氬姟Pdu瀵硅薄
+*
+* @author zxfei
+* @date 2022-07-06
+*/
+
+public class UserPdu extends BaseEntityLong {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 鐧诲綍鍚�
+ */
+ private String loginName;
+ /**
+ * 鐧诲綍瀵嗙爜锛屼娇鐢╩d5鍙屾鍔犲瘑
+ */
+ private String loginPwd;
+
+ private String password;
+
+ private String securityCode;
+ /**
+ * 鐧诲綍闄愬埗鍦板潃锛屽涓狪P鍦板潃鐢ㄩ€楀彿鍒嗛殧锛屽彲浠ヤ娇鐢↖P娈靛尮閰嶏紝濡傦細172.17.*闈炵┖锛氬垯鍙兘璇ュ€煎唴鐨処P鍙互鐧诲綍
+ */
+ private String loginLimitAddress;
+ /**
+ * 鐢ㄦ埛鍚�
+ */
+ private String realName;
+ /**
+ * 鐢ㄦ埛鎵嬫満鍙�
+ */
+ private String mobile;
+ /**
+ * 鐢ㄦ埛鑱旂郴鐢佃瘽
+ */
+ private String phone;
+ /**
+ * 鐢ㄦ埛閭
+ */
+ private String email;
+ /**
+ * QQ鍙风爜
+ */
+ private String qq;
+ /**
+ * 鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳)
+ */
+ private Integer userType;
+ /**
+ * 鎵€灞炵珯鐐筰d,澶氫釜閫楀彿鍒嗛殧
+ */
+ private String siteIds;
+ /**
+ * 鎵€灞炲尯鍩焎ode,澶氫釜閫楀彿鍒嗛殧
+ */
+ private String areaCodes;
+ /**
+ * 鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝ｅ父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴)
+ */
+ private Integer status;
+ /**
+ * 鍒涘缓鐢ㄦ埛鍚嶇О
+ */
+ private String createUserName;
+ /**
+ * 鏈€鍚庝竴娆＄櫥褰曟椂闂�
+ */
+ private Date lastLoginTime;
+ /**
+ * 鏈€鍚庝竴娆＄櫥褰曞湴鍧€
+ */
+ private String lastLoginAddress;
+
+ /** 寮€濮� 鐢ㄦ埛ID锛屼富閿紝鑷闀� */
+ private Long idStart;
+
+ /** 缁撴潫 鐢ㄦ埛ID锛屼富閿紝鑷闀� */
+ private Long idEnd;
+
+ /** 澧炲姞 鐢ㄦ埛ID锛屼富閿紝鑷闀� */
+ private Long idIncrement;
+
+ /** 鐢ㄦ埛ID锛屼富閿紝鑷闀垮垪琛� */
+ private List <Long> idList;
+
+ /** 鐧诲綍鍚� */
+ private List<String> loginNameList;
+
+ /** 鐧诲綍瀵嗙爜锛屼娇鐢╩d5鍙屾鍔犲瘑 */
+ private List<String> loginPwdList;
+
+ /** 鐧诲綍闄愬埗鍦板潃锛屽涓狪P鍦板潃鐢ㄩ€楀彿鍒嗛殧锛屽彲浠ヤ娇鐢↖P娈靛尮閰嶏紝濡傦細172.17.*闈炵┖锛氬垯鍙兘璇ュ€煎唴鐨処P鍙互鐧诲綍 */
+ private List<String> loginLimitAddressList;
+
+ /** 鐢ㄦ埛鍚� */
+ private List<String> realNameList;
+
+ /** 鐢ㄦ埛鎵嬫満鍙� */
+ private List<String> mobileList;
+
+ /** 鐢ㄦ埛鑱旂郴鐢佃瘽 */
+ private List<String> phoneList;
+
+ /** 鐢ㄦ埛閭 */
+ private List<String> emailList;
+
+ /** QQ鍙风爜 */
+ private List<String> qqList;
+
+ /** 寮€濮� 鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳) */
+ private Integer userTypeStart;
+
+ /** 缁撴潫 鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳) */
+ private Integer userTypeEnd;
+
+ /** 澧炲姞 鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳) */
+ private Integer userTypeIncrement;
+
+ /** 鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳)鍒楄〃 */
+ private List <Integer> userTypeList;
+
+ /** 鎵€灞炵珯鐐筰d,澶氫釜閫楀彿鍒嗛殧 */
+ private List<String> siteIdsList;
+
+ /** 鎵€灞炲尯鍩焎ode,澶氫釜閫楀彿鍒嗛殧 */
+ private List<String> areaCodesList;
+
+ /** 寮€濮� 鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝ｅ父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴) */
+ private Integer statusStart;
+
+ /** 缁撴潫 鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝ｅ父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴) */
+ private Integer statusEnd;
+
+ /** 澧炲姞 鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝ｅ父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴) */
+ private Integer statusIncrement;
+
+ /** 鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝ｅ父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴)鍒楄〃 */
+ private List <Integer> statusList;
+
+ /** 寮€濮� 鍒涘缓鏃堕棿 */
+ private String createTimeStart;
+
+ /** 缁撴潫 鍒涘缓鏃堕棿 */
+ private String createTimeEnd;
+
+ /** 寮€濮� 鍒涘缓鐢ㄦ埛 */
+ private Long createUserIdStart;
+
+ /** 缁撴潫 鍒涘缓鐢ㄦ埛 */
+ private Long createUserIdEnd;
+
+ /** 澧炲姞 鍒涘缓鐢ㄦ埛 */
+ private Long createUserIdIncrement;
+
+ /** 鍒涘缓鐢ㄦ埛鍒楄〃 */
+ private List <Long> createUserIdList;
+
+ /** 鍒涘缓鐢ㄦ埛鍚嶇О */
+ private List<String> createUserNameList;
+
+ /** 寮€濮� 鏈€鍚庝竴娆＄櫥褰曟椂闂� */
+ private String lastLoginTimeStart;
+
+ /** 缁撴潫 鏈€鍚庝竴娆＄櫥褰曟椂闂� */
+ private String lastLoginTimeEnd;
+
+ /** 鏈€鍚庝竴娆＄櫥褰曞湴鍧€ */
+ private List<String> lastLoginAddressList;
+
+
+ /** OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
+ private List<UserPdu> orConditionList;
+
+ /** AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+ private List<UserPdu> andConditionList;
+
+ public UserPdu(){}
+ /**
+ * 鑾峰彇 鐧诲綍鍚�
+ * @return String
+ */
+ public String getLoginName(){
+ return loginName;
+ }
+ /**
+ * 璁剧疆 鐧诲綍鍚�
+ * @param loginName
+ */
+ public void setLoginName(String loginName){
+ this.loginName = loginName;
+ }
+ /**
+ * 鑾峰彇 鐧诲綍瀵嗙爜锛屼娇鐢╩d5鍙屾鍔犲瘑
+ * @return String
+ */
+ public String getLoginPwd(){
+ return loginPwd;
+ }
+ /**
+ * 璁剧疆 鐧诲綍瀵嗙爜锛屼娇鐢╩d5鍙屾鍔犲瘑
+ * @param loginPwd
+ */
+ public void setLoginPwd(String loginPwd){
+ this.loginPwd = loginPwd;
+ }
+ /**
+ * 鑾峰彇 鐧诲綍闄愬埗鍦板潃锛屽涓狪P鍦板潃鐢ㄩ€楀彿鍒嗛殧锛屽彲浠ヤ娇鐢↖P娈靛尮閰嶏紝濡傦細172.17.*闈炵┖锛氬垯鍙兘璇ュ€煎唴鐨処P鍙互鐧诲綍
+ * @return String
+ */
+ public String getLoginLimitAddress(){
+ return loginLimitAddress;
+ }
+ /**
+ * 璁剧疆 鐧诲綍闄愬埗鍦板潃锛屽涓狪P鍦板潃鐢ㄩ€楀彿鍒嗛殧锛屽彲浠ヤ娇鐢↖P娈靛尮閰嶏紝濡傦細172.17.*闈炵┖锛氬垯鍙兘璇ュ€煎唴鐨処P鍙互鐧诲綍
+ * @param loginLimitAddress
+ */
+ public void setLoginLimitAddress(String loginLimitAddress){
+ this.loginLimitAddress = loginLimitAddress;
+ }
+ /**
+ * 鑾峰彇 鐢ㄦ埛鍚�
+ * @return String
+ */
+ public String getRealName(){
+ return realName;
+ }
+ /**
+ * 璁剧疆 鐢ㄦ埛鍚�
+ * @param realName
+ */
+ public void setRealName(String realName){
+ this.realName = realName;
+ }
+ /**
+ * 鑾峰彇 鐢ㄦ埛鎵嬫満鍙�
+ * @return String
+ */
+ public String getMobile(){
+ return mobile;
+ }
+ /**
+ * 璁剧疆 鐢ㄦ埛鎵嬫満鍙�
+ * @param mobile
+ */
+ public void setMobile(String mobile){
+ this.mobile = mobile;
+ }
+ /**
+ * 鑾峰彇 鐢ㄦ埛鑱旂郴鐢佃瘽
+ * @return String
+ */
+ public String getPhone(){
+ return phone;
+ }
+ /**
+ * 璁剧疆 鐢ㄦ埛鑱旂郴鐢佃瘽
+ * @param phone
+ */
+ public void setPhone(String phone){
+ this.phone = phone;
+ }
+ /**
+ * 鑾峰彇 鐢ㄦ埛閭
+ * @return String
+ */
+ public String getEmail(){
+ return email;
+ }
+ /**
+ * 璁剧疆 鐢ㄦ埛閭
+ * @param email
+ */
+ public void setEmail(String email){
+ this.email = email;
+ }
+ /**
+ * 鑾峰彇 QQ鍙风爜
+ * @return String
+ */
+ public String getQq(){
+ return qq;
+ }
+ /**
+ * 璁剧疆 QQ鍙风爜
+ * @param qq
+ */
+ public void setQq(String qq){
+ this.qq = qq;
+ }
+ /**
+ * 鑾峰彇 鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳)
+ * @return Integer
+ */
+ public Integer getUserType(){
+ return userType;
+ }
+ /**
+ * 璁剧疆 鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳)
+ * @param userType
+ */
+ public void setUserType(Integer userType){
+ this.userType = userType;
+ }
+ /**
+ * 鑾峰彇 鎵€灞炵珯鐐筰d,澶氫釜閫楀彿鍒嗛殧
+ * @return String
+ */
+ public String getSiteIds(){
+ return siteIds;
+ }
+ /**
+ * 璁剧疆 鎵€灞炵珯鐐筰d,澶氫釜閫楀彿鍒嗛殧
+ * @param siteIds
+ */
+ public void setSiteIds(String siteIds){
+ this.siteIds = siteIds;
+ }
+ /**
+ * 鑾峰彇 鎵€灞炲尯鍩焎ode,澶氫釜閫楀彿鍒嗛殧
+ * @return String
+ */
+ public String getAreaCodes(){
+ return areaCodes;
+ }
+ /**
+ * 璁剧疆 鎵€灞炲尯鍩焎ode,澶氫釜閫楀彿鍒嗛殧
+ * @param areaCodes
+ */
+ public void setAreaCodes(String areaCodes){
+ this.areaCodes = areaCodes;
+ }
+ /**
+ * 鑾峰彇 鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝ｅ父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴)
+ * @return Integer
+ */
+ public Integer getStatus(){
+ return status;
+ }
+ /**
+ * 璁剧疆 鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝ｅ父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴)
+ * @param status
+ */
+ public void setStatus(Integer status){
+ this.status = status;
+ }
+ /**
+ * 鑾峰彇 鍒涘缓鐢ㄦ埛鍚嶇О
+ * @return String
+ */
+ public String getCreateUserName(){
+ return createUserName;
+ }
+ /**
+ * 璁剧疆 鍒涘缓鐢ㄦ埛鍚嶇О
+ * @param createUserName
+ */
+ public void setCreateUserName(String createUserName){
+ this.createUserName = createUserName;
+ }
+ /**
+ * 鑾峰彇 鏈€鍚庝竴娆＄櫥褰曟椂闂�
+ * @return Date
+ */
+ public Date getLastLoginTime(){
+ return lastLoginTime;
+ }
+ /**
+ * 璁剧疆 鏈€鍚庝竴娆＄櫥褰曟椂闂�
+ * @param lastLoginTime
+ */
+ public void setLastLoginTime(Date lastLoginTime){
+ this.lastLoginTime = lastLoginTime;
+ }
+ /**
+ * 鑾峰彇 鏈€鍚庝竴娆＄櫥褰曞湴鍧€
+ * @return String
+ */
+ public String getLastLoginAddress(){
+ return lastLoginAddress;
+ }
+ /**
+ * 璁剧疆 鏈€鍚庝竴娆＄櫥褰曞湴鍧€
+ * @param lastLoginAddress
+ */
+ public void setLastLoginAddress(String lastLoginAddress){
+ this.lastLoginAddress = lastLoginAddress;
+ }
+
+ /**
+ * 鑾峰彇 寮€濮� 鐢ㄦ埛ID锛屼富閿紝鑷闀�
+ * @return idStart
+ */
+ public Long getIdStart(){
+ return this.idStart;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鐢ㄦ埛ID锛屼富閿紝鑷闀�
+ * @param idStart
+ */
+ public void setIdStart(Long idStart){
+ this.idStart = idStart;
+ }
+
+ /**
+ * 鑾峰彇 缁撴潫 鐢ㄦ埛ID锛屼富閿紝鑷闀�
+ * @return $idEnd
+ */
+ public Long getIdEnd(){
+ return this.idEnd;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 鐢ㄦ埛ID锛屼富閿紝鑷闀�
+ * @param idEnd
+ */
+ public void setIdEnd(Long idEnd){
+ this.idEnd = idEnd;
+ }
+
+ /**
+ * 鑾峰彇 澧炲姞 鐢ㄦ埛ID锛屼富閿紝鑷闀�
+ * @return idIncrement
+ */
+ public Long getIdIncrement(){
+ return this.idIncrement;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 鐢ㄦ埛ID锛屼富閿紝鑷闀�
+ * @param idIncrement
+ */
+ public void setIdIncrement(Long idIncrement){
+ this.idIncrement = idIncrement;
+ }
+
+ /**
+ * 鑾峰彇 鐢ㄦ埛ID锛屼富閿紝鑷闀�
+ * @return idList
+ */
+ public List<Long> getIdList(){
+ return this.idList;
+ }
+
+ /**
+ * 璁剧疆 鐢ㄦ埛ID锛屼富閿紝鑷闀�
+ * @param idList
+ */
+ public void setIdList(List<Long> idList){
+ this.idList = idList;
+ }
+
+ /**
+ * 鑾峰彇 鐧诲綍鍚�
+ * @return loginNameList
+ */
+ public List<String> getLoginNameList(){
+ return this.loginNameList;
+ }
+
+ /**
+ * 璁剧疆 鐧诲綍鍚�
+ * @param loginNameList
+ */
+ public void setLoginNameList(List<String> loginNameList){
+ this.loginNameList = loginNameList;
+ }
+ /**
+ * 鑾峰彇 鐧诲綍瀵嗙爜锛屼娇鐢╩d5鍙屾鍔犲瘑
+ * @return loginPwdList
+ */
+ public List<String> getLoginPwdList(){
+ return this.loginPwdList;
+ }
+
+ /**
+ * 璁剧疆 鐧诲綍瀵嗙爜锛屼娇鐢╩d5鍙屾鍔犲瘑
+ * @param loginPwdList
+ */
+ public void setLoginPwdList(List<String> loginPwdList){
+ this.loginPwdList = loginPwdList;
+ }
+ /**
+ * 鑾峰彇 鐧诲綍闄愬埗鍦板潃锛屽涓狪P鍦板潃鐢ㄩ€楀彿鍒嗛殧锛屽彲浠ヤ娇鐢↖P娈靛尮閰嶏紝濡傦細172.17.*闈炵┖锛氬垯鍙兘璇ュ€煎唴鐨処P鍙互鐧诲綍
+ * @return loginLimitAddressList
+ */
+ public List<String> getLoginLimitAddressList(){
+ return this.loginLimitAddressList;
+ }
+
+ /**
+ * 璁剧疆 鐧诲綍闄愬埗鍦板潃锛屽涓狪P鍦板潃鐢ㄩ€楀彿鍒嗛殧锛屽彲浠ヤ娇鐢↖P娈靛尮閰嶏紝濡傦細172.17.*闈炵┖锛氬垯鍙兘璇ュ€煎唴鐨処P鍙互鐧诲綍
+ * @param loginLimitAddressList
+ */
+ public void setLoginLimitAddressList(List<String> loginLimitAddressList){
+ this.loginLimitAddressList = loginLimitAddressList;
+ }
+ /**
+ * 鑾峰彇 鐢ㄦ埛鍚�
+ * @return realNameList
+ */
+ public List<String> getRealNameList(){
+ return this.realNameList;
+ }
+
+ /**
+ * 璁剧疆 鐢ㄦ埛鍚�
+ * @param realNameList
+ */
+ public void setRealNameList(List<String> realNameList){
+ this.realNameList = realNameList;
+ }
+ /**
+ * 鑾峰彇 鐢ㄦ埛鎵嬫満鍙�
+ * @return mobileList
+ */
+ public List<String> getMobileList(){
+ return this.mobileList;
+ }
+
+ /**
+ * 璁剧疆 鐢ㄦ埛鎵嬫満鍙�
+ * @param mobileList
+ */
+ public void setMobileList(List<String> mobileList){
+ this.mobileList = mobileList;
+ }
+ /**
+ * 鑾峰彇 鐢ㄦ埛鑱旂郴鐢佃瘽
+ * @return phoneList
+ */
+ public List<String> getPhoneList(){
+ return this.phoneList;
+ }
+
+ /**
+ * 璁剧疆 鐢ㄦ埛鑱旂郴鐢佃瘽
+ * @param phoneList
+ */
+ public void setPhoneList(List<String> phoneList){
+ this.phoneList = phoneList;
+ }
+ /**
+ * 鑾峰彇 鐢ㄦ埛閭
+ * @return emailList
+ */
+ public List<String> getEmailList(){
+ return this.emailList;
+ }
+
+ /**
+ * 璁剧疆 鐢ㄦ埛閭
+ * @param emailList
+ */
+ public void setEmailList(List<String> emailList){
+ this.emailList = emailList;
+ }
+ /**
+ * 鑾峰彇 QQ鍙风爜
+ * @return qqList
+ */
+ public List<String> getQqList(){
+ return this.qqList;
+ }
+
+ /**
+ * 璁剧疆 QQ鍙风爜
+ * @param qqList
+ */
+ public void setQqList(List<String> qqList){
+ this.qqList = qqList;
+ }
+ /**
+ * 鑾峰彇 寮€濮� 鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳)
+ * @return userTypeStart
+ */
+ public Integer getUserTypeStart(){
+ return this.userTypeStart;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳)
+ * @param userTypeStart
+ */
+ public void setUserTypeStart(Integer userTypeStart){
+ this.userTypeStart = userTypeStart;
+ }
+
+ /**
+ * 鑾峰彇 缁撴潫 鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳)
+ * @return $userTypeEnd
+ */
+ public Integer getUserTypeEnd(){
+ return this.userTypeEnd;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳)
+ * @param userTypeEnd
+ */
+ public void setUserTypeEnd(Integer userTypeEnd){
+ this.userTypeEnd = userTypeEnd;
+ }
+
+ /**
+ * 鑾峰彇 澧炲姞 鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳)
+ * @return userTypeIncrement
+ */
+ public Integer getUserTypeIncrement(){
+ return this.userTypeIncrement;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳)
+ * @param userTypeIncrement
+ */
+ public void setUserTypeIncrement(Integer userTypeIncrement){
+ this.userTypeIncrement = userTypeIncrement;
+ }
+
+ /**
+ * 鑾峰彇 鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳)
+ * @return userTypeList
+ */
+ public List<Integer> getUserTypeList(){
+ return this.userTypeList;
+ }
+
+ /**
+ * 璁剧疆 鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳)
+ * @param userTypeList
+ */
+ public void setUserTypeList(List<Integer> userTypeList){
+ this.userTypeList = userTypeList;
+ }
+
+ /**
+ * 鑾峰彇 鎵€灞炵珯鐐筰d,澶氫釜閫楀彿鍒嗛殧
+ * @return siteIdsList
+ */
+ public List<String> getSiteIdsList(){
+ return this.siteIdsList;
+ }
+
+ /**
+ * 璁剧疆 鎵€灞炵珯鐐筰d,澶氫釜閫楀彿鍒嗛殧
+ * @param siteIdsList
+ */
+ public void setSiteIdsList(List<String> siteIdsList){
+ this.siteIdsList = siteIdsList;
+ }
+ /**
+ * 鑾峰彇 鎵€灞炲尯鍩焎ode,澶氫釜閫楀彿鍒嗛殧
+ * @return areaCodesList
+ */
+ public List<String> getAreaCodesList(){
+ return this.areaCodesList;
+ }
+
+ /**
+ * 璁剧疆 鎵€灞炲尯鍩焎ode,澶氫釜閫楀彿鍒嗛殧
+ * @param areaCodesList
+ */
+ public void setAreaCodesList(List<String> areaCodesList){
+ this.areaCodesList = areaCodesList;
+ }
+ /**
+ * 鑾峰彇 寮€濮� 鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝ｅ父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴)
+ * @return statusStart
+ */
+ public Integer getStatusStart(){
+ return this.statusStart;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝ｅ父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴)
+ * @param statusStart
+ */
+ public void setStatusStart(Integer statusStart){
+ this.statusStart = statusStart;
+ }
+
+ /**
+ * 鑾峰彇 缁撴潫 鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝ｅ父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴)
+ * @return $statusEnd
+ */
+ public Integer getStatusEnd(){
+ return this.statusEnd;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝ｅ父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴)
+ * @param statusEnd
+ */
+ public void setStatusEnd(Integer statusEnd){
+ this.statusEnd = statusEnd;
+ }
+
+ /**
+ * 鑾峰彇 澧炲姞 鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝ｅ父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴)
+ * @return statusIncrement
+ */
+ public Integer getStatusIncrement(){
+ return this.statusIncrement;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝ｅ父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴)
+ * @param statusIncrement
+ */
+ public void setStatusIncrement(Integer statusIncrement){
+ this.statusIncrement = statusIncrement;
+ }
+
+ /**
+ * 鑾峰彇 鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝ｅ父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴)
+ * @return statusList
+ */
+ public List<Integer> getStatusList(){
+ return this.statusList;
+ }
+
+ /**
+ * 璁剧疆 鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝ｅ父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴)
+ * @param statusList
+ */
+ public void setStatusList(List<Integer> statusList){
+ this.statusList = statusList;
+ }
+
+ /**
+ * 鑾峰彇 寮€濮� 鍒涘缓鏃堕棿
+ * @return createTimeStart
+ */
+ public String getCreateTimeStart(){
+ return this.createTimeStart;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鍒涘缓鏃堕棿
+ * @param createTimeStart
+ */
+ public void setCreateTimeStart(String createTimeStart){
+ this.createTimeStart = createTimeStart;
+ }
+
+ /**
+ * 鑾峰彇 缁撴潫 鍒涘缓鏃堕棿
+ * @return createTimeEnd
+ */
+ public String getCreateTimeEnd(){
+ return this.createTimeEnd;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 鍒涘缓鏃堕棿
+ * @param createTimeEnd
+ */
+ public void setCreateTimeEnd(String createTimeEnd){
+ this.createTimeEnd = createTimeEnd;
+ }
+
+ /**
+ * 鑾峰彇 寮€濮� 鍒涘缓鐢ㄦ埛
+ * @return createUserIdStart
+ */
+ public Long getCreateUserIdStart(){
+ return this.createUserIdStart;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛
+ * @param createUserIdStart
+ */
+ public void setCreateUserIdStart(Long createUserIdStart){
+ this.createUserIdStart = createUserIdStart;
+ }
+
+ /**
+ * 鑾峰彇 缁撴潫 鍒涘缓鐢ㄦ埛
+ * @return $createUserIdEnd
+ */
+ public Long getCreateUserIdEnd(){
+ return this.createUserIdEnd;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛
+ * @param createUserIdEnd
+ */
+ public void setCreateUserIdEnd(Long createUserIdEnd){
+ this.createUserIdEnd = createUserIdEnd;
+ }
+
+ /**
+ * 鑾峰彇 澧炲姞 鍒涘缓鐢ㄦ埛
+ * @return createUserIdIncrement
+ */
+ public Long getCreateUserIdIncrement(){
+ return this.createUserIdIncrement;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛
+ * @param createUserIdIncrement
+ */
+ public void setCreateUserIdIncrement(Long createUserIdIncrement){
+ this.createUserIdIncrement = createUserIdIncrement;
+ }
+
+ /**
+ * 鑾峰彇 鍒涘缓鐢ㄦ埛
+ * @return createUserIdList
+ */
+ public List<Long> getCreateUserIdList(){
+ return this.createUserIdList;
+ }
+
+ /**
+ * 璁剧疆 鍒涘缓鐢ㄦ埛
+ * @param createUserIdList
+ */
+ public void setCreateUserIdList(List<Long> createUserIdList){
+ this.createUserIdList = createUserIdList;
+ }
+
+ /**
+ * 鑾峰彇 鍒涘缓鐢ㄦ埛鍚嶇О
+ * @return createUserNameList
+ */
+ public List<String> getCreateUserNameList(){
+ return this.createUserNameList;
+ }
+
+ /**
+ * 璁剧疆 鍒涘缓鐢ㄦ埛鍚嶇О
+ * @param createUserNameList
+ */
+ public void setCreateUserNameList(List<String> createUserNameList){
+ this.createUserNameList = createUserNameList;
+ }
+ /**
+ * 鑾峰彇 寮€濮� 鏈€鍚庝竴娆＄櫥褰曟椂闂�
+ * @return lastLoginTimeStart
+ */
+ public String getLastLoginTimeStart(){
+ return this.lastLoginTimeStart;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鏈€鍚庝竴娆＄櫥褰曟椂闂�
+ * @param lastLoginTimeStart
+ */
+ public void setLastLoginTimeStart(String lastLoginTimeStart){
+ this.lastLoginTimeStart = lastLoginTimeStart;
+ }
+
+ /**
+ * 鑾峰彇 缁撴潫 鏈€鍚庝竴娆＄櫥褰曟椂闂�
+ * @return lastLoginTimeEnd
+ */
+ public String getLastLoginTimeEnd(){
+ return this.lastLoginTimeEnd;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 鏈€鍚庝竴娆＄櫥褰曟椂闂�
+ * @param lastLoginTimeEnd
+ */
+ public void setLastLoginTimeEnd(String lastLoginTimeEnd){
+ this.lastLoginTimeEnd = lastLoginTimeEnd;
+ }
+
+ /**
+ * 鑾峰彇 鏈€鍚庝竴娆＄櫥褰曞湴鍧€
+ * @return lastLoginAddressList
+ */
+ public List<String> getLastLoginAddressList(){
+ return this.lastLoginAddressList;
+ }
+
+ /**
+ * 璁剧疆 鏈€鍚庝竴娆＄櫥褰曞湴鍧€
+ * @param lastLoginAddressList
+ */
+ public void setLastLoginAddressList(List<String> lastLoginAddressList){
+ this.lastLoginAddressList = lastLoginAddressList;
+ }
+ /**
+ * 璁剧疆 鐢ㄦ埛ID锛屼富閿紝鑷闀�
+ * @param id
+ */
+ public UserPdu id(Long id){
+ setId(id);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鐢ㄦ埛ID锛屼富閿紝鑷闀�
+ * @param idStart
+ */
+ public UserPdu idStart(Long idStart){
+ this.idStart = idStart;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 鐢ㄦ埛ID锛屼富閿紝鑷闀�
+ * @param idEnd
+ */
+ public UserPdu idEnd(Long idEnd){
+ this.idEnd = idEnd;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 鐢ㄦ埛ID锛屼富閿紝鑷闀�
+ * @param idIncrement
+ */
+ public UserPdu idIncrement(Long idIncrement){
+ this.idIncrement = idIncrement;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鐢ㄦ埛ID锛屼富閿紝鑷闀�
+ * @param idList
+ */
+ public UserPdu idList(List<Long> idList){
+ this.idList = idList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 鐧诲綍鍚�
+ * @param loginName
+ */
+ public UserPdu loginName(String loginName){
+ setLoginName(loginName);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鐧诲綍鍚�
+ * @param loginNameList
+ */
+ public UserPdu loginNameList(List<String> loginNameList){
+ this.loginNameList = loginNameList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 鐧诲綍瀵嗙爜锛屼娇鐢╩d5鍙屾鍔犲瘑
+ * @param loginPwd
+ */
+ public UserPdu loginPwd(String loginPwd){
+ setLoginPwd(loginPwd);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鐧诲綍瀵嗙爜锛屼娇鐢╩d5鍙屾鍔犲瘑
+ * @param loginPwdList
+ */
+ public UserPdu loginPwdList(List<String> loginPwdList){
+ this.loginPwdList = loginPwdList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 鐧诲綍闄愬埗鍦板潃锛屽涓狪P鍦板潃鐢ㄩ€楀彿鍒嗛殧锛屽彲浠ヤ娇鐢↖P娈靛尮閰嶏紝濡傦細172.17.*闈炵┖锛氬垯鍙兘璇ュ€煎唴鐨処P鍙互鐧诲綍
+ * @param loginLimitAddress
+ */
+ public UserPdu loginLimitAddress(String loginLimitAddress){
+ setLoginLimitAddress(loginLimitAddress);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鐧诲綍闄愬埗鍦板潃锛屽涓狪P鍦板潃鐢ㄩ€楀彿鍒嗛殧锛屽彲浠ヤ娇鐢↖P娈靛尮閰嶏紝濡傦細172.17.*闈炵┖锛氬垯鍙兘璇ュ€煎唴鐨処P鍙互鐧诲綍
+ * @param loginLimitAddressList
+ */
+ public UserPdu loginLimitAddressList(List<String> loginLimitAddressList){
+ this.loginLimitAddressList = loginLimitAddressList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 鐢ㄦ埛鍚�
+ * @param realName
+ */
+ public UserPdu realName(String realName){
+ setRealName(realName);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鐢ㄦ埛鍚�
+ * @param realNameList
+ */
+ public UserPdu realNameList(List<String> realNameList){
+ this.realNameList = realNameList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 鐢ㄦ埛鎵嬫満鍙�
+ * @param mobile
+ */
+ public UserPdu mobile(String mobile){
+ setMobile(mobile);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鐢ㄦ埛鎵嬫満鍙�
+ * @param mobileList
+ */
+ public UserPdu mobileList(List<String> mobileList){
+ this.mobileList = mobileList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 鐢ㄦ埛鑱旂郴鐢佃瘽
+ * @param phone
+ */
+ public UserPdu phone(String phone){
+ setPhone(phone);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鐢ㄦ埛鑱旂郴鐢佃瘽
+ * @param phoneList
+ */
+ public UserPdu phoneList(List<String> phoneList){
+ this.phoneList = phoneList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 鐢ㄦ埛閭
+ * @param email
+ */
+ public UserPdu email(String email){
+ setEmail(email);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鐢ㄦ埛閭
+ * @param emailList
+ */
+ public UserPdu emailList(List<String> emailList){
+ this.emailList = emailList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 QQ鍙风爜
+ * @param qq
+ */
+ public UserPdu qq(String qq){
+ setQq(qq);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 QQ鍙风爜
+ * @param qqList
+ */
+ public UserPdu qqList(List<String> qqList){
+ this.qqList = qqList;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳)
+ * @param userType
+ */
+ public UserPdu userType(Integer userType){
+ setUserType(userType);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳)
+ * @param userTypeStart
+ */
+ public UserPdu userTypeStart(Integer userTypeStart){
+ this.userTypeStart = userTypeStart;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳)
+ * @param userTypeEnd
+ */
+ public UserPdu userTypeEnd(Integer userTypeEnd){
+ this.userTypeEnd = userTypeEnd;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳)
+ * @param userTypeIncrement
+ */
+ public UserPdu userTypeIncrement(Integer userTypeIncrement){
+ this.userTypeIncrement = userTypeIncrement;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳)
+ * @param userTypeList
+ */
+ public UserPdu userTypeList(List<Integer> userTypeList){
+ this.userTypeList = userTypeList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 鎵€灞炵珯鐐筰d,澶氫釜閫楀彿鍒嗛殧
+ * @param siteIds
+ */
+ public UserPdu siteIds(String siteIds){
+ setSiteIds(siteIds);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鎵€灞炵珯鐐筰d,澶氫釜閫楀彿鍒嗛殧
+ * @param siteIdsList
+ */
+ public UserPdu siteIdsList(List<String> siteIdsList){
+ this.siteIdsList = siteIdsList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 鎵€灞炲尯鍩焎ode,澶氫釜閫楀彿鍒嗛殧
+ * @param areaCodes
+ */
+ public UserPdu areaCodes(String areaCodes){
+ setAreaCodes(areaCodes);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鎵€灞炲尯鍩焎ode,澶氫釜閫楀彿鍒嗛殧
+ * @param areaCodesList
+ */
+ public UserPdu areaCodesList(List<String> areaCodesList){
+ this.areaCodesList = areaCodesList;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝ｅ父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴)
+ * @param status
+ */
+ public UserPdu status(Integer status){
+ setStatus(status);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝ｅ父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴)
+ * @param statusStart
+ */
+ public UserPdu statusStart(Integer statusStart){
+ this.statusStart = statusStart;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝ｅ父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴)
+ * @param statusEnd
+ */
+ public UserPdu statusEnd(Integer statusEnd){
+ this.statusEnd = statusEnd;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝ｅ父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴)
+ * @param statusIncrement
+ */
+ public UserPdu statusIncrement(Integer statusIncrement){
+ this.statusIncrement = statusIncrement;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝ｅ父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴)
+ * @param statusList
+ */
+ public UserPdu statusList(List<Integer> statusList){
+ this.statusList = statusList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 鍒涘缓鐢ㄦ埛
+ * @param createUserId
+ */
+ public UserPdu createUserId(Long createUserId){
+ setCreateUserId(createUserId);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮€濮� 鍒涘缓鐢ㄦ埛
+ * @param createUserIdStart
+ */
+ public UserPdu createUserIdStart(Long createUserIdStart){
+ this.createUserIdStart = createUserIdStart;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 缁撴潫 鍒涘缓鐢ㄦ埛
+ * @param createUserIdEnd
+ */
+ public UserPdu createUserIdEnd(Long createUserIdEnd){
+ this.createUserIdEnd = createUserIdEnd;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 澧炲姞 鍒涘缓鐢ㄦ埛
+ * @param createUserIdIncrement
+ */
+ public UserPdu createUserIdIncrement(Long createUserIdIncrement){
+ this.createUserIdIncrement = createUserIdIncrement;
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鍒涘缓鐢ㄦ埛
+ * @param createUserIdList
+ */
+ public UserPdu createUserIdList(List<Long> createUserIdList){
+ this.createUserIdList = createUserIdList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 鍒涘缓鐢ㄦ埛鍚嶇О
+ * @param createUserName
+ */
+ public UserPdu createUserName(String createUserName){
+ setCreateUserName(createUserName);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鍒涘缓鐢ㄦ埛鍚嶇О
+ * @param createUserNameList
+ */
+ public UserPdu createUserNameList(List<String> createUserNameList){
+ this.createUserNameList = createUserNameList;
+ return this;
+ }
+
+
+
+ /**
+ * 璁剧疆 鏈€鍚庝竴娆＄櫥褰曞湴鍧€
+ * @param lastLoginAddress
+ */
+ public UserPdu lastLoginAddress(String lastLoginAddress){
+ setLastLoginAddress(lastLoginAddress);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 鏈€鍚庝竴娆＄櫥褰曞湴鍧€
+ * @param lastLoginAddressList
+ */
+ public UserPdu lastLoginAddressList(List<String> lastLoginAddressList){
+ this.lastLoginAddressList = lastLoginAddressList;
+ return this;
+ }
+
+
+/**
+ * 鑾峰彇 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+ * @return orConditionList
+ */
+ public List<UserPdu> getOrConditionList(){
+ return this.orConditionList;
+ }
+
+ /**
+ * 璁剧疆 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+ * @param orConditionList
+ */
+ public void setOrConditionList(List<UserPdu> orConditionList){
+ this.orConditionList = orConditionList;
+ }
+
+ /**
+ * 鑾峰彇 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+ * @return andConditionList
+ */
+ public List<UserPdu> getAndConditionList(){
+ return this.andConditionList;
+ }
+
+ /**
+ * 璁剧疆 AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+ * @param andConditionList
+ */
+ public void setAndConditionList(List<UserPdu> andConditionList){
+ this.andConditionList = andConditionList;
+ }
+
+ public String getSecurityCode() {
+ return securityCode;
+ }
+
+ public void setSecurityCode(String securityCode) {
+ this.securityCode = securityCode;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ @Override
+ public int hashCode() {
+ return this.getId().hashCode();
+ }
+ @Override
+ public boolean equals(Object obj) {
+ if (obj == null) return false;
+ if (obj instanceof UserPdu) {
+ UserPdu tmp = (UserPdu) obj;
+ if (this.getId() == tmp.getId()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public void initAttrValue(){
+
+ this.loginName = "";
+
+ this.loginPwd = "";
+
+ this.loginLimitAddress = "";
+
+ this.realName = "";
+
+ this.mobile = "";
+
+ this.phone = "";
+
+ this.email = "";
+
+ this.qq = "";
+
+ this.userType = null;
+
+ this.siteIds = "";
+
+ this.areaCodes = "";
+
+ this.status = 1;
+
+ this.createUserName = "";
+
+ this.lastLoginTime = null;
+
+ this.lastLoginAddress = "";
+ }
+}
\ No newline at end of file
diff --git a/common-lib/src/main/java/com/mortals/xhx/feign/user/IApiUserFeign.java b/common-lib/src/main/java/com/mortals/xhx/feign/user/IApiUserFeign.java
deleted file mode 100644
index d3d61ea06cb2e7984030315e3e2cfb878715b8e0..0000000000000000000000000000000000000000
--- a/common-lib/src/main/java/com/mortals/xhx/feign/user/IApiUserFeign.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.mortals.xhx.feign.user;
-
-import com.mortals.xhx.common.pdu.UserPdu;
-import com.mortals.xhx.feign.IFeign;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * 鐢ㄦ埛鏈嶅姟
- *
- * @author: zxfei
- * @date: 2022/5/30 10:40
- */
-@FeignClient(name = "base-manager", path = "/base", fallback = UserFeignFallbackFactory.class)
-public interface IApiUserFeign extends IFeign {
-
- /**
- * 闂ㄦ埛鐧诲綍
- *
- * @param req
- * @return
- */
- @PostMapping("/login/login")
- String portalLogin(@RequestBody UserPdu req);
-
-}
-
-
-@Slf4j
-@Component
-class UserFeignFallbackFactory implements FallbackFactory<IApiUserFeign> {
- @Override
- public IApiUserFeign create(Throwable t) {
- return new IApiUserFeign() {
-
- @Override
- public String portalLogin(UserPdu req) {
- return null;
- }
- };
- }
-}
\ No newline at end of file
diff --git a/common-lib/src/main/java/com/mortals/xhx/feign/user/IUserFeign.java b/common-lib/src/main/java/com/mortals/xhx/feign/user/IUserFeign.java
new file mode 100644
index 0000000000000000000000000000000000000000..b1b31ea96b80e67c40a783a90551e462df40d53c
--- /dev/null
+++ b/common-lib/src/main/java/com/mortals/xhx/feign/user/IUserFeign.java
@@ -0,0 +1,107 @@
+package com.mortals.xhx.feign.user;
+
+import com.mortals.xhx.common.pdu.user.UserPdu;
+import com.alibaba.fastjson.JSON;
+import com.mortals.framework.common.Rest;
+import com.mortals.xhx.feign.IFeign;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 鐢ㄦ埛淇℃伅涓氬姟 Feign鎺ュ彛
+ * @author zxfei
+ * @date 2022-07-06
+ */
+@FeignClient(name = "portal-manager ", path = "/zwfw", fallback = UserFeignFallbackFactory.class)
+public interface IUserFeign extends IFeign {
+
+
+ /**
+ * 鏌ョ湅鐢ㄦ埛淇℃伅涓氬姟鍒楄〃
+ *
+ * @param userPdu
+ * @return
+ */
+ @PostMapping(value = "/user/list")
+ String list(@RequestBody UserPdu userPdu);
+
+
+ /**
+ * 鏌ョ湅鐢ㄦ埛淇℃伅涓氬姟
+ *
+ * @param id
+ * @return
+ */
+ @GetMapping(value = "/user/info")
+ String info(@RequestParam(value = "id") Long id);
+
+ /**
+ * 鍒犻櫎鐢ㄦ埛淇℃伅涓氬姟
+ *
+ * @param ids
+ * @return
+ */
+ @GetMapping(value = "/user/delete")
+ String delete(Long[] ids,@RequestHeader("Authorization") String authorization);
+
+
+ /**
+ * 鐢ㄦ埛淇℃伅涓氬姟淇濆瓨鏇存柊
+ *
+ * @param userPdu
+ * @return
+ */
+ @PostMapping(value = "/user/save")
+ String save(@RequestBody UserPdu userPdu,@RequestHeader("Authorization") String authorization);
+
+
+ @PostMapping(value = "/login/login")
+ String portalLogin(@RequestBody UserPdu userPdu);
+
+}
+
+
+@Slf4j
+@Component
+class UserFeignFallbackFactory implements FallbackFactory<IUserFeign> {
+ @Override
+ public IUserFeign create(Throwable t) {
+ return new IUserFeign() {
+ @Override
+ public String list(UserPdu userPdu) {
+ return JSON.toJSONString(Rest.fail("鏆傛椂鏃犳硶鑾峰彇鐢ㄦ埛淇℃伅涓氬姟鍒楄〃锛岃绋嶅悗鍐嶈瘯!"));
+ }
+
+ @Override
+ public String info(Long id) {
+ return JSON.toJSONString(Rest.fail("鏆傛椂鏃犳硶鑾峰彇鐢ㄦ埛淇℃伅涓氬姟璇︾粏锛岃绋嶅悗鍐嶈瘯!"));
+ }
+
+ @Override
+ public String delete(Long[] ids, String authorization) {
+ return JSON.toJSONString(Rest.fail("鏆傛椂鏃犳硶鍒犻櫎鐢ㄦ埛淇℃伅涓氬姟锛岃绋嶅悗鍐嶈瘯!"));
+ }
+
+ @Override
+ public String save(UserPdu userPdu, String authorization) {
+ return JSON.toJSONString(Rest.fail("鏆傛椂鏃犳硶淇濆瓨鐢ㄦ埛淇℃伅涓氬姟锛岃绋嶅悗鍐嶈瘯!"));
+ }
+
+ @Override
+ public String portalLogin(UserPdu userPdu) {
+ return JSON.toJSONString(Rest.fail("鐧诲綍澶辫触!"));
+ }
+ };
+ }
+}
+
+
+
+
+
+
+
+
diff --git a/device-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java b/device-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..c2ede135870ca2ae55ed576b9b62ea0b090639ce
--- /dev/null
+++ b/device-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java
@@ -0,0 +1,60 @@
+package com.mortals.xhx.daemon.task;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.service.ITask;
+import com.mortals.framework.service.ITaskExcuteService;
+import com.mortals.xhx.common.code.SendStatusEnum;
+import com.mortals.xhx.common.pdu.site.SitePdu;
+import com.mortals.xhx.common.pdu.user.UserPdu;
+import com.mortals.xhx.common.utils.SendSmsTask;
+import com.mortals.xhx.common.utils.SendTaskThreadPool;
+import com.mortals.xhx.feign.user.IUserFeign;
+import com.mortals.xhx.module.alarm.model.AlarmSmsSendEntity;
+import com.mortals.xhx.module.alarm.model.AlarmSmsSendQuery;
+import com.mortals.xhx.module.alarm.service.AlarmSmsSendService;
+import lombok.extern.apachecommons.CommonsLog;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 鍚屾鐢ㄦ埛
+ */
+@Slf4j
+@Service("SyncUserTask")
+public class SyncUserTaskImpl implements ITaskExcuteService {
+
+ @Autowired
+ private IUserFeign userFeign;
+
+
+ @Override
+ public void excuteTask(ITask task) throws AppException {
+
+ String resp = userFeign.list(new UserPdu());
+
+ log.info("resp:{}",resp);
+ JSONObject jsonObject = JSONObject.parseObject(resp);
+ if (jsonObject.getInteger("code") == 1) {
+ List<UserPdu> userList = jsonObject.getJSONObject("data").getObject("data", new TypeReference<List<UserPdu>>() {
+ });
+
+ log.info("userList:{}", JSON.toJSONString(userList));
+
+ }
+
+ }
+
+
+ @Override
+ public void stopTask(ITask task) throws AppException {
+
+ }
+
+
+}
diff --git a/device-manager/src/main/java/com/mortals/xhx/module/sitestat/service/impl/SitestatServiceImpl.java b/device-manager/src/main/java/com/mortals/xhx/module/sitestat/service/impl/SitestatServiceImpl.java
index 0f09027f69b08b7378ea9f085153101d0f7067b2..1813f03caafb1cf0c404dd19835a49f23ab9d11c 100644
--- a/device-manager/src/main/java/com/mortals/xhx/module/sitestat/service/impl/SitestatServiceImpl.java
+++ b/device-manager/src/main/java/com/mortals/xhx/module/sitestat/service/impl/SitestatServiceImpl.java
@@ -9,11 +9,11 @@ import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result;
import com.mortals.xhx.common.code.DeviceStatusEnum;
import com.mortals.xhx.common.code.YesNoEnum;
-import com.mortals.xhx.common.pdu.UserPdu;
import com.mortals.xhx.common.pdu.site.SitePdu;
+import com.mortals.xhx.common.pdu.user.UserPdu;
import com.mortals.xhx.common.utils.MemoryPagination;
import com.mortals.xhx.feign.site.ISiteFeign;
-import com.mortals.xhx.feign.user.IApiUserFeign;
+import com.mortals.xhx.feign.user.IUserFeign;
import com.mortals.xhx.module.device.model.DeviceEntity;
import com.mortals.xhx.module.device.model.DeviceQuery;
import com.mortals.xhx.module.device.service.DeviceService;
@@ -44,9 +44,9 @@ public class SitestatServiceImpl extends AbstractCRUDServiceImpl<SitestatDao, Si
@Autowired
private ISiteFeign siteFeign;
@Autowired
- private IApiUserFeign userFeign;
- @Autowired
private DeviceService deviceService;
+ @Autowired
+ private IUserFeign userFeign;
/**
* 閲嶅啓甯﹀垎椤电殑鏂规硶
diff --git a/device-manager/src/main/java/com/mortals/xhx/module/sitestat/web/SitestatController.java b/device-manager/src/main/java/com/mortals/xhx/module/sitestat/web/SitestatController.java
index e7b2d810ea21ca37ce1c164c9199980e1cf39dc4..ab2c86cae68b3e25a4ed2816ac8016d119231d9a 100644
--- a/device-manager/src/main/java/com/mortals/xhx/module/sitestat/web/SitestatController.java
+++ b/device-manager/src/main/java/com/mortals/xhx/module/sitestat/web/SitestatController.java
@@ -10,7 +10,6 @@ import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.common.pdu.UserPdu;
import com.mortals.xhx.feign.site.ISiteFeign;
-import com.mortals.xhx.feign.user.IApiUserFeign;
import com.mortals.xhx.module.sitestat.model.SitestatEntity;
import com.mortals.xhx.module.sitestat.service.SitestatService;
import lombok.extern.slf4j.Slf4j;
@@ -37,8 +36,7 @@ public class SitestatController extends BaseCRUDJsonBodyMappingController<Sitest
@Autowired
private IAuthTokenService authTokenService;
- @Autowired
- private IApiUserFeign userFeign;
+
@Autowired
private ISiteFeign siteFeign;