Merge remote-tracking branch 'origin/dev_jyztc' into dev_temp

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

@@ -0,0 +1,21 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 描述一下
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/3/29 15:26
+ */
+@Data
+public class CustomerRoleResultDTO implements Serializable {
+    private static final long serialVersionUID = 4933114432141586045L;
+
+    private String roleName;
+    private String roleKey;
+    private String roleId;
+    private Boolean fullTimeOnly;
+}

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

@@ -147,5 +147,18 @@ public class OpenUpController {
         ValidatorUtils.validateEntity(formDTO);
         return new Result<StaffPermissionResultDTO>().ok(openUpService.queryStaffPermissionV2(formDTO));
     }
+
+    /**
+     * @return
+     * @param formDTO 客户id
+     * @author yinzuomei
+     * @description 010、获取当前客户下-工作端角色列表
+     * @Date 2021/3/29 15:25
+     **/
+    @PostMapping("govrolelist")
+    public Result<List<CustomerRoleResultDTO>> queryCustomerGovRoleList(@RequestBody CustomerInfoQueryFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<List<CustomerRoleResultDTO>>().ok(openUpService.queryCustomerGovRoleList(formDTO.getCustomerId()));
+    }
 }
 

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

@@ -62,4 +62,13 @@ public interface OpenUpService {
      * @Date 2021/2/3 20:59
      **/
     StaffPermissionResultDTO queryStaffPermissionV2(StaffPermissionFormDTO formDTO);
+
+    /**
+     * @return java.util.List<com.epmet.dto.result.CustomerRoleResultDTO>
+     * @param customerId
+     * @author yinzuomei
+     * @description 010、获取当前客户下-工作端角色列表
+     * @Date 2021/3/29 15:27 
+     **/
+    List<CustomerRoleResultDTO> queryCustomerGovRoleList(String customerId);
 }

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

@@ -210,4 +210,21 @@ public class OpenUpServiceImpl implements OpenUpService {
         return resultDTO;
     }
 
+    /**
+     * @param customerId
+     * @return java.util.List<com.epmet.dto.result.CustomerRoleResultDTO>
+     * @author yinzuomei
+     * @description 010、获取当前客户下-工作端角色列表
+     * @Date 2021/3/29 15:27
+     **/
+    @Override
+    public List<CustomerRoleResultDTO> queryCustomerGovRoleList(String customerId) {
+        Result<List<RoleInfoResultDTO>> userRes = epmetUserOpenFeignClient.queryCustomerGovRoleList(customerId);
+        if (!userRes.success() || CollectionUtils.isEmpty(userRes.getData())) {
+            log.error(String.format("获取当前客户下,工作端角色列表失败,customerId:%s", customerId));
+            return new ArrayList<>();
+        }
+        return ConvertUtils.sourceToTarget(userRes.getData(), CustomerRoleResultDTO.class);
+    }
+
 }

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

@@ -29,4 +29,6 @@ public class RoleInfoResultDTO implements Serializable{
      * */
     @JsonInclude(JsonInclude.Include.NON_NULL)
     private Boolean fullTimeOnly = false;
+
+    private String roleKey;
 }

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

@@ -486,4 +486,14 @@ public interface EpmetUserOpenFeignClient {
      */
     @PostMapping(value = "/epmetuser/user/saveuserinfo")
     Result<UserDTO> saveUserInfo(@RequestBody UserInfoFormDTO formDTO);
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.RoleInfoResultDTO>>
+     * @param customerId
+     * @author yinzuomei
+     * @description 获取当前客户下-工作端角色列表
+     * @Date 2021/3/29 15:35
+     **/
+    @GetMapping(value = "/epmetuser/govstaffrole/querycustomergovrolelist/{customerId}")
+    Result<List<RoleInfoResultDTO>> queryCustomerGovRoleList(@PathVariable("customerId")String customerId);
 }

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

@@ -337,8 +337,21 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "saveUserInfo", formDTO);
     }
 
+    /**
+     * @param customerId
+     * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.RoleInfoResultDTO>>
+     * @author yinzuomei
+     * @description 获取当前客户下-工作端角色列表
+     * @Date 2021/3/29 15:35
+     **/
+    @Override
+    public Result<List<RoleInfoResultDTO>> queryCustomerGovRoleList(String customerId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "queryCustomerGovRoleList", customerId);
+    }
+
     @Override
     public Result initGovStaffRolesForCustomer(String customerId) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "initGovStaffRolesForCustomer", customerId);
     }
+
 }

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

