epmet-ext 部门人员信息

epmet-module/epmet-ext/epmet-ext-client/src/main/java/com/epmet/dto/result/RoleResultDTO.java

@@ -0,0 +1,32 @@
+package com.epmet.dto.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+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 = -4321366067217459L;
+
+    /**
+     * 角色key
+     */
+    private String roleKey;
+
+    /**
+     * 角色名称
+     */
+    private String roleName;
+
+    /**
+     * 用户id
+     */
+    @JsonIgnore
+    private String userId;
+}

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

@@ -6,7 +6,9 @@ package com.epmet.constant;
  */
 public interface ModuleConstant {
 
-    String ERROR_GOV_ORG = "调用gov_org服务查询网格下的所有工作人员失败";
+    String ERROR_GOV_ORG_GRID = "调用gov_org服务查询【网格】下的所有工作人员失败";
+
+    String ERROR_GOV_ORG_DEPARTMENT = "调用gov_org服务查询【部门】下的所有工作人员失败";
 
     String ERROR_EPMET_USER = "调用epmet_user服务查询网格下的所有工作人员失败";
 

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

@@ -2,10 +2,14 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
+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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -13,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;
 
 /**
@@ -25,6 +30,10 @@ public class OpenUpController {
 
     @Autowired
     private OpenUpService openUpService;
+    @Autowired
+    private GovOrgOpenFeignClient govOrgOpenFeignClient;
+    @Autowired
+    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
 
     /**
      * @Description  网格工作人员  被禁用的、未激活的不显示

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

@@ -3,19 +3,18 @@ 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.form.*;
 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 org.bouncycastle.math.raw.Mod;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -43,7 +42,7 @@ public class OpenUpServiceImpl implements OpenUpService {
         commonGridId.setUserId("");
         Result<List<String>> gridStaffs = govOrgOpenFeignClient.getGridStaffs(commonGridId);
         if (!gridStaffs.success()){
-            throw new RenException(ModuleConstant.ERROR_GOV_ORG);
+            throw new RenException(ModuleConstant.ERROR_GOV_ORG_GRID);
         }
         List<String> userIds = gridStaffs.getData();
         UserIdsFormDTO userIdsForm = new UserIdsFormDTO();
@@ -63,6 +62,26 @@ public class OpenUpServiceImpl implements OpenUpService {
      */
     @Override
     public List<StaffSinDeptResultDTO> staffSinDept(StaffSinDeptFormDTO formDTO) {
-        return null;
+        DepartmentIdFormDTO departmentId = new DepartmentIdFormDTO();
+        departmentId.setDepartmentId(formDTO.getDepartmentId());
+        Result<List<String>> departmentStaffs = govOrgOpenFeignClient.getDepartmentStaffs(departmentId);
+        if (!departmentStaffs.success()){
+            throw new RenException(ModuleConstant.ERROR_GOV_ORG_DEPARTMENT);
+        }
+        List<String> userIds = departmentStaffs.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);
+        }
+        List<StaffSinGridResultDTO> data = staffInfoList.getData();
+        List<StaffSinDeptResultDTO> result = new ArrayList<>();
+        data.forEach(staff -> {
+            StaffSinDeptResultDTO dept = new StaffSinDeptResultDTO();
+            BeanUtils.copyProperties(staff,dept);
+            result.add(dept);
+        });
+        return result;
     }
 }

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

@@ -193,4 +193,13 @@ public interface GovOrgOpenFeignClient {
      */
     @PostMapping("/gov/org/customerstaffgrid/getgridstaffs")
     Result<List<String>> getGridStaffs(@RequestBody CommonGridIdFormDTO gridIdFormDTO);
+
+    /**
+     * @Description  查询部门下工作人员
+     * @param formDTO
+     * @author zxc
+     * @date 2020/8/13 2:46 下午
+     */
+    @PostMapping("/gov/org/customerstaffdepartment/getdepartmentstaffs")
+    Result<List<String>> getDepartmentStaffs(@RequestBody DepartmentIdFormDTO formDTO);
 }

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

@@ -116,4 +116,9 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
     public Result<List<String>> getGridStaffs(CommonGridIdFormDTO gridIdFormDTO) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getGridStaffs", gridIdFormDTO);
     }
+
+    @Override
+    public Result<List<String>> getDepartmentStaffs(DepartmentIdFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getDepartmentStaffs", formDTO);
+    }
 }

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

@@ -26,6 +26,7 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.CustomerStaffDepartmentDTO;
+import com.epmet.dto.form.DepartmentIdFormDTO;
 import com.epmet.excel.CustomerStaffDepartmentExcel;
 import com.epmet.service.CustomerStaffDepartmentService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -91,4 +92,16 @@ public class CustomerStaffDepartmentController {
         ExcelUtils.exportExcelToTarget(response, null, list, CustomerStaffDepartmentExcel.class);
     }
 
