Browse Source

网格工作人员

dev
zxc 5 years ago
parent
commit
9bdddd4216
  1. 10
      epmet-module/epmet-ext/epmet-ext-server/pom.xml
  2. 3
      epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/constant/ModuleConstant.java
  3. 40
      epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/controller/OpenUpController.java
  4. 24
      epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/service/OpenUpService.java
  5. 56
      epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/service/impl/OpenUpServiceImpl.java
  6. 20
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/DepartmentIdFormDTO.java
  7. 20
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GridIdFormDTO.java
  8. 14
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
  9. 10
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
  10. 5
      epmet-module/gov-org/gov-org-server/pom.xml
  11. 18
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserIdsFormDTO.java
  12. 33
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/RoleResultDTO.java
  13. 42
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffSinGridResultDTO.java
  14. 9
      epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
  15. 5
      epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
  16. 12
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java
  17. 13
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java
  18. 10
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GovStaffRoleDao.java
  19. 8
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java
  20. 36
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
  21. 19
      epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
  22. 18
      epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml

10
epmet-module/epmet-ext/epmet-ext-server/pom.xml

@ -31,6 +31,16 @@
<artifactId>epmet-commons-tools</artifactId> <artifactId>epmet-commons-tools</artifactId>
<version>2.0.0</version> <version>2.0.0</version>
</dependency> </dependency>
<dependency>
<groupId>com.epmet</groupId>
<artifactId>epmet-user-client</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>com.epmet</groupId>
<artifactId>gov-org-client</artifactId>
<version>2.0.0</version>
</dependency>
<dependency> <dependency>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>epmet-commons-mybatis</artifactId> <artifactId>epmet-commons-mybatis</artifactId>

3
epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/constant/ModuleConstant.java

@ -6,5 +6,8 @@ package com.epmet.constant;
*/ */
public interface ModuleConstant { public interface ModuleConstant {
String ERROR_GOV_ORG = "调用gov_org服务查询网格下的所有工作人员失败";
String ERROR_EPMET_USER = "调用epmet_user服务查询网格下的所有工作人员失败";
} }

40
epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/controller/OpenUpController.java

@ -1,8 +1,20 @@
package com.epmet.controller; package com.epmet.controller;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.dto.form.StaffSinDeptFormDTO;
import com.epmet.dto.form.StaffSinGridFormDTO;
import com.epmet.dto.result.StaffSinDeptResultDTO;
import com.epmet.dto.result.StaffSinGridResultDTO;
import com.epmet.service.OpenUpService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/** /**
* @Author zxc * @Author zxc
* @DateTime 2020/8/13 9:16 上午 * @DateTime 2020/8/13 9:16 上午
@ -10,4 +22,32 @@ import org.springframework.web.bind.annotation.RestController;
@RestController @RestController
@RequestMapping("staff") @RequestMapping("staff")
public class OpenUpController { public class OpenUpController {
@Autowired
private OpenUpService openUpService;
/**
* @Description 网格工作人员 被禁用的未激活的不显示
* @param formDTO
* @author zxc
* @date 2020/8/13 9:42 上午
*/
@PostMapping("staffsingrid")
public Result<List<StaffSinGridResultDTO>> staffSinGrid(@RequestBody StaffSinGridFormDTO formDTO){
ValidatorUtils.validateEntity(formDTO, StaffSinGridFormDTO.StaffSinGrid.class);
return new Result<List<StaffSinGridResultDTO>>().ok(openUpService.staffSinGrid(formDTO));
}
/**
* @Description 部门工作人员 被禁用的未激活的不显示
* @param formDTO
* @author zxc
* @date 2020/8/13 9:51 上午
*/
@PostMapping("staffsindept")
public Result<List<StaffSinDeptResultDTO>> staffSinDept(@RequestBody StaffSinDeptFormDTO formDTO){
ValidatorUtils.validateEntity(formDTO, StaffSinDeptFormDTO.StaffSinDept.class);
return new Result<List<StaffSinDeptResultDTO>>().ok(openUpService.staffSinDept(formDTO));
}
} }

