1、异常处理函数修改。

saas-backen/src/main/java/com/pavis/app/saasbacken/controller/CommonController.java

@@ -157,14 +157,14 @@ public class CommonController {
 
     @PreSaveLog("获取节点基础数据")
     @ApiOperation(value = "获取节点基础数据接口", notes = "获取节点基础数据接口")
-    @GetMapping("/node/data")
-    public ResultBody getNodeData() {
+    @PostMapping("/node/data")
+    public ResultBody getNodeData(String resType) {
         HttpServletRequest request = HttpContextUtils.getHttpServletRequest();
         String uri = request.getRequestURI();
         try {
-            log.info("getNodeData:{}", "");
+            log.info("getNodeData:{}", resType);
             // return ResultBody.ok().path(uri).data(null);
-            return ResultBody.ok().path(uri).data(checkModuleService.getNodeData());
+            return ResultBody.ok().path(uri).data(checkModuleService.getNodeData(resType));
         } catch (Exception e) {
             return GlobalExceptionHandler.resolveException(e, uri);
         }

saas-backen/src/main/java/com/pavis/app/saasbacken/exception/GlobalExceptionHandler.java

@@ -59,7 +59,7 @@ public class GlobalExceptionHandler {
             code = ErrorCode.ALERT;
             return ResultBody.failed().code(code.getCode()).msg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
         } else if (className.contains("IllegalArgumentException")) {
-            code = ErrorCode.ALERT;
+            code = ErrorCode.ILLEGAL_ARGUMENT;
         } else if (className.contains("AlertException")) {
             code = ErrorCode.ALERT;
         } else if (className.contains("CheckException")) {
@@ -68,14 +68,10 @@ public class GlobalExceptionHandler {
             code = ErrorCode.LOGIN_FAILURE;
         } else if (className.contains("OrgException")) {
             code = ErrorCode.REQUEST_ORG_FAILED;
-        } else if (className.contains("AuthException")) {
-            code = ErrorCode.IS_RELATION_EXIST;
         } else if (className.contains("OpException")) {
             code = ErrorCode.FAIL;
-        } else if (className.contains("RestClientException")) {
-            code = ErrorCode.QA_NO_RESPONSE;
         } else if (className.contains("NumberFormatException")) {
-            code = ErrorCode.ILLEGAL_ARGUMENT;
+            code = ErrorCode.FAIL;
         }
         return buildBody(ex, code, path, httpStatus);
     }

saas-backen/src/main/java/com/pavis/app/saasbacken/exception/IllegalArgumentException.java

@@ -0,0 +1,19 @@
+package com.pavis.app.saasbacken.exception;
+
+
+import com.pavis.app.saasbacken.http.ErrorCode;
+
+public class IllegalArgumentException extends BaseException {
+
+    public IllegalArgumentException() {
+        this(ErrorCode.ILLEGAL_ARGUMENT.getCode(), ErrorCode.ILLEGAL_ARGUMENT.getMessage());
+    }
+
+    public IllegalArgumentException(String msg) {
+        this(ErrorCode.ILLEGAL_ARGUMENT.getCode(), msg);
+    }
+
+    public IllegalArgumentException(int code, String msg) {
+        super(code, msg);
+    }
+}

saas-backen/src/main/java/com/pavis/app/saasbacken/form/ModuleData.java

@@ -32,4 +32,20 @@ public class ModuleData{
     @ApiModelProperty(value = "上级节点id")
     private String parentId;
 
+    @ApiModelProperty(value = "是否可用")
+    private String isEnabled;
+
+    @ApiModelProperty(value = "是否必填")
+    private String isMust;
+
+    @ApiModelProperty(value = "是否排序")
+    private String isSorted;
+
+    @ApiModelProperty(value = "单选：是/否，是否有二级目录")
+    private String weatherChild;
+
+    // input()、单选框、复选框、下拉选择、图片、是/否、是/否二级目录、
+    @ApiModelProperty(value = "前端展示类型")
+    private String showType;
+
 }

saas-backen/src/main/java/com/pavis/app/saasbacken/service/CheckModuleService.java

@@ -33,5 +33,5 @@ public interface CheckModuleService extends IService<CheckModule> {
      * 获取节点数据。
      * @return
      */
-    List<ModuleParam> getNodeData();
+    List<ModuleParam> getNodeData(String resType);
 }

saas-backen/src/main/java/com/pavis/app/saasbacken/service/impl/base/CheckModuleServiceImpl.java

@@ -11,11 +11,14 @@ import com.pavis.app.saasbacken.entity.CheckModule;
 import com.pavis.app.saasbacken.entity.InitDataChild;
 import com.pavis.app.saasbacken.entity.InitDataParent;
 import com.pavis.app.saasbacken.entity.InitDataThird;
+import com.pavis.app.saasbacken.exception.IllegalArgumentException;
 import com.pavis.app.saasbacken.form.ModuleData;
 import com.pavis.app.saasbacken.form.ModuleParam;
 import com.pavis.app.saasbacken.form.ModuleTree;
+import com.pavis.app.saasbacken.http.ErrorCode;
 import com.pavis.app.saasbacken.service.CheckModuleService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -23,6 +26,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -95,7 +99,15 @@ public class CheckModuleServiceImpl extends ServiceImpl<CheckModuleMapper, Check
 
     @Override
     public List<CheckModule> addInitData(List<ModuleTree> moduleTrees) {
+        List<CheckModule> checkModules = checkModuleMapper.selectList(new QueryWrapper<CheckModule>().lambda().isNotNull(CheckModule::getId));
+        if (checkModules.size() > 0){
+            // 先删除，后新增。
+            List<String> ids = checkModules.stream().map(t -> t.getId()).collect(Collectors.toList());
+            int i = checkModuleMapper.deleteBatchIds(ids);
+            log.info("del res:{}",i);
+        }
 
+        // 一级数据
         CheckModule firstCheck;
         List<CheckModule> firstCheckModules = new ArrayList<>();
         List<CheckModule> thirdCheckModules = new ArrayList<>();
@@ -107,6 +119,7 @@ public class CheckModuleServiceImpl extends ServiceImpl<CheckModuleMapper, Check
             firstCheck.setParentId("0");
             firstCheckModules.add(firstCheck);
 
+            // 二级数据
             CheckModule secCheck;
             for (ModuleParam tree : moduleTree.getTrees()) {
                 secCheck = new CheckModule();
@@ -114,6 +127,7 @@ public class CheckModuleServiceImpl extends ServiceImpl<CheckModuleMapper, Check
                 secCheck.setResType(tree.getId());
                 secCheckModules.add(secCheck);
 
+                // 三级数据
                 CheckModule thirdCheck;
                 for (ModuleData treeTree : tree.getTrees()) {
                     thirdCheck = new CheckModule();
@@ -129,23 +143,6 @@ public class CheckModuleServiceImpl extends ServiceImpl<CheckModuleMapper, Check
         log.info("secCheckModules:{}",JSON.toJSONString(secCheckModules));
         log.info("thirdCheckModules:{}",JSON.toJSONString(thirdCheckModules));
 
-        // 增删改查。
-        // 提交的数据结构。
-        // 返回的数据结构
-        CheckModule checkModule = CheckModule.builder()
-                .resType("")
-                .title("")
-                .titleCode("")
-                .parentId("")
-                .icon("")
-                .isEnabled("")
-                .isMust("")
-                .isSorted("")
-                .weatherChild("")
-                .showType("")
-                .build();
-        // 是否必填，手动设置。还是前端展示，节点管理员可选。
-
         boolean b = saveBatch(firstCheckModules);
         boolean b1 = saveBatch(secCheckModules);
         boolean b2 = saveBatch(thirdCheckModules);
@@ -153,20 +150,31 @@ public class CheckModuleServiceImpl extends ServiceImpl<CheckModuleMapper, Check
         log.info("b1:{}",b1);
         log.info("b2:{}",b2);
 
-        List<CheckModule> checkModules = checkModuleMapper.selectList(new QueryWrapper<CheckModule>().lambda().isNotNull(CheckModule::getId));
         return checkModules;
     }
 
     @Override
-    public List<ModuleParam> getNodeData() {
+    public List<ModuleParam> getNodeData(String resType) {
+        if (StringUtils.isEmpty(resType)){
+            throw new IllegalArgumentException(ErrorCode.ILLEGAL_ARGUMENT.getCode(), ErrorCode.ILLEGAL_ARGUMENT.getMessage());
+        }
+        // 根据resType值判断是什么资源库的数据，如果resType为-1则表示获取所有资源库的层级数据。
+        List<CheckModule> checkModules1 = new ArrayList<>();
+        if ("-1".equals(resType)){
+            checkModules1 = checkModuleMapper.selectList(new QueryWrapper<CheckModule>().lambda().eq(CheckModule::getParentId,"0"));
+        }else {
+            checkModules1 = checkModuleMapper.selectList(new QueryWrapper<CheckModule>().lambda()
+                    .eq(CheckModule::getResType,resType)
+                    .eq(CheckModule::getParentId,"0"));
+        }
         // 构建返回信息。
-        List<CheckModule> checkModules1 = checkModuleMapper.selectList(new QueryWrapper<CheckModule>().lambda().eq(CheckModule::getParentId,"0"));
         ModuleParam moduleParam;
         List<ModuleParam> moduleParams = new ArrayList<>();
         for (CheckModule module : checkModules1) {
             moduleParam = new ModuleParam();
             BeanUtils.copyProperties(module, moduleParam);
 
+            // 二级
             List<ModuleData> childs = new ArrayList<>();
             ModuleParam moduleParamChild;
             List<CheckModule> checkModules2 = checkModuleMapper.selectList(new QueryWrapper<CheckModule>()
@@ -176,6 +184,7 @@ public class CheckModuleServiceImpl extends ServiceImpl<CheckModuleMapper, Check
                 BeanUtils.copyProperties(checkModule1, moduleParamChild);
                 childs.add(moduleParamChild);
 
+                // 三级
                 ModuleParam moduleParamThird;
                 List<ModuleData> thirds = new ArrayList<>();
                 List<CheckModule> checkModules3 = checkModuleMapper.selectList(new QueryWrapper<CheckModule>()