网格管理、部门管理接口相关

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

@@ -0,0 +1,30 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @ClassName CommonDepartmentFormDTO
+ * @Author wangc
+ * @date 2020.04.26 16:21
+ */
+@Data
+public class CommonDepartmentFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -7557299771900280575L;
+
+    /**
+     * 部门Id
+     * */
+    @NotBlank(message = "部门Id不能为空")
+    private String departmentId;
+
+    /**
+     * 用户Id
+     * */
+    @NotBlank(message = "用户Id不能为空")
+    private String userId;
+}

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

@@ -0,0 +1,35 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @ClassName CommonDepartmentStaffInfoFormDTO
+ * @Author wangc
+ * @date 2020.04.26 16:52
+ */
+@Data
+public class CommonDepartmentStaffInfoFormDTO implements Serializable {
+    private static final long serialVersionUID = 2895745833519899428L;
+
+    /**
+     * 部门Id
+     * */
+    @NotBlank(message = "部门Id")
+    private String departmentId;
+
+    /**
+     * 工作人员Id
+     * */
+    @NotBlank(message = "工作人员Id不能为空")
+    private String staffId;
+
+    /**
+     * 用户Id
+     * */
+    @NotBlank(message = "用户Id不能为空")
+    private String userId;
+}

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

@@ -0,0 +1,35 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 通用的网格工作人员入参DTO   包含网格Id和用户Id
+ * @ClassName CommonGridStaffInfoFormDTO
+ * @Author wangc
+ * @date 2020.04.26 09:38
+ */
+@Data
+public class CommonGridStaffInfoFormDTO implements Serializable{
+    private static final long serialVersionUID = 6345334778886091374L;
+
+    /**
+     * 网格Id
+     * */
+    @NotBlank(message = "网格Id不能为空")
+    private String gridId;
+
+    /**
+     * 员工Id
+     * */
+    @NotBlank(message = "工作人员Id不能为空")
+    private String staffId;
+
+    /**
+     * 当前操作人
+     * */
+    @NotBlank(message = "用户Id不能为空")
+    private String userId;
+}

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