@@ -9,6 +9,7 @@ import com.epmet.dto.form.GovStaffRoleFormDTO;
 import com.epmet.dto.result.GovStaffRoleResultDTO;
 import com.epmet.dto.result.GovStaffRoleTemplateDTO;
 import com.epmet.dto.result.ResiGovRoleListResultDTO;
+import com.epmet.dto.result.RoleInfoResultDTO;
 import com.epmet.service.GovStaffRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
@@ -112,4 +113,15 @@ public class GovStaffRoleController {
         return new Result<List<GovStaffRoleResultDTO>>().ok(roles);
     }
 
+    /**
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.RoleInfoResultDTO>>
+     * @param customerId
+     * @author yinzuomei
+     * @description 获取当前客户下-工作端角色列表
+     * @Date 2021/3/29 15:37
+     **/
+    @GetMapping("querycustomergovrolelist/{customerId}")
+    Result<List<RoleInfoResultDTO>> queryCustomerGovRoleList(@PathVariable("customerId") String customerId){
+        return new Result<List<RoleInfoResultDTO>>().ok(govStaffRoleService.queryCustomerGovRoleList(customerId));
+    }
 }

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

@@ -23,6 +23,7 @@ import com.epmet.dto.GovStaffRoleDTO;
 import com.epmet.dto.result.GovStaffRoleResultDTO;
 import com.epmet.dto.result.GovStaffRoleTemplateDTO;
 import com.epmet.dto.result.ResiGovRoleListResultDTO;
+import com.epmet.dto.result.RoleInfoResultDTO;
 import com.epmet.entity.GovStaffRoleEntity;
 
 import java.util.List;
@@ -140,4 +141,13 @@ public interface GovStaffRoleService extends BaseService<GovStaffRoleEntity> {
     void saveSortOrder(List<String> roleIdList);
 
     List<GovStaffRoleResultDTO> listRolesByRoleKey(String roleKey);
+
+    /**
+     * @return java.util.List<com.epmet.dto.result.RoleInfoResultDTO>
+     * @param customerId
+     * @author yinzuomei
+     * @description 获取当前客户下-工作端角色列表
+     * @Date 2021/3/29 15:37
+     **/
+    List<RoleInfoResultDTO> queryCustomerGovRoleList(String customerId);
 }

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

@@ -20,20 +20,17 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.RenException;
 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.GovStaffRoleDao;
 import com.epmet.dao.GovStaffRoleTemplateDao;
 import com.epmet.dao.RoleDao;
 import com.epmet.dto.GovStaffRoleDTO;
 import com.epmet.dto.form.InitDefaultOperationsFormDTO;
-import com.epmet.dto.result.GovStaffRoleResultDTO;
-import com.epmet.dto.result.GovStaffRoleTemplateDTO;
-import com.epmet.dto.result.ResiGovRoleListResultDTO;
-import com.epmet.dto.result.ResiGovRoleResultDTO;
+import com.epmet.dto.result.*;
 import com.epmet.entity.GovStaffRoleEntity;
 import com.epmet.feign.GovAccessFeignClient;
 import com.epmet.redis.GovStaffRoleRedis;
@@ -243,4 +240,28 @@ public class GovStaffRoleServiceImpl extends BaseServiceImpl<GovStaffRoleDao, Go
     public List<GovStaffRoleResultDTO> listRolesByRoleKey(String roleKey) {
         return govStaffRoleDao.listRolesByRoleKey(roleKey);
     }
+
+    /**
+     * @param customerId
+     * @return java.util.List<com.epmet.dto.result.RoleInfoResultDTO>
+     * @author yinzuomei
+     * @description 获取当前客户下-工作端角色列表
+     * @Date 2021/3/29 15:37
+     **/
+    @Override
+    public List<RoleInfoResultDTO> queryCustomerGovRoleList(String customerId) {
+        List<RoleInfoResultDTO> resultList=new ArrayList<>();
+        GovStaffRoleDTO govStaffRoleDTO=new GovStaffRoleDTO();
+        govStaffRoleDTO.setCustomerId(customerId);
+        List<GovStaffRoleDTO> roleList = this.getGovStaffRoleList(govStaffRoleDTO);
+        roleList.forEach(role->{
+            RoleInfoResultDTO resultDTO=new RoleInfoResultDTO();
+            resultDTO.setFullTimeOnly(role.getFullTimeOnly());
+            resultDTO.setRoleId(role.getId());
+            resultDTO.setRoleName(role.getRoleName());
+            resultDTO.setRoleKey(role.getRoleKey());
+            resultList.add(resultDTO);
+        });
+        return resultList;
+    }
 }