From b70f6a308291b5ecafd6f1c28005ac1fa4a3043d Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 14 Jul 2020 16:06:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=B7=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=87=AA=E6=B5=8B=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/PublicSendSmsCodeFormDTO.java | 7 ++++++- .../service/impl/PublicUserLoginServiceImpl.java | 2 +- .../java/com/epmet/dto/result/MyInfoResultDTO.java | 14 +++++++------- .../main/java/com/epmet/constant/PaConstant.java | 13 ++++++++++++- .../epmet/service/impl/PaCustomerServiceImpl.java | 14 +++++++++----- .../com/epmet/service/impl/PaUserServiceImpl.java | 6 +++--- .../src/main/resources/mapper/PaUserWechatDao.xml | 2 -- 7 files changed, 38 insertions(+), 20 deletions(-) diff --git a/epmet-auth/src/main/java/com/epmet/dto/form/PublicSendSmsCodeFormDTO.java b/epmet-auth/src/main/java/com/epmet/dto/form/PublicSendSmsCodeFormDTO.java index b3e9558600..22b096ca6a 100644 --- a/epmet-auth/src/main/java/com/epmet/dto/form/PublicSendSmsCodeFormDTO.java +++ b/epmet-auth/src/main/java/com/epmet/dto/form/PublicSendSmsCodeFormDTO.java @@ -21,8 +21,13 @@ public class PublicSendSmsCodeFormDTO implements Serializable { public interface AddUserShowGroup extends CustomerClientShowGroup { } + /** + * 手机号 + */ @NotBlank(message = "手机号不能为空", groups = {AddUserShowGroup.class}) private String phone; - @NotBlank(message = "是否登陆不能为空", groups = {AddUserShowGroup.class}) + /** + * 是否登陆（登陆：true 注册：false） + */ private Boolean isLogon; } diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java index a5e0a48d3f..c4b973b0fd 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java @@ -189,7 +189,7 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService { //2.用户不存在时不允许登陆 PaUserDTO userDTO = resultDTO.getPaUserResult(); - if (null == resultDTO || StringUtils.isBlank(userDTO.getId())) { + if (null == userDTO || StringUtils.isBlank(userDTO.getId())) { throw new RenException(PublicUserLoginConstant.LOGON_EXCEPTION); } diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/MyInfoResultDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/MyInfoResultDTO.java index 3d75eaed38..62dd3471db 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/MyInfoResultDTO.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/MyInfoResultDTO.java @@ -22,31 +22,31 @@ public class MyInfoResultDTO implements Serializable { */ private String agencyName = ""; /** - * 新增客户Id + * 组织级别 */ private String level = ""; /** - * 包含customerId的token + * 省 */ private String province = ""; /** - * 新增客户Id + * 市 */ private String city = ""; /** - * 包含customerId的token + * 区 */ private String district = ""; /** - * 新增客户Id + * 党支部数量 */ private Integer partyBranchNum; /** - * 包含customerId的token + * 居民端授权状态(0：未授权，1：已授权) */ private Integer resiAuthorization; /** - * 新增客户Id + * 政府端授权状态(0：未授权，1：已授权) */ private Integer workAuthorization; diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/PaConstant.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/PaConstant.java index e523ba6fbd..9f43dface4 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/PaConstant.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/PaConstant.java @@ -10,11 +10,18 @@ public interface PaConstant { * 手机号注册 */ String PHONE_EXCEPTION = "手机号已存在，不允许再次注册"; - + /** + * 更新用户信息失败 + */ + String UPDATE_USER_EXCEPTION = "更新用户信息失败"; /** * 根据userId查询pa_user_wechat表失败 */ String SELECT_WECHAT_EXCEPTION = "获取用户微信信息失败"; + /** + * 保存用户访问记录数据失败 + */ + String SAVE_VISITED_EXCEPTION = "保存用户访问记录数据失败"; /** * 组织级别对应的key、name @@ -49,4 +56,8 @@ public interface PaConstant { String CLIENT_RESI = "resi"; String CLIENT_WORK = "work"; + /** + * 获取缓存中token信息失败 + */ + String TOKEN_EXCEPTION = "token已过期"; } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java index 84b676eb78..3dd016aaf8 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java @@ -154,7 +154,7 @@ public class PaCustomerServiceImpl extends BaseServiceImpl userList = paUserDao.selectUserByPhone(formDTO.getPhone()); - if (null != userList || userList.size() > NumConstant.ZERO) { + if (null != userList && userList.size() > NumConstant.ZERO) { throw new RenException(PaConstant.PHONE_EXCEPTION); } @@ -172,7 +172,9 @@ public class PaCustomerServiceImpl extends BaseServiceImpl CustomerUserResultDTO resultDTO = new CustomerUserResultDTO(); List userList = baseDao.selectUserByPhone(phone); if (null == userList || userList.size() < NumConstant.ONE) { - resultDTO.setPaUserResult(new PaUserDTO()); - resultDTO.setPaCustomerResult(new PaCustomerDTO()); + resultDTO.setPaUserResult(null); + resultDTO.setPaCustomerResult(null); return resultDTO; } PaUserDTO dto = userList.get(NumConstant.ZERO); List customerList = paCustomerDao.selectCustomerByUserId(dto.getId()); resultDTO.setPaUserResult(dto); - resultDTO.setPaCustomerResult(customerList.size() > NumConstant.ZERO ? customerList.get(NumConstant.ZERO) : new PaCustomerDTO()); + resultDTO.setPaCustomerResult(customerList.size() > NumConstant.ZERO ? customerList.get(NumConstant.ZERO) : null); return resultDTO; } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaUserWechatDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaUserWechatDao.xml index 8f77d5598e..6afbc70806 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaUserWechatDao.xml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaUserWechatDao.xml @@ -31,14 +31,12 @@ user_id, wx_open_id, union_id, - phone, gender, nickname, head_img_url, country, province, city, - privilege, `language` FROM pa_user_wechat