24
epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/service/OpenUpService.java

@ -1,8 +1,32 @@
package com.epmet.service; package com.epmet.service;
import com.epmet.dto.form.StaffSinDeptFormDTO;
import com.epmet.dto.form.StaffSinGridFormDTO;
import com.epmet.dto.result.StaffSinDeptResultDTO;
import com.epmet.dto.result.StaffSinGridResultDTO;
import java.util.List;
/** /**
* @Author zxc * @Author zxc
* @DateTime 2020/8/13 9:17 上午 * @DateTime 2020/8/13 9:17 上午
*/ */
public interface OpenUpService { public interface OpenUpService {
/**
* @Description 网格工作人员 被禁用的未激活的不显示
* @param formDTO
* @author zxc
* @date 2020/8/13 9:42 上午
*/
List<StaffSinGridResultDTO> staffSinGrid(StaffSinGridFormDTO formDTO);
/**
* @Description 部门工作人员 被禁用的未激活的不显示
* @param formDTO
* @author zxc
* @date 2020/8/13 9:51 上午
*/
List<StaffSinDeptResultDTO> staffSinDept( StaffSinDeptFormDTO formDTO);
} }

56
epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/service/impl/OpenUpServiceImpl.java

@ -1,12 +1,68 @@
package com.epmet.service.impl; package com.epmet.service.impl;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.utils.Result;
import com.epmet.constant.ModuleConstant;
import com.epmet.dto.form.CommonGridIdFormDTO;
import com.epmet.dto.form.StaffSinDeptFormDTO;
import com.epmet.dto.form.StaffSinGridFormDTO;
import com.epmet.dto.form.UserIdsFormDTO;
import com.epmet.dto.result.StaffSinDeptResultDTO;
import com.epmet.dto.result.StaffSinGridResultDTO;
import com.epmet.feign.EpmetUserOpenFeignClient;
import com.epmet.feign.GovOrgOpenFeignClient;
import com.epmet.service.OpenUpService; import com.epmet.service.OpenUpService;
import org.bouncycastle.math.raw.Mod;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List;
/** /**
* @Author zxc * @Author zxc
* @DateTime 2020/8/13 9:18 上午 * @DateTime 2020/8/13 9:18 上午
*/ */
@Service @Service
public class OpenUpServiceImpl implements OpenUpService { public class OpenUpServiceImpl implements OpenUpService {
@Autowired
private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
@Autowired
private GovOrgOpenFeignClient govOrgOpenFeignClient;
/**
* @Description 网格工作人员 被禁用的未激活的不显示
* @param formDTO
* @author zxc
* @date 2020/8/13 9:42 上午
*/
@Override
public List<StaffSinGridResultDTO> staffSinGrid(StaffSinGridFormDTO formDTO) {
CommonGridIdFormDTO commonGridId = new CommonGridIdFormDTO();
commonGridId.setGridId(formDTO.getGridId());
commonGridId.setUserId("");
Result<List<String>> gridStaffs = govOrgOpenFeignClient.getGridStaffs(commonGridId);
if (!gridStaffs.success()){
throw new RenException(ModuleConstant.ERROR_GOV_ORG);
}
List<String> userIds = gridStaffs.getData();
UserIdsFormDTO userIdsForm = new UserIdsFormDTO();
userIdsForm.setUserIds(userIds);
Result<List<StaffSinGridResultDTO>> staffInfoList = epmetUserOpenFeignClient.getStaffInfoList(userIdsForm);
if (!staffInfoList.success()){
throw new RenException(ModuleConstant.ERROR_EPMET_USER);
}
return staffInfoList.getData();
}
/**
* @Description 部门工作人员 被禁用的未激活的不显示
* @param formDTO
* @author zxc
* @date 2020/8/13 9:51 上午
*/
@Override
public List<StaffSinDeptResultDTO> staffSinDept(StaffSinDeptFormDTO formDTO) {
return null;
}
} }

20
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/DepartmentIdFormDTO.java

