修改类名和注释

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<java.util.List < com.epmet.dto.result.StaffOrgsResultDTO>>
-     * @author yinzuomei
+     * @author zhy
-     * @description 6、手机号密码获取组织
+     * @description 6、账户密码获取组织
      * @Date 2020/6/30 22:43
      **/
     @PostMapping(value = "/getmyorgbyaccount")
-    public Result<List<StaffOrgsResultDTO>> getMyOrgByAccount(@RequestBody StaffOrgsAccountFormDTO formDTO) {
+    public Result<List<StaffOrgsResultDTO>> getMyOrgByAccount(@RequestBody StaffOrgByAccountFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO, StaffOrgsAccountFormDTO.AddUserShowGroup.class, StaffOrgsAccountFormDTO.GetMyOrgByPassWordGroup.class);
+        ValidatorUtils.validateEntity(formDTO, StaffOrgByAccountFormDTO.AddUserShowGroup.class, StaffOrgByAccountFormDTO.GetMyOrgByPassWordGroup.class);
         List<StaffOrgsResultDTO> staffOrgs = govLoginService.getMyOrgByAccount(formDTO);
         return new Result<List<StaffOrgsResultDTO>>().ok(staffOrgs);
     }

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<List<StaffOrgsResultDTO>> getMyOrgByAccount(@RequestBody ThirdStaffAccountOrgsFormDTO formDTO) {
+    public Result<List<StaffOrgsResultDTO>> getMyOrgByAccount(@RequestBody ThirdStaffOrgByAccountFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO, StaffAccountOrgsFormDTO.AddUserShowGroup.class, StaffAccountOrgsFormDTO.GetMyOrgByPassWordGroup.class);
+        ValidatorUtils.validateEntity(formDTO, StaffOrgByAccountFormDTO.AddUserShowGroup.class, StaffOrgByAccountFormDTO.GetMyOrgByPassWordGroup.class);
         List<StaffOrgsResultDTO> staffOrgs = thirdLoginService.getMyOrgByAccount(formDTO);
         return new Result<List<StaffOrgsResultDTO>>().ok(staffOrgs);
     }

epmet-auth/src/main/java/com/epmet/dto/form/StaffAccountOrgsFormDTO.java

@@ -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;
-}
-

epmet-auth/src/main/java/com/epmet/dto/form/StaffOrgsAccountFormDTO.java → 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;
     /**
      * 添加用户操作的用户可见异常分组

epmet-auth/src/main/java/com/epmet/dto/form/ThirdStaffAccountOrgsFormDTO.java → 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;
     /**
      * 添加用户操作的用户可见异常分组

epmet-auth/src/main/java/com/epmet/feign/EpmetUserFeignClient.java

@@ -71,14 +71,14 @@ public interface EpmetUserFeignClient {
 	Result<List<CustomerStaffDTO>> checkCustomerStaff(@PathVariable("mobile") String mobile);
 
 	/**
-	 * @param mobile
+	 * @param account
 	 * @return com.epmet.commons.tools.utils.Result
-	 * @Author yinzuomei
+	 * @Author zhy
-	 * @Description 根据手机号查询政府端工作人员基本信息，校验用户是否存在
+	 * @Description 根据账户查询政府端工作人员基本信息，校验用户是否存在
 	 * @Date 2020/4/18 14:03
 	 **/
-	@GetMapping(value = "epmetuser/customerstaff/getcustsomerstaffbyaccount/{userAccount}")
+	@GetMapping(value = "epmetuser/customerstaff/getcustsomerstaffbyaccount/{account}")
-	Result<List<CustomerStaffDTO>> checkCustomerStaffByAccount(@PathVariable("userAccount") String userAccount);
+	Result<List<CustomerStaffDTO>> checkCustomerStaffByAccount(@PathVariable("account") String account);
 
 
 	/**

epmet-auth/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallback.java

@@ -45,8 +45,8 @@ public class EpmetUserFeignClientFallback implements EpmetUserFeignClient {
 	}
 
 	@Override
-	public Result<List<CustomerStaffDTO>> checkCustomerStaffByAccount(String userAccount) {
+	public Result<List<CustomerStaffDTO>> checkCustomerStaffByAccount(String account) {
-		return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getCustsomerStaffByAccount", userAccount);
+		return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getCustsomerStaffByAccount", account);
 	}
 	@Override
 	public Result saveStaffWechat(StaffWechatFormDTO staffWechatFormDTO) {

epmet-auth/src/main/java/com/epmet/service/GovLoginService.java

@@ -77,9 +77,9 @@ public interface GovLoginService {
     /**
      * @return java.util.List<com.epmet.dto.result.StaffOrgsResultDTO>
      * @param formDTO
-     * @author yinzuomei
+     * @author zhy
-     * @description 6、手机号密码获取组织
+     * @description 6、账户密码获取组织
      * @Date 2020/6/30 22:43
      **/
-    List<StaffOrgsResultDTO> getMyOrgByAccount(StaffOrgsAccountFormDTO formDTO);
+    List<StaffOrgsResultDTO> getMyOrgByAccount(StaffOrgByAccountFormDTO formDTO);
 }

epmet-auth/src/main/java/com/epmet/service/ThirdLoginService.java

@@ -58,7 +58,7 @@ public interface ThirdLoginService {
 	 * @author zhy
 	 * @description 单客户-手机号密码获取组织
 	 **/
-	List<StaffOrgsResultDTO> getMyOrgByAccount(ThirdStaffAccountOrgsFormDTO formDTO);
+	List<StaffOrgsResultDTO> getMyOrgByAccount(ThirdStaffOrgByAccountFormDTO formDTO);
 
 
 	/**

epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java

@@ -382,9 +382,9 @@ public class GovLoginServiceImpl implements GovLoginService, ResultDataResolver
     }
 
     @Override
-    public List<StaffOrgsResultDTO> getMyOrgByAccount(StaffOrgsAccountFormDTO formDTO) {
+    public List<StaffOrgsResultDTO> getMyOrgByAccount(StaffOrgByAccountFormDTO formDTO) {
         //1、根据手机号查询到用户信息
-        Result<List<CustomerStaffDTO>> customerStaffResult = epmetUserFeignClient.checkCustomerStaff(formDTO.getUserAccount());
+        Result<List<CustomerStaffDTO>> 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());

epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java

@@ -539,17 +539,17 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
     }
 
     @Override
-    public List<StaffOrgsResultDTO> getMyOrgByAccount(ThirdStaffAccountOrgsFormDTO formDTO) {
+    public List<StaffOrgsResultDTO> 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<List<CustomerStaffDTO>> 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、密码是否正确

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ThirdAccountCustomerStaffFormDTO.java → 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;
 
     /**

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<List<CustomerStaffDTO>> getCustsomerStaffByIdAndAccount(@RequestBody ThirdAccountCustomerStaffFormDTO formDTO);
+    Result<List<CustomerStaffDTO>> getCustsomerStaffByIdAndAccount(@RequestBody ThirdCustomerStaffByAccountFormDTO formDTO);
 
 
     /**

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<List<CustomerStaffDTO>> getCustsomerStaffByIdAndAccount(ThirdAccountCustomerStaffFormDTO formDTO) {
+    public Result<List<CustomerStaffDTO>> getCustsomerStaffByIdAndAccount(ThirdCustomerStaffByAccountFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getCustsomerStaffByIdAndAccount", formDTO);
     }
     @Override

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<List<CustomerStaffDTO>> getCustsomerStaffByIdAndAccount(@RequestBody ThirdAccountCustomerStaffFormDTO formDTO) {
+    public Result<List<CustomerStaffDTO>> getCustsomerStaffByIdAndAccount(@RequestBody ThirdCustomerStaffByAccountFormDTO formDTO) {
         return new Result<List<CustomerStaffDTO>>().ok(customerStaffService.getCustsomerStaffByIdAndAccount(formDTO));
     }
 

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java

@@ -155,7 +155,7 @@ public interface CustomerStaffDao extends BaseDao<CustomerStaffEntity> {
 	 * @Author zhy
 	 * @Description 根据客户ID、手机号查询政府端工作人员基本信息
 	 **/
-	List<CustomerStaffDTO> selectStaffByAccount(ThirdAccountCustomerStaffFormDTO formDTO);
+	List<CustomerStaffDTO> selectStaffByAccount(ThirdCustomerStaffByAccountFormDTO formDTO);
 
 	/**
 	 * @Description  查询工作人员的信息

epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java

@@ -291,7 +291,7 @@ public interface CustomerStaffService extends BaseService<CustomerStaffEntity> {
 	 * @Author zhy
 	 * @Description 根据客户ID、手机号查询政府端工作人员基本信息，校验用户是否存在
 	 **/
-	List<CustomerStaffDTO> getCustsomerStaffByIdAndAccount(ThirdAccountCustomerStaffFormDTO formDTO);
+	List<CustomerStaffDTO> getCustsomerStaffByIdAndAccount(ThirdCustomerStaffByAccountFormDTO formDTO);
 
 	/**
 	 * @Description  查询工作人员的信息

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java

@@ -726,7 +726,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
     }
 
     @Override
-    public List<CustomerStaffDTO> getCustsomerStaffByIdAndAccount(ThirdAccountCustomerStaffFormDTO formDTO) {
+    public List<CustomerStaffDTO> getCustsomerStaffByIdAndAccount(ThirdCustomerStaffByAccountFormDTO formDTO) {
         //根据客户Id和手机号查询工作人员信息
         List<CustomerStaffDTO> customerStaffDTOList = baseDao.selectStaffByAccount(formDTO);
         if (null == customerStaffDTOList || customerStaffDTOList.size() < NumConstant.ONE) {

epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml

@@ -229,7 +229,7 @@
         ORDER BY active_time DESC, created_time ASC
     </select>
 
-    <select id="selectStaffByAccount" resultType="com.epmet.dto.form.ThirdAccountCustomerStaffFormDTO">
+    <select id="selectStaffByAccount" resultType="com.epmet.dto.form.ThirdCustomerStaffByAccountFormDTO">
         SELECT
             *
         FROM