diff --git a/epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java b/epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java index 2dbdd36239..94a947819d 100644 --- a/epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java +++ b/epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java @@ -125,13 +125,13 @@ public class GovLoginController { /** * @param formDTO * @return com.epmet.commons.tools.utils.Result> - * @author yinzuomei - * @description 6、手机号密码获取组织 + * @author zhy + * @description 6、账户密码获取组织 * @Date 2020/6/30 22:43 **/ @PostMapping(value = "/getmyorgbyaccount") - public Result> getMyOrgByAccount(@RequestBody StaffOrgsAccountFormDTO formDTO) { - ValidatorUtils.validateEntity(formDTO, StaffOrgsAccountFormDTO.AddUserShowGroup.class, StaffOrgsAccountFormDTO.GetMyOrgByPassWordGroup.class); + public Result> getMyOrgByAccount(@RequestBody StaffOrgByAccountFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, StaffOrgByAccountFormDTO.AddUserShowGroup.class, StaffOrgByAccountFormDTO.GetMyOrgByPassWordGroup.class); List staffOrgs = govLoginService.getMyOrgByAccount(formDTO); return new Result>().ok(staffOrgs); } diff --git a/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java b/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java index 5604dd1d66..8efad1063c 100644 --- a/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java +++ b/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java @@ -92,12 +92,12 @@ public class ThirdLoginController { /** * @param formDTO * @return - * @author sun + * @author zhy * @description 单客户-账号密码获取组织 **/ @PostMapping(value = "/getmyorgbyaccount") - public Result> getMyOrgByAccount(@RequestBody ThirdStaffAccountOrgsFormDTO formDTO) { - ValidatorUtils.validateEntity(formDTO, StaffAccountOrgsFormDTO.AddUserShowGroup.class, StaffAccountOrgsFormDTO.GetMyOrgByPassWordGroup.class); + public Result> getMyOrgByAccount(@RequestBody ThirdStaffOrgByAccountFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, StaffOrgByAccountFormDTO.AddUserShowGroup.class, StaffOrgByAccountFormDTO.GetMyOrgByPassWordGroup.class); List staffOrgs = thirdLoginService.getMyOrgByAccount(formDTO); return new Result>().ok(staffOrgs); } diff --git a/epmet-auth/src/main/java/com/epmet/dto/form/StaffAccountOrgsFormDTO.java b/epmet-auth/src/main/java/com/epmet/dto/form/StaffAccountOrgsFormDTO.java deleted file mode 100644 index 1ac9076a1d..0000000000 --- a/epmet-auth/src/main/java/com/epmet/dto/form/StaffAccountOrgsFormDTO.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.epmet.dto.form; - -import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; - -/** - * @Description 手机验证码获取组织接口入参 - * @Author yinzuomei - * @Date 2020/4/18 10:38 - */ -@Data -public class StaffAccountOrgsFormDTO implements Serializable { - private static final long serialVersionUID = 4193133227120225342L; - /** - * 添加用户操作的用户可见异常分组 - * 该分组用于校验需要返回给前端错误信息提示的列，需要继承CustomerClientShowGroup - * 返回错误码为8999，提示信息为DTO中具体的列的校验注解message的内容 - */ - public interface AddUserShowGroup extends CustomerClientShowGroup { - } - - public interface GetMyOrgByPassWordGroup extends CustomerClientShowGroup { - } - public interface GetMyOrgByLoginWxmp extends CustomerClientShowGroup{} - /** - * 手机号 - */ - @NotBlank(message = "账号不能为空", groups = {AddUserShowGroup.class}) - private String userAccount; - - /** - * 验证码 - */ - @NotBlank(message="验证码不能为空", groups = {GetMyOrgByLoginWxmp.class}) - private String smsCode; - - @NotBlank(message = "密码不能为空",groups ={GetMyOrgByPassWordGroup.class}) - private String password; -} - diff --git a/epmet-auth/src/main/java/com/epmet/dto/form/StaffOrgsAccountFormDTO.java b/epmet-auth/src/main/java/com/epmet/dto/form/StaffOrgByAccountFormDTO.java similarity index 93% rename from epmet-auth/src/main/java/com/epmet/dto/form/StaffOrgsAccountFormDTO.java rename to epmet-auth/src/main/java/com/epmet/dto/form/StaffOrgByAccountFormDTO.java index 80dc1b4feb..669a0e7998 100644 --- a/epmet-auth/src/main/java/com/epmet/dto/form/StaffOrgsAccountFormDTO.java +++ b/epmet-auth/src/main/java/com/epmet/dto/form/StaffOrgByAccountFormDTO.java @@ -8,11 +8,11 @@ import java.io.Serializable; /** * @Description 手机验证码获取组织接口入参 - * @Author yinzuomei + * @Author zhy * @Date 2020/4/18 10:38 */ @Data -public class StaffOrgsAccountFormDTO implements Serializable { +public class StaffOrgByAccountFormDTO implements Serializable { private static final long serialVersionUID = 4193133227120225342L; /** * 添加用户操作的用户可见异常分组 diff --git a/epmet-auth/src/main/java/com/epmet/dto/form/ThirdStaffAccountOrgsFormDTO.java b/epmet-auth/src/main/java/com/epmet/dto/form/ThirdStaffOrgByAccountFormDTO.java similarity index 94% rename from epmet-auth/src/main/java/com/epmet/dto/form/ThirdStaffAccountOrgsFormDTO.java rename to epmet-auth/src/main/java/com/epmet/dto/form/ThirdStaffOrgByAccountFormDTO.java index c9a31bcf5b..3cad308ab6 100644 --- a/epmet-auth/src/main/java/com/epmet/dto/form/ThirdStaffAccountOrgsFormDTO.java +++ b/epmet-auth/src/main/java/com/epmet/dto/form/ThirdStaffOrgByAccountFormDTO.java @@ -8,10 +8,10 @@ import java.io.Serializable; /** * @Description appId、账号、验证码获取组织-接口入参 - * @Author sun + * @Author zhy */ @Data -public class ThirdStaffAccountOrgsFormDTO implements Serializable { +public class ThirdStaffOrgByAccountFormDTO implements Serializable { private static final long serialVersionUID = 4193133227120225342L; /** * 添加用户操作的用户可见异常分组 diff --git a/epmet-auth/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-auth/src/main/java/com/epmet/feign/EpmetUserFeignClient.java index 4c93fc32c9..1877439c9c 100644 --- a/epmet-auth/src/main/java/com/epmet/feign/EpmetUserFeignClient.java +++ b/epmet-auth/src/main/java/com/epmet/feign/EpmetUserFeignClient.java @@ -71,14 +71,14 @@ public interface EpmetUserFeignClient { Result> checkCustomerStaff(@PathVariable("mobile") String mobile); /** - * @param mobile + * @param account * @return com.epmet.commons.tools.utils.Result - * @Author yinzuomei - * @Description 根据手机号查询政府端工作人员基本信息，校验用户是否存在 + * @Author zhy + * @Description 根据账户查询政府端工作人员基本信息，校验用户是否存在 * @Date 2020/4/18 14:03 **/ - @GetMapping(value = "epmetuser/customerstaff/getcustsomerstaffbyaccount/{userAccount}") - Result> checkCustomerStaffByAccount(@PathVariable("userAccount") String userAccount); + @GetMapping(value = "epmetuser/customerstaff/getcustsomerstaffbyaccount/{account}") + Result> checkCustomerStaffByAccount(@PathVariable("account") String account); /** diff --git a/epmet-auth/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallback.java b/epmet-auth/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallback.java index a78d7cf8f8..4f195cb3bd 100644 --- a/epmet-auth/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallback.java +++ b/epmet-auth/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallback.java @@ -45,8 +45,8 @@ public class EpmetUserFeignClientFallback implements EpmetUserFeignClient { } @Override - public Result> checkCustomerStaffByAccount(String userAccount) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getCustsomerStaffByAccount", userAccount); + public Result> checkCustomerStaffByAccount(String account) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getCustsomerStaffByAccount", account); } @Override public Result saveStaffWechat(StaffWechatFormDTO staffWechatFormDTO) { diff --git a/epmet-auth/src/main/java/com/epmet/service/GovLoginService.java b/epmet-auth/src/main/java/com/epmet/service/GovLoginService.java index 70f2c38cea..67e8c37ceb 100644 --- a/epmet-auth/src/main/java/com/epmet/service/GovLoginService.java +++ b/epmet-auth/src/main/java/com/epmet/service/GovLoginService.java @@ -77,9 +77,9 @@ public interface GovLoginService { /** * @return java.util.List * @param formDTO - * @author yinzuomei - * @description 6、手机号密码获取组织 + * @author zhy + * @description 6、账户密码获取组织 * @Date 2020/6/30 22:43 **/ - List getMyOrgByAccount(StaffOrgsAccountFormDTO formDTO); + List getMyOrgByAccount(StaffOrgByAccountFormDTO formDTO); } diff --git a/epmet-auth/src/main/java/com/epmet/service/ThirdLoginService.java b/epmet-auth/src/main/java/com/epmet/service/ThirdLoginService.java index 08772e1947..3a07dda74f 100644 --- a/epmet-auth/src/main/java/com/epmet/service/ThirdLoginService.java +++ b/epmet-auth/src/main/java/com/epmet/service/ThirdLoginService.java @@ -58,7 +58,7 @@ public interface ThirdLoginService { * @author zhy * @description 单客户-手机号密码获取组织 **/ - List getMyOrgByAccount(ThirdStaffAccountOrgsFormDTO formDTO); + List getMyOrgByAccount(ThirdStaffOrgByAccountFormDTO formDTO); /** diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java index b48c92ec76..3f392af088 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java @@ -382,9 +382,9 @@ public class GovLoginServiceImpl implements GovLoginService, ResultDataResolver } @Override - public List getMyOrgByAccount(StaffOrgsAccountFormDTO formDTO) { + public List getMyOrgByAccount(StaffOrgByAccountFormDTO formDTO) { //1、根据手机号查询到用户信息 - Result> customerStaffResult = epmetUserFeignClient.checkCustomerStaff(formDTO.getUserAccount()); + Result> customerStaffResult = epmetUserFeignClient.checkCustomerStaffByAccount(formDTO.getUserAccount()); if (!customerStaffResult.success()) { logger.warn(String.format("账户密码登录异常,手机号[%s],code[%s],msg[%s]", formDTO.getUserAccount(), customerStaffResult.getCode(), customerStaffResult.getMsg())); throw new RenException(customerStaffResult.getCode()); diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java index 30b4aa2148..f8542f97e0 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java @@ -539,17 +539,17 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol } @Override - public List getMyOrgByAccount(ThirdStaffAccountOrgsFormDTO formDTO) { + public List getMyOrgByAccount(ThirdStaffOrgByAccountFormDTO formDTO) { //0.根据appId查询对应客户Id PaCustomerDTO customer = this.getCustomerInfo(formDTO.getAppId()); //7.28 上边根据appId只能锁定一条客户id,后边的批量循环操作暂不做调整，还是使用之前的代码 sun //1、根据手机号查询到用户信息 - ThirdAccountCustomerStaffFormDTO dto = new ThirdAccountCustomerStaffFormDTO(); + ThirdCustomerStaffByAccountFormDTO dto = new ThirdCustomerStaffByAccountFormDTO(); dto.setCustomerId(customer.getId()); dto.setUserAccount(formDTO.getUserAccount()); Result> customerStaffResult = epmetUserOpenFeignClient.getCustsomerStaffByIdAndAccount(dto); if (!customerStaffResult.success()) { - logger.warn(String.format("账户密码登录异常,手机号[%s],code[%s],msg[%s]", formDTO.getUserAccount(), customerStaffResult.getCode(), customerStaffResult.getMsg())); + logger.warn(String.format("账户密码登录异常,账户[%s],code[%s],msg[%s]", formDTO.getUserAccount(), customerStaffResult.getCode(), customerStaffResult.getMsg())); throw new RenException(customerStaffResult.getCode()); } //2、密码是否正确 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ThirdAccountCustomerStaffFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ThirdCustomerStaffByAccountFormDTO.java similarity index 81% rename from epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ThirdAccountCustomerStaffFormDTO.java rename to epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ThirdCustomerStaffByAccountFormDTO.java index a19a33f586..72eacbd9a1 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ThirdAccountCustomerStaffFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ThirdCustomerStaffByAccountFormDTO.java @@ -6,10 +6,10 @@ import java.io.Serializable; /** * @Description 根据客户ID、手机号查询政府端工作人员基本信息 - * @Author sun + * @Author zhy */ @Data -public class ThirdAccountCustomerStaffFormDTO implements Serializable{ +public class ThirdCustomerStaffByAccountFormDTO implements Serializable{ private static final long serialVersionUID = -7994579456530273809L; /** diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index 6f0afaf4a7..631daa1354 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -238,7 +238,7 @@ public interface EpmetUserOpenFeignClient { * @Description 根据客户ID、手机号查询政府端工作人员基本信息，校验用户是否存在 **/ @GetMapping(value = "epmetuser/customerstaff/getCustsomerStaffByIdAndAccount") - Result> getCustsomerStaffByIdAndAccount(@RequestBody ThirdAccountCustomerStaffFormDTO formDTO); + Result> getCustsomerStaffByIdAndAccount(@RequestBody ThirdCustomerStaffByAccountFormDTO formDTO); /** diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index 765dfe2414..31e62d076f 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -172,7 +172,7 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien } @Override - public Result> getCustsomerStaffByIdAndAccount(ThirdAccountCustomerStaffFormDTO formDTO) { + public Result> getCustsomerStaffByIdAndAccount(ThirdCustomerStaffByAccountFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getCustsomerStaffByIdAndAccount", formDTO); } @Override diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java index f5a4441032..40942a3967 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java @@ -423,7 +423,7 @@ public class CustomerStaffController { } @GetMapping(value = "getCustsomerStaffByIdAndAccount") - public Result> getCustsomerStaffByIdAndAccount(@RequestBody ThirdAccountCustomerStaffFormDTO formDTO) { + public Result> getCustsomerStaffByIdAndAccount(@RequestBody ThirdCustomerStaffByAccountFormDTO formDTO) { return new Result>().ok(customerStaffService.getCustsomerStaffByIdAndAccount(formDTO)); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java index 11041476f6..df882b3a66 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java @@ -155,7 +155,7 @@ public interface CustomerStaffDao extends BaseDao { * @Author zhy * @Description 根据客户ID、手机号查询政府端工作人员基本信息 **/ - List selectStaffByAccount(ThirdAccountCustomerStaffFormDTO formDTO); + List selectStaffByAccount(ThirdCustomerStaffByAccountFormDTO formDTO); /** * @Description 查询工作人员的信息 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java index d50093169e..b4e0e1a4f4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java @@ -291,7 +291,7 @@ public interface CustomerStaffService extends BaseService { * @Author zhy * @Description 根据客户ID、手机号查询政府端工作人员基本信息，校验用户是否存在 **/ - List getCustsomerStaffByIdAndAccount(ThirdAccountCustomerStaffFormDTO formDTO); + List getCustsomerStaffByIdAndAccount(ThirdCustomerStaffByAccountFormDTO formDTO); /** * @Description 查询工作人员的信息 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index e639c304d9..08adfd0425 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -726,7 +726,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl getCustsomerStaffByIdAndAccount(ThirdAccountCustomerStaffFormDTO formDTO) { + public List getCustsomerStaffByIdAndAccount(ThirdCustomerStaffByAccountFormDTO formDTO) { //根据客户Id和手机号查询工作人员信息 List customerStaffDTOList = baseDao.selectStaffByAccount(formDTO); if (null == customerStaffDTOList || customerStaffDTOList.size() < NumConstant.ONE) { diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml index d77a070cc4..964481a4a8 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml @@ -229,7 +229,7 @@ ORDER BY active_time DESC, created_time ASC - SELECT * FROM