@ -0,0 +1,20 @@
package com.epmet.dto.form;
import lombok.Data;
import java.io.Serializable;
/**
* @Author zxc
* @DateTime 2020/8/13 10:37 上午
*/
@Data
public class DepartmentIdFormDTO implements Serializable {
private static final long serialVersionUID = -1718433407335647411L;
/**
* 部门Id
*/
private String departmentId;
}

20
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GridIdFormDTO.java

@ -0,0 +1,20 @@
package com.epmet.dto.form;
import lombok.Data;
import java.io.Serializable;
/**
* @Author zxc
* @DateTime 2020/8/13 10:35 上午
*/
@Data
public class GridIdFormDTO implements Serializable {
private static final long serialVersionUID = -1062540828459359881L;
/**
* 网格Id
*/
private String gridId;
}

14
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java

@ -4,10 +4,7 @@ import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.CustomerAgencyDTO; import com.epmet.dto.CustomerAgencyDTO;
import com.epmet.dto.CustomerPartyBranchDTO; import com.epmet.dto.CustomerPartyBranchDTO;
import com.epmet.dto.form.AddAgencyAndStaffFormDTO; import com.epmet.dto.form.*;
import com.epmet.dto.form.BelongGridNameFormDTO;
import com.epmet.dto.form.ListPartyBranchFormDTO;
import com.epmet.dto.form.StaffOrgFormDTO;
import com.epmet.dto.result.*; import com.epmet.dto.result.*;
import com.epmet.feign.fallback.GovOrgOpenFeignClientFallback; import com.epmet.feign.fallback.GovOrgOpenFeignClientFallback;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
@ -187,4 +184,13 @@ public interface GovOrgOpenFeignClient {
**/ **/
@PostMapping(value = "/gov/org/customeragency/getStaffOrgList",consumes = MediaType.APPLICATION_JSON_VALUE) @PostMapping(value = "/gov/org/customeragency/getStaffOrgList",consumes = MediaType.APPLICATION_JSON_VALUE)
Result<List<StaffOrgsResultDTO>> getStaffOrgList(StaffOrgFormDTO staffOrgFormDTO); Result<List<StaffOrgsResultDTO>> getStaffOrgList(StaffOrgFormDTO staffOrgFormDTO);
/**
* @Description 查询一个网格下的所有工作人员
* @param gridIdFormDTO
* @author zxc
* @date 2020/8/13 10:46 上午
*/
@PostMapping("/gov/org/customerstaffgrid/getgridstaffs")
Result<List<String>> getGridStaffs(@RequestBody CommonGridIdFormDTO gridIdFormDTO);
} }

10
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java

@ -5,10 +5,7 @@ import com.epmet.commons.tools.utils.ModuleUtils;
import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.CustomerAgencyDTO; import com.epmet.dto.CustomerAgencyDTO;
import com.epmet.dto.CustomerPartyBranchDTO; import com.epmet.dto.CustomerPartyBranchDTO;
import com.epmet.dto.form.AddAgencyAndStaffFormDTO; import com.epmet.dto.form.*;
import com.epmet.dto.form.BelongGridNameFormDTO;
import com.epmet.dto.form.ListPartyBranchFormDTO;
import com.epmet.dto.form.StaffOrgFormDTO;
import com.epmet.dto.result.*; import com.epmet.dto.result.*;
import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.feign.GovOrgOpenFeignClient;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -114,4 +111,9 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
public Result<List<StaffOrgsResultDTO>> getStaffOrgList(StaffOrgFormDTO staffOrgFormDTO) { public Result<List<StaffOrgsResultDTO>> getStaffOrgList(StaffOrgFormDTO staffOrgFormDTO) {
return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getStaffOrgList", staffOrgFormDTO); return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getStaffOrgList", staffOrgFormDTO);
} }
@Override
public Result<List<String>> getGridStaffs(CommonGridIdFormDTO gridIdFormDTO) {
return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getGridStaffs", gridIdFormDTO);
}
} }

5
epmet-module/gov-org/gov-org-server/pom.xml

