Merge branch 'mazq-jiekouyouhua-230523' into 'develop'

Mazq jiekouyouhua 230523

See merge request dcuc-tjdsj/auth-back!157

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.dragoninfo</groupId>
     <artifactId>dcuc-auth-back</artifactId>
-    <version>2.4.3-tjdsj-SNAPSHOT</version>
+    <version>2.5.0-tjdsj-SNAPSHOT</version>
 
 
     <properties>

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v4/controller/AuthV4Controller.java

@@ -3,11 +3,10 @@ package com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v4.controller
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.dragoninfo.dcuc.auth.api.vo.BusinessRespEnum;
-import com.dragoninfo.dcuc.auth.api.vo.DataRespVO;
-import com.dragoninfo.dcuc.auth.api.vo.MessageRespVO;
-import com.dragoninfo.dcuc.auth.api.vo.ResultRespVO;
+import com.dragoninfo.dcuc.auth.api.vo.*;
+import com.dragoninfo.dcuc.auth.api.vo.zerotrust.*;
 import com.dragoninfo.dcuc.auth.auth.api.IApiDataAuthFacade;
+import com.dragoninfo.dcuc.auth.auth.api.IZeroTrustAuthFacade;
 import com.dragoninfo.dcuc.auth.auth.dto.AppDataSensitiveLevelDTO;
 import com.dragoninfo.dcuc.auth.auth.dto.AppFunInfoDTO;
 import com.dragoninfo.dcuc.auth.auth.dto.DataItemsDto;
@@ -26,11 +25,10 @@ import com.dragoninfo.dcuc.auth.token.facade.IAuthTokenFacade;
 import com.dragoninfo.dcuc.auth.token.vo.TokenDetailRespVo;
 import com.dragoninfo.dcuc.auth.token.vo.TokenReceiveVO;
 import com.dragoninfo.dcuc.auth.token.vo.UserTokenInfoRespVO;
-import com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v4.vo.*;
-import com.dragoninfo.dcuc.common.utils.LangUtil;
 import com.dragoninfo.dcuc.common.utils.ResponseUtil;
 import com.dragonsoft.duceap.base.entity.http.ResponseDTO;
 import com.dragonsoft.duceap.commons.util.ip.IpUtils;
