1.增加角色及其默认权限相关配置

epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigOpeDefaultScopesFormDTO.java

@@ -0,0 +1,26 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * 权限配置-操作默认范围form dto
+ */
+@Data
+public class AccessConfigOpeDefaultScopesFormDTO {
+
+    public interface ListOpeDefaultScopesGroup {}
+    public interface SaveOpeDefaultScopesGroup {}
+
+    @NotBlank(message = "角色Key不能为空", groups = { ListOpeDefaultScopesGroup.class, SaveOpeDefaultScopesGroup.class })
+    private String roleKey;
+
+    @NotBlank(message = "操作Key不能为空", groups = { ListOpeDefaultScopesGroup.class, SaveOpeDefaultScopesGroup.class })
+    private String operationKey;
+
+    private List<String> scopeKeys;
+}

epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AccessConfigRoleDefaultOpesFormDTO.java

@@ -0,0 +1,18 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+/**
+ * 角色默认操作权限列表from DTO
+ */
+@Data
+public class AccessConfigRoleDefaultOpesFormDTO {
+
+    @NotBlank(message = "角色Key不能为空")
+    private String roleKey;
+
+    private List<String> operationKeys;
+}

epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/AccessConfigOpeDefaultScopesResultDTO.java

@@ -0,0 +1,16 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+/**
+ * 权限配置-操作的默认范围result dto
+ */
+@Data
+public class AccessConfigOpeDefaultScopesResultDTO {
+    private String scopeKey;
+    private String scopeName;
+    private String scopeIndex;
+    private String operationKey;
+    private String roleKey;
+    private Boolean assigned;
+}

epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/RoleOperationDefaultResultDTO.java

@@ -18,7 +18,6 @@
 package com.epmet.dto.result;
 
 import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
 
@@ -48,4 +47,14 @@ public class RoleOperationDefaultResultDTO implements Serializable {
      */
 	private String operationKey;
 
+    /**
+     * 操作名称
+     */
+	private String operationName;
+
+    /**
+     * 是否已经具有该操作权限
+     */
+    private Boolean assigned;
+
 }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/AccessConfigController.java

@@ -2,12 +2,13 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.dto.form.AccessConfigOpesFormDTO;
-import com.epmet.dto.form.AccessConfigOptionsFormDTO;
-import com.epmet.dto.form.AccessConfigSaveConfigDTO;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.AccessConfigOpeDefaultScopesResultDTO;
 import com.epmet.dto.result.AccessConfigOpesResultDTO;
 import com.epmet.dto.result.AccessConfigOptionsResultDTO;
+import com.epmet.dto.result.RoleOperationDefaultResultDTO;
 import com.epmet.service.AccessConfigService;