@ -18,6 +18,11 @@
<artifactId>gov-org-client</artifactId> <artifactId>gov-org-client</artifactId>
<version>2.0.0</version> <version>2.0.0</version>
</dependency> </dependency>
<dependency>
<groupId>com.epmet</groupId>
<artifactId>oper-crm-client</artifactId>
<version>2.0.0</version>
</dependency>
<dependency> <dependency>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>epmet-commons-mybatis</artifactId> <artifactId>epmet-commons-mybatis</artifactId>

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

@ -0,0 +1,18 @@
package com.epmet.dto.form;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @Author zxc
* @DateTime 2020/8/13 1:36 下午
*/
@Data
public class UserIdsFormDTO implements Serializable {
private static final long serialVersionUID = -6168528618954442905L;
private List<String> userIds;
}

33
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/RoleResultDTO.java

@ -0,0 +1,33 @@
package com.epmet.dto.result;
import com.fasterxml.jackson.annotation.JsonIgnore;
import jdk.nashorn.internal.ir.annotations.Ignore;
import lombok.Data;
import java.io.Serializable;
/**
* @Author zxc
* @DateTime 2020/8/13 9:30 上午
*/
@Data
public class RoleResultDTO implements Serializable {
private static final long serialVersionUID = -432136606721817459L;
/**
* 角色key
*/
private String roleKey;
/**
* 角色名称
*/
private String roleName;
/**
* 用户id
*/
@JsonIgnore
private String userId;
}

42
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffSinGridResultDTO.java

@ -0,0 +1,42 @@
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @Author zxc
* @DateTime 2020/8/13 9:25 上午
*/
@Data
public class StaffSinGridResultDTO implements Serializable {
private static final long serialVersionUID = -3440415466710443002L;
/**
* 工作人员Id
*/
private String staffId;
/**
* 工作人员名称
*/
private String staffName;
/**
* 头像
*/
private String headPhoto;
/**
* 性别1男2女0未知
*/
private Integer gender;
/**
* 角色列表
*/
private List<RoleResultDTO> roleList;
}

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

@ -259,4 +259,13 @@ public interface EpmetUserOpenFeignClient {
**/ **/
@PostMapping(value = "epmetuser/gridlatest/latestgridinfo") @PostMapping(value = "epmetuser/gridlatest/latestgridinfo")
Result<LatestGridInfoResultDTO> latestGridInfo(@RequestBody LatestGridInfoFormDTO formDTO); Result<LatestGridInfoResultDTO> latestGridInfo(@RequestBody LatestGridInfoFormDTO formDTO);
/**
* @Description 查询工作人员的信息
* @param formDTO
* @author zxc
* @date 2020/8/13 1:37 下午
*/
@PostMapping("epmetuser/customerstaff/getstaffinfolist")
Result<List<StaffSinGridResultDTO>> getStaffInfoList(@RequestBody UserIdsFormDTO formDTO);
} }

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

@ -183,4 +183,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
public Result<LatestGridInfoResultDTO> latestGridInfo(LatestGridInfoFormDTO formDTO) { public Result<LatestGridInfoResultDTO> latestGridInfo(LatestGridInfoFormDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "latestGridInfo", formDTO); return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "latestGridInfo", formDTO);
} }
@Override
public Result<List<StaffSinGridResultDTO>> getStaffInfoList(UserIdsFormDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffInfoList", formDTO);
}
} }

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

@ -321,4 +321,16 @@ public class CustomerStaffController {
public Result<List<CustomerStaffDTO>> getCustsomerStaffByIdAndPhone(@RequestBody ThirdCustomerStaffFormDTO formDTO) { public Result<List<CustomerStaffDTO>> getCustsomerStaffByIdAndPhone(@RequestBody ThirdCustomerStaffFormDTO formDTO) {
return new Result<List<CustomerStaffDTO>>().ok(customerStaffService.getCustsomerStaffByIdAndPhone(formDTO)); return new Result<List<CustomerStaffDTO>>().ok(customerStaffService.getCustsomerStaffByIdAndPhone(formDTO));
} }
/**
* @Description 查询工作人员的信息
* @param formDTO
* @author zxc
* @date 2020/8/13 1:45 下午
*/
@PostMapping("getstaffinfolist")
public Result<List<StaffSinGridResultDTO>> getStaffInfoList(@RequestBody UserIdsFormDTO formDTO){
ValidatorUtils.validateEntity(formDTO);
return new Result<List<StaffSinGridResultDTO>>().ok(customerStaffService.getStaffInfoList(formDTO));
}
} }

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