+import com.dragonsoft.duceap.commons.util.string.StringUtils;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,15 +58,6 @@ import java.util.stream.Collectors;
 @RequestMapping(value = "/api/auth-service/v4/")
 public class AuthV4Controller {
 
-    @Autowired
-    private IStaffAssignAuthInfoFacade staffAssignAuthInfoFacade;
-
-    @Autowired
-    private IServiceAuthFlowFacade serviceAuthFlowFacade;
-
-    @Autowired
-    private IRoleFacade roleFacade;
-
     @Autowired
     private IApiDataAuthFacade apiDataAuthFacade;
 
@@ -76,7 +65,7 @@ public class AuthV4Controller {
     private IAuthTokenFacade authTokenFacade;
 
     @Autowired
-    private IAuthUserInfoFacade userInfoFacade;
+    private IZeroTrustAuthFacade zeroTrustAuthFacade;
 
     /**
      * 应用级鉴权
@@ -85,51 +74,16 @@ public class AuthV4Controller {
      * @return 应用级权限
      */
     @PostMapping("appAuth")
-    public DataRespVO<String> appAuth(@RequestBody AppAuthReqVO appAuthReqVO) {
+    public ZeroTrustDataRespVO<String> appAuth(@RequestBody AppAuthReqVO appAuthReqVO) {
         String userTokenId = appAuthReqVO.getUserTokenId();
-
-        log.info("传入的用户令牌为：{}", userTokenId);
-
+        log.info("=============应用级鉴权开始, 请求参数:{}===============", userTokenId);
         if (StrUtil.isBlank(userTokenId)) {
-            return DataRespVO.resultEnumMessage(BusinessRespEnum.TOKEN_FAIL);
+            log.error("鉴权参数为空");
+            return ZeroTrustDataRespVO.resultEnumMessage(ZeroTrustBusinessRespEnum.OPERATE_FAIL);
         }
-
-        UserTokenInfoRespVO userToken = authTokenFacade.getUserTokenInfo(userTokenId);
-        log.info("应用鉴权查寻到的令牌结果：{}", JSON.toJSONString(userToken));
-
-        String pId = userToken.getPid();
-        log.info("pid:{}", pId);
-
-        AuthUserDTO userInfo = userInfoFacade.findByIdcard(pId);
-        if (userInfo == null) {
-            log.info("查询不到用户信息");
-            return DataRespVO.resultEnumMessage(BusinessRespEnum.AUTH_FAIL);
-        }
-
-        // 缓存应用令牌
-        int expiredTime = (int) ((userToken.getExpireAt().getTime() - System.currentTimeMillis()) / 1000);
-
-        authTokenFacade.cacheStandardUserToken(userInfo.getIdcard(), userToken.getUserTokenId(), expiredTime);
-
-        AuthUserVo userVo = new AuthUserVo();
-        BeanUtil.copyProperties(userInfo, userVo);
-        ApiAppAuthVo authVo = ApiAppAuthVo.builder()
-                .userInfo(userVo)
-                .userToken(userTokenId)
-                .terminalIp(IpUtils.getIp())
-                .build();
-        List<AppDataSensitiveLevelDTO> appList = staffAssignAuthInfoFacade.apiAppAuth(authVo);
-
-        StringBuilder appAuthBuilder = new StringBuilder();
-
-        for (AppDataSensitiveLevelDTO appDataSensitiveLevelDTO : appList) {
-            String code = appDataSensitiveLevelDTO.getCode();
-
-            appAuthBuilder.append(code).append(StrUtil.COMMA);
-        }
-
-        String appAuth = LangUtil.subLastSymbol(appAuthBuilder.toString(), StrUtil.COMMA);
-        return DataRespVO.success(appAuth);
+        ZeroTrustDataRespVO<String> respVo = zeroTrustAuthFacade.appAuth(appAuthReqVO);
+        log.info("应用鉴权结果:{}", JSON.toJSONString(respVo));
+        return respVo;
     }
 
     /**
@@ -139,35 +93,17 @@ public class AuthV4Controller {
      * @return 功能级鉴权
      */
     @PostMapping("functionAuth")
-    public DataRespVO<String> functionAuth(@RequestBody FunctionAuthReqVO functionAuthReqVO) {
+    public ZeroTrustDataRespVO<String> functionAuth(@RequestBody FunctionAuthReqVO functionAuthReqVO) {
         String appTokenId = functionAuthReqVO.getAppTokenId();
         String taskId = functionAuthReqVO.getTaskId();
-
-        if (StrUtil.isBlank(appTokenId)) {
-            return DataRespVO.resultEnumMessage(BusinessRespEnum.PARAM_ERROR);
+        log.info("==============功能级鉴权开始, 请求参数appTokenId:{}, taskId:{}================", appTokenId, taskId);
+        if (StrUtil.isBlank(appTokenId) || StrUtil.isBlank(taskId)) {
+            log.error("鉴权参数为空");
+            return ZeroTrustDataRespVO.resultEnumMessage(ZeroTrustBusinessRespEnum.OPERATE_FAIL);
         }
-        TokenDetailRespVo tokenInfo = authTokenFacade.getByAppTokenId(appTokenId, true, false);
-        AuthUserVo userInfo = tokenInfo.getUserInfo();
-        if (userInfo == null) {
-            return DataRespVO.resultEnumMessage(BusinessRespEnum.AUTH_FAIL);
-        }
-        String appCode = tokenInfo.getAppToken().getAppId();
-
-        RoleApiDto roleApiDto = new RoleApiDto();
-        roleApiDto.setAppCode(appCode);
-        roleApiDto.setUserId(userInfo.getId());
-        roleApiDto.setIdcard(userInfo.getIdcard());
-        List<AppFunInfoDTO> menus = roleFacade.getMenus(roleApiDto);
-
-        StringBuilder functionAuthBuilder = new StringBuilder();
-
-        for (AppFunInfoDTO menu : menus) {
-            String code = menu.getCode();
-            functionAuthBuilder.append(code).append(StrUtil.COMMA);
-        }
-
-        String appAuth = LangUtil.subLastSymbol(functionAuthBuilder.toString(), StrUtil.COMMA);
-        return DataRespVO.success(appAuth);
+        ZeroTrustDataRespVO<String> respVO = zeroTrustAuthFacade.functionAuth(functionAuthReqVO);
+        log.info("功能鉴权结果:{}", JSON.toJSONString(respVO));
+        return respVO;
     }
 
     /**
@@ -177,31 +113,19 @@ public class AuthV4Controller {
      * @return 服务级鉴权
      */
     @PostMapping("serviceAuth")
-    public DataRespVO<String> serviceAuth(@RequestBody ServiceAuthReqVO serviceAuthReqVO) {
+    public ZeroTrustDataRespVO<String> serviceAuth(@RequestBody ServiceAuthReqVO serviceAuthReqVO) {
         String appTokenId = serviceAuthReqVO.getAppTokenId();
         String taskId = serviceAuthReqVO.getTaskId();
-        if (StrUtil.isBlank(appTokenId)) {
-            return DataRespVO.resultEnumMessage(BusinessRespEnum.PARAM_ERROR);
-        }
-
-        TokenDetailRespVo tokenInfo = authTokenFacade.getByAppTokenId(appTokenId, true, false);
-        AuthUserVo userInfo = tokenInfo.getUserInfo();
-        if (userInfo == null) {
-            return DataRespVO.resultEnumMessage(BusinessRespEnum.AUTH_FAIL);
-        }
-        String appCode = tokenInfo.getAppToken().getAppId();
-
-        List<ServiceAuthenticationResVO> serviceAuthenticationResVOList = serviceAuthFlowFacade.serviceAuthentication(userInfo.getIdcard(), appCode, "", "");
-
-        StringBuilder serviceAuthBuilder = new StringBuilder();
+        log.info("===========服务级鉴权开始,appTokenId:{}, taskId:{}===========", appTokenId, taskId);
 
-        for (ServiceAuthenticationResVO serviceAuthenticationResVO : serviceAuthenticationResVOList) {
-            String serviceCode = serviceAuthenticationResVO.getServiceCode();
-            serviceAuthBuilder.append(serviceCode).append(StrUtil.COMMA);
+        if (StrUtil.isBlank(taskId) || StrUtil.isBlank(appTokenId)) {
+            log.error("鉴权参数为空");
+            return ZeroTrustDataRespVO.resultEnumMessage(ZeroTrustBusinessRespEnum.OPERATE_FAIL);
         }
 
-        String serviceAuth = LangUtil.subLastSymbol(serviceAuthBuilder.toString(), StrUtil.COMMA);
-        return DataRespVO.success(serviceAuth);
+        ZeroTrustDataRespVO<String> respVO = zeroTrustAuthFacade.serviceAuth(serviceAuthReqVO);
+        log.info("服务级鉴权结果:{}", JSON.toJSONString(respVO));
+        return respVO;
     }
 
     /**
@@ -211,49 +135,22 @@ public class AuthV4Controller {
      * @return 数据级鉴权
      */
     @PostMapping("dataAuth")
-    public DataRespVO<List<DataAuthRespVO>> dataAuth(@RequestBody DataAuthReqVO dataAuthReqVO) {
-        String appTokenId = dataAuthReqVO.getAppTokenId();
-
-        if (StrUtil.isBlank(appTokenId)) {
-            return DataRespVO.resultEnumMessage(BusinessRespEnum.PARAM_ERROR);
-        }
-
+    public ZeroTrustDataRespVO<DataAuthRespVO> dataAuth(@RequestBody DataAuthReqVO dataAuthReqVO) {
         String resourceId = dataAuthReqVO.getResourceId();
-        if (StrUtil.isBlank(resourceId)) {
-            return DataRespVO.resultEnumMessage(BusinessRespEnum.PARAM_ERROR);
-        }
-
-        TokenDetailRespVo tokenInfo = authTokenFacade.getByAppTokenId(appTokenId, true, false);
-        AuthUserVo userInfo = tokenInfo.getUserInfo();
-        if (null == userInfo) {
-            return DataRespVO.resultEnumMessage(BusinessRespEnum.AUTH_FAIL);
-        }
-
-        DataAuthV2ReqDTO v2ReqDTO = new DataAuthV2ReqDTO();
-        v2ReqDTO.setIdcard(userInfo.getIdcard());
-        v2ReqDTO.setResourceId(resourceId);
-        v2ReqDTO.setAppToken(appTokenId);
-        v2ReqDTO.setUserToken(tokenInfo.getUserToken().getUserTokenId());
-        v2ReqDTO.setRequestAppCode(tokenInfo.getAppToken().getAppId());
-
-        ResponseDTO<DataAuthV2RespDTO> dto = apiDataAuthFacade.dataItemsCheckV2(v2ReqDTO);
-        if (!ResponseUtil.isSuccess(dto)) {
-            return DataRespVO.resultEnumMessage(BusinessRespEnum.AUTH_FAIL);
-        } else {
-            DataAuthV2RespDTO respDTO = (DataAuthV2RespDTO) dto.getResult();
-            Set<String> resultSet = respDTO.getItemIdentifier();
-            List<DataAuthRespVO> collect = Optional.ofNullable(resultSet).orElse(Collections.emptySet()).stream().map(e -> {
-                DataAuthRespVO vo = new DataAuthRespVO();
-                vo.setResourceId(resourceId);
-                vo.setItemIdentifier(e);
-                return vo;
-            }).collect(Collectors.toList());
-            return DataRespVO.success(collect);
+        String taskId = dataAuthReqVO.getTaskId();
+        String appTokenId = dataAuthReqVO.getAppTokenId();
+        log.info("======数据级鉴权开始, 请求参数resourceId:{}, taskId:{}, appTokenId:{}=====", resourceId, taskId, appTokenId);
+        if (StrUtil.isBlank(resourceId) || StrUtil.isBlank(taskId) || StrUtil.isBlank(appTokenId)) {
+            log.error("鉴权参数为空");
+            return ZeroTrustDataRespVO.resultEnumMessage(ZeroTrustBusinessRespEnum.OPERATE_FAIL, DataAuthRespVO.empty());
         }
+        ZeroTrustDataRespVO<DataAuthRespVO> respVO = zeroTrustAuthFacade.dataAuth(dataAuthReqVO);
+        log.info("数据鉴权结果:{}", JSON.toJSONString(respVO));
+        return respVO;
     }
 
     @PostMapping("token-receive")
-    public MessageRespVO tokenReceive(@Valid @RequestBody TokenReceiveVO receiveVO) {
+    public ZeroTustMessageRespVO tokenReceive(@Valid @RequestBody TokenReceiveVO receiveVO) {
         return authTokenFacade.tokenReceive(receiveVO);
     }
 

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v4/vo/AppAuthReqVO.java

@@ -1,24 +0,0 @@
-
-package com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v4.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * <p>
- * 应用级鉴权请求
- * </p>
- *
- * @author huangzqa
- * @date 2022/8/1
- */
-@Data
-public class AppAuthReqVO {
-    /**
-     * 用户令牌标识
-     */
-    @ApiModelProperty(value = "用户令牌标识")
-    private String userTokenId;
-
-
-}

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v4/vo/DataAuthReqVO.java

@@ -1,33 +0,0 @@
-
-package com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v4.vo;
-
-import lombok.Data;
-
-/**
- * <p>
- * 数据鉴权请求
- * </p>
- *
- * @author huangzqa
- * @date 2022/8/1
- */
-@Data
-public class DataAuthReqVO {
-
-    /**
-     * 应用令牌标识
-     */
-    private String appTokenId;
-
-    /**
-     * 任务编码
-     */
-    private String taskId;
-
-    /**
-     * 资源标识符
-     */
-    private String resourceId;
-
-
-}

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v4/vo/DataAuthRespVO.java

@@ -1,27 +0,0 @@
-
-package com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v4.vo;
-
-import lombok.Data;
-
-/**
- * <p>
- * 数据鉴权返回值
- * </p>
- *
- * @author huangzqa
- * @date 2022/8/1
- */
-@Data
-public class DataAuthRespVO {
-
-    /**
-     * 资源标识符
-     */
-    private String resourceId;
-
-    /**
-     * 数据项标识符
-     */
-    private String itemIdentifier;
-
-}

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v4/vo/FunctionAuthReqVO.java

@@ -1,28 +0,0 @@
-
-package com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v4.vo;
-
-import lombok.Data;
-
-/**
- * <p>
- * 功能鉴权请求
- * </p>
- *
- * @author huangzqa
- * @date 2022/8/1
- */
-@Data
-public class FunctionAuthReqVO {
-
-    /**
-     * 应用令牌标识
-     */
-    private String appTokenId;
-
-    /**
-     * 任务编码
-     */
-    private String taskId;
-
-
-}

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v4/vo/ServiceAuthReqVO.java

@@ -1,28 +0,0 @@
-
-package com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v4.vo;
-
-import lombok.Data;
-
-/**
- * <p>
- * 服务鉴权请求
- * </p>
- *
- * @author huangzqa
- * @date 2022/8/1
- */
-@Data
-public class ServiceAuthReqVO {
-
-    /**
-     * 应用令牌标识
-     */
-    private String appTokenId;
-
-    /**
-     * 任务编码
-     */
-    private String taskId;
-
-
-}

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v4/vo/UserOrgAuthReqVO.java

@@ -1,33 +0,0 @@
-
-package com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v4.vo;
-
-import lombok.Data;
-
-/**
- * <p>
- * 用户结构数据鉴权请求
- * </p>
- *
- * @author huangzqa
- * @date 2022/8/1
- */
-@Data
-public class UserOrgAuthReqVO {
-
-    /**
-     * 应用令牌标识
-     */
-    private String appTokenId;
-
-    /**
-     * 身份证号
-     */
-    private String idcard;
-
-    /**
-     * 机构编号
-     */
-    private String orgCode;
-
-
-}

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/auth/RoleInfoController.java

@@ -8,14 +8,18 @@ import com.dragoninfo.dcuc.auth.auth.facade.IRoleInfoFacade;
 import com.dragoninfo.dcuc.auth.auth.facade.IStaffAssignAuthInfoFacade;
 import com.dragoninfo.dcuc.auth.auth.vo.RoleInfoVO;
 import com.dragoninfo.dcuc.auth.auth.vo.RsGridCheckedVO;
+import com.dragoninfo.dcuc.auth.auth.vo.rolemanage.RoleOperateApplyVo;
 import com.dragoninfo.dcuc.authweb.restcontroller.auth.vo.RoleFunRsRlVo;
 import com.dragoninfo.dcuc.authweb.restcontroller.auth.vo.RoleInfoVo;
 import com.dragoninfo.dcuc.authweb.restcontroller.auth.vo.RoleQuotaVo;
 import com.dragoninfo.dcuc.authweb.restcontroller.auth.vo.StaffAssignAuthInfoVo;
+import com.dragoninfo.dcuc.common.utils.ResponseUtil;
 import com.dragoninfo.duceap.core.response.Result;
+import com.dragonsoft.duceap.base.entity.http.ResponseDTO;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import com.dragonsoft.duceap.base.entity.security.SecurityUser;
 import com.dragonsoft.duceap.base.enums.BooleanEnum;
+import com.dragonsoft.duceap.base.utils.UserContextUtils;
 import com.dragonsoft.duceap.commons.util.string.StringUtils;
 import com.dragonsoft.duceap.core.context.ContextUtils;
 import com.dragonsoft.duceap.core.search.Searchable;
@@ -34,6 +38,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -47,11 +52,24 @@ public class RoleInfoController {
 
 
     @Autowired
-    private IRoleInfoFacade iRoleInfoFacade;
+    private IRoleInfoFacade roleInfoFacade;
 
     @Autowired
     private IStaffAssignAuthInfoFacade iStaffAssignAuthInfoFacade;
 
+
+    @ApiOperation(value = "角色新增、修改、删除操作申请")
+    @PostMapping("role-operate-apply")
+    public Result<Object> roleOperateApply(@Valid @RequestBody RoleOperateApplyVo roleOperateApplyVo) {
+        ResponseDTO<Object> responseDTO = roleInfoFacade.roleOperateApply(roleOperateApplyVo);
+        if (ResponseUtil.isSuccess(responseDTO)) {
+            return Result.success();
+        } else {
+            return Result.failMessage(responseDTO.getMessage());
+        }
+    }
+
+
     /**
      * 角色列表
      *
@@ -62,7 +80,7 @@ public class RoleInfoController {
     @ApiImplicitParam(name = "searchable", value = "查询条件,app_id_eq不能为空")
     @PostMapping(value = "roleList/_search")
     public Result<List<RoleInfoVO>> roleList(SearchDTO searchDTO) {
-        Page<RoleInfoVO> roleInfoVOPage = iRoleInfoFacade.page(searchDTO);
+        Page<RoleInfoVO> roleInfoVOPage = roleInfoFacade.page(searchDTO);
         return Result.success(roleInfoVOPage.getTotalElements(), roleInfoVOPage.getContent());
     }
 
@@ -81,7 +99,7 @@ public class RoleInfoController {
             //DTO暂未设计,沿用原来的接口参数,后期修改
             String roleId = roleFunRsRlVo.getRoleId();
             String rsGridList = JSON.toJSONString(roleFunRsRlVo.getRsGridLists());
-            iRoleInfoFacade.saveRsGrid(rsGridList, roleId);
+            roleInfoFacade.saveRsGrid(rsGridList, roleId);
             result = Result.success("保存成功");
         } catch (Exception e) {
             logger.error("saveRsGrid error:{}", e);
@@ -102,7 +120,7 @@ public class RoleInfoController {
             , example = "40288a8b699fc2500169a33b20540000")})
     @GetMapping(value = "/role/{id}", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public Result<RoleInfoVo> roleInfo(@PathVariable("id") String id) {
-        RoleInfo roleInfo = iRoleInfoFacade.get(id);
+        RoleInfo roleInfo = roleInfoFacade.get(id);
         RoleInfoVo vo = new RoleInfoVo();
         BeanUtils.copyProperties(roleInfo, vo);
         return Result.success(vo);
@@ -127,12 +145,14 @@ public class RoleInfoController {
             }
             Searchable searchable = Searchable.newSearchable();
             searchable.addSearchFilter("code", SearchOperator.eq, roleInfoVo.getCode());
-            if (StringUtils.isNotEmpty(roleInfoVo.getId()))
+            if (StringUtils.isNotEmpty(roleInfoVo.getId())) {
                 searchable.addSearchFilter("id", SearchOperator.ne, roleInfoVo.getId());
-            List<RoleInfo> list = iRoleInfoFacade.roleList(searchable.toSearchDTO());
-            if (list != null && list.size() > 0)
-                return Result.fail("角色代码已被使用");
-            SecurityUser user = (SecurityUser) ContextUtils.getUserInfo();
+            }
+            List<RoleInfo> list = roleInfoFacade.roleList(searchable.toSearchDTO());
+            if (list != null && list.size() > 0) {
+                return Result.failMessage("角色代码已被使用");
+            }
+            SecurityUser user = UserContextUtils.getCurrentUser();
             roleInfoVo.setInitNumber(0);
             roleInfoVo.setCreator(user.getId());
             roleInfoVo.setIsActive(BooleanEnum.TRUE.getValue());
@@ -142,7 +162,7 @@ public class RoleInfoController {
             //DTO暂未设计,沿用原来的接口参数,后期修改
             RoleInfo roleInfo = new RoleInfo();
             BeanUtils.copyProperties(roleInfoVo, roleInfo);
-            iRoleInfoFacade.save(roleInfo);
+            roleInfoFacade.save(roleInfo);
             result = Result.success("保存成功");
 
         } catch (Exception e) {
@@ -172,12 +192,14 @@ public class RoleInfoController {
             }
             Searchable searchable = Searchable.newSearchable();
             searchable.addSearchFilter("code", SearchOperator.eq, roleInfoVo.getCode());
-            if (StringUtils.isNotEmpty(roleInfoVo.getId()))
+            if (StringUtils.isNotEmpty(roleInfoVo.getId())) {
                 searchable.addSearchFilter("id", SearchOperator.ne, roleInfoVo.getId());
-            List<RoleInfo> list = iRoleInfoFacade.roleList(searchable.toSearchDTO());
-            if (list != null && list.size() > 0)
+            }
+            List<RoleInfo> list = roleInfoFacade.roleList(searchable.toSearchDTO());
+            if (list != null && list.size() > 0) {
                 return Result.fail("角色代码已被使用");
-            RoleInfo role_info = iRoleInfoFacade.get(roleInfoVo.getId());
+            }
+            RoleInfo role_info = roleInfoFacade.get(roleInfoVo.getId());
             role_info.setCode(roleInfoVo.getCode());
             role_info.setName(roleInfoVo.getName());
             role_info.setRoleLevel(roleInfoVo.getRoleLevel());
@@ -187,7 +209,8 @@ public class RoleInfoController {
             role_info.setPoliceCategory(StringUtils.isEmpty(roleInfoVo.getPoliceCategory()) ? null : roleInfoVo.getPoliceCategory());
             role_info.setRoleBusiness(roleInfoVo.getRoleBusiness());
             role_info.setIsNotLimitCount(roleInfoVo.getIsNotLimitCount());
-            iRoleInfoFacade.update(role_info);
+            role_info.setRoleCategory(roleInfoVo.getRoleCategory());
+            roleInfoFacade.update(role_info);
             result = Result.success("保存成功");
 
         } catch (Exception e) {
@@ -214,9 +237,9 @@ public class RoleInfoController {
         Result result;
         try {
             //删除角色信息
-            iRoleInfoFacade.delete(id);
+            roleInfoFacade.delete(id);
             //删除角色相关表的信息
-            iRoleInfoFacade.delAllRolesInfo(id);
+            roleInfoFacade.delAllRolesInfo(id);
             result = Result.success("删除成功");
         } catch (Exception e) {
             logger.error("delete role error:{}", e);
@@ -237,7 +260,7 @@ public class RoleInfoController {
     @ApiImplicitParam(name = "roleId", value = "角色id", required = true)
     @GetMapping(value = "/checked/{roleId}")
     public Result<List<RsGridCheckedVO>> checked(@PathVariable("roleId") String roleId) {
-        List<RsGridCheckedVO> rsGridCheckedVOList = iRoleInfoFacade.getRsGridChecked(roleId);
+        List<RsGridCheckedVO> rsGridCheckedVOList = roleInfoFacade.getRsGridChecked(roleId);
         return Result.success(rsGridCheckedVOList);
     }
 
@@ -259,7 +282,7 @@ public class RoleInfoController {
         if (StringUtils.isBlank(applicationId)){
             return Result.fail("400", "applicationId 不能为空");
         }
-        Page<RoleInfoVO> page = iRoleInfoFacade.getRoleQuotaList(searchDTO);
+        Page<RoleInfoVO> page = roleInfoFacade.getRoleQuotaList(searchDTO);
         return Result.success(page.getTotalElements(), page.getContent());
     }
 
@@ -288,7 +311,7 @@ public class RoleInfoController {
             searchable.addSearchFilter("role_level", SearchOperator.eq, roleLevel_eq.getValue());
         }
         searchable.addSearchFilter("is_not_limit_count", SearchOperator.eq, BooleanEnum.TRUE.value);
-        Page<RoleInfoVO> page = iRoleInfoFacade.getQuotoRoles(searchable.toSearchDTO());
+        Page<RoleInfoVO> page = roleInfoFacade.getQuotoRoles(searchable.toSearchDTO());
         return Result.success(page.getTotalElements(), page.getContent());
     }
 
@@ -305,7 +328,7 @@ public class RoleInfoController {
         Result result;
         try {
             String listStr = JSON.toJSONString(roleQuotaList);
-            iRoleInfoFacade.roleQuotaSave(listStr);
+            roleInfoFacade.roleQuotaSave(listStr);
             result = Result.success("保存成功");
         } catch (Exception e) {
             logger.error("role quota save error:{}", e);

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/auth/vo/RoleInfoVo.java

@@ -79,6 +79,9 @@ public class RoleInfoVo {
     @ApiModelProperty(value = "角色类型")
     private String roleType;
 
+    @ApiModelProperty(value = "361标准角色类型字段")
+    private String roleCategory;
+
     @ApiModelProperty(value = "人脸认证标识")
     private String faceVerifyFlag;