+import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -22,7 +23,18 @@ public class AccessConfigController {
     private AccessConfigService accessConfigService;
 
     /**
-     * 列出角色的操作列表(及该操作的scope范围)
+     * 根据roleKey查询角色默认操作列表(包括assigned字段，标识该角色是否已经具有该操作权限)
+     * @param roleKey
+     * @return
+     */
+    @PostMapping("roledefaultops/{roleKey}")
+    public Result listRoleDefaultOps(@PathVariable("roleKey") String roleKey) {
+        List<RoleOperationDefaultResultDTO> defaultOps = accessConfigService.listRoleDefaultOpsByRoleKey(roleKey);
+        return new Result().ok(defaultOps);
+    }
+
+    /**
+     * 根据角色ID列出角色的操作列表(及该操作的scope范围)
      * @param roleId
      * @return
      */
@@ -68,4 +80,40 @@ public class AccessConfigController {
         return new Result();
     }
 
+    /**
+     * 保存角色默认操作权限列表
+     * @param form
+     * @return
+     */
+    @PostMapping("roledefaultopes/save")
+    public Result saveRoleDefaultOperations(@RequestBody AccessConfigRoleDefaultOpesFormDTO form) {
+        ValidatorUtils.validateEntity(form);
+        accessConfigService.saveRoleDefaultOperations(form.getRoleKey(), form.getOperationKeys());
+        return new Result();
+    }
+
+    /**
+     * 查询操作的默认范围列表
+     * @param form
+     * @return
+     */
+    @PostMapping("opedefaultscopes/list")
+    public Result listOpeDefaultScopes(@RequestBody AccessConfigOpeDefaultScopesFormDTO form) {
+        ValidatorUtils.validateEntity(form, AccessConfigOpeDefaultScopesFormDTO.ListOpeDefaultScopesGroup.class);
+        List<AccessConfigOpeDefaultScopesResultDTO> scopes = accessConfigService.listOpeDefaultScopes4Role(form.getRoleKey(), form.getOperationKey());
+        return new Result().ok(scopes);
+    }
+
+    /**
+     * 保存操作的默认范围配置
+     * @param form
+     * @return
+     */
+    @PostMapping("opedefaultscopes/save")
+    public Result saveOpeDefaultScopes(@RequestBody AccessConfigOpeDefaultScopesFormDTO form) {
+        ValidatorUtils.validateEntity(form, AccessConfigOpeDefaultScopesFormDTO.SaveOpeDefaultScopesGroup.class);
+        accessConfigService.saveOpeDefaultScopes(form.getRoleKey(), form.getOperationKey(), form.getScopeKeys());
+        return new Result();
+    }
+
 }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperationScopeDefaultDao.java

@@ -18,6 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.AccessConfigOpeDefaultScopesResultDTO;
 import com.epmet.dto.result.OperationScopeDefaultResultDTO;
 import com.epmet.entity.OperationScopeDefaultEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -41,4 +42,23 @@ public interface OperationScopeDefaultDao extends BaseDao<OperationScopeDefaultE
      * @return
      */
     List<OperationScopeDefaultResultDTO> listDefaultOpeScopes(@Param("roleKey") String roleKey);
+
+    /**
+     * 查询操作的默认范围
+     * @param roleKey
+     * @param operationKey
+     * @return
+     */
+    List<AccessConfigOpeDefaultScopesResultDTO> listOpeDefaultScopes4Config(
+            @Param("roleKey") String roleKey,
+            @Param("operationKey") String operationKey);
+
+    List<OperationScopeDefaultEntity> listOpeDefaultScopesByRoleAndOpeKey(
+            @Param("roleKey") String roleKey,
+            @Param("operationKey") String operationKey);
+
+    int delete(
+            @Param("roleKey") String roleKey,
+            @Param("operationKey") String operationKey,
+            @Param("scopeKey") String scopeKey);
 }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/RoleOperationDefaultDao.java

@@ -18,6 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.AccessConfigOpeDefaultScopesResultDTO;
 import com.epmet.dto.result.RoleOperationDefaultResultDTO;
 import com.epmet.entity.RoleOperationDefaultEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -47,4 +48,10 @@ public interface RoleOperationDefaultDao extends BaseDao<RoleOperationDefaultEnt
      * @return
      */
      List<RoleOperationDefaultResultDTO> listByRoleKey(@Param("roleKey") String roleKey);
+
+    List<RoleOperationDefaultResultDTO> listRoleDefaultOpsByRoleKey(@Param("roleKey") String roleKey);
+
+    int deleteByRoleKeyAndOpeKey(
+            @Param("roleKey") String roleKey,
+            @Param("operationKey") String operationKey);
 }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/RoleOperationDefaultEntity.java

@@ -18,12 +18,13 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 @Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("role_operation_default")
 public class RoleOperationDefaultEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/AccessConfigService.java

@@ -1,7 +1,10 @@
 package com.epmet.service;
 
+import com.epmet.dto.form.AccessConfigRoleDefaultOpesFormDTO;
+import com.epmet.dto.result.AccessConfigOpeDefaultScopesResultDTO;
 import com.epmet.dto.result.AccessConfigOpesResultDTO;
 import com.epmet.dto.result.AccessConfigOptionsResultDTO;
