Merge branch 'mazq-220825-xqkf' into 'develop'

feature(评测内容开发): 评测内容开发

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

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/element/EnvElementController.java

@@ -0,0 +1,62 @@
+package com.dragoninfo.dcuc.authweb.restcontroller.element;
+
+import com.dragoninfo.dcuc.auth.element.facade.IEnvElementFacade;
+import com.dragoninfo.dcuc.auth.element.vo.EnvElementSaveVo;
+import com.dragoninfo.dcuc.auth.element.vo.RespEnvElementVo;
+import com.dragoninfo.duceap.core.response.Result;
+import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
+import com.dragonsoft.duceap.base.entity.search.SearchDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author mazq
+ * @date 2022/8/25
+ */
+@RestController
+@RequestMapping("/envElement")
+public class EnvElementController {
+
+    @Autowired
+    private IEnvElementFacade envElementFacade;
+
+    @GetMapping("getById/{id}")
+    public Result<RespEnvElementVo> getById(@PathVariable("id") String id) {
+        RespEnvElementVo vo = envElementFacade.getById(id);
+        return Result.success(vo);
+    }
+
+    @PostMapping("search")
+    public Result<List<RespEnvElementVo>> pageSearch(SearchDTO searchDTO) {
+        Page<RespEnvElementVo> page = envElementFacade.pageSearch(searchDTO);
+        return Result.success(page.getTotalElements(), page.getContent());
+    }
+
+    @PostMapping("save")
+    public Result save(@RequestBody EnvElementSaveVo envElementVo) {
+       ResponseStatus responseStatus = envElementFacade.save(envElementVo);
+        return getResult(responseStatus);
+    }
+
+    @PostMapping("update")
+    public Result update(@RequestBody EnvElementSaveVo envElementVo) {
+        ResponseStatus responseStatus = envElementFacade.update(envElementVo);
+        return getResult(responseStatus);
+    }
+
+    @DeleteMapping("deleteById/{id}")
+    public Result deleteById(@PathVariable("id") String id) {
+        ResponseStatus responseStatus = envElementFacade.deleteById(id);
+        return getResult(responseStatus);
+    }
+
+    private Result getResult(ResponseStatus responseStatus) {
+        Result result = new Result();
+        result.setMsg(responseStatus.getMessage());
+        result.setResult(responseStatus.getStatusCode());
+        return result;
+    }
+}

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/selfauth/controller/SelfAuthAppLyController.java

@@ -5,16 +5,19 @@ import com.dragoninfo.dcuc.auth.auth.dto.*;
 import com.dragoninfo.dcuc.auth.auth.enumresources.WorkFlowSourceEnum;
 import com.dragoninfo.dcuc.auth.auth.facade.IAuthApplyFacade;
 import com.dragoninfo.dcuc.auth.auth.facade.IFunAuthResultFacade;
+import com.dragoninfo.dcuc.auth.auth.vo.RedListRiskLogVo;
 import com.dragoninfo.dcuc.authweb.restcontroller.selfauth.vo.*;
 import com.dragoninfo.duceap.core.response.Result;
 import com.dragonsoft.duceap.base.entity.http.ResponseDTO;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
+import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import com.dragonsoft.duceap.core.search.Searchable;
 import com.dragonsoft.duceap.core.search.enums.SearchOperator;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -114,7 +117,7 @@ public class SelfAuthAppLyController {
     })
     @GetMapping(value = "funApplyDetail")
     public Result<FunApplyDetailVo> funApplyDetail(@RequestParam("applyOrdNo") String applyOrdNo,
-                                 @RequestParam(value = "needFlowInfo", required = false) Boolean needFlowInfo) {
+                                                   @RequestParam(value = "needFlowInfo", required = false) Boolean needFlowInfo) {
         if(null == needFlowInfo) {
             needFlowInfo = false;
         }
@@ -261,4 +264,27 @@ public class SelfAuthAppLyController {
             return Result.success(vo);
         }
     }
+
+    @ApiOperation(value = "功能授权红名单风险校验")
+    @PostMapping("redListCheck")
+    public Result<Boolean> redListCheck(@RequestBody List<AppFunAuthResourceVo> resourceInfos) {
+        if (CollectionUtils.isEmpty(resourceInfos)) {
+            return Result.success(false);
+        }
+        List<AppFunAuthResourceDTO> collect = resourceInfos.stream().map(e -> {
+            AppFunAuthResourceDTO resourceDTO = new AppFunAuthResourceDTO();
+            resourceDTO.setAppId(e.getAppId());
+            resourceDTO.setFunId(e.getFunId());
+            return resourceDTO;
+        }).collect(Collectors.toList());
+        Boolean b = selfAuthApplyFacade.redListCheck(collect);
+        return Result.success(b);
+    }
+
+    @ApiOperation(value = "红名单风险日志查询")
+    @PostMapping("redListApplyLog")
+    public Result<List<RedListRiskLogVo>> redListApplyLog(SearchDTO searchDTO) {
+        Page<RedListRiskLogVo> page = selfAuthApplyFacade.redListApplyLog(searchDTO);
+        return Result.success(page.getTotalElements(), page.getContent());
+    }
 }