@@ -0,0 +1,38 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 通用的网格工作人员列表入参DTO   包含网格Id和用户Id集合
+ * @ClassName CommonGridStaffListFromDTO
+ * @Author wangc
+ * @date 2020.04.26 09:38
+ */
+@Data
+public class CommonGridStaffListFromDTO implements Serializable{
+
+    private static final long serialVersionUID = -5753128515827497700L;
+
+    /**
+     * 网格Id
+     * */
+    @NotBlank(message = "网格Id不能为空")
+    private String gridId;
+
+    /**
+     * 员工Id列表
+     * */
+    @NotBlank(message = "工作人员Id不能为空")
+    private List<String> selectedList;
+
+    /**
+     * 当前操作人
+     * */
+    @NotBlank(message = "用户Id不能为空")
+    private String userId;
+
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridListInfoResultDTO.java

@@ -16,8 +16,6 @@ import java.util.List;
  */
 @Data
 @AllArgsConstructor
-@RequiredArgsConstructor
-@NoArgsConstructor
 public class GridListInfoResultDTO implements Serializable {
     private static final long serialVersionUID = -5513674274570559283L;
 

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

@@ -3,11 +3,10 @@ package com.epmet.controller;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.AddDepartmentResultDTO;
+import com.epmet.dto.result.*;
-import com.epmet.dto.result.DepartmentDetailResultDTO;
+import com.epmet.service.CustomerStaffAgencyService;
-import com.epmet.dto.result.DepartmentInAgencyResultDTO;
-import com.epmet.dto.result.DepartmentListResultDTO;
 import com.epmet.service.DepartmentService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -28,6 +27,8 @@ public class DepartmentController {
 
     @Autowired
     private DepartmentService departmentService;
+    @Autowired
+    private CustomerStaffAgencyService customerStaffAgencyService;
 
     @PostMapping(value = "adddepartmentstaff")
     public Result addDepartmentStaff(@LoginUser TokenDto tokenDto, @RequestBody AddDepartmentFormDTO addDepartmentFormDTO){
@@ -99,4 +100,33 @@ public class DepartmentController {
     public Result<List<DepartmentListResultDTO>> departmentList(@RequestBody DepartmentListFormDTO formDTO) {
         return departmentService.departmentList(formDTO);
     }
+
+    /**
+     * @Description 查询加入部门的可选人员列表
+     * @Param TokenDto
+     * @Param CommonDepartmentFormDTO
+     * @return Result<List<CommonStaffInfoResultDTO>>
+     * @Author wangc
+     * @Date 2020.04.26 16:47
+     **/
+    @PostMapping("selectablestaffs")
+    public Result<List<CommonStaffInfoResultDTO>> selectableStaffs(@LoginUser TokenDto tokenDto,@RequestBody CommonDepartmentFormDTO departmentFormDTO){
+        departmentFormDTO.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(departmentFormDTO);
+        return customerStaffAgencyService.getSelectableDeptStaffs(departmentFormDTO);
+    }
+
+    /**
+     * @Description 移除部门人员
+     * @Param TokenDto
+     * @Param CommonDepartmentStaffInfoFormDTO
+     * @return Result
+     * @Author wangc
+     * @Date 2020.04.26 17:09
+     **/
+    public Result removeStaff(@LoginUser TokenDto tokenDto,@RequestBody CommonDepartmentStaffInfoFormDTO departmentStaffInfoFormDTO){
+        departmentStaffInfoFormDTO.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(departmentStaffInfoFormDTO);
+        return departmentService.removeStaff(departmentStaffInfoFormDTO);
+    }
 }

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

@@ -3,15 +3,11 @@ package com.epmet.controller;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.form.AddGridFormDTO;
+import com.epmet.dto.form.*;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.dto.form.CommonAgencyIdFormDTO;
-import com.epmet.dto.form.CommonGridIdFormDTO;
-import com.epmet.dto.form.CustomerGridFormDTO;
-import com.epmet.dto.form.DeleteGridFormDTO;
-import com.epmet.dto.form.EditGridFormDTO;
 import com.epmet.dto.result.AddGridResultDTO;
 import com.epmet.dto.result.CommonStaffInfoResultDTO;
+import com.epmet.dto.result.GridBaseInfoResultDTO;
 import com.epmet.dto.result.GridDetailResultDTO;
 import com.epmet.dto.result.GridListInfoResultDTO;
 import com.epmet.service.CustomerGridService;
@@ -76,7 +72,7 @@ public class GridController {
 
     /**
      * @Description 查找指定机构下的网格列表
-     * @Param CommonAgencyIdFormDTO -> gridId
+     * @Param CommonAgencyIdFormDTO -> agencyId
      * @return Result<GridListInfoResultDTO>
      * @Author wangc
      * @Date 2020.04.23 14:45
@@ -88,6 +84,20 @@ public class GridController {
         return customerGridService.getGridListByAgency(agencyFormDTO);
     }
 
+    /**
+     * @Description 查找指定机构下的全部网格列表
+     * @Param CommonAgencyIdFormDTO -> agencyId
+     * @return Result<GridListInfoResultDTO>
+     * @Author wangc
+     * @Date 2020.04.23 14:45
+     **/
+    @PostMapping("allgrids")
+    public Result<List<GridBaseInfoResultDTO>> allGrids(@LoginUser TokenDto tokenDto, @RequestBody CommonAgencyIdFormDTO agencyFormDTO){
+        agencyFormDTO.setAgencyId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(agencyFormDTO);
+        return customerGridService.getAllGridsByAgency(agencyFormDTO);
+    }
+
     /**
      * @Description 在给网格添加工作人员时，查询当前机关下没有加入到此网格下的工作人员，禁用的也不能选（不显示）
      * @Param CommonGridIdFormDTO
@@ -101,4 +111,34 @@ public class GridController {
         ValidatorUtils.validateEntity(gridIdFormDTO);
         return customerStaffAgencyService.getSelectableStaffs(gridIdFormDTO);
     }
+
+    /**
+     * @Description 添加网格工作人员 批量
+     * @Param tokenDto
+     * @Param CommonGridStaffListFromDTO
+     * @return Result
+     * @Author wangc
+     * @Date 2020.04.26 15:36
+     **/
+    @PostMapping("addgridstaffs")
+    public Result addGridStaffs(@LoginUser TokenDto tokenDto, @RequestBody CommonGridStaffListFromDTO commonGridStaffListFromDTO){
+        commonGridStaffListFromDTO.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(tokenDto);
+        return customerGridService.addGridStaffs(commonGridStaffListFromDTO);
+    }
+
+    /**
+     * @Description 移除网格工作人员
+     * @Param tokenDto
+     * @Param CommonGridStaffInfoFormDTO
+     * @return Result
+     * @Author wangc
+     * @Date 2020.04.26 15:36
+     **/
+    @PostMapping("removegridstaff")
+    public Result removeGridStaff(@LoginUser TokenDto tokenDto, @RequestBody CommonGridStaffInfoFormDTO commonGridStaffInfoFormDTO){
+        commonGridStaffInfoFormDTO.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(tokenDto);
+        return customerGridService.removeGridStaff(commonGridStaffInfoFormDTO);
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java

@@ -142,5 +142,5 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
      * @Author wangc
      * @Date 2020.04.23 15:30
      **/
-    List<GridBaseInfoResultDTO> selectGridListByAgencyId(@Param("agencyId")String agencyId);
+    List<GridBaseInfoResultDTO> selectGridListByAgencyId(@Param("agencyId")String agencyId,@Param("pageSize")Integer pageSize);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffAgencyDao.java

@@ -60,4 +60,12 @@ public interface CustomerStaffAgencyDao extends BaseDao<CustomerStaffAgencyEntit
 	 **/
 	List<String> getSelectableStaffsForGrid(@Param("gridId") String gridId);
 
+	/**
+	 * @Description 查询当前网格所属机构下的不在此部门的工作人员Id(禁用未知)
+	 * @Param gridId (String)
+	 * @return List<String> UserId列表
+	 * @Author wangc
+	 * @Date 2020.04.26 16:33
+	 **/
+	List<String> getSelectableStaffsForDept(@Param("departmentId") String departmentId);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffGridDao.java

@@ -19,9 +19,15 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.CustomerGridDTO;
+import com.epmet.dto.CustomerStaffGridDTO;
 import com.epmet.dto.form.LatestGridFormDTO;
 import com.epmet.entity.CustomerStaffGridEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 /**
  * 网格人员关系表 
@@ -41,4 +47,22 @@ public interface CustomerStaffGridDao extends BaseDao<CustomerStaffGridEntity> {
      **/
     CustomerGridDTO selectStaffGridOrderByGridName(LatestGridFormDTO latestGridFormDTO);
 
+    /**
+     * @Description 校验用户是否已加入当前网格
+     * @Param userIds
+     * @Param gridId
+     * @return Set<String>
+     * @Author wangc
+     * @Date 2020.04.26 14:08
+     **/
+    Set<String> distinctGridStaffs(@Param("userIds")List<String> userIds, @Param("gridId")String gridId);
+
+    /**
+     * @Description 批量插入网格工作人员
+     * @Param List<CustomerStaffGridDTO>
+     * @return
+     * @Author wangc
+     * @Date 2020.04.26 14:57
+     **/
+    void insertBatch(List<CustomerStaffGridDTO> list);
 }

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

@@ -3,19 +3,11 @@ package com.epmet.feign;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.*;
-import com.epmet.dto.form.DepartmentInStaffFormDTO;
+import com.epmet.dto.form.*;
-import com.epmet.dto.form.StaffInfoFromDTO;
+import com.epmet.dto.result.*;
-import com.epmet.dto.form.StaffSubmitFromDTO;
-import com.epmet.dto.form.StaffsInAgencyFromDTO;
-import com.epmet.dto.result.DepartInStaffListResultDTO;
-import com.epmet.dto.result.StaffDetailResultDTO;
-import com.epmet.dto.result.StaffInfoResultDTO;
-import com.epmet.dto.result.StaffInitResultDTO;
 import com.epmet.dto.CustomerStaffDTO;
 import com.epmet.dto.CustomerStaffGridDTO;
 import com.epmet.dto.StaffGridListDTO;
-import com.epmet.dto.form.CommonUserIdListFormList;
-import com.epmet.dto.result.CommonStaffInfoResultDTO;
 import com.epmet.feign.fallback.EpmetUserFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -127,11 +119,21 @@ public interface EpmetUserFeignClient {
 
 	/**
 	 * @Description 通过userId列表查询未被禁用的用户信息
-	 * @Param CommonUserIdListFormList :: getUserIdList
+	 * @Param CommonUserIdListFormDTO :: getUserIdList
 	 * @return Result<List<CommonStaffInfoResultDTO>>
 	 * @Author wangc
 	 * @Date 2020.04.24 15:44
 	 **/
     @PostMapping("/epmetuser/customerstaff/enabestaffmsglist")
-	Result<List<CommonStaffInfoResultDTO>> enableStaffMsgList(CommonUserIdListFormList userIdList);
+	Result<List<CommonStaffInfoResultDTO>> enableStaffMsgList(CommonUserIdListFormDTO userIdList);
+
+    /**
+     * @Description 查询一个员工在指定客户下的角色
+     * @Param CommonUserFormDTO
+     * @return Result<StaffRolesResultDTO>
+     * @Author wangc
+     * @Date 2020.04.26 13:08
+     **/
+    @PostMapping("/epmetuser/staffrole/getcustomerstaffroles")
+	Result<StaffRolesResultDTO> getCustomerStaffRoles(CommonUserFormDTO commonUserFormDTO);
 }

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

@@ -4,19 +4,11 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.*;
-import com.epmet.dto.form.DepartmentInStaffFormDTO;
+import com.epmet.dto.form.*;
-import com.epmet.dto.form.StaffInfoFromDTO;
+import com.epmet.dto.result.*;
-import com.epmet.dto.form.StaffSubmitFromDTO;
-import com.epmet.dto.form.StaffsInAgencyFromDTO;
-import com.epmet.dto.result.DepartInStaffListResultDTO;
-import com.epmet.dto.result.StaffDetailResultDTO;
-import com.epmet.dto.result.StaffInfoResultDTO;
-import com.epmet.dto.result.StaffInitResultDTO;
 import com.epmet.dto.CustomerStaffDTO;
 import com.epmet.dto.CustomerStaffGridDTO;
 import com.epmet.dto.StaffGridListDTO;
-import com.epmet.dto.form.CommonUserIdListFormList;
-import com.epmet.dto.result.CommonStaffInfoResultDTO;
 import com.epmet.feign.EpmetUserFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -89,7 +81,12 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
     }
 
     @Override
-    public Result<List<CommonStaffInfoResultDTO>> enableStaffMsgList(CommonUserIdListFormList userIdList) {
+    public Result<List<CommonStaffInfoResultDTO>> enableStaffMsgList(CommonUserIdListFormDTO userIdList) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "enableStaffMsgList", userIdList);
     }
+
+    @Override
+    public Result<StaffRolesResultDTO> getCustomerStaffRoles(CommonUserFormDTO commonUserFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getCustomerStaffRoles", commonUserFormDTO);
+    }
 }

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

@@ -28,10 +28,7 @@ import com.epmet.dto.result.AddGridResultDTO;
 import com.epmet.dto.form.CommonAgencyIdFormDTO;
 import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.dto.form.ListCustomerGridFormDTO;
-import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
+import com.epmet.dto.result.*;
-import com.epmet.dto.result.CustomerGridForStrangerResultDTO;
-import com.epmet.dto.result.GridDetailResultDTO;
-import com.epmet.dto.result.GridListInfoResultDTO;
 import com.epmet.entity.CustomerGridEntity;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -160,12 +157,38 @@ public interface CustomerGridService extends BaseService<CustomerGridEntity> {
 
     /**
      * @Description 查找指定机构下的网格列表 对应接口:/gov/org/grid/gridlist
-     * @Param CommonAgencyIdFormDTO -> gridId
+     * @Param CommonAgencyIdFormDTO -> agencyId
      * @return Result<GridListInfoResultDTO>
      * @Author wangc
      * @Date 2020.04.23 14:45
      **/
     Result<GridListInfoResultDTO> getGridListByAgency(CommonAgencyIdFormDTO agencyFormDTO);
+    
+    /**
+     * @Description 查找指定机构下的全部网格列表 对应接口:/gov/org/grid/allgrids
+     * @Param CommonAgencyIdFormDTO -> agencyId
+     * @return Result<List<GridBaseInfoResultDTO>>
+     * @Author wangc
+     * @Date 2020.04.24 17:16
+     **/
+    Result<List<GridBaseInfoResultDTO>> getAllGridsByAgency(CommonAgencyIdFormDTO agencyFormDTO);
+
+    /**
+     * @Description 移除网格工作人员
+     * @Param CommonGridStaffInfoFormDTO
+     * @return Result
+     * @Author wangc
+     * @Date 2020.04.26 09:48
+     **/
+    Result removeGridStaff(CommonGridStaffInfoFormDTO staffInfoFormDTO);
 
+    /**
+     * @Description 批量添加网格工作人员
+     * @Param CommonGridStaffListFromDTO
+     * @return Result
+     * @Author wangc
+     * @Date 2020.04.26 09:50
+     **/
+    Result addGridStaffs(CommonGridStaffListFromDTO staffListFormDTO);
 
 }

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

@@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerStaffAgencyDTO;
+import com.epmet.dto.form.CommonDepartmentFormDTO;
 import com.epmet.dto.form.StaffsInAgencyFromDTO;
 import com.epmet.dto.form.CommonGridIdFormDTO;
 import com.epmet.dto.result.CommonStaffInfoResultDTO;
@@ -123,4 +124,13 @@ public interface CustomerStaffAgencyService extends BaseService<CustomerStaffAge
 	 * @Date 2020.04.23 16:15
 	 **/
 	Result<List<CommonStaffInfoResultDTO>> getSelectableStaffs(CommonGridIdFormDTO gridIdFormDTO);
+
+	/**
+	 * @Description 获取添加部门成员的可选人员列表
+	 * @Param CommonDepartmentFormDTO
+	 * @return com.epmet.dto.result.CommonStaffInfoResultDTO[epmet-user-client]
+	 * @Author wangc
+	 * @Date 2020.04.26 16:37
+	 **/
+	Result<List<CommonStaffInfoResultDTO>> getSelectableDeptStaffs(CommonDepartmentFormDTO departmentFormDTO);
 }

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

@@ -77,4 +77,13 @@ public interface DepartmentService {
      * @Description 获取机构下部门列表
      */
     Result<List<DepartmentListResultDTO>> departmentList(DepartmentListFormDTO formDTO);
+
+    /**
+     * @Description 部门人员移除
+     * @Param CommonDepartmentStaffInfoFormDTO
+     * @return Result
+     * @Author wangc
+     * @Date 2020.04.26 16:57
+     **/
+    Result removeStaff(CommonDepartmentStaffInfoFormDTO departmentStaffInfoFormDTO);
 }

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

@@ -22,38 +22,39 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
-import com.epmet.commons.tools.exception.ErrorCode;
+import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.CustomerGridDao;
+import com.epmet.dao.CustomerStaffGridDao;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.AddGridResultDTO;
+import com.epmet.dto.result.*;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.CustomerStaffGridDTO;
 import com.epmet.dto.StaffGridListDTO;
 import com.epmet.dto.form.CommonAgencyIdFormDTO;
 import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.dto.form.ListCustomerGridFormDTO;
-import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
-import com.epmet.dto.result.CustomerGridForStrangerResultDTO;
-import com.epmet.dto.result.GridDetailResultDTO;
-import com.epmet.dto.result.GridBaseInfoResultDTO;
-import com.epmet.dto.result.GridListInfoResultDTO;
 import com.epmet.entity.CustomerGridEntity;
 import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.redis.CustomerGridRedis;
 import com.epmet.service.CustomerGridService;
+import com.epmet.service.CustomerStaffGridService;
 import com.epmet.util.ModuleConstant;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 客户网格表
@@ -62,12 +63,18 @@ import java.util.*;
  * @since v1.0.0 2020-03-16
  */
 @Service
+@Slf4j
 public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, CustomerGridEntity> implements CustomerGridService {
 
+    private static final Logger logger = LoggerFactory.getLogger(CustomerGridServiceImpl.class);
     @Autowired
     private CustomerGridRedis customerGridRedis;
     @Autowired
     private EpmetUserFeignClient epmetUserFeignClient;
+    @Autowired
+    private CustomerStaffGridService customerStaffGridService;
+    @Autowired
+    private CustomerStaffGridDao customerStaffGridDao;
 
     @Override
     public PageData<CustomerGridDTO> page(Map<String, Object> params) {
@@ -243,7 +250,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
     }
 
     /**
-     * @Description 查找指定机构下的网格列表 对应接口:/gov/org/grid/gridlist
+     * @Description 查找指定机构下的网格列表,按照创建时间倒叙取前十个
      * @Param CommonAgencyIdFormDTO
      * @return Result<GridListInfoResultDTO>
      * @Author wangc
@@ -254,12 +261,151 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
 
         //1.查当前机构下网格总数
         int gridCount = baseDao.selectGridCountByAgencyId(agencyFormDTO.getAgencyId());
-        //2.查当前机构下每个网格的详情
+        //2.查当前机构下每个网格的详情，按照创建时间倒叙取前十个
-        List<GridBaseInfoResultDTO> gridList = baseDao.selectGridListByAgencyId(agencyFormDTO.getAgencyId());
+        List<GridBaseInfoResultDTO> gridList = baseDao.selectGridListByAgencyId(agencyFormDTO.getAgencyId(), NumConstant.TEN);
         //3.封装结果
         GridListInfoResultDTO resultData = new GridListInfoResultDTO(gridCount,gridList);
         return new Result<GridListInfoResultDTO>().ok(resultData);
     }
 
+    /**
+     * @Description 查找指定机构下的全部网格列表
+     * @Param CommonAgencyIdFormDTO -> agencyId
+     * @return Result<List<GridBaseInfoResultDTO>>
+     * @Author wangc
+     * @Date 2020.04.24 17:16
+     **/
+    @Override
+    public Result<List<GridBaseInfoResultDTO>> getAllGridsByAgency(CommonAgencyIdFormDTO agencyFormDTO) {
+        return new Result<List<GridBaseInfoResultDTO>>().ok(baseDao.selectGridListByAgencyId(agencyFormDTO.getAgencyId(),null));
+    }
+
+    /**
+     * @Description 移除网格工作人员
+     * @Param CommonGridStaffInfoFormDTO
+     * @return Result
+     * @Author wangc
+     * @Date 2020.04.26 09:48
+     **/
+    @Override
+    public Result removeGridStaff(CommonGridStaffInfoFormDTO staffInfoFormDTO) {
+
+        Result<CustomerGridEntity> authResult = authenticateManager(staffInfoFormDTO.getGridId(),staffInfoFormDTO.getUserId());
+        if(authResult.success()){
+            //3.移除操作
+            //3.1 人员剔除
+            CustomerStaffGridDTO staff = new CustomerStaffGridDTO();
+            staff.setUserId(staffInfoFormDTO.getStaffId());
+            staff.setGridId(staffInfoFormDTO.getGridId());
+            staff.setUpdatedBy(staffInfoFormDTO.getUserId());
+            staff.setDelFlag(NumConstant.ONE);
+            customerStaffGridService.update(staff);
+            //3.2 人数减一
+            CustomerGridDTO grid = new CustomerGridDTO();
+            grid.setId(authResult.getData().getId());
+            grid.setUpdatedBy(staffInfoFormDTO.getUserId());
+            grid.setTotalUser(authResult.getData().getTotalUser() == null || authResult.getData().getTotalUser() <= 0
+                    ? 0 : (authResult.getData().getTotalUser() - 1));
+            update(grid);
+        }
+
+        return new Result().error();
+    }
+
+    /**
+     * @Description 批量添加网格工作人员
+     * @Param CommonGridStaffListFromDTO
+     * @return Result
+     * @Author wangc
+     * @Date 2020.04.26 09:50
+     **/
+    @Override
+    public Result addGridStaffs(CommonGridStaffListFromDTO staffListFormDTO) {
+        //1.校验管理员权限
+        Result<CustomerGridEntity> authResult = authenticateManager(staffListFormDTO.getGridId(),staffListFormDTO.getUserId());
+        if(authResult.success()){
+            //2.校验人员重复信息，剔除重复人员
+            Set<String> existedStaffIds =
+            customerStaffGridDao.distinctGridStaffs(staffListFormDTO.getSelectedList(),staffListFormDTO.getGridId());
+            Set<String> staffIds = new HashSet<>(staffListFormDTO.getSelectedList());
+            staffIds.removeAll(existedStaffIds);
+            //3.校验人员是否被禁用
+            Result<List<CommonStaffInfoResultDTO>> staffsFeignResult =
+            epmetUserFeignClient.enableStaffMsgList(new CommonUserIdListFormDTO(
+                    new ArrayList<>(staffIds),
+                    authResult.getData().getCustomerId()
+            ));
+            if(staffsFeignResult.success() && null != staffsFeignResult.getData() && staffsFeignResult.getData().size() > 0){
+                //4.添加
+                List<String> validStaffIds =
+                        staffsFeignResult.getData()
+                                .stream()
+                                .map(CommonStaffInfoResultDTO::getStaffId)
+                                .collect(Collectors.toList());
+                List<CustomerStaffGridDTO> staffs2Insert = new LinkedList<>();
+                for(String id : validStaffIds){
+                    CustomerStaffGridDTO staff2Insert = new CustomerStaffGridDTO();
+                    staff2Insert.setUserId(id);
+                    staff2Insert.setGridId(staffListFormDTO.getGridId());
+                    staff2Insert.setCustomerId(authResult.getData().getCustomerId());
+                    staff2Insert.setCreatedBy(staffListFormDTO.getUserId());
+                    staff2Insert.setUpdatedBy(staffListFormDTO.getUserId());
+                    staffs2Insert.add(staff2Insert);
+                }
+                //4.1 批量新增网格工作人员
+                customerStaffGridDao.insertBatch(staffs2Insert);
+                CustomerGridDTO grid2Update = new CustomerGridDTO();
+                grid2Update.setId(staffListFormDTO.getGridId());
+                grid2Update.setUpdatedBy(staffListFormDTO.getUserId());
+                grid2Update.setTotalUser(
+                       null == authResult.getData().getTotalUser() ?
+                               validStaffIds.size() : authResult.getData().getTotalUser() + validStaffIds.size()
+                );
+                //4.2 更新网格人数
+                update(grid2Update);
+                return new Result();
+            }
+
+        }
+        return new Result().error();
+    }
+
+    /**
+     * @Description 对管理员身份进行权鉴
+     * @Param
+     * @return
+     * @Author wangc
+     * @Date 2020.04.26 13:44
+     **/
+    private Result<CustomerGridEntity> authenticateManager(String gridId,String userId){
+        //1.查询网格相关信息
+        CustomerGridEntity gridMsg =
+                baseDao.selectById(gridId);
+        //2.校验权限
+        if(null != gridMsg && StringUtils.isNotBlank(gridMsg.getId()) && StringUtils.equals(gridMsg.getDelFlag(),NumConstant.ZERO_STR)){
+            CommonUserFormDTO userParam = new CommonUserFormDTO();
+            userParam.setCustomerId(gridMsg.getCustomerId());
+            userParam.setUserId(userId);
+            Result<StaffRolesResultDTO> staffFeignResult =
+                    epmetUserFeignClient.getCustomerStaffRoles(userParam);
+            StaffRolesResultDTO resultData = staffFeignResult.getData();
+            if(staffFeignResult.success() && null != resultData && StringUtils.isNotBlank(resultData.getStaffId())){
+                if(null != resultData.getRoleList()
+                        && StringUtils.equals(ModuleConstant.ENABLE,resultData.getEnableFlag())
+                        && resultData.getRoleList().size() > 0
+                        && resultData.getRoleList().contains(ModuleConstant.MANAGER)){
+                        return new Result<CustomerGridEntity>().ok(gridMsg);
+                }else{
+                    log.error(ModuleConstant.NO_AUTH_OR_DISABLE);
+                }
+            }else{
+                log.error(ModuleConstant.STAFF_INFO_NOT_FOUND);
+            }
+        }else{
+            log.error(ModuleConstant.GRID_INFO_NOT_FOUND);
+        }
+        return new Result<CustomerGridEntity>().error();
+    }
+
 
 }

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

@@ -26,22 +26,20 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.CustomerStaffAgencyDao;
-import com.epmet.dto.CustomerDTO;
+import com.epmet.dto.*;
-import com.epmet.dto.CustomerStaffAgencyDTO;
+import com.epmet.dto.form.CommonDepartmentFormDTO;
-import com.epmet.dto.CustomerStaffDTO;
+import com.epmet.dto.form.CommonUserIdListFormDTO;
 import com.epmet.dto.form.StaffsInAgencyFromDTO;
 import com.epmet.dto.form.CommonGridIdFormDTO;
-import com.epmet.dto.form.CommonUserIdListFormList;
 import com.epmet.dto.result.CommonStaffInfoResultDTO;
 import com.epmet.dto.result.LatestCustomerResultDTO;
-import com.epmet.dto.result.StaffInfoResultDTO;
-import com.epmet.dto.result.StaffsInAgencyResultDTO;
-import com.epmet.entity.CustomerAgencyEntity;
 import com.epmet.entity.CustomerStaffAgencyEntity;
 import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.feign.OperCrmFeignClient;
 import com.epmet.redis.CustomerStaffAgencyRedis;
 import com.epmet.service.CustomerAgencyService;
+import com.epmet.service.CustomerDepartmentService;
+import com.epmet.service.CustomerGridService;
 import com.epmet.service.CustomerStaffAgencyService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,7 +50,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * 人员-机关单位关系表
@@ -71,6 +68,10 @@ public class CustomerStaffAgencyServiceImpl extends BaseServiceImpl<CustomerStaf
     private OperCrmFeignClient operCrmFeignClient;
     @Autowired
     private CustomerAgencyService customerAgencyService;
+    @Autowired
+    private CustomerGridService customerGridService;
+    @Autowired
+    private CustomerDepartmentService customerDepartmentService;
 
     @Override
     public PageData<CustomerStaffAgencyDTO> page(Map<String, Object> params) {
@@ -166,9 +167,35 @@ public class CustomerStaffAgencyServiceImpl extends BaseServiceImpl<CustomerStaf
         List<String> userId = baseDao.getSelectableStaffsForGrid(customerGridFormDTO.getGridId());
         //2.去用户服务下拿取用户基本信息，并校验工作人员身份是否被禁用
         if(null != userId && userId.size() >= NumConstant.ONE){
-            //直接返回结果
+            CustomerGridDTO gridMsg =
-            return epmetUserFeignClient.enableStaffMsgList(new CommonUserIdListFormList(userId));
+            customerGridService.get(customerGridFormDTO.getGridId());
+            if(null != gridMsg && StringUtils.isNotBlank(gridMsg.getId())){
+                //直接返回结果
+                return epmetUserFeignClient.enableStaffMsgList(new CommonUserIdListFormDTO(userId,gridMsg.getCustomerId()));
+            }
+        }
+        return new Result<List<CommonStaffInfoResultDTO>>().ok(new ArrayList<>());
+    }
 
+    /**
+     * @Description 获取添加部门成员的可选人员列表
+     * @Param CommonDepartmentFormDTO
+     * @return com.epmet.dto.result.CommonStaffInfoResultDTO[epmet-user-client]
+     * @Author wangc
+     * @Date 2020.04.26 16:37
+     **/
+    @Override
+    public Result<List<CommonStaffInfoResultDTO>> getSelectableDeptStaffs(CommonDepartmentFormDTO departmentFormDTO) {
+        //1.去数据库查询是此网格所属机构且不在此网格下的工作人员，这里无法确认是否被禁用
+        List<String> userId = baseDao.getSelectableStaffsForDept(departmentFormDTO.getDepartmentId());
+        //2.去用户服务下拿取用户基本信息，并校验工作人员身份是否被禁用
+        if(null != userId && userId.size() >= NumConstant.ONE){
+            CustomerDepartmentDTO deptMsg =
+                    customerDepartmentService.get(departmentFormDTO.getDepartmentId());
+            if(null != deptMsg && StringUtils.isNotBlank(deptMsg.getId())){
+                //直接返回结果
+                return epmetUserFeignClient.enableStaffMsgList(new CommonUserIdListFormDTO(userId,deptMsg.getCustomerId()));
+            }
         }
         return new Result<List<CommonStaffInfoResultDTO>>().ok(new ArrayList<>());
     }

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

@@ -26,14 +26,19 @@ import com.epmet.constant.CustomerDepartmentConstant;
 import com.epmet.dao.CustomerAgencyDao;
 import com.epmet.dao.CustomerDepartmentDao;
 import com.epmet.dao.CustomerStaffDepartmentDao;
+import com.epmet.dto.CustomerDepartmentDTO;
+import com.epmet.dto.CustomerStaffDepartmentDTO;
 import com.epmet.dto.StaffRoleDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.CustomerAgencyEntity;
 import com.epmet.entity.CustomerDepartmentEntity;
 import com.epmet.feign.EpmetUserFeignClient;
+import com.epmet.service.CustomerDepartmentService;
+import com.epmet.service.CustomerStaffDepartmentService;
 import com.epmet.service.DepartmentService;
 import com.epmet.util.ModuleConstant;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,8 +62,12 @@ public class DepartmentServiceImpl implements DepartmentService {
     @Autowired
     private CustomerDepartmentDao customerDepartmentDao;
     @Autowired
+    private CustomerDepartmentService customerDepartmentService;
+    @Autowired
     private CustomerStaffDepartmentDao customerStaffDepartmentDao;
     @Autowired
+    private CustomerStaffDepartmentService customerStaffDepartmentService;
+    @Autowired
     private EpmetUserFeignClient epmetUserFeignClient;
 
     /**
@@ -197,4 +206,37 @@ public class DepartmentServiceImpl implements DepartmentService {
         List<DepartmentListResultDTO> departmentList = customerDepartmentDao.selectDepartmentList(formDTO.getAgencyId());
         return new Result<List<DepartmentListResultDTO>>().ok(departmentList);
     }
+
+
+    /**
+     * @Description 部门人员移除
+     * @Param CommonDepartmentStaffInfoFormDTO
+     * @return Result
+     * @Author wangc
+     * @Date 2020.04.26 16:57
+     **/
+    @Override
+    public Result removeStaff(CommonDepartmentStaffInfoFormDTO departmentStaffInfoFormDTO) {
+        //1.剔除工作人员
+        CustomerStaffDepartmentDTO staff = new CustomerStaffDepartmentDTO();
+        staff.setUserId(departmentStaffInfoFormDTO.getStaffId());
+        staff.setDepartmentId(departmentStaffInfoFormDTO.getDepartmentId());
+        staff.setUpdatedBy(departmentStaffInfoFormDTO.getUserId());
+        staff.setDelFlag(NumConstant.ONE_STR);
+        customerStaffDepartmentService.update(staff);
+        //2.部门人数减一
+        CustomerDepartmentDTO dept =
+        customerDepartmentService.get(departmentStaffInfoFormDTO.getDepartmentId());
+        if(null != dept && StringUtils.isNotBlank(dept.getId())){
+            CustomerDepartmentDTO dept2Update = new CustomerDepartmentDTO();
+            dept2Update.setId(dept.getId());
+            dept2Update.setTotalUser(null == dept.getTotalUser() || dept.getTotalUser() == 0
+                                    ? 0 : dept.getTotalUser() - NumConstant.ONE);
+            dept2Update.setUpdatedBy(departmentStaffInfoFormDTO.getUserId());
+            customerDepartmentService.update(dept2Update);
+            return new Result();
+        }
+        log.warn(ModuleConstant.DEPT_INFO_NOT_FOUND);
+        return new Result().error();
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/util/ModuleConstant.java

@@ -18,4 +18,39 @@ public interface ModuleConstant {
      * tokenDto不能为null userId不能为空
      */
     String USER_NOT_NULL="用户信息不能为空";
+
+    /**
+     * 用户未被禁用标识
+     * */
+    String ENABLE = "enable";
+
+    /**
+     * 用户被禁用标识
+     * */
+    String DISABLE = "disable";
+
+    /**
+     * 管理员角色名称
+     * */
+    String MANAGER = "管理员";
+
+    /**
+     * 操作者账号失效或没有相应权限
+     * */
+    String NO_AUTH_OR_DISABLE = "操作者账号失效或没有相应权限，终止操作。";
+
+    /**
+     * 查询操作者身份信息失败
+     * */
+    String STAFF_INFO_NOT_FOUND = "查询操作者身份信息失败，终止操作。";
+
+    /**
+     * 网格信息有误
+     * */
+    String GRID_INFO_NOT_FOUND = "网格信息有误，终止操作。";
+
+    /**
+     * 找不到相关部门信息
+     * */
+    String DEPT_INFO_NOT_FOUND = "找不到相关部门信息";
 }

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml

@@ -207,18 +207,21 @@
     </select>
 
     <!-- 得到当前机构的网格列表 -->
-    <select id="selectGridListByAgencyId" parameterType="string" resultType="com.epmet.dto.result.GridBaseInfoResultDTO">
+    <select id="selectGridListByAgencyId" resultType="com.epmet.dto.result.GridBaseInfoResultDTO">
         SELECT
             ID AS grdiId,
             GRID_NAME,
             TOTAL_USER
         FROM
             CUSTOMER_GRID
-        WHERE
+        <where>
             DEL_FLAG = '0'
             AND PID = #{agencyId}
             ORDER BY CREATED_TIME DESC
-            LIMIT 10
+            <if test="null != pageSize and pageSize > 0">
+                LIMIT #{pageSize}
+            </if>
+        </where>
     </select>
 
 </mapper>

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffAgencyDao.xml

@@ -60,13 +60,40 @@
         SELECT
 	        grid2.USER_ID
         FROM
-	        CUSTOMER_STAFF_GRID grid2
+	        CUSTOMER_STAFF_GRID
         WHERE
-	        grid2.DEL_FLAG = '0'
+	        DEL_FLAG = '0'
 	    AND
-	        grid2.GRID_ID = #{gridId} )
+	       GRID_ID = #{gridId} )
     </select>
 
+    <!-- 查询当前部门所属机构下的不在此部门的工作人员Id -->
+    <select id="getSelectableStaffsForDept" parameterType="string" resultType="string">
+        SELECT
+        agency.USER_ID
+        FROM
+        CUSTOMER_STAFF_AGENCY agency
+        WHERE
+        agency.DEL_FLAG = '0'
+        AND agency.AGENCY_ID = (
+        SELECT
+        AGENCY_ID
+        FROM
+        CUSTOMER_DEPARTMENT
+        WHERE
+        DEL_FLAG = '0'
+        AND ID = #{departmentId})
+
+        AND agency.USER_ID NOT IN (
+        SELECT
+        USER_ID
+        FROM
+        CUSTOMER_STAFF_DEPARTMENT
+        WHERE
+        DEL_FLAG = '0'
+        AND
+        DEPARTMENT_ID = #{departmentId} )
+    </select>
 
 
 

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml

@@ -41,4 +41,49 @@
         LIMIT 1
     </select>
 
+    <!-- 校验用户是否已加入当前网格 -->
+    <select id="distinctGridStaffs"  resultType="string">
+        SELECT
+            USER_ID
+        FROM
+            CUSTOMER_STAFF_GRID
+        WHERE
+            DEL_FLAG = '0'
+        AND GRID_ID = #{gird}
+        <foreach collection="userIds" item="userId" open="AND USER_ID IN (" separator="," close=")">
+            #{userId}
+        </foreach>
+
+    </select>
+
+    <!-- 批量插入网格工作人员 -->
+    <insert id="insertBatch" parameterType="java.util.List">
+        insert into customer_staff_grid
+        (
+        id,
+        user_id,
+        grid_id,
+        customer_id,
+        del_flag,
+        revision,
+        created_by,
+        created_time,
+        updated_by,
+        updated_time
+        ) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            (SELECT REPLACE(UUID(), '-', '') AS id),
+            #{item.userId},
+            #{item.gridId},
+            #{item.customerId},
+            '0',
+            0,
+            #{item.createdBy},
+            now(),
+            #{item.updatedBy},
+            now()
+            )
+        </foreach>
+    </insert>
 </mapper>

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

@@ -0,0 +1,29 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 通用的用户Id入参
+ * @ClassName CommonUserFormDTO
+ * @Author wangc
+ * @date 2020.04.26 10:53
+ */
+@Data
+public class CommonUserFormDTO implements Serializable{
+    private static final long serialVersionUID = -7994579456530273809L;
+
+    /**
+     * 用户Id
+     * */
+    @NotBlank(message = "用户Id不能为空")
+    private String userId;
+
+    /**
+     * 客户Id
+     * */
+    @NotBlank(message = "客户Id不能为空")
+    private String customerId;
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CommonUserIdListFormList.java → epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CommonUserIdListFormDTO.java

@@ -2,6 +2,7 @@ package com.epmet.dto.form;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
@@ -9,13 +10,13 @@ import java.util.List;
 
 /**
  * @Description 通用用户Id列表参数DTO
- * @ClassName CommonUserIdListFormList
+ * @ClassName CommonUserIdListFormDTO
  * @Author wangc
  * @date 2020.04.24 15:42
  */
 @Data
 @AllArgsConstructor
-public class CommonUserIdListFormList implements Serializable{
+public class CommonUserIdListFormDTO implements Serializable{
     private static final long serialVersionUID = -7045691156972928671L;
 
     /**
@@ -23,4 +24,7 @@ public class CommonUserIdListFormList implements Serializable{
      * */
     @NotBlank(message = "用户列表不能为空")
     private List<String> userIdList;
+
+    @NotBlank(message = "客户Id不能为空")
+    private String customerId;
 }

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

@@ -0,0 +1,32 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 通用的员工角色返参
+ * @ClassName StaffRolesResultDTO
+ * @Author wangc
+ * @date 2020.04.26 10:29
+ */
+@Data
+public class StaffRolesResultDTO implements Serializable {
+    private static final long serialVersionUID = -2049883620062097446L;
+
+    /**
+     * 员工Id
+     * */
+    private String staffId;
+
+    /**
+     * 角色列表
+     * */
+    private List<String> roleList;
+
+    /**
+     * 是否被禁用 未禁用enable,已禁用disabled
+     * */
+    private String enableFlag;
+}

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

@@ -34,8 +34,6 @@ import com.epmet.dto.result.StaffInitResultDTO;
 import com.epmet.dto.CustomerStaffDTO;
 import com.epmet.dto.CustomerStaffGridDTO;
 import com.epmet.dto.StaffGridListDTO;
-import com.epmet.dto.form.CommonUserIdListFormList;
-import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.dto.form.CustomerStaffFormDTO;
 import com.epmet.dto.result.CommonStaffInfoResultDTO;
 import com.epmet.excel.CustomerStaffExcel;
@@ -256,13 +254,13 @@ public class CustomerStaffController {
 
     /**
      * @Description 通过userId列表查询未被禁用的用户信息
-     * @Param CommonUserIdListFormList :: getUserIdList
+     * @Param CommonUserIdListFormDTO :: getUserIdList
      * @return Result<List<CommonStaffInfoResultDTO>>
      * @Author wangc
      * @Date 2020.04.24 15:44
      **/
     @PostMapping(value = "enabestaffmsglist")
-    public Result<List<CommonStaffInfoResultDTO>> enableStaffMsgList(@RequestBody CommonUserIdListFormList userIdList){
+    public Result<List<CommonStaffInfoResultDTO>> enableStaffMsgList(@RequestBody CommonUserIdListFormDTO userIdList){
         ValidatorUtils.validateEntity(userIdList);
         return customerStaffService.getEnableStaffMsgList(userIdList);
     }

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

@@ -3,8 +3,10 @@ package com.epmet.controller;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.GovStaffRoleDTO;
+import com.epmet.dto.form.CommonUserFormDTO;
 import com.epmet.dto.form.StaffRoleFormDTO;
 import com.epmet.dto.result.GovStaffRoleResultDTO;
+import com.epmet.dto.result.StaffRolesResultDTO;
 import com.epmet.entity.GovStaffRoleEntity;
 import com.epmet.service.GovStaffRoleService;
 import com.epmet.service.StaffRoleService;
@@ -15,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -69,4 +72,16 @@ public class StaffRoleController {
         return new Result<List<GovStaffRoleResultDTO>>().ok(staffRoleDTOS);
     }
 
+    /**
+     * @Description 查询一个员工在指定客户下的角色
+     * @Param CommonUserFormDTO
+     * @return Result<StaffRolesResultDTO>
+     * @Author wangc
+     * @Date 2020.04.26 13:06
+     **/
+    @PostMapping("getcustomerstaffroles")
+    public Result<StaffRolesResultDTO> getCustomerStaffRoles(@RequestBody CommonUserFormDTO commonUserFormDTO){
+        ValidatorUtils.validateEntity(commonUserFormDTO);
+        return staffRoleService.getStaffRoles(commonUserFormDTO);
+    }
 }

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

@@ -117,11 +117,6 @@ public interface CustomerStaffDao extends BaseDao<CustomerStaffEntity> {
 	 * @Description 根据客户Id及userId集合查询用户基本信息
 	 */
     List<DepartInStaffListResultDTO> selectDepartmentStaffList(DepartmentInStaffFormDTO fromDTO);
-     * 根据userId查询查询网格下的用户信息
-     * @param customerStaffGridDTOS
-     * @return
-     */
-    List<StaffGridListDTO> selectStaffGridListByUserId(List<CustomerStaffGridDTO> customerStaffGridDTOS);
 
     /**
      * @Description  根据UserId列表查询用信息，过滤掉被禁用的，包含未激活的
@@ -130,5 +125,5 @@ public interface CustomerStaffDao extends BaseDao<CustomerStaffEntity> {
      * @Author wangc
      * @Date 2020.04.24 15:34
      **/
-    List<CommonStaffInfoResultDTO>  selectEnableStaffMsg(@Param("userIds") List<String> userIds);
+    List<CommonStaffInfoResultDTO>  selectEnableStaffMsg(@Param("userIds") List<String> userIds,@Param("customerId")String customerId);
 }

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

@@ -19,7 +19,9 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.StaffRoleDTO;
+import com.epmet.dto.form.CommonUserFormDTO;
 import com.epmet.dto.result.GovStaffRoleResultDTO;
+import com.epmet.dto.result.StaffRolesResultDTO;
 import com.epmet.entity.StaffRoleEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -49,4 +51,13 @@ public interface StaffRoleDao extends BaseDao<StaffRoleEntity> {
      */
     boolean delStaffRoles(StaffRoleDTO dto);
 
+    /**
+     * @Description 得到指定客户下的某个用户的全部角色
+     * @Param getCustomerId :: getUserId
+     * @return StaffRolesResultDTO
+     * @Author wangc
+     * @Date 2020.04.26 11:01
+     **/
+    StaffRolesResultDTO getStaffRoles(CommonUserFormDTO commonUserFormDTO);
+
 }

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

@@ -25,7 +25,7 @@ import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.dto.CustomerStaffDTO;
 import com.epmet.dto.CustomerStaffGridDTO;
 import com.epmet.dto.StaffGridListDTO;
-import com.epmet.dto.form.CommonUserIdListFormList;
+import com.epmet.dto.form.CommonUserIdListFormDTO;
 import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.dto.form.CustomerStaffFormDTO;
 import com.epmet.dto.form.StaffInfoFromDTO;
@@ -224,10 +224,10 @@ public interface CustomerStaffService extends BaseService<CustomerStaffEntity> {
 
 	/**
 	 * @Description 通过userId列表查询未被禁用的用户信息
-	 * @Param CommonUserIdListFormList :: getUserIdList
+	 * @Param CommonUserIdListFormDTO :: getUserIdList
 	 * @return Result<List<CommonStaffInfoResultDTO>>
 	 * @Author wangc
 	 * @Date 2020.04.24 15:44
 	 **/
-	Result<List<CommonStaffInfoResultDTO>> getEnableStaffMsgList(CommonUserIdListFormList userIdList);
+	Result<List<CommonStaffInfoResultDTO>> getEnableStaffMsgList(CommonUserIdListFormDTO userIdList);
 }

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

@@ -19,8 +19,11 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.StaffRoleDTO;
+import com.epmet.dto.form.CommonUserFormDTO;
 import com.epmet.dto.result.GovStaffRoleResultDTO;
+import com.epmet.dto.result.StaffRolesResultDTO;
 import com.epmet.entity.StaffRoleEntity;
 
 import java.util.List;
@@ -107,4 +110,13 @@ public interface StaffRoleService extends BaseService<StaffRoleEntity> {
      * @param dto
      */
     void clearStaffRoles(StaffRoleDTO dto);
+
+    /**
+     * @Description 得到某一个员工在一个客户下的所有角色
+     * @Param CommonUserFormDTO :: getUserId :: getCustomerId
+     * @return Result<StaffRolesResultDTO>
+     * @Author wangc
+     * @Date 2020.04.26 10:59
+     **/
+    Result<StaffRolesResultDTO> getStaffRoles(CommonUserFormDTO userParam);
 }

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

@@ -35,8 +35,6 @@ import com.epmet.dto.result.*;
 import com.epmet.dto.CustomerStaffDTO;
 import com.epmet.dto.CustomerStaffGridDTO;
 import com.epmet.dto.StaffGridListDTO;
-import com.epmet.dto.form.CommonUserIdListFormList;
-import com.epmet.dto.form.CustomerGridFormDTO;
 import com.epmet.dto.form.CustomerStaffFormDTO;
 import com.epmet.dto.result.CommonStaffInfoResultDTO;
 import com.epmet.entity.CustomerStaffEntity;
@@ -361,14 +359,14 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 
     /**
      * @Description 通过userId列表查询未被禁用的用户信息
-     * @Param CommonUserIdListFormList :: getUserIdList
+     * @Param CommonUserIdListFormDTO :: getUserIdList
      * @return Result<List<CommonStaffInfoResultDTO>>
      * @Author wangc
      * @Date 2020.04.24 15:44
      **/
     @Override
-    public Result<List<CommonStaffInfoResultDTO>> getEnableStaffMsgList(CommonUserIdListFormList userIdList) {
+    public Result<List<CommonStaffInfoResultDTO>> getEnableStaffMsgList(CommonUserIdListFormDTO userIdList) {
-        return new Result<List<CommonStaffInfoResultDTO>>().ok(baseDao.selectEnableStaffMsg(userIdList.getUserIdList()));
+        return new Result<List<CommonStaffInfoResultDTO>>().ok(baseDao.selectEnableStaffMsg(userIdList.getUserIdList(),userIdList.getCustomerId()));
     }
 
 }

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

@@ -23,9 +23,12 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.StaffRoleDao;
 import com.epmet.dto.StaffRoleDTO;
+import com.epmet.dto.form.CommonUserFormDTO;
 import com.epmet.dto.result.GovStaffRoleResultDTO;
+import com.epmet.dto.result.StaffRolesResultDTO;
 import com.epmet.entity.StaffRoleEntity;
 import com.epmet.redis.StaffRoleRedis;
 import com.epmet.service.StaffRoleService;
@@ -120,4 +123,16 @@ public class StaffRoleServiceImpl extends BaseServiceImpl<StaffRoleDao, StaffRol
         baseDao.delStaffRoles(dto);
     }
 
+    /**
+     * @Description 得到某一个员工在一个客户下的所有角色
+     * @Param CommonUserFormDTO :: getUserId :: getCustomerId
+     * @return Result<StaffRolesResultDTO>
+     * @Author wangc
+     * @Date 2020.04.26 10:59
+     **/
+    @Override
+    public Result<StaffRolesResultDTO> getStaffRoles(CommonUserFormDTO userParam) {
+        return new Result<StaffRolesResultDTO>().ok(baseDao.getStaffRoles(userParam));
+    }
+
 }

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

@@ -157,6 +157,8 @@
             CUSTOMER_STAFF
         WHERE
             DEL_FLAG = '0'
+        AND
+            CUSTOMER_ID = #{customerId}
         AND
             ENABLE_FLAG = 'enable'
             <foreach collection="userIds" item="userId" open="AND USER_ID IN (" separator="," close=")">

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

@@ -35,4 +35,35 @@
             r.ROLE_KEY = #{roleKey}
             AND sr.ORG_ID = #{orgId}
     </select>
+
+
+    <!-- StaffRolesResultDTO的映射结果集 -->
+    <resultMap id="staffRolesResultMap" type="com.epmet.dto.result.StaffRolesResultDTO">
+        <id property="staffId" column="USER_ID"/>
+        <result property="enableFlag" column="ENABLE_FLAG"/>
+        <collection property="roleList" ofType="java.lang.String">
+            <constructor>
+                <arg column="ROLE_NAME"/>
+            </constructor>
+        </collection>
+    </resultMap>
+
+
+    <!--  得到指定客户下的某个用户的全部角色  -->
+    <select id="getStaffRoles" parameterType="com.epmet.dto.form.CommonUserFormDTO" resultMap="staffRolesResultMap">
+        SELECT
+            staff.USER_ID,
+            staff.ENABLE_FLAG,
+            rolename.ROLE_NAME
+        FROM
+            STAFF_ROLE role
+            LEFT JOIN CUSTOMER_STAFF staff ON ( role.STAFF_ID = staff.USER_ID )
+            LEFT JOIN GOV_STAFF_ROLE rolename ON ( role.ROLE_ID = rolename.ID )
+        WHERE
+            role.DEL_FLAG = '0'
+            AND staff.DEL_FLAG = '0'
+            AND rolename.DEL_FLAG = '0'
+            AND staff.ID = #{userId}
+            AND staff.CUSTOMER_ID = #{customerId}
+    </select>
 </mapper>