+import com.epmet.dto.result.RoleOperationDefaultResultDTO;
 
 import java.util.List;
 import java.util.Set;
@@ -14,4 +17,12 @@ public interface AccessConfigService {
     AccessConfigOptionsResultDTO listScopeOptionsForAccessConfig(String roleId, String operationKey);
 
     void saveConfig(String roleId, String operationKey, Set<String> scopeKeys);
+
+    List<RoleOperationDefaultResultDTO> listRoleDefaultOpsByRoleKey(String roleKey);
+
+    void saveRoleDefaultOperations(String roleKey, List<String> operationKeys);
+
+    List<AccessConfigOpeDefaultScopesResultDTO> listOpeDefaultScopes4Role(String roleKey, String operationKey);
+
+    void saveOpeDefaultScopes(String roleKey, String operationKey, List<String> scopeKeys);
 }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessConfigServiceImpl.java

@@ -4,6 +4,8 @@ import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.dao.*;
 import com.epmet.dto.result.*;
+import com.epmet.entity.OperationScopeDefaultEntity;
+import com.epmet.entity.RoleOperationDefaultEntity;
 import com.epmet.entity.RoleOperationEntity;
 import com.epmet.entity.RoleScopeEntity;
 import com.epmet.redis.RoleOpeScopeRedis;
