Merge branch 'mazq-jiekouyouhua-230523' into 'release/v1.2.0'

Mazq jiekouyouhua 230523

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

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

@@ -1,34 +1,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.*;
+import com.dragoninfo.dcuc.auth.api.enums.zerotrust.ZeroTrustBusinessRespEnum;
 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;
-import com.dragoninfo.dcuc.auth.auth.dto.RoleApiDto;
-import com.dragoninfo.dcuc.auth.auth.dto.data.DataAuthV2ReqDTO;
-import com.dragoninfo.dcuc.auth.auth.dto.data.DataAuthV2RespDTO;
-import com.dragoninfo.dcuc.auth.auth.facade.IRoleFacade;
-import com.dragoninfo.dcuc.auth.auth.facade.IServiceAuthFlowFacade;
-import com.dragoninfo.dcuc.auth.auth.facade.IStaffAssignAuthInfoFacade;
-import com.dragoninfo.dcuc.auth.auth.vo.ApiAppAuthVo;
-import com.dragoninfo.dcuc.auth.auth.vo.ServiceAuthenticationResVO;
-import com.dragoninfo.dcuc.auth.sub.dto.AuthUserDTO;
-import com.dragoninfo.dcuc.auth.sub.facade.IAuthUserInfoFacade;
-import com.dragoninfo.dcuc.auth.sub.vo.AuthUserVo;
-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.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;
@@ -37,13 +13,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 /**
  * <p>
  *
@@ -58,12 +27,6 @@ import java.util.stream.Collectors;
 @RequestMapping(value = "/api/auth-service/v4/")
 public class AuthV4Controller {
 
-    @Autowired
-    private IApiDataAuthFacade apiDataAuthFacade;
-
-    @Autowired
-    private IAuthTokenFacade authTokenFacade;
-
     @Autowired
     private IZeroTrustAuthFacade zeroTrustAuthFacade;
 
@@ -149,22 +112,4 @@ public class AuthV4Controller {
         return respVO;
     }
 
-    @PostMapping("token-receive")
-    public ZeroTustMessageRespVO tokenReceive(@Valid @RequestBody TokenReceiveVO receiveVO) {
-        return authTokenFacade.tokenReceive(receiveVO);
-    }
-
-    @PostMapping("userOrgDataAuth")
-    public ResultRespVO<DataAuthRespVO> userOrgDataAuth(@RequestBody UserOrgAuthReqVO userOrgAuthReqVO) {
-
-        String orgCode = userOrgAuthReqVO.getOrgCode();
-        String idcard = userOrgAuthReqVO.getIdcard();
-
-        DataItemsDto dataItemsDto = apiDataAuthFacade.userOrgDataAuth(idcard, orgCode);
-
-        DataAuthRespVO dataAuthRespVO = new DataAuthRespVO();
-        dataAuthRespVO.setResourceId(dataItemsDto.getResourceCode());
-        dataAuthRespVO.setItemIdentifier(dataItemsDto.getDataItemCode());
-        return ResultRespVO.success(dataAuthRespVO);
-    }
 }

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/securitypolicy/ApiHwSecurityPolicyController.java

@@ -0,0 +1,62 @@
+package com.dragoninfo.dcuc.authweb.restcontroller.api.securitypolicy;
+
+import com.dragoninfo.dcuc.auth.api.vo.securitypolicy.req.ReqUserRiskScoreVO;
+import com.dragoninfo.dcuc.auth.api.vo.securitypolicy.resp.ErrorException;
+import com.dragoninfo.dcuc.auth.api.vo.securitypolicy.resp.HwSecurityPolicyResp;
+import com.dragoninfo.dcuc.auth.securitypolicy.facade.IApiSecurityPolicyFacade;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author huangzqa
+ * @date 2023/5/12
+ */
+@Api(tags = {"接收安全策略服务接口"})
+@Slf4j
+@RestController
+@RequestMapping("/api/hw/security-police/")
+public class ApiHwSecurityPolicyController {
+
+    @Autowired
+    private IApiSecurityPolicyFacade apiHwSecurityPolicyFacade;
+
+    /**
+     * 接收评分
+     *
+     * @return AuthResp
+     */
+    @PostMapping(value = "/setRiskScore")
+    public HwSecurityPolicyResp<Boolean> setRiskScore(@RequestParam(value = "messageID", required = false) String messageId,
+                                                      @RequestParam(value = "token", required = false) String token,
+                                                      @RequestParam(value = "contents", required = false) String userRiskScoresJson) {
+
+        log.info("接收安全策略控制服务指令评分信息 messageId:{},contents:{}", messageId, userRiskScoresJson);
+        ObjectMapper objectMapper = new ObjectMapper();
+        List<ReqUserRiskScoreVO> userRiskScores;
+        try {
+            userRiskScores = objectMapper.readValue(userRiskScoresJson, new TypeReference<List<ReqUserRiskScoreVO>>() {
+            });
+        } catch (IOException e) {
+            log.error("messageId:{},contents :{} 解析异常", messageId, userRiskScoresJson, e);
+            return HwSecurityPolicyResp.fail("", "contents 解析异常", ErrorException.errorException(e));
+        }
+
+        apiHwSecurityPolicyFacade.receivePolicy(userRiskScores);
+
+        return HwSecurityPolicyResp.success();
+    }
+}

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