+    /**
+     * @Description  查询部门下工作人员
+     * @param formDTO
+     * @author zxc
+     * @date 2020/8/13 2:46 下午
+     */
+    @PostMapping("getdepartmentstaffs")
+    public Result<List<String>> getDepartmentStaffs(@RequestBody DepartmentIdFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<List<String>>().ok(customerStaffDepartmentService.getDepartmentStaffs(formDTO));
+    }
+
 }

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

@@ -66,4 +66,12 @@ public interface CustomerStaffDepartmentDao extends BaseDao<CustomerStaffDepartm
      * @Description 遍历查询每个部门下人员
      */
     List<CustomerStaffDepartmentDTO> selectDeptStaffs(@Param("deptIdList") List<String> deptIdList);
+
+    /**
+     * @Description  查询部门下的工作人员userId
+     * @param departmentId
+     * @author zxc
+     * @date 2020/8/13 2:53 下午
+     */
+    List<String> getDepartmentStaffList(@Param("departmentId")String departmentId);
 }

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

@@ -20,6 +20,7 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.CustomerStaffDepartmentDTO;
+import com.epmet.dto.form.DepartmentIdFormDTO;
 import com.epmet.entity.CustomerStaffDepartmentEntity;
 
 import java.util.List;
@@ -92,4 +93,12 @@ public interface CustomerStaffDepartmentService extends BaseService<CustomerStaf
      * @date 2020-04-20
      */
     void delete(String[] ids);
+
+    /**
+     * @Description  查询部门下工作人员
+     * @param formDTO
+     * @author zxc
+     * @date 2020/8/13 2:46 下午
+     */
+    List<String> getDepartmentStaffs(DepartmentIdFormDTO formDTO);
 }

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

@@ -25,6 +25,7 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.CustomerStaffDepartmentDao;
 import com.epmet.dto.CustomerStaffDepartmentDTO;
+import com.epmet.dto.form.DepartmentIdFormDTO;
 import com.epmet.entity.CustomerStaffDepartmentEntity;
 import com.epmet.redis.CustomerStaffDepartmentRedis;
 import com.epmet.service.CustomerStaffDepartmentService;
@@ -47,7 +48,7 @@ import java.util.Map;
 public class CustomerStaffDepartmentServiceImpl extends BaseServiceImpl<CustomerStaffDepartmentDao, CustomerStaffDepartmentEntity> implements CustomerStaffDepartmentService {
 
     @Autowired
-    private CustomerStaffDepartmentRedis customerStaffDepartmentRedis;
+    private CustomerStaffDepartmentDao customerStaffDepartmentDao;
 
     @Override
     public PageData<CustomerStaffDepartmentDTO> page(Map<String, Object> params) {
@@ -101,4 +102,16 @@ public class CustomerStaffDepartmentServiceImpl extends BaseServiceImpl<Customer
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @Description  查询部门下工作人员
+     * @param formDTO
+     * @author zxc
+     * @date 2020/8/13 2:46 下午
+     */
+    @Override
+    public List<String> getDepartmentStaffs(DepartmentIdFormDTO formDTO) {
+        String departmentId = formDTO.getDepartmentId();
+        return customerStaffDepartmentDao.getDepartmentStaffList(departmentId);
+    }
+
 }

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

@@ -27,6 +27,17 @@
         </foreach>
     </select>
 
+    <!-- 查询部门下的工作人员userId -->
+    <select id="getDepartmentStaffList" resultType="java.lang.String">
+        SELECT
+            user_id AS userId
+        FROM
+            customer_staff_department
+        WHERE
+            del_flag = '0'
+            AND department_id = #{departmentId}
+    </select>
+
     <!-- 修改部门人数 -->
     <update id="updateDepartmentStaffCount">
         UPDATE

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@@ -59,6 +59,7 @@ import com.epmet.resi.group.constant.MemberStateConstant;
 import com.epmet.resi.group.dto.UserRoleDTO;
 import com.epmet.resi.group.dto.group.*;
 import com.epmet.resi.group.dto.group.form.*;
+import com.epmet.resi.group.dto.group.form.GridIdFormDTO;
 import com.epmet.resi.group.dto.group.form.ShouldVoteCountFormDTO;
 import com.epmet.resi.group.dto.group.result.*;
 import com.epmet.resi.group.dto.member.GroupMemeberOperationDTO;

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

@@ -229,6 +229,8 @@
         WHERE
             cs.del_flag = 0
             AND uw.del_flag = 0
+            AND cs.active_flag = 'active'
+            AND cs.enable_flag = 'enable'
             AND
             <foreach collection="userIds" item="userId" separator="OR">
                 cs.user_id = #{userId}