@@ -30,9 +32,15 @@ public class AccessConfigServiceImpl implements AccessConfigService {
     @Autowired
     private RoleOperationDao roleOperationDao;
 
+    @Autowired
+    private RoleOperationDefaultDao roleOperationDefaultDao;
+
     @Autowired
     private RoleScopeDao roleScopeDao;
 
+    @Autowired
+    private OperationScopeDefaultDao operationScopeDefaultDao;
+
     @Override
     public List<AccessConfigOpesResultDTO> listOpesByRole(String roleId) {
         return roleOperationDao.listOpesForAccessConfig(roleId);
@@ -118,4 +126,74 @@ public class AccessConfigServiceImpl implements AccessConfigService {
         // 清空redis缓存
         roleOpeScopeRedis.delRoleAllOpeScopes(roleId);
     }
+
+    @Override
+    public List<RoleOperationDefaultResultDTO> listRoleDefaultOpsByRoleKey(String roleKey) {
+        return roleOperationDefaultDao.listRoleDefaultOpsByRoleKey(roleKey);
+    }
+
+    /**
+     *
+     * @param roleKey
+     * @param operationKeys
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void saveRoleDefaultOperations(String roleKey, List<String> operationKeys) {
+
+        List<RoleOperationDefaultResultDTO> opesExists = roleOperationDefaultDao.listByRoleKey(roleKey);
+        Set<String> opeKeysExists = opesExists.stream().map(ope -> ope.getOperationKey()).collect(Collectors.toSet());
+
+        // 过滤出删掉的
+        Set<String> deletedOpes = opeKeysExists.stream().filter(oke -> !operationKeys.contains(oke)).collect(Collectors.toSet());
+        // 过滤出新增的
+        Set<String> newOpes = operationKeys.stream().filter(okn -> !opeKeysExists.contains(okn)).collect(Collectors.toSet());
+
+        for (String deletedOpe : deletedOpes) {
+            roleOperationDefaultDao.deleteByRoleKeyAndOpeKey(roleKey, deletedOpe);
+        }
+
+        for (String newOpe : newOpes) {
+            RoleOperationDefaultEntity entity = new RoleOperationDefaultEntity();
+            entity.setRoleKey(roleKey);
+            entity.setOperationKey(newOpe);
+            roleOperationDefaultDao.insert(entity);
+        }
+    }
+
+    /**
+     * 查询默认的
+     * @param roleKey
+     * @param operationKey
+     * @return
+     */
+    @Override
+    public List<AccessConfigOpeDefaultScopesResultDTO> listOpeDefaultScopes4Role(String roleKey, String operationKey) {
+        return operationScopeDefaultDao.listOpeDefaultScopes4Config(roleKey, operationKey);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void saveOpeDefaultScopes(String roleKey, String operationKey, List<String> submitScopeKeys) {
+        List<OperationScopeDefaultEntity > exists = operationScopeDefaultDao.listOpeDefaultScopesByRoleAndOpeKey(roleKey, operationKey);
+
+        Set<String> existsScopeKeys = exists.stream().map(ope -> ope.getScopeKey()).collect(Collectors.toSet());
+
+        // 删掉的
+        Set<String> deleteds = existsScopeKeys.stream().filter(esk -> !submitScopeKeys.contains(esk)).collect(Collectors.toSet());
+        // 新增的
+        Set<String> addeds = submitScopeKeys.stream().filter(ssk -> !existsScopeKeys.contains(ssk)).collect(Collectors.toSet());
+
+        for (String scopeKey : deleteds) {
+            operationScopeDefaultDao.delete(roleKey, operationKey, scopeKey);
+        }
+
+        for (String scopeKey : addeds) {
+            OperationScopeDefaultEntity entity = new OperationScopeDefaultEntity();
+            entity.setOperationKey(operationKey);
+            entity.setRoleKey(roleKey);
+            entity.setScopeKey(scopeKey);
+            operationScopeDefaultDao.insert(entity);
+        }
+    }
 }

epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperationScopeDefaultDao.xml

@@ -16,6 +16,14 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <delete id="delete">
+        DELETE
+        FROM operation_scope_default
+        WHERE ROLE_KEY = #{roleKey}
+          AND OPERATION_KEY = #{operationKey}
+          AND SCOPE_KEY = #{scopeKey}
+    </delete>
+
     <select id="listAllValid" resultType="com.epmet.entity.OperationScopeDefaultEntity">
         SELECT *
         FROM operation_scope_default WHERE DEL_FLAG=0
@@ -37,5 +45,33 @@
         WHERE ROLE_KEY = #{roleKey}
     </select>
 
+    <!--查询操作的默认范围-->
+    <select id="listOpeDefaultScopes4Config"
+            resultType="com.epmet.dto.result.AccessConfigOpeDefaultScopesResultDTO">
+        SELECT os.SCOPE_KEY,
+               os.SCOPE_NAME,
+               os.SCOPE_INDEX,
+               rs.OPERATION_KEY,
+               rs.ROLE_KEY,
+               CASE
+                   WHEN rs.ROLE_KEY IS NULL
+                       THEN FALSE
+                   ELSE TRUE
+                   END AS assigned
+        FROM operation_scope os
+                 LEFT JOIN operation_scope_default rs
+                           ON (os.SCOPE_KEY = rs.SCOPE_KEY AND rs.DEL_FLAG = 0 AND rs.ROLE_KEY = #{roleKey} AND
+                               OPERATION_KEY = #{operationKey})
+        WHERE os.DEL_FLAG = 0
+        ORDER BY os.SORT ASC
+    </select>
+
+    <select id="listOpeDefaultScopesByRoleAndOpeKey" resultType="com.epmet.entity.OperationScopeDefaultEntity">
+        SELECT *
+        FROM operation_scope_default
+        WHERE ROLE_KEY = #{roleKey}
+          AND OPERATION_KEY = #{operationKey}
+    </select>
+
 
 </mapper>

epmet-module/gov-access/gov-access-server/src/main/resources/mapper/RoleOperationDefaultDao.xml

@@ -15,6 +15,11 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <!--根据角色key和操作key删除-->
+    <delete id="deleteByRoleKeyAndOpeKey">
+        DELETE FROM role_operation_default WHERE ROLE_KEY = #{roleKey} AND OPERATION_KEY = #{operationKey}
+    </delete>
+
     <select id="listAllValid" resultType="com.epmet.dto.result.RoleOperationDefaultResultDTO">
         SELECT o.ID, d.ROLE_KEY, o.OPERATION_KEY
         FROM role_operation_default d
@@ -33,5 +38,16 @@
           AND o.DEL_FLAG = 0
     </select>
 
-
+    <select id="listRoleDefaultOpsByRoleKey" resultType="com.epmet.dto.result.RoleOperationDefaultResultDTO">
+        SELECT o.OPERATION_KEY,
+               o.OPERATION_NAME,
+               CASE
+                   WHEN d.ROLE_KEY IS NOT NULL THEN TRUE
+                   ELSE FALSE END AS assigned
+        FROM operation o
+                 LEFT JOIN role_operation_default d ON (o.OPERATION_KEY = d.OPERATION_KEY AND d.DEL_FLAG = '0'
+            AND d.ROLE_KEY = #{roleKey})
+        WHERE o.DEL_FLAG = '0'
+        ORDER BY o.OPERATION_KEY ASC
+    </select>
 </mapper>

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

@@ -34,6 +34,7 @@ public class GovStaffRoleResultDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    private String customerId;
     /**
      * 角色ID
      */
@@ -54,6 +55,8 @@ public class GovStaffRoleResultDTO implements Serializable {
      */
 	private String roleName;
 
+	private String orgType;
+
     /**
      * 姓名
      */

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

@@ -0,0 +1,43 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.RoleDTO;
+import com.epmet.dto.result.GovStaffRoleResultDTO;
+import com.epmet.dto.result.GovStaffRoleTemplateDTO;
+import com.epmet.service.GovStaffRoleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RequestMapping("govstaffrole")
+@RestController
+public class GovStaffRoleController {
+
+    @Autowired
+    private GovStaffRoleService govStaffRoleService;
+
+    /**
+     * 根据客户ID查询该客户的角色列表
+     * @param customerId
+     * @return
+     */
+    @PostMapping("rolesbycustomer/{customerId}")
+    public Result listGovStaffRolesByCustomer(@PathVariable("customerId") String customerId) {
+        List<GovStaffRoleResultDTO> roleEntities = govStaffRoleService.listRolesByCustomer(customerId);
+        return new Result().ok(roleEntities);
+    }
+
+    /**
+     * 查询角色模板列表
+     * @return
+     */
+    @PostMapping("roletemplates")
+    public Result listGovStaffRoleTemplates() {
+        List<GovStaffRoleTemplateDTO> roleTemplates = govStaffRoleService.listRoleTemplates();
+        return new Result().ok(roleTemplates);
+    }
+}

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

@@ -49,19 +49,6 @@ public class RoleController {
     @Autowired
     private RoleService roleService;
 
-    /**
-     * 根据客户ID查询该客户的角色列表
-     * @param customerId
-     * @return
-     */
-    @PostMapping("rolesbycustomer/{customerId}")
-    public Result listRolesByCustomer(@PathVariable("customerId") String customerId) {
-        List<RoleDTO> roleEntities = roleService.listRolesByCustomer(customerId);
-        return new Result().ok(roleEntities);
-    }
-
-
-
     @GetMapping("page")
     public Result<PageData<RoleDTO>> page(@RequestParam Map<String, Object> params){
         PageData<RoleDTO> page = roleService.page(params);

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

@@ -19,6 +19,7 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.GovStaffRoleDTO;
+import com.epmet.dto.result.GovStaffRoleResultDTO;
 import com.epmet.entity.GovStaffRoleEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -56,4 +57,6 @@ public interface GovStaffRoleDao extends BaseDao<GovStaffRoleEntity> {
      * @return
      */
     GovStaffRoleDTO getRoleByCustomerIdAndRoleKey(@Param("customerId") String customerId, @Param("roleKey") String roleKey);
+
+    List<GovStaffRoleResultDTO> listRolesByCustomer(@Param("customerId") String customerId);
 }

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

@@ -41,11 +41,4 @@ public interface RoleDao extends BaseDao<RoleEntity> {
 	 * @return RoleEntity
 	 */
 	RoleEntity selectRoleByKey(RoleEntity param);
-
-	/**
-	 * 通过客户ID查询客户的角色列表
-	 * @param customerId
-	 * @return
-	 */
-    List<RoleDTO> listRolesByCustomer(@Param("customerId") String customerId);
 }

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

@@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.GovStaffRoleDTO;
 import com.epmet.dto.result.GovStaffRoleResultDTO;
+import com.epmet.dto.result.GovStaffRoleTemplateDTO;
 import com.epmet.entity.GovStaffRoleEntity;
 
 import java.util.List;
@@ -120,4 +121,8 @@ public interface GovStaffRoleService extends BaseService<GovStaffRoleEntity> {
      * @param roleKey
      */
     GovStaffRoleDTO getRoleByCustomerIdAndRoleKey(String customerId, String roleKey);
+
+    List<GovStaffRoleResultDTO> listRolesByCustomer(String customerId);
+
+    List<GovStaffRoleTemplateDTO> listRoleTemplates();
 }

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

@@ -99,6 +99,4 @@ public interface RoleService extends BaseService<RoleEntity> {
      * @return RoleDTO
      */
     RoleDTO getRoleByKey(RoleDTO role);
-
-    List<RoleDTO> listRolesByCustomer(String customerId);
 }

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

@@ -29,6 +29,7 @@ import com.epmet.dao.GovStaffRoleDao;
 import com.epmet.dao.GovStaffRoleTemplateDao;
 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.entity.GovStaffRoleEntity;
 import com.epmet.feign.GovAccessFeignClient;
@@ -165,4 +166,14 @@ public class GovStaffRoleServiceImpl extends BaseServiceImpl<GovStaffRoleDao, Go
     public GovStaffRoleDTO getRoleByCustomerIdAndRoleKey(String customerId, String roleKey) {
         return govStaffRoleDao.getRoleByCustomerIdAndRoleKey(customerId, roleKey);
     }
+
+    @Override
+    public List<GovStaffRoleResultDTO> listRolesByCustomer(String customerId) {
+        return govStaffRoleDao.listRolesByCustomer(customerId);
+    }
+
+    @Override
+    public List<GovStaffRoleTemplateDTO> listRoleTemplates() {
+        return govStaffRoleTemplateDao.listValidateRoles();
+    }
 }

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

@@ -106,12 +106,4 @@ public class RoleServiceImpl extends BaseServiceImpl<RoleDao, RoleEntity> implem
         RoleEntity entity = baseDao.selectRoleByKey(ConvertUtils.sourceToTarget(role, RoleEntity.class));
         return ConvertUtils.sourceToTarget(entity, RoleDTO.class);
     }
-
-
-
-    @Override
-    public List<RoleDTO> listRolesByCustomer(String customerId) {
-        return baseDao.listRolesByCustomer(customerId);
-    }
-
 }

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

@@ -49,4 +49,14 @@
           AND ROLE_KEY = #{roleKey}
           AND DEL_FLAG = '0'
     </select>
+
+    <select id="listRolesByCustomer" resultType="com.epmet.dto.result.GovStaffRoleResultDTO">
+        SELECT r.ID          AS roleId,
+               r.CUSTOMER_ID AS customerId,
+               r.ROLE_KEY    AS roleKey,
+               r.ROLE_NAME   AS roleName,
+               r.ORG_TYPE    AS orgType
+        FROM gov_staff_role r
+        WHERE r.CUSTOMER_ID = #{customerId}
+    </select>
 </mapper>

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

@@ -27,11 +27,4 @@
             and ROLE_KEY = #{roleKey}
             and DEL_FLAG = 0
     </select>
-
-    <select id="listRolesByCustomer" resultType="com.epmet.dto.RoleDTO">
-        SELECT r.*
-        FROM gov_staff_role r
-        WHERE r.CUSTOMER_ID = #{customerId}
-    </select>
-
 </mapper>