@@ -6,6 +6,7 @@ import com.dragoninfo.dcuc.auth.auth.entity.AppFunInfo;
 import com.dragoninfo.dcuc.auth.auth.vo.AppFunInfoVo;
 import com.dragoninfo.dcuc.auth.auth.vo.EventInfoVO;
 import com.dragoninfo.dcuc.auth.auth.vo.TreeInfoVO;
+import com.dragoninfo.dcuc.auth.auth.vo.appfun.RespAppFunTreeVo;
 import com.dragoninfo.dcuc.auth.power.facade.IAppFunInfoFacade;
 import com.dragoninfo.dcuc.auth.power.facade.IFunEventFacade;
 import com.dragoninfo.dcuc.authweb.restcontroller.auth.vo.AppFunTreeVo;
@@ -190,6 +191,18 @@ public class AppFunInfoController {
     }
 
 
+    /**
+     * 查看角色关联的菜单树
+     */
+    @ApiOperation(value = "角色关联的菜单树")
+    @ApiImplicitParam(name = "roleId", value = "角色id")
+    @GetMapping(value = "/menuTree")
+    public Result<List<RespAppFunTreeVo>> getRoleMenuTree(@RequestParam("roleId") String roleId) {
+        List<RespAppFunTreeVo> treeVos = iAppFunInfoFacade.getRoleMenuTree(roleId);
+        return Result.success(treeVos);
+    }
+
+
     public List<TreeInfoVO> getChildTreeObjects(List<TreeInfoVO> list,
                                                 String parentCode) {
         List<TreeInfoVO> returnList = new ArrayList<TreeInfoVO>();

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

@@ -104,31 +104,6 @@ public class RoleAuthInfoController {
         return allConvertMap;
     }
 
-
-//    /**
-//     * 人员视图 角色列表
-//     *
-//     * @param
-//     * @return
-//     */
-//    @ApiOperation(value = "人员视图 角色列表")
-//    @ApiImplicitParam(name = "searchDTO", value = "查询条件（orgId必须）",required = true)
-//    @PostMapping(value = "/staffRolePage/_search")
-//    public Result<List<AuthUserDTO>> staffRolePage(SearchDTO searchDTO) {
-//        Searchable searchable = Searchable.toSearchable(searchDTO);
-//        searchable.addSearchFilter("deleted",SearchOperator.eq,BooleanEnum.FALSE.getValue());
-//        searchable.addSearchFilter("id",SearchOperator.ne, authUserInfoFacade.getRootUserId());
-//        Page<AuthUserDTO> page = authUserInfoFacade.page(searchable.toSearchDTO());
-//        SecurityUser curUser = UserContextUtils.getCurrentUser();
-//        String userId = curUser.getId();
-//        ManageInfo manageInfo = manageInfoFacade.getManageInfoByUserId(userId);
-//        //判断是否是管理员
-//        if (null == manageInfo) {
-//            return Result.success(0L,null);
-//        }
-//        return Result.success(page.getTotalElements(),page.getContent());
-//    }
-
     /**
      * 人员视图 人员列表
      * @param
@@ -151,33 +126,6 @@ public class RoleAuthInfoController {
         return Result.success(page.getTotalElements(),page.getContent());
     }
 
-
-
-//    /**
-//     * 人员视图-角色已勾选
-//     * @param userId 用户Id
-//     * @return
-//     */
-//    @ApiOperation(value = "人员视图-角色已勾选")
-//    @ApiImplicitParam(name = "userId", value = "用户id（orgId必须）",required = true)
-//    @GetMapping(value = "/roleChecked")
-//    public Result<List<StaffAssignAuthInfoVo>> getRoleChecked(@RequestParam(value = "userId", required = false) String userId) {
-//        if (StringUtils.isEmpty(userId)) {
-//            return Result.success(new ArrayList());
-//        }
-//        Searchable searchable = Searchable.newSearchable();
-//        searchable.addSearchFilter("staffId",SearchOperator.eq,userId);
-//        List<StaffAssignAuthInfo> staffAssignAuthInfoList = staffAssignAuthInfoFacade.findForList(searchable.toSearchDTO());
-//        List<StaffAssignAuthInfoVo> vos = new ArrayList<>();
-//        for (StaffAssignAuthInfo source : staffAssignAuthInfoList) {
-//            StaffAssignAuthInfoVo vo = new StaffAssignAuthInfoVo();
-//            BeanUtils.copyProperties(source,vo);
-//            vos.add(vo);
-//        }
-//        return Result.success(vos);
-//    }
-
-
     /**
      * 角色视图 角色列表
      * @param