@ -21,10 +21,7 @@ import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.*; import com.epmet.dto.*;
import com.epmet.dto.form.*; import com.epmet.dto.form.*;
import com.epmet.dto.result.DepartInStaffListResultDTO; import com.epmet.dto.result.*;
import com.epmet.dto.result.StaffInfoResultDTO;
import com.epmet.dto.result.CommonStaffInfoResultDTO;
import com.epmet.dto.result.StaffListResultDTO;
import com.epmet.entity.CustomerStaffEntity; import com.epmet.entity.CustomerStaffEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
@ -148,4 +145,12 @@ public interface CustomerStaffDao extends BaseDao<CustomerStaffEntity> {
* @Description 根据客户ID手机号查询政府端工作人员基本信息 * @Description 根据客户ID手机号查询政府端工作人员基本信息
**/ **/
List<CustomerStaffDTO> selectStaff(ThirdCustomerStaffFormDTO formDTO); List<CustomerStaffDTO> selectStaff(ThirdCustomerStaffFormDTO formDTO);
/**
* @Description 查询工作人员的信息
* @param userIds
* @author zxc
* @date 2020/8/13 1:45 下午
*/
List<StaffSinGridResultDTO> getStaffInfoList(@Param("userIds")List<String> userIds);
} }

10
epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GovStaffRoleDao.java

@ -20,6 +20,8 @@ package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.GovStaffRoleDTO; import com.epmet.dto.GovStaffRoleDTO;
import com.epmet.dto.result.GovStaffRoleResultDTO; import com.epmet.dto.result.GovStaffRoleResultDTO;
import com.epmet.dto.result.RoleInfoResultDTO;
import com.epmet.dto.result.RoleResultDTO;
import com.epmet.entity.GovStaffRoleEntity; import com.epmet.entity.GovStaffRoleEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
@ -61,4 +63,12 @@ public interface GovStaffRoleDao extends BaseDao<GovStaffRoleEntity> {
List<GovStaffRoleResultDTO> listRolesByCustomer(@Param("customerId") String customerId); List<GovStaffRoleResultDTO> listRolesByCustomer(@Param("customerId") String customerId);
GovStaffRoleResultDTO getDTOById(@Param("roleId") String roleId); GovStaffRoleResultDTO getDTOById(@Param("roleId") String roleId);
/**
* @Description 查询用户的权限
* @param userIds
* @author zxc
* @date 2020/8/13 2:14 下午
*/
List<RoleResultDTO> getRoleInfoList(@Param("userIds")List<String> userIds);
} }

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

@ -258,4 +258,12 @@ public interface CustomerStaffService extends BaseService<CustomerStaffEntity> {
* @Description 根据客户ID手机号查询政府端工作人员基本信息校验用户是否存在 * @Description 根据客户ID手机号查询政府端工作人员基本信息校验用户是否存在
**/ **/
List<CustomerStaffDTO> getCustsomerStaffByIdAndPhone(ThirdCustomerStaffFormDTO formDTO); List<CustomerStaffDTO> getCustsomerStaffByIdAndPhone(ThirdCustomerStaffFormDTO formDTO);
/**
* @Description 查询工作人员的信息
* @param formDTO
* @author zxc
* @date 2020/8/13 1:45 下午
*/
List<StaffSinGridResultDTO> getStaffInfoList( UserIdsFormDTO formDTO);
} }

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

@ -36,6 +36,7 @@ import com.epmet.constant.RoleKeyConstants;
import com.epmet.constant.UserConstant; import com.epmet.constant.UserConstant;
import com.epmet.constant.UserRoleConstant; import com.epmet.constant.UserRoleConstant;
import com.epmet.dao.CustomerStaffDao; import com.epmet.dao.CustomerStaffDao;
import com.epmet.dao.GovStaffRoleDao;
import com.epmet.dao.StaffRoleDao; import com.epmet.dao.StaffRoleDao;
import com.epmet.dto.*; import com.epmet.dto.*;
import com.epmet.dto.form.*; import com.epmet.dto.form.*;
@ -56,6 +57,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -93,6 +95,10 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
private AuthFeignClient authFeignClient; private AuthFeignClient authFeignClient;
@Autowired @Autowired
private GovOrgOpenFeignClient govOrgOpenFeignClient; private GovOrgOpenFeignClient govOrgOpenFeignClient;
@Autowired
private CustomerStaffDao customerStaffDao;
@Autowired
private GovStaffRoleDao govStaffRoleDao;
@Override @Override
public PageData<CustomerStaffDTO> page(Map<String, Object> params) { public PageData<CustomerStaffDTO> page(Map<String, Object> params) {
@ -540,4 +546,34 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
return customerStaffDTOList; return customerStaffDTOList;
} }
/**
* @Description 查询工作人员的信息
* @param formDTO
* @author zxc
* @date 2020/8/13 1:45 下午
*/
@Override
public List<StaffSinGridResultDTO> getStaffInfoList(UserIdsFormDTO formDTO) {
List<String> userIds = formDTO.getUserIds();
// 1. 根据userId查询人员基本信息
List<StaffSinGridResultDTO> staffInfoList = customerStaffDao.getStaffInfoList(userIds);
if (staffInfoList.size() == NumConstant.ZERO){
return staffInfoList;
}
// 2. 根据userId查询权限
List<RoleResultDTO> roleInfoList = govStaffRoleDao.getRoleInfoList(userIds);
staffInfoList.forEach(staffInfo -> {
List<RoleResultDTO> roleResult = new ArrayList<>();
roleInfoList.forEach(role -> {
if (staffInfo.getStaffId().equals(role.getUserId())){
RoleResultDTO result = new RoleResultDTO();
BeanUtils.copyProperties(role,result);
roleResult.add(result);
}
});
staffInfo.setRoleList(roleResult);
});
return staffInfoList;
}
} }

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

@ -215,4 +215,23 @@
AND mobile = #{mobile} AND mobile = #{mobile}
ORDER BY active_time DESC, created_time ASC ORDER BY active_time DESC, created_time ASC
</select> </select>
<!-- 查询工作人员的信息 -->
<select id="getStaffInfoList" resultType="com.epmet.dto.result.StaffSinGridResultDTO">
SELECT
cs.user_id AS staffId,
cs.real_name AS staffName,
IFNULL( uw.head_img_url, '' ) AS headPhoto,
gender AS gender
FROM
customer_staff cs
LEFT JOIN user_wechat uw ON uw.user_id = cs.user_id
WHERE
cs.del_flag = 0
AND uw.del_flag = 0
AND
<foreach collection="userIds" item="userId" separator="OR">
cs.user_id = #{userId}
</foreach>
</select>
</mapper> </mapper>

18
epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml

@ -68,4 +68,22 @@
gsr.ORG_TYPE AS orgType gsr.ORG_TYPE AS orgType
FROM gov_staff_role gsr WHERE ID = #{roleId} FROM gov_staff_role gsr WHERE ID = #{roleId}
</select> </select>
<!-- 查询用户的权限 -->
<select id="getRoleInfoList" resultType="com.epmet.dto.result.RoleResultDTO">
SELECT
gsr.role_key AS roleKey,
gsr.role_name AS roleName,
sr.staff_id AS userId
FROM
gov_staff_role gsr
LEFT JOIN staff_role sr ON sr.role_id = gsr.id
WHERE
gsr.del_flag = 0
AND sr.del_flag = 0
AND
<foreach collection="userIds" item="userId" separator="OR">
sr.staff_id = #{userId}
</foreach>
</select>
</mapper> </mapper>
Loading…
Cancel
Save