登陆验证方法追加

epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java

@@ -83,6 +83,20 @@ public class GovLoginController {
         return new Result<UserTokenResultDTO>().ok(userTokenResultDTO);
     }
 
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.UserTokenResultDTO>
+     * @Author zhy
+     * @Description 4、选择组织，进入首页
+     * @Date 2020/4/20 13:07
+     **/
+    @PostMapping(value = "/loginwxmp/enterorgbyaccount")
+    public Result<UserTokenResultDTO> enterOrgByAccount(@RequestBody GovWxmpEnteOrgByAccountFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO,GovWxmpEnteOrgByAccountFormDTO.AddUserShowGroup.class,GovWxmpEnteOrgByAccountFormDTO.AddUserInternalGroup.class);
+        UserTokenResultDTO userTokenResultDTO=govLoginService.enterOrgByAccount(formDTO);
+        return new Result<UserTokenResultDTO>().ok(userTokenResultDTO);
+    }
+
     /**
      * @param tokenDto
      * @return com.epmet.commons.tools.utils.Result

epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java

@@ -63,6 +63,19 @@ public class ThirdLoginController {
         return new Result<UserTokenResultDTO>().ok(userTokenResultDTO);
     }
 
+    /**
+     * @param formDTO
+     * @return
+     * @Author zhy
+     * @Description 单客户-选择组织，进入首页
+     **/
+    @PostMapping(value = "enterorgbyaccount")
+    public Result<UserTokenResultDTO> enterOrgByAccount(@RequestBody ThirdWxmpEnteOrgByAccountFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO,ThirdWxmpEnteOrgFormDTO.AddUserShowGroup.class,ThirdWxmpEnteOrgFormDTO.AddUserInternalGroup.class);
+        UserTokenResultDTO userTokenResultDTO=thirdLoginService.enterOrgByAccount(formDTO);
+        return new Result<UserTokenResultDTO>().ok(userTokenResultDTO);
+    }
+
     /**
      * @param formDTO
      * @return

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

@@ -0,0 +1,48 @@
+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 选择组织，进入首页入参Dto
+ * @Author yinzuomei
+ * @Date 2020/4/20 13:03
+ */
+@Data
+public class GovWxmpEnteOrgByAccountFormDTO implements Serializable {
+    public interface AddUserInternalGroup {}
+    public interface AddUserShowGroup extends CustomerClientShowGroup {}
+    /**
+     * wxCode
+     */
+    @NotBlank(message = "wxCode不能为空",groups = {AddUserInternalGroup.class})
+    private String wxCode;
+
+    /**
+     * 手机号
+     */
+    @NotBlank(message = "账号不能为空",groups = {AddUserShowGroup.class})
+    private String userAccount;
+
+    /**
+     * 选择的组织所属的id
+     */
+    @NotBlank(message = "客户id不能为空",groups = {AddUserInternalGroup.class})
+    private String customerId;
+
+    /**
+     * 选择的要进入的组织(根组织id)
+     */
+    @NotBlank(message = "组织id不能为空",groups = {AddUserInternalGroup.class})
+    private String rootAgencyId;
+
+    /**
+     * desc:小程序appId
+     */
+    private String appId;
+
+}
+

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

@@ -0,0 +1,47 @@
+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 单客户-选择组织，进入首页入参Dto
+ * @Author sun
+ */
+@Data
+public class ThirdWxmpEnteOrgByAccountFormDTO implements Serializable {
+    public interface AddUserInternalGroup {}
+    public interface AddUserShowGroup extends CustomerClientShowGroup {}
+    /**
+     * wxCode
+     */
+    @NotBlank(message = "wxCode不能为空",groups = {AddUserInternalGroup.class})
+    private String wxCode;
+
+    /**
+     * 手机号
+     */
+    @NotBlank(message = "账号不能为空",groups = {AddUserShowGroup.class})
+    private String userAccount;
+
+    /**
+     * 选择的组织所属的id
+     */
+    @NotBlank(message = "客户id不能为空",groups = {AddUserInternalGroup.class})
+    private String customerId;
+
+    /**
+     * 选择的要进入的组织(根组织id)
+     */
+    @NotBlank(message = "组织id不能为空",groups = {AddUserInternalGroup.class})
+    private String rootAgencyId;
+
+    /**
+     * 客户appId（exJson文件中获取）
+     */
+    @NotBlank(message = "appId不能为空",groups = {AddUserInternalGroup.class})
+    private String appId;
+}
+

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

@@ -111,6 +111,17 @@ public interface EpmetUserFeignClient {
 	@PostMapping(value = "epmetuser/customerstaff/getcustomerstaffinfo", consumes = MediaType.APPLICATION_JSON_VALUE)
 	Result<CustomerStaffDTO> getCustomerStaffInfo(@RequestBody CustomerStaffFormDTO customerStaffFormDTO);
 
+	/**
+	 * @param customerStaffFormDTO
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.CustomerStaffDTO>
+	 * @Author zhy
+	 * @Description 根据手机号+客户id获取工作人员基本信息
+	 * @Date 2020/4/20 14:16
+	 **/
+	@PostMapping(value = "epmetuser/customerstaff/getcustomerstaffinfobyaccount", consumes = MediaType.APPLICATION_JSON_VALUE)
+	Result<CustomerStaffDTO> getCustomerStaffInfoByAccount(@RequestBody CustomerStaffByAccountFormDTO customerStaffFormDTO);
+
+
 	/**
 	 * @param staffLoginHistoryFormDTO
 	 * @return com.epmet.commons.tools.utils.Result

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

@@ -63,6 +63,11 @@ public class EpmetUserFeignClientFallback implements EpmetUserFeignClient {
 		return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getCustomerStaffInfo", customerStaffFormDTO);
 	}
 
+	@Override
+	public Result<CustomerStaffDTO> getCustomerStaffInfoByAccount(CustomerStaffByAccountFormDTO customerStaffFormDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getCustomerStaffInfoByAccount", customerStaffFormDTO);
+	}
+
 	@Override
 	public Result saveStaffLoginRecord(StaffLoginAgencyRecordFormDTO staffLoginHistoryFormDTO) {
 		return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "saveStaffLoginRecord", staffLoginHistoryFormDTO);

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

@@ -49,6 +49,15 @@ public interface GovLoginService {
      **/
     UserTokenResultDTO enterOrg(GovWxmpEnteOrgFormDTO formDTO);
 
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.UserTokenResultDTO>
+     * @Author zhy
+     * @Description 4、选择组织，进入首页
+     * @Date 2020/4/20 13:08
+     **/
+    UserTokenResultDTO enterOrgByAccount(GovWxmpEnteOrgByAccountFormDTO formDTO);
+
     /**
      * @return com.epmet.commons.tools.utils.Result
      * @param tokenDto

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

@@ -36,6 +36,15 @@ public interface ThirdLoginService {
 	 **/
 	UserTokenResultDTO enterOrg(ThirdWxmpEnteOrgFormDTO formDTO);
 
+
+	/**
+	 * @param formDTO
+	 * @return
+	 * @Author zhy
+	 * @Description 单客户-选择组织，进入首页
+	 **/
+	UserTokenResultDTO enterOrgByAccount(ThirdWxmpEnteOrgByAccountFormDTO formDTO);
+
 	/**
 	 * @param formDTO
 	 * @return

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

@@ -289,6 +289,36 @@ public class GovLoginServiceImpl implements GovLoginService, ResultDataResolver
         return userTokenResultDTO;
     }
 
+    @Override
+    public UserTokenResultDTO enterOrgByAccount(GovWxmpEnteOrgByAccountFormDTO formDTO) {
+        //1、需要校验要登录的客户，是否被禁用
+        CustomerStaffByAccountFormDTO customerStaffFormDTO = new CustomerStaffByAccountFormDTO();
+        customerStaffFormDTO.setCustomerId(formDTO.getCustomerId());
+        customerStaffFormDTO.setUserAccount(formDTO.getUserAccount());
+        Result<CustomerStaffDTO> customerStaffDTOResult = epmetUserFeignClient.getCustomerStaffInfoByAccount(customerStaffFormDTO);
+        if (!customerStaffDTOResult.success() || null == customerStaffDTOResult.getData()) {
+            logger.warn(String.format("获取工作人员信息失败,账户[%s],客户id:[%s],code[%s],msg[%s]", formDTO.getUserAccount(), formDTO.getCustomerId(), customerStaffDTOResult.getCode(), customerStaffDTOResult.getMsg()));
+            throw new RenException(customerStaffDTOResult.getCode());
+        }
+        CustomerStaffDTO customerStaff = customerStaffDTOResult.getData();
+        //2、解析微信用户
+        WxMaJscode2SessionResult wxMaJscode2SessionResult = loginService.getWxMaUser(LoginConstant.APP_GOV, formDTO.getWxCode(), formDTO.getAppId());
+
+        //3、记录staff_wechat,并记录用户激活状态，激活时间
+        this.savestaffwechat(customerStaff.getUserId(), wxMaJscode2SessionResult.getOpenid(), formDTO.getCustomerId());
+        //4、记录登录日志
+        GovWxmpEnteOrgFormDTO orgDTO = ConvertUtils.sourceToTarget(formDTO, GovWxmpEnteOrgFormDTO.class);
+        orgDTO.setMobile(customerStaff.getMobile());
+        this.saveStaffLoginRecord(orgDTO, customerStaff.getUserId(), wxMaJscode2SessionResult.getOpenid());
+        //5.1、获取用户token
+        String token = this.generateGovWxmpToken(customerStaff.getUserId());
+        //5.2、保存到redis
+        this.saveGovTokenDto(formDTO.getRootAgencyId(), formDTO.getCustomerId(), customerStaff.getUserId(), wxMaJscode2SessionResult, token);
+        UserTokenResultDTO userTokenResultDTO = new UserTokenResultDTO();
+        userTokenResultDTO.setToken(token);
+        return userTokenResultDTO;
+    }
+
     @Override
     public void loginOut(TokenDto tokenDto) {
         if(null == tokenDto){

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

@@ -425,6 +425,68 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
         return userTokenResultDTO;
     }
 
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 单客户-选择组织，进入首页
+     **/
+    @Override
+    public UserTokenResultDTO enterOrgByAccount(ThirdWxmpEnteOrgByAccountFormDTO formDTO) {
+        //1、需要校验要登录的客户，是否被禁用
+        CustomerStaffByAccountFormDTO customerStaffFormDTO = new CustomerStaffByAccountFormDTO();
+        customerStaffFormDTO.setCustomerId(formDTO.getCustomerId());
+        customerStaffFormDTO.setUserAccount(formDTO.getUserAccount());
+        Result<CustomerStaffDTO> customerStaffDTOResult = epmetUserOpenFeignClient.getCustomerStaffInfoByAccount(customerStaffFormDTO);
+        if (!customerStaffDTOResult.success() || null == customerStaffDTOResult.getData()) {
+            logger.error(String.format("获取工作人员信息失败,账户[%s],客户id:[%s],code[%s],msg[%s]", formDTO.getUserAccount(), formDTO.getCustomerId(), customerStaffDTOResult.getCode(), customerStaffDTOResult.getMsg()));
+            throw new RenException(customerStaffDTOResult.getCode());
+        }
+        CustomerStaffDTO customerStaff = customerStaffDTOResult.getData();
+        //2020.7.24 获取微信信息接口调整，改调用微信api的方式  sun  start
+        //2.调用epmet_third服务，校验appId是否有效以及是否授权,校验通过的调用微信API获取用户基本信息
+        WxLoginFormDTO resiLoginFormDTO = new WxLoginFormDTO();
+        resiLoginFormDTO.setAppId(formDTO.getAppId());
+        resiLoginFormDTO.setWxCode(formDTO.getWxCode());
+        UserWechatDTO userWechatDTO = this.getUserWeChat(resiLoginFormDTO);
+        WxMaJscode2SessionResult wxMaJscode2SessionResult = new WxMaJscode2SessionResult();
+        wxMaJscode2SessionResult.setOpenid(userWechatDTO.getWxOpenId());
+        wxMaJscode2SessionResult.setSessionKey(userWechatDTO.getSessionKey());
+        wxMaJscode2SessionResult.setUnionid("");
+        // end
+        //3、记录staff_wechat,并记录用户激活状态，激活时间
+        this.savestaffwechat(customerStaff.getUserId(), userWechatDTO.getWxOpenId(), formDTO.getCustomerId());
+        //4、记录登录日志
+        StaffLatestAgencyResultDTO staffLatestAgencyResultDTO = new StaffLatestAgencyResultDTO();
+        staffLatestAgencyResultDTO.setCustomerId(formDTO.getCustomerId());
+        staffLatestAgencyResultDTO.setStaffId(customerStaff.getUserId());
+        staffLatestAgencyResultDTO.setWxOpenId(userWechatDTO.getWxOpenId());
+        staffLatestAgencyResultDTO.setMobile(customerStaff.getMobile());
+        staffLatestAgencyResultDTO.setAgencyId(formDTO.getRootAgencyId());
+        this.saveStaffLoginRecord(staffLatestAgencyResultDTO);
+        //5.1、获取用户token
+        String token = this.generateGovWxmpToken(customerStaff.getUserId());
+        //5.2、保存到redis
+        StaffLatestAgencyResultDTO staffLatestAgency = new StaffLatestAgencyResultDTO();
+        staffLatestAgency.setAgencyId(formDTO.getRootAgencyId());
+        staffLatestAgency.setCustomerId(formDTO.getCustomerId());
+        staffLatestAgency.setStaffId(customerStaff.getUserId());
+        this.saveLatestGovTokenDto(staffLatestAgency, userWechatDTO, token);
+
+        UserTokenResultDTO userTokenResultDTO = new UserTokenResultDTO();
+        userTokenResultDTO.setToken(token);
+
+        //6.发送登录事件
+        try {
+            sendLoginEvent(customerStaff.getUserId(), formDTO.getAppId(), AppClientConstant.APP_GOV, AppClientConstant.CLIENT_WXMP);
+        } catch (RenException e) {
+            log.error(e.getInternalMsg());
+        } catch (Exception e) {
+            log.error("【工作端enterOrg登录】发送登录事件失败，程序继续执行。错误信息");
+        }
+        return userTokenResultDTO;
+    }
+
     /**
      * @param formDTO
      * @return

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddStaffV3FromDTO.java → epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddStaffPyFromDTO.java

@@ -17,7 +17,7 @@ import java.util.List;
  */
 @NoArgsConstructor
 @Data
-public class AddStaffV3FromDTO implements Serializable {
+public class AddStaffPyFromDTO implements Serializable {
 	private static final long serialVersionUID = 1L;
 	/**
 	 * 新增人员所属类型Id
@@ -34,8 +34,8 @@ public class AddStaffV3FromDTO implements Serializable {
 	/**
 	 * 姓名
 	 */
-	@NotBlank(message = "姓名不能为空", groups = AddStaffV3FromDTO.AddStaff.class)
+	@NotBlank(message = "姓名不能为空", groups = AddStaffPyFromDTO.AddStaff.class)
-	@Length(max = 15, message = "姓名仅允许输入15个字符", groups = AddStaffV3FromDTO.AddStaff.class)
+	@Length(max = 15, message = "姓名仅允许输入15个字符", groups = AddStaffPyFromDTO.AddStaff.class)
 	private String name;
 	/**
 	 * 人员ID
@@ -44,29 +44,36 @@ public class AddStaffV3FromDTO implements Serializable {
 	/**
 	 * 手机
 	 */
-	@NotBlank(message = "手机号不能为空", groups = AddStaffV3FromDTO.AddStaff.class)
+	@NotBlank(message = "手机号不能为空", groups = AddStaffPyFromDTO.AddStaff.class)
-	@Pattern(regexp = "^[1][3,4,5,6,7,8,9][0-9]{9}$", message = "请输入正确的手机号", groups = AddStaffV3FromDTO.AddStaff.class)
+	@Pattern(regexp = "^[1][3,4,5,6,7,8,9][0-9]{9}$", message = "请输入正确的手机号", groups = AddStaffPyFromDTO.AddStaff.class)
 	private String mobile;
 	/**
 	 * 性别
 	 */
-	@NotNull(message = "性别不能为空", groups = AddStaffV3FromDTO.AddStaff.class)
+	@NotNull(message = "性别不能为空", groups = AddStaffPyFromDTO.AddStaff.class)
 	private Integer gender;
 	/**
 	 * 专兼职
 	 */
-	@NotBlank(message = "专兼职不能为空", groups = AddStaffV3FromDTO.AddStaff.class)
+	@NotBlank(message = "专兼职不能为空", groups = AddStaffPyFromDTO.AddStaff.class)
 	private String workType;
 
 	/**
 	 * 账户
 	 */
-	@NotBlank(message = "账户不能为空", groups = AddStaffV3FromDTO.AddStaff.class)
+	@NotBlank(message = "账号不能为空", groups = AddStaffPyFromDTO.AddStaff.class)
 	private String userAccount;
+
+	/**
+	 * 密码
+	 */
+	@NotBlank(message = "密码不能为空", groups = AddStaffPyFromDTO.AddStaff.class)
+	private String pwd;
+
 	/**
 	 * 角色id列表
 	 */
-	@NotNull(message = "角色不能为空", groups = AddStaffV3FromDTO.AddStaff.class)
+	@NotNull(message = "角色不能为空", groups = AddStaffPyFromDTO.AddStaff.class)
 	private List<String> roles;
 	public interface AddStaff extends CustomerClientShowGroup {}
 	/**

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitV3FromDTO.java → epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitPyFromDTO.java

@@ -11,13 +11,13 @@ import java.io.Serializable;
 import java.util.List;
 
 /**
- * @author zhaoqifeng
+ * @author zhy
  * @dscription
  * @date 2020/4/24 10:43
  */
 @NoArgsConstructor
 @Data
-public class StaffSubmitV3FromDTO implements Serializable {
+public class StaffSubmitPyFromDTO implements Serializable {
 	private static final long serialVersionUID = 1L;
 	/**
 	 * 客户ID
@@ -51,8 +51,12 @@ public class StaffSubmitV3FromDTO implements Serializable {
 	/**
 	 * 性别
 	 */
-	@NotNull(message = "账户不能为空")
+	@NotNull(message = "账号不能为空")
 	private String userAccount;
+	/**
+	 * 密码
+	 */
+	private String pwd;
 	/**
 	 * 专兼职
 	 */

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java

@@ -109,7 +109,7 @@ public class StaffController {
 	 */
 	@PostMapping("editstaffv3")
 	@RequirePermission(requirePermission = RequirePermissionEnum.ORG_STAFF_UPDATE)
-	public Result editStaff(@LoginUser TokenDto tokenDto, @RequestBody StaffSubmitV3FromDTO fromDTO){
+	public Result editStaff(@LoginUser TokenDto tokenDto, @RequestBody StaffSubmitPyFromDTO fromDTO){
 		ValidatorUtils.validateEntity(fromDTO);
 		return staffService.editStaffV3(tokenDto, fromDTO);
 	}
@@ -209,17 +209,17 @@ public class StaffController {
 	}
 
 	/**
-	 * 【通讯录】人员添加v2
+	 * 【通讯录】人员添加-平阴
-	 * @author sun
+	 * @author zhy
 	 */
-	@PostMapping("addstaffv3")
+	@PostMapping("addstaffpy")
 	@RequirePermission(requirePermission = RequirePermissionEnum.ORG_STAFF_CREATE)
-	public Result addStaffV2(@LoginUser TokenDto tokenDto, @RequestBody AddStaffV3FromDTO fromDTO){
+	public Result addStaffPy(@LoginUser TokenDto tokenDto, @RequestBody AddStaffPyFromDTO fromDTO){
-		ValidatorUtils.validateEntity(fromDTO, AddStaffV3FromDTO.AddStaff.class);
+		ValidatorUtils.validateEntity(fromDTO, AddStaffPyFromDTO.AddStaff.class);
 		fromDTO.setCustomerId(tokenDto.getCustomerId());
 		fromDTO.setApp(tokenDto.getApp());
 		fromDTO.setClient(tokenDto.getClient());
-		return staffService.addStaffV3(fromDTO);
+		return staffService.addStaffPy(fromDTO);
 	}
 
 	/**

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java

@@ -97,8 +97,8 @@ public interface EpmetUserFeignClient {
 	 * @param fromDTO 参数
 	 * @return Result
 	 */
-	@PostMapping("/epmetuser/customerstaff/addstaffv3")
+	@PostMapping("/epmetuser/customerstaff/addstaffpy")
-	Result<CustomerStaffDTO> addStaffV3(@RequestBody StaffSubmitV3FromDTO fromDTO);
+	Result<CustomerStaffDTO> addStaffPy(@RequestBody StaffSubmitPyFromDTO fromDTO);
 
 
 	/**
@@ -117,7 +117,7 @@ public interface EpmetUserFeignClient {
 	 * @return Result
 	 */
 	@PostMapping("/epmetuser/customerstaff/editstaffv3")
-	Result editStaffV3(@RequestBody StaffSubmitV3FromDTO fromDTO);
+	Result editStaffV3(@RequestBody StaffSubmitPyFromDTO fromDTO);
 
 
 	/**

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java

@@ -63,8 +63,8 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
     }
 
     @Override
-    public Result<CustomerStaffDTO> addStaffV3(StaffSubmitV3FromDTO fromDTO) {
+    public Result<CustomerStaffDTO> addStaffPy(StaffSubmitPyFromDTO fromDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "addStaffv3", fromDTO);
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "addStaffPy", fromDTO);
     }
 
     @Override
@@ -73,7 +73,7 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
     }
 
     @Override
-    public Result editStaffV3(StaffSubmitV3FromDTO fromDTO) {
+    public Result editStaffV3(StaffSubmitPyFromDTO fromDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "editStaffV3", fromDTO);
     }
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java

@@ -70,7 +70,7 @@ public interface StaffService {
 	 * @param fromDTO 参数
 	 * @return Result
 	 */
-	Result editStaffV3(TokenDto tokenDto,StaffSubmitV3FromDTO fromDTO);
+	Result editStaffV3(TokenDto tokenDto, StaffSubmitPyFromDTO fromDTO);
 
 	/**
 	 * 人员详情
@@ -140,10 +140,10 @@ public interface StaffService {
 
 
 	/**
-	 * 【通讯录】人员添加v3
+	 * 【通讯录】人员添加-平阴
 	 * @author zhy
 	 */
-	Result addStaffV3(AddStaffV3FromDTO fromDTO);
+	Result addStaffPy(AddStaffPyFromDTO fromDTO);
 
 	/**
 	 * @Description 工作人员所属组织

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java

@@ -196,7 +196,7 @@ public class StaffServiceImpl implements StaffService {
 	}
 
 	@Override
-	public Result editStaffV3(TokenDto tokenDto, StaffSubmitV3FromDTO fromDTO) {
+	public Result editStaffV3(TokenDto tokenDto, StaffSubmitPyFromDTO fromDTO) {
 		CustomerAgencyEntity customerAgencyEntity = customerAgencyService.selectById(fromDTO.getAgencyId());
 		fromDTO.setCustomerId(customerAgencyEntity.getCustomerId());
 
@@ -600,13 +600,10 @@ public class StaffServiceImpl implements StaffService {
 		return new Result();
 	}
 
-	/**
+
-	 * 【通讯录】人员添加v3
-	 * @author zhy
-	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public Result addStaffV3(AddStaffV3FromDTO fromDTO) {
+	public Result addStaffPy(AddStaffPyFromDTO fromDTO) {
 		//1.根据新增人员类型判断查询机关信息
 		OrgResultDTO orgDTO = customerAgencyDao.selectAgencyDetail(fromDTO.getOrgId(), fromDTO.getOrgType());
 		if (null == orgDTO) {
@@ -615,9 +612,9 @@ public class StaffServiceImpl implements StaffService {
 		}
 
 		//2.调用user服务，新增用户信息
-		StaffSubmitV3FromDTO submitDTO = ConvertUtils.sourceToTarget(fromDTO, StaffSubmitV3FromDTO.class);
+		StaffSubmitPyFromDTO submitDTO = ConvertUtils.sourceToTarget(fromDTO, StaffSubmitPyFromDTO.class);
 		submitDTO.setAgencyId(orgDTO.getAgencyId());
-		Result<CustomerStaffDTO> result = epmetUserFeignClient.addStaffV3(submitDTO);
+		Result<CustomerStaffDTO> result = epmetUserFeignClient.addStaffPy(submitDTO);
 		if (!result.success()) {
 			if (result.getCode() != EpmetErrorCode.SERVER_ERROR.getCode()) {
 				return new Result().error(result.getCode(), result.getMsg());

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CustomerStaffByAccountFormDTO.java

@@ -0,0 +1,36 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 根据手机号+客户id获取工作人员基本信息
+ * @Author yinzuomei
+ * @Date 2020/4/20 14:02
+ */
+@Data
+public class CustomerStaffByAccountFormDTO implements Serializable {
+    private static final long serialVersionUID = 7619815083427853431L;
+
+    // 根据手机号+客户id获取工作人员基本信息
+    public interface GetCustomerStaffInfo {}
+
+    @NotBlank(message = "账号不能为空", groups = { GetCustomerStaffInfo.class })
+    private String userAccount;
+    @NotBlank(message = "客户id不能为空", groups = { GetCustomerStaffInfo.class })
+    private String customerId;
+
+    /**
+     * 姓名
+     */
+    private String realName;
+
+    /**
+     * 用户id集合
+     */
+    private List<String> userIds;
+}
+

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -150,6 +150,16 @@ public interface EpmetUserOpenFeignClient {
     @PostMapping(value = "epmetuser/customerstaff/getcustomerstaffinfo", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<CustomerStaffDTO> getCustomerStaffInfo(@RequestBody CustomerStaffFormDTO customerStaffFormDTO);
 
+    /**
+     * @param customerStaffFormDTO
+     * @return
+     * @Author sun
+     * @Description 根据账户+客户id获取工作人员基本信息
+     **/
+    @PostMapping(value = "epmetuser/customerstaff/getcustomerstaffinfobyaccount", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<CustomerStaffDTO> getCustomerStaffInfoByAccount(@RequestBody CustomerStaffByAccountFormDTO customerStaffFormDTO);
+
+
     /**
      * @param userIdList
      * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.UserBaseInfoResultDTO>>

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -96,6 +96,11 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getCustomerStaffInfo", customerStaffFormDTO);
     }
 
+    @Override
+    public Result<CustomerStaffDTO> getCustomerStaffInfoByAccount(CustomerStaffByAccountFormDTO customerStaffFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getCustomerStaffInfoByAccount", customerStaffFormDTO);
+    }
+
     /**
      * @param userIdList
      * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.UserBaseInfoResultDTO>>

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java

@@ -143,6 +143,19 @@ public class CustomerStaffController {
         return customerStaffService.getCustomerStaffInfo(formDTO);
     }
 
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.CustomerStaffDTO>
+     * @Author zhy
+     * @Description 根据账户+客户id获取工作人员基本信息
+     * @Date 2020/4/20 14:04
+     **/
+    @PostMapping(value = "getcustomerstaffinfobyaccount")
+    public Result<CustomerStaffDTO> getCustomerStaffInfoByAccount(@RequestBody CustomerStaffByAccountFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, CustomerStaffFormDTO.GetCustomerStaffInfo.class);
+        return customerStaffService.getCustomerStaffInfoByAccount(formDTO);
+    }
+
     /**
      * 根据userId查询网格下用户信息
      * @param customerStaffGridDTOS
@@ -250,9 +263,9 @@ public class CustomerStaffController {
      * @param fromDTO 参数
      * @return Result
      */
-    @PostMapping("addstaffv3")
+    @PostMapping("addstaffpy")
-    public Result<CustomerStaffDTO> addStaffV3(@RequestBody StaffSubmitV3FromDTO fromDTO){
+    public Result<CustomerStaffDTO> addStaffPy(@RequestBody StaffSubmitPyFromDTO fromDTO){
-        Result<CustomerStaffDTO> result = customerStaffService.addStaffV3(fromDTO);
+        Result<CustomerStaffDTO> result = customerStaffService.addStaffPy(fromDTO);
 
         //2021-10-18 推送mq，数据同步到中介库 start
         if (result.success()) {
@@ -299,7 +312,7 @@ public class CustomerStaffController {
      * @return Result
      */
     @PostMapping("editstaffv3")
-    public Result editStaffV3(@RequestBody StaffSubmitV3FromDTO fromDTO){
+    public Result editStaffV3(@RequestBody StaffSubmitPyFromDTO fromDTO){
         Result result = customerStaffService.editStaffV3(fromDTO);
 
         //2021-10-18 推送mq，数据同步到中介库 start

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

@@ -56,6 +56,15 @@ public interface CustomerStaffDao extends BaseDao<CustomerStaffEntity> {
      **/
     CustomerStaffDTO selectListCustomerStaffInfo(CustomerStaffFormDTO formDTO);
 
+	/**
+	 * @param formDTO
+	 * @return com.epmet.dto.CustomerStaffDTO
+	 * @Author zhy
+	 * @Description 根据账户+客户id获取工作人员基本信息
+	 * @Date 2020/4/20 14:08
+	 **/
+	CustomerStaffDTO selectListCustomerStaffInfoByAccount(CustomerStaffByAccountFormDTO formDTO);
+
 	CustomerStaffDTO selectStaffInfoByUserId(CustomerStaffDTO formDTO);
 
     /**

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

@@ -123,6 +123,15 @@ public interface CustomerStaffService extends BaseService<CustomerStaffEntity> {
 	 **/
 	Result<CustomerStaffDTO> getCustomerStaffInfo(CustomerStaffFormDTO formDTO);
 
+	/**
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.CustomerStaffDTO>
+	 * @Author zhy
+	 * @Description 根据账户+客户id获取工作人员基本信息
+	 * @Date 2020/4/20 14:05
+	 **/
+	Result<CustomerStaffDTO> getCustomerStaffInfoByAccount(CustomerStaffByAccountFormDTO formDTO);
+
 	/**
 	 * 根据用户ID获取工作人员基本信息
 	 *
@@ -184,7 +193,7 @@ public interface CustomerStaffService extends BaseService<CustomerStaffEntity> {
 	 * @param fromDTO 参数
 	 * @return Result
 	 */
-	Result<CustomerStaffDTO> addStaffV3(StaffSubmitV3FromDTO fromDTO);
+	Result<CustomerStaffDTO> addStaffPy(StaffSubmitPyFromDTO fromDTO);
 
 
 	/**
@@ -201,7 +210,7 @@ public interface CustomerStaffService extends BaseService<CustomerStaffEntity> {
 	 * @param fromDTO 参数
 	 * @return Result
 	 */
-	Result editStaffV3(StaffSubmitV3FromDTO fromDTO);
+	Result editStaffV3(StaffSubmitPyFromDTO fromDTO);
 
 	/**
 	 * 人员详情

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

@@ -184,6 +184,21 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
         return new Result<CustomerStaffDTO>().ok(customerStaffDTO);
     }
 
+    @Override
+    public Result<CustomerStaffDTO> getCustomerStaffInfoByAccount(CustomerStaffByAccountFormDTO formDTO) {
+        CustomerStaffDTO customerStaffDTO = baseDao.selectListCustomerStaffInfoByAccount(formDTO);
+        if (null == customerStaffDTO) {
+            logger.warn(String.format("根据账户查询用户异常,账户:[%s],code[%s],msg[%s]", formDTO.getUserAccount(), EpmetErrorCode.GOV_STAFF_ACCOUNT_NOT_EXISTS.getCode(), EpmetErrorCode.GOV_STAFF_ACCOUNT_NOT_EXISTS.getMsg()));
+            return new Result().error(EpmetErrorCode.GOV_STAFF_ACCOUNT_NOT_EXISTS.getCode());
+        }
+        //判断用户是否已被禁用
+        if (null != customerStaffDTO && UserConstant.DISABLED.equals(customerStaffDTO.getEnableFlag())) {
+            logger.warn(String.format("根据账户查询用户异常,账户:[%s],客户id:[%s],code[%s],msg[%s]", formDTO.getUserAccount(), formDTO.getCustomerId(), EpmetErrorCode.GOV_STAFF_DISABLED.getCode(), EpmetErrorCode.GOV_STAFF_DISABLED.getMsg()));
+            return new Result().error(EpmetErrorCode.GOV_STAFF_DISABLED.getCode());
+        }
+        return new Result<CustomerStaffDTO>().ok(customerStaffDTO);
+    }
+
     @Override
     public Result<CustomerStaffDTO> getCustomerStaffInfoByUserId(CustomerStaffDTO formDTO) {
         CustomerStaffDTO customerStaffDTO = baseDao.selectStaffInfoByUserId(formDTO);
@@ -355,7 +370,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Result<CustomerStaffDTO> addStaffV3(StaffSubmitV3FromDTO fromDTO) {
+    public Result<CustomerStaffDTO> addStaffPy(StaffSubmitPyFromDTO fromDTO) {
         CustomerStaffFormDTO customerStaffFormDTO = new CustomerStaffFormDTO();
         customerStaffFormDTO.setCustomerId(fromDTO.getCustomerId());
         customerStaffFormDTO.setMobile(fromDTO.getMobile());
@@ -380,7 +395,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
         staffEntity.setGender(fromDTO.getGender());
         staffEntity.setWorkType(fromDTO.getWorkType());
         staffEntity.setEnableFlag(CustomerStaffConstant.ENABLE);
-        staffEntity.setPassword(PasswordUtils.encode("12345678"));
+        staffEntity.setPassword(PasswordUtils.encode(fromDTO.getPwd()));
         baseDao.insert(staffEntity);
 
         //工作人员角色关联表
@@ -485,7 +500,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Result editStaffV3(StaffSubmitV3FromDTO fromDTO) {
+    public Result editStaffV3(StaffSubmitPyFromDTO fromDTO) {
         CustomerStaffFormDTO customerStaffFormDTO = new CustomerStaffFormDTO();
         customerStaffFormDTO.setCustomerId(fromDTO.getCustomerId());
         customerStaffFormDTO.setMobile(fromDTO.getMobile());

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

@@ -26,6 +26,14 @@
         and cs.CUSTOMER_ID=#{customerId}
         and cs.DEL_FLAG='0'
     </select>
+    <!--    根据账户+客户id获取工作人员基本信息 -->
+    <select id="selectListCustomerStaffInfoByAccount" parameterType="com.epmet.dto.form.CustomerStaffByAccountFormDTO" resultType="com.epmet.dto.CustomerStaffDTO">
+        select * from customer_staff cs
+        where cs.USER_ACCOUNT=#{userAccount}
+          and cs.CUSTOMER_ID=#{customerId}
+          and cs.DEL_FLAG='0'
+    </select>
+
     <select id="selectStaffInfoByUserId" parameterType="com.epmet.dto.CustomerStaffDTO" resultType="com.epmet.dto.CustomerStaffDTO">
         select * from customer_staff cs
         where cs.USER_ID=#{userId}