bug

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ArchiveTreeController.java

@@ -141,7 +141,7 @@ public class ArchiveTreeController extends BladeController {
     /**
      * 保存/修改上传文件显示配置树
      */
-    @PostMapping("/submitDisplayConfigTree")
+    @PostMapping("/submit-display-config-tree")
     @ApiOperationSupport(order = 8)
     @ApiOperation(value = "保存/修改上传文件显示配置树", notes = "传入ids")
     @ApiImplicitParams(value = {
@@ -154,7 +154,7 @@ public class ArchiveTreeController extends BladeController {
     /**
      * 获取归档树同级节点
      */
-    @GetMapping("/getSameGradeNode")
+    @GetMapping("/get-same-grade-node")
     @ApiOperationSupport(order = 9)
     @ApiOperation(value = "获取归档树同级节点", notes = "传入节点id")
     public R<List<ArchiveTree>> getSameGradeNode(@RequestParam String id) {
@@ -164,7 +164,7 @@ public class ArchiveTreeController extends BladeController {
     /**
      * 提交归档树手动排序
      */
-    @PostMapping("/submitArchiveTreeSort")
+    @PostMapping("/submit-tree-sort")
     @ApiOperationSupport(order = 10)
     @ApiOperation(value = "提交归档树手动排序", notes = "List<ArchiveTreeSortDTO>集合")
     public R submitArchiveTreeSort(@RequestBody List<ArchiveTreeSortDTO> listSort) {

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ContractInfoController.java

@@ -75,7 +75,7 @@ public class ContractInfoController extends BladeController {
     /**
      * 根据项目id查询当前所有合同
      */
-    @GetMapping("/getContractInfoByPid")
+    @GetMapping("/get-contractInfo-by-pid")
     @ApiOperationSupport(order = 8)
     @ApiOperation(value = "根据项目id查询当前所有合同", notes = "传入pid")
     public R<List<ContractInfo>> findContractInfoByPid(String pid) {
@@ -129,7 +129,7 @@ public class ContractInfoController extends BladeController {
     /**
      * 删除文件
      */
-    @GetMapping("/deleteFile")
+    @GetMapping("/delete-file")
     @ApiOperationSupport(order = 5)
     @ApiOperation(value = "删除文件", notes = "传入文件url")
     public R deleteFile(@Valid @RequestParam("url") String url) {
@@ -180,7 +180,7 @@ public class ContractInfoController extends BladeController {
     /**
      * 查询角色的岗位
      */
-    @GetMapping("/getJobByRoleId")
+    @GetMapping("/get-job-by-roleId")
     @ApiOperationSupport(order = 8)
     @ApiOperation(value = "查询角色下的岗位", notes = "传入id")
     public R<List<CRolePostVO>> findJobByRoleId(@ApiParam(value = "id", required = true)
@@ -196,7 +196,7 @@ public class ContractInfoController extends BladeController {
     /**
      * 根据用户列表
      */
-    @GetMapping("/getUserList")
+    @GetMapping("/get-user-list")
     @ApiOperationSupport(order = 11)
     @ApiOperation(value = "", notes = "")
     public R<List<User>> findUserList() {
@@ -211,7 +211,7 @@ public class ContractInfoController extends BladeController {
     /**
      * 根据项目id、合同id、角色id查询当前运维的用户
      */
-    @GetMapping("/getUserListByCondition")
+    @GetMapping("/get-user-list-by-condition")
     @ApiOperationSupport(order = 10)
     @ApiOperation(value = "查询当前项目角色下的运维用户列表", notes = "传入项目id、角色id、合同id(非必传)、size每页数量、current当前页")
     public R<IPage<User>> findUserListByCondition(FindAllUserByConditionDTO values, Query query) {
@@ -223,7 +223,7 @@ public class ContractInfoController extends BladeController {
     /**
      * 保存-项目分配维护人员
      */
-    @PostMapping("/saveUserInfoByProject")
+    @PostMapping("/save-userInfo-by-project")
     @ApiOperationSupport(order = 12)
     @ApiOperation(value = "保存-项目分配维护人员", notes = "传入项目id、合同id、字典主键id、用户id List集合")
     public R saveUserInfoByProject(@RequestBody List<SaveUserInfoByProjectDTO> list) {
@@ -292,7 +292,7 @@ public class ContractInfoController extends BladeController {
     /**
      * 根据项目id、合同id、岗位id查询当前分配的用户-查询当前项目合同岗位下的用户
      */
-    @GetMapping("/getAllUserByCondition")
+    @GetMapping("/get-all-user-by-condition")
     @ApiOperationSupport(order = 9)
     @ApiOperation(value = "查询当前项目合同岗位下的用户", notes = "传入项目id、合同id、岗位id、size每页数量、current当前页")
     public R<IPage<UserVO2>> findAllUserByCondition(FindAllUserByConditionDTO values, Query query) {
@@ -304,7 +304,7 @@ public class ContractInfoController extends BladeController {
     /**
      * 保存-项目合同段分配人员
      */
-    @PostMapping("/saveUserInfoByProjectTow")
+    @PostMapping("/save-userInfo-by-projectTow")
     @ApiOperationSupport(order = 13)
     @ApiOperation(value = "保存-项目合同段分配人员", notes = "传入项目id、合同id、岗位处roleId、用户id")
     @Transactional(rollbackFor = Exception.class)
@@ -336,7 +336,7 @@ public class ContractInfoController extends BladeController {
     /**
      * 项目分配用户删除
      */
-    @PostMapping("/removeUsersByIds")
+    @PostMapping("/remove-users-by-ids")
     @ApiOperationSupport(order = 14)
     @ApiOperation(value = "项目分配用户删除", notes = "传入当前列表用户的ids")
     @Transactional(rollbackFor = Exception.class)
@@ -374,7 +374,7 @@ public class ContractInfoController extends BladeController {
     /**
      * 项目分配用户逻辑删除当前项目下所有合同段角色信息
      */
-    @PostMapping("/removeUserProjectInfoAndRoleById")
+    @PostMapping("/remove-user-projectInfoAndRole-by-id")
     @ApiOperationSupport(order = 14)
     @ApiOperation(value = "逻辑删除当前项目下所有合同段角色信息", notes = "传入dataInfo内的一个id")
     public R removeUserProjectInfoAndRoleById(@ApiParam(value = "dataInfo内的一个id", required = true) @RequestParam String id) {
@@ -392,7 +392,7 @@ public class ContractInfoController extends BladeController {
     /**
      * 重置密码
      */
-    @PostMapping("/resetPasswordByUserId")
+    @PostMapping("/reset-password-by-userId")
     @ApiOperationSupport(order = 16)
     @ApiOperation(value = "重置密码", notes = "传入当前用户的userId，默认重置密码123456")
     public R updatePasswordByUserId(@ApiParam(value = "用户userId", required = true) @RequestParam String userId) {
@@ -406,7 +406,7 @@ public class ContractInfoController extends BladeController {
     /**
      * 保存或修改分配合同段wbs树
      */
-    @PostMapping("/submitWbsTreeInContract")
+    @PostMapping("/submit-wbsTree-in-contract")
     @ApiOperationSupport(order = 17)
     @ApiOperation(value = "保存或修改分配合同段wbs树", notes = "传入WbsTreeContractDTO")
     public R submitWbsTreeInContract(@RequestBody WbsTreeContractDTO wbsTreeContractDTO) {
@@ -458,7 +458,7 @@ public class ContractInfoController extends BladeController {
     /**
      * 查询所有施工合同wbs树根节点(新建监理或业主合同段时，加载当前项目下的施工WBS树，分配时使用)
      */
-    @GetMapping("/treeAllConstruction")
+    @GetMapping("/tree-all-construction")
     @ApiOperationSupport(order = 19)
     @ApiOperation(value = "查询所有施工合同wbs树根节点", notes = "传入wbsId,项目id")
     @ApiImplicitParams(value = {
@@ -498,7 +498,7 @@ public class ContractInfoController extends BladeController {
     /**
      * 查询监理or业主合同段关联信息
      */
-    @GetMapping("/getContractRelationInfo")
+    @GetMapping("/get-contract-relationInfo")
     @ApiOperationSupport(order = 21)
     @ApiOperation(value = "查询监理or业主合同段关联信息", notes = "合同段id")
     @ApiImplicitParam(name = "contractId", value = "合同段id")

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ProjectInfoController.java

@@ -163,7 +163,7 @@ public class ProjectInfoController extends BladeController {
     /**
      * 查询业务条数
      */
-    @GetMapping("/getListContractInfoCount")
+    @GetMapping("/get-list-contractInfo-count")
     @ApiOperationSupport(order = 9)
     @ApiOperation(value = "统计合同数", notes = "null")
     public List<ContractlnfoCountVO> selectContractInfoCount() {
@@ -173,7 +173,7 @@ public class ProjectInfoController extends BladeController {
     /**
      * 项目私有库分配wbs树下拉框列表type=1质检 =2实验
      */
-    @GetMapping("/getWbsTreeList")
+    @GetMapping("/get-wbsTree-list")
     @ApiOperationSupport(order = 10)
     @ApiOperation(value = "项目合同段私有库分配wbs树下拉框列表", notes = "null")
     public R<WbsTreeAllListVO> findWbsTreeList(Integer type) {
@@ -209,7 +209,7 @@ public class ProjectInfoController extends BladeController {
     /**
      * 保存或修改分配项目级wbs树
      */
-    @PostMapping("/submitWbsTreeInProject")
+    @PostMapping("/submit-wbsTree-in-project")
     @ApiOperationSupport(order = 12)
     @ApiOperation(value = "保存或修改分配项目级wbs树", notes = "传入WbsTreeContractDTO")
     public R submitWbsTreeInProject(@RequestBody WbsTreeContractDTO pawDTO) {
@@ -226,11 +226,11 @@ public class ProjectInfoController extends BladeController {
     /**
      * 根据用户id查询项目合同岗位列表信息(用于展示在用户编辑、详情中)
      */
-    @GetMapping("/getProjectAndContractList")
+    @GetMapping("/get-project-contract-list")
     @ApiOperationSupport(order = 13)
     @ApiOperation(value = "根据用户id查询项目合同岗位列表信息", notes = "传入用户id")
-    public R<List<Map>> findProjectAndContractList(Long userId) {
-        List<Map> result = wbsTreeService.findProjectAndContractList(userId);
+    public R<List<Map<String,Object>>> findProjectAndContractList(Long userId) {
+        List<Map<String,Object>> result = wbsTreeService.findProjectAndContractList(userId);
         return R.data(result);
     }
 

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsFormElementController.java

@@ -84,7 +84,7 @@ public class WbsFormElementController extends BladeController {
     /**
      * 批量新增wbs元素 同步实体表
      */
-    @PostMapping("/submitBatch")
+    @PostMapping("/submit-batch")
     @ApiOperationSupport(order = 5)
     @ApiOperation(value = "批量新增wbs元素", notes = "传入wbsFormElementList")
     public R submitBatch(@RequestBody WbsFormElementVO2 wbsFormElementVO2) {
@@ -160,7 +160,7 @@ public class WbsFormElementController extends BladeController {
      */
     @ApiOperationSupport(order = 9)
     @ApiOperation(value = "查询当前节点下所有表单", notes = "传入该节点id")
-    @RequestMapping(value = "/getWbsTreeTableSameLevel", method = RequestMethod.GET)
+    @RequestMapping(value = "/get-wbsTree-tableSameLevel", method = RequestMethod.GET)
     public R<List<WbsFormElementDTO2>> findWbsTreeTableSameLevel(@RequestParam("id") String id) {
         List<WbsFormElementDTO2> trees = wbsFormElementService.findWbsTreeTableSameLevel(id);
         return R.data(trees);
@@ -171,7 +171,7 @@ public class WbsFormElementController extends BladeController {
      */
     @ApiOperationSupport(order = 10)
     @ApiOperation(value = "wbs树节点手动排序", notes = "WbsFormElementDTO2集合,id=表单id")
-    @RequestMapping(value = "/submitWbsTreeTableSort", method = RequestMethod.POST)
+    @RequestMapping(value = "/submit-wbsTree-table-sort", method = RequestMethod.POST)
     public R wbsTreeTableSort(@RequestBody List<WbsFormElementDTO2> wbsTreeDTO) {
         boolean b = wbsFormElementService.wbsTreeTableSort(wbsTreeDTO);
         return R.status(b);
@@ -183,7 +183,7 @@ public class WbsFormElementController extends BladeController {
      */
     @ApiOperationSupport(order = 11)
     @ApiOperation(value = "提交清表关联公有Wbs树并创建元素", notes = "节点id、表名、元素DTO")
-    @RequestMapping(value = "/submitExcelRelationWbsTreeAndElement", method = RequestMethod.POST)
+    @RequestMapping(value = "/submit-excel-relation-wbsTreeAndElement", method = RequestMethod.POST)
     public R submitExcelRelationWbsTreeAndElement(@RequestBody FormElementDTO2 formElementDTO) {
         return R.status(wbsFormElementService.submitExcelRelationWbsTreeAndElement(formElementDTO));
     }
@@ -206,7 +206,7 @@ public class WbsFormElementController extends BladeController {
      */
     @ApiOperationSupport(order = 13)
     @ApiOperation(value = "元素识别关联公共WBS模板-查询节点下已关联的所有表单", notes = "传入节点id、清表id")
-    @RequestMapping(value = "/getNodeTables", method = RequestMethod.GET)
+    @RequestMapping(value = "/get-node-tables", method = RequestMethod.GET)
     public R<List<WbsNodeTableVO>> searchNodeTables(String nodeId, String excelTabId) {
         List<WbsNodeTableVO> list = wbsFormElementService.searchNodeTables(nodeId, excelTabId);
         if (list.size() > 0) {

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsInfoController.java

@@ -158,7 +158,7 @@ public class WbsInfoController extends BladeController {
     /**
      * 根据类型查找
      */
-    @GetMapping("/getByWbsType")
+    @GetMapping("/get-by-wbsType")
     @ApiOperationSupport(order = 8)
     @ApiOperation(value = "根据类型查找", notes = "传入type,1=质检 2=实验 3=计量")
     public R<List<WbsInfo>> findByWbsType(String type) {

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsTreeContractController.java

@@ -23,7 +23,7 @@ public class WbsTreeContractController extends BladeController {
 
     private final IWbsTreeContractService iWbsTreeContractService;
 
-    @GetMapping("/searchNodeAllTable")
+    @GetMapping("/search-node-tables")
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "查询当前节点下所有元素表信息", notes = "传入节点primaryKeyId、type、合同段id、项目id")
     public R searchNodeAllTable(String primaryKeyId, String type, String contractId, String projectId) {
@@ -34,7 +34,7 @@ public class WbsTreeContractController extends BladeController {
         return R.fail(200, "未查询到数据");
     }
 
-    @GetMapping("/searchParentAllNode")
+    @GetMapping("/search-parent-nodes")
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "获取当前节点的父集合", notes = "获取当前节点的父集合")
     @ApiImplicitParams(value = {

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsTreeController.java

@@ -152,7 +152,7 @@ public class WbsTreeController extends BladeController {
     /**
      * 查询当前节点下所有表单（根据节点ID查询当前表单）
      */
-    @GetMapping("/getByNodeTable")
+    @GetMapping("/get-by-node-table")
     @ApiOperationSupport(order = 6)
     @ApiOperation(value = "查询当前节点下所有表单", notes = "传入父节点id")
     public R<List<WbsNodeTableVO>> selectByNodeTable(@ApiParam(value = "父节点id", required = true) @RequestParam String id) {
@@ -166,7 +166,7 @@ public class WbsTreeController extends BladeController {
     /**
      * 删除表单
      */
-    @GetMapping("/removeTableById")
+    @GetMapping("/remove-table-by-id")
     @ApiOperationSupport(order = 7)
     @ApiOperation(value = "表单删除", notes = "传入id")
     @ApiImplicitParam(name = "id", value = "表单id", required = true)
@@ -192,7 +192,7 @@ public class WbsTreeController extends BladeController {
     /**
      * 根据表单id查询所有元素
      */
-    @GetMapping("/getFormElements")
+    @GetMapping("/get-table-elements")
     @ApiOperationSupport(order = 8)
     @ApiOperation(value = "根据表单id查询所有元素", notes = "传入表单id")
     @ApiImplicitParam(name = "id", value = "表单id", required = true)
@@ -211,7 +211,7 @@ public class WbsTreeController extends BladeController {
     /**
      * 新增表单与元素
      */
-    @PostMapping("/saveFormAndElement")
+    @PostMapping("/save-table-element")
     @ApiOperationSupport(order = 9)
     @ApiOperation(value = "表单与元素新增", notes = "传入FormElementDTO")
     public R saveFormElement(@RequestBody FormElementDTO formElementDTO) {
@@ -222,7 +222,7 @@ public class WbsTreeController extends BladeController {
     /**
      * 编辑表单元素批量修改
      */
-    @PostMapping("/updateBatchElements")
+    @PostMapping("/update-batch-elements")
     @ApiOperationSupport(order = 10)
     @ApiOperation(value = "编辑表单元素批量修改", notes = "传入WbsFormElement")
     @ApiImplicitParam(name = "ids", value = "元素的id集合", required = true)
@@ -265,7 +265,7 @@ public class WbsTreeController extends BladeController {
      */
     @ApiOperationSupport(order = 13)
     @ApiOperation(value = "查询当前节点所有同级节点", notes = "传入该节点parentId")
-    @RequestMapping(value = "/getWbsTreeSameLevel", method = RequestMethod.GET)
+    @RequestMapping(value = "/get-same-level", method = RequestMethod.GET)
     public R<List<WbsTreeDTO2>> findWbsTreeSameLevel(@RequestParam("parentId") String parentId) {
         List<WbsTreeDTO2> trees = wbsTreeService.findWbsTreeSameLevel(parentId);
         return R.data(trees);
@@ -276,7 +276,7 @@ public class WbsTreeController extends BladeController {
      */
     @ApiOperationSupport(order = 14)
     @ApiOperation(value = "wbs树节点手动排序", notes = "WbsTreeDTO2集合,id=节点id,sort=节点顺序")
-    @RequestMapping(value = "/submitWbsTreeSort", method = RequestMethod.POST)
+    @RequestMapping(value = "/submit-sort", method = RequestMethod.POST)
     public R wbsTreeSort(@RequestBody List<WbsTreeDTO2> wbsTreeDTO) {
         boolean b = wbsTreeService.wbsTreeSort(wbsTreeDTO);
         return R.status(b);
@@ -323,7 +323,7 @@ public class WbsTreeController extends BladeController {
      */
     @ApiOperationSupport(order = 17)
     @ApiOperation(value = "批量修改节点下元素表基本信息", notes = "传入List<WbsTree>")
-    @RequestMapping(value = "/updateBatchNodeTableInfo", method = RequestMethod.POST)
+    @RequestMapping(value = "/update-batch-node-tableInfo", method = RequestMethod.POST)
     public R updateBatchNodeTableInfo(@RequestBody List<WbsTree> WbsTrees) {
         return R.status(wbsTreeService.updateBatchById(WbsTrees));
     }
@@ -333,7 +333,7 @@ public class WbsTreeController extends BladeController {
      */
     @ApiOperationSupport(order = 18)
     @ApiOperation(value = "查询公有wbs节点元素表与节点参数", notes = "传入父节点id")
-    @RequestMapping(value = "/getNodeTabAndParam", method = RequestMethod.GET)
+    @RequestMapping(value = "/get-node-table-param", method = RequestMethod.GET)
     public R<WbsNodeTabAndParamVO> getNodeTabAndParam(@ApiParam(value = "父节点id", required = true) @RequestParam String id) {
         WbsNodeTabAndParamVO rs = wbsTreeService.getNodeTabAndParam(id);
         return R.data(rs);

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsTreePrivateController.java

@@ -307,7 +307,7 @@ public class WbsTreePrivateController extends BladeController {
     /**
      * 查询当前节点下所有表单（根据节点ID查询当前表单）
      */
-    @GetMapping("/getNodeTableByCondition")
+    @GetMapping("/get-node-table-by-condition")
     @ApiOperationSupport(order = 3)
     @ApiOperation(value = "查询当前节点下所有元素表", notes = "传入父节点id、wbsId、projectId")
     public R<List<WbsNodeTableVO>> findNodeTableByCondition(@RequestParam("parentId") String parentId,
@@ -321,7 +321,7 @@ public class WbsTreePrivateController extends BladeController {
     }
 
 
-    @GetMapping("/removeTableByCondition")
+    @GetMapping("/remove-table-by-condition")
     @ApiOperationSupport(order = 4)
     @ApiOperation(value = "删除节点下的元素表", notes = "传入表单id、wbsId、projectId")
     public R removeTableByCondition(@RequestParam("id") String id,
@@ -390,7 +390,7 @@ public class WbsTreePrivateController extends BladeController {
      */
     @ApiOperationSupport(order = 7)
     @ApiOperation(value = "查询当前节点所有同级节点", notes = "传入项目id、当前节点parentId")
-    @RequestMapping(value = "/getWbsTreePrivateSameLevel", method = RequestMethod.GET)
+    @RequestMapping(value = "/get-node-same-level", method = RequestMethod.GET)
     public R<List<WbsTreePrivateDTO2>> findWbsTreePrivateSameLevel(@RequestParam("projectId") String projectId,
                                                                    @RequestParam("parentId") String parentId,
                                                                    @RequestParam("wbsId") String wbsId) {
@@ -402,7 +402,7 @@ public class WbsTreePrivateController extends BladeController {
      */
     @ApiOperationSupport(order = 8)
     @ApiOperation(value = "wbs私有树节点手动排序", notes = "WbsTreeDTO2集合,pKeyId=节点pKeyId")
-    @RequestMapping(value = "/submitWbsTreePrivateSort", method = RequestMethod.POST)
+    @RequestMapping(value = "/submit-sort", method = RequestMethod.POST)
     public R wbsTreePrivateSort(@RequestBody List<WbsTreePrivateDTO2> wbsTreeDTO) {
         return R.status(wbsTreePrivateService.wbsTreePrivateSort(wbsTreeDTO));
     }
@@ -413,7 +413,7 @@ public class WbsTreePrivateController extends BladeController {
      */
     @ApiOperationSupport(order = 9)
     @ApiOperation(value = "wbs私有树表单手动排序", notes = "WbsTreeDTO2集合,pKeyId=表单pKeyId")
-    @RequestMapping(value = "/submitWbsTreePrivateTableSort", method = RequestMethod.POST)
+    @RequestMapping(value = "/submit-table-sort", method = RequestMethod.POST)
     public R wbsTreePrivateTableSort(@RequestBody List<WbsTreePrivateDTO2> wbsTreeDTO) {
         return R.status(wbsTreePrivateService.wbsTreePrivateTableSort(wbsTreeDTO));
     }
@@ -423,7 +423,7 @@ public class WbsTreePrivateController extends BladeController {
      */
     @ApiOperationSupport(order = 10)
     @ApiOperation(value = "批量修改wbs私有树节点下元素表基本信息", notes = "传入List<WbsTreePrivate>")
-    @RequestMapping(value = "/updateBatchNodeTableInfo", method = RequestMethod.POST)
+    @RequestMapping(value = "/update-batch-node-tableInfo", method = RequestMethod.POST)
     public R updateBatchNodeTableInfo(@RequestBody List<WbsTreePrivateDTO3> wbsTreePrivates) {
         return R.status(wbsTreePrivateService.updateBatchByPid(wbsTreePrivates));
     }
@@ -433,7 +433,7 @@ public class WbsTreePrivateController extends BladeController {
      */
     @ApiOperationSupport(order = 11)
     @ApiOperation(value = "隐藏/启用表单", notes = "传入pKeyId")
-    @RequestMapping(value = "/updateStatus", method = RequestMethod.GET)
+    @RequestMapping(value = "/update-status", method = RequestMethod.GET)
     public R updateStatus(@RequestParam String pKeyId) {
         return R.status(wbsTreePrivateService.updateStatus(pKeyId));
     }
@@ -443,7 +443,7 @@ public class WbsTreePrivateController extends BladeController {
      */
     @ApiOperationSupport(order = 12)
     @ApiOperation(value = "查询私有wbs节点元素表与节点参数", notes = "传入节点parentId、wbsId、projectId")
-    @RequestMapping(value = "/getNodeTabAndParam", method = RequestMethod.GET)
+    @RequestMapping(value = "/get-node-table-param", method = RequestMethod.GET)
     public R<WbsNodeTabAndParamVO> getNodeTabAndParam(@RequestParam("parentId") String parentId,
                                                       @RequestParam("wbsId") String wbsId,
                                                       @RequestParam("projectId") String projectId) {

blade-service/blade-manager/src/main/java/org/springblade/manager/service/IWbsTreeService.java

@@ -48,7 +48,7 @@ public interface IWbsTreeService extends BaseService<WbsTree> {
 
     List<WbsTree> findByWbsTreeNode(String ids);
 
-    List<Map> findProjectAndContractList(Long userId);
+    List<Map<String,Object>> findProjectAndContractList(Long userId);
 
     List<WbsTreeDTO2> findWbsTreeSameLevel(String parentId);
 

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeServiceImpl.java

@@ -55,7 +55,6 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
     private final BladeRedis bladeRedis;
     private final WbsParamServiceImpl wbsParamService;
 
-
     @Override
     public IPage<WbsTreeVO> selectWbsTreePage(IPage<WbsTreeVO> page, WbsTreeVO wbsTree) {
         return page.setRecords(baseMapper.selectWbsTreePage(page, wbsTree));
@@ -78,24 +77,6 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         return wbsTreeVO2s;
     }
 
-    private List<WbsTreeVO2> buildWbsTreeByStream(List<WbsTreeVO2> wbsTreeVO2s) {
-        List<WbsTreeVO2> list = wbsTreeVO2s.stream().filter(f -> f.getParentId() == 0L).collect(Collectors.toList());
-        Map<Long, List<WbsTreeVO2>> map = wbsTreeVO2s.stream().collect(Collectors.groupingBy(WbsTreeVO2::getParentId));
-        this.recursionFnTree(list, map);
-        return list;
-    }
-
-    private void recursionFnTree(List<WbsTreeVO2> list, Map<Long, List<WbsTreeVO2>> map) {
-        for (WbsTreeVO2 wbsTreeVO2 : list) {
-            List<WbsTreeVO2> childrenList = map.get(wbsTreeVO2.getId());
-            wbsTreeVO2.setChildren(childrenList);
-            if (childrenList != null && childrenList.size() > 0) {
-                wbsTreeVO2.setHasChildren(true);
-                recursionFnTree(childrenList, map);
-            }
-        }
-    }
-
     @Override
     public boolean submit(WbsTree wbsTree) {
         if (Func.isEmpty(wbsTree.getParentId())) {
@@ -307,14 +288,6 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         return false;
     }
 
-    private Boolean initTable(String tableName) {
-        Integer row = baseMapper.createTable(tableName);
-        if (row >= 0) {
-            return true;
-        }
-        return false;
-    }
-
     @Override
     public List<WbsNodeTableVO> selectByNodeTable(String id) {
         return wbsTreeMapper.selectByNodeTable(id);
@@ -357,19 +330,6 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         return wbsFormElements;
     }
 
-    private static String getEscapeChar(String str) {
-        if (StringUtils.isBlank(str)) {
-            return str;
-        }
-        if (str.contains("&gt;")) {
-            return str.replace("&gt;", ">");
-        }
-        if (str.contains("&lt;")) {
-            return str.replace("&lt;", "<");
-        }
-        return null;
-    }
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean importWbsTree(MultipartFile excelFile, WbsTree wbsTreeFu, WbsTree wbsTree1) throws IOException {
@@ -396,119 +356,6 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         }
     }
 
-    private boolean importExcel(ArrayList<Map<String, String>> result, WbsTree wbsTreeFu, WbsTree wbsTree1) {
-        List<WbsTree> allNodeData = new ArrayList<>();
-        int sortNumber = 1;
-        for (Map<String, String> map : result) {
-            for (Map.Entry<String, String> maps : map.entrySet()) {
-                if (StringUtils.isNotEmpty(maps.getValue())) {
-                    //初始化节点参数
-                    WbsTree wbsTreeZi = new WbsTree();
-                    wbsTreeZi.setId(SnowFlakeUtil.getId());
-                    wbsTreeZi.setTenantId(AuthUtil.getTenantId());
-                    wbsTreeZi.setNodeName(maps.getValue());
-                    wbsTreeZi.setFullName(maps.getValue());
-                    wbsTreeZi.setNodeType(Integer.valueOf(maps.getKey()));
-                    wbsTreeZi.setWbsId(wbsTreeFu.getWbsId());
-                    wbsTreeZi.setParentId(wbsTreeFu.getParentId());
-                    wbsTreeZi.setAncestors(wbsTreeFu.getAncestors());
-                    wbsTreeZi.setProjectNodeId(wbsTree1.getProjectNodeId());
-                    wbsTreeZi.setMajorDataType(0);
-                    //内页资料
-                    if (wbsTreeZi.getNodeType() == 6 && !(("中间交工证书").equals(wbsTreeZi.getNodeName()) || ("分项工程质量检验评定表").equals(wbsTreeZi.getNodeName()) || ("分项工程开工报告").equals(wbsTreeZi.getNodeName()))) {
-                        wbsTreeZi.setMajorDataType(4);
-                    } else if (wbsTreeZi.getNodeType() == 5 || wbsTreeZi.getNodeType() == 4 || wbsTreeZi.getNodeType() == 3 || wbsTreeZi.getNodeType() == 2) {
-                        if (DiffListUtil.getContains(wbsTreeZi.getNodeName(), "开工报告")) {
-                            wbsTreeZi.setMajorDataType(1);
-                        } else if (DiffListUtil.getContains(wbsTreeZi.getNodeName(), "质量评定")) {
-                            wbsTreeZi.setMajorDataType(2);
-                        } else if (DiffListUtil.getContains(wbsTreeZi.getNodeName(), "中间交工")) {
-                            wbsTreeZi.setMajorDataType(3);
-                        }
-                    }
-
-                    //构建参数
-                    WbsTree wbsTree = buildTreeNode(wbsTreeZi, allNodeData);
-
-                    if (wbsTree == null) {
-                        //构建成功,后置赋值
-                        Long id = wbsTreeZi.getId();
-                        StringBuilder stringBuffer = new StringBuilder();
-                        StringBuilder appendStr = stringBuffer.append(",").append(wbsTreeZi.getParentId());
-                        String ancestors = wbsTreeZi.getAncestors() + appendStr;
-
-                        wbsTreeZi.setAncestors(ancestors);
-
-                        wbsTreeFu.setParentId(id);
-                        wbsTreeFu.setAncestors(ancestors);
-
-                        wbsTreeZi.setSort(sortNumber);
-                        sortNumber++;
-
-                        //返回结果集
-                        allNodeData.add(wbsTreeZi);
-
-                    } else {
-                        //相同节点参数跳过
-                        wbsTreeFu.setParentId(wbsTree.getId());
-                        wbsTreeFu.setAncestors(wbsTree.getAncestors());
-
-                    }
-                }
-            }
-        }
-
-        return this.saveBatch(allNodeData, 1000) && baseMapper.updateById(wbsTree1) > 0;
-
-    }
-
-    private WbsTree buildTreeNode(WbsTree wbsTreeZi, List<WbsTree> allNodeData) {
-        List<WbsTree> wbsTrees = new ArrayList<>();
-        //判重
-        for (WbsTree tree : allNodeData) {
-            if (tree.getNodeName().equals(wbsTreeZi.getNodeName())
-                    && tree.getWbsId().equals(wbsTreeZi.getWbsId())
-                    && tree.getNodeType().equals(wbsTreeZi.getNodeType())
-                    && tree.getProjectNodeId().equals(wbsTreeZi.getProjectNodeId())) {
-                //判断上级节点不同,当前节点名相同的tree选择问题
-                //例如：第X跨的上级有上部构造现场浇筑、上部构造预制和安装,导致下方新增重复节点判断时找到的是前一个 TODO
-                if (!tree.getAncestors().equals(wbsTreeZi.getAncestors())) {
-                    wbsTrees.add(tree);
-                    break;
-                }
-            }
-        }
-
-        WbsTree wbsTree = null;
-        //不重复 直接新增
-        if (wbsTrees.size() <= 0) {
-            wbsTreeZi.setStatus(1);
-            wbsTreeZi.setType(1);
-            if (wbsTreeZi.getNodeType() == 6) {
-                wbsTreeZi.setIsConcrete(0);
-                wbsTreeZi.setIsExpernode(0);
-            }
-        } else {
-            //重复 判断是否为同一父节点,相同父节点跳过,不同新增
-            for (WbsTree tree : wbsTrees) {
-                if (wbsTreeZi.getNodeType() == 2 || wbsTreeZi.getNodeType() == 3
-                        || wbsTreeZi.getNodeType() == 4 || wbsTreeZi.getNodeType() == 5 || wbsTreeZi.getNodeType() == 6) {
-                    if (!wbsTreeZi.getParentId().equals(tree.getParentId()) && wbsTreeZi.getNodeName().equals(tree.getNodeName())) {
-                        wbsTreeZi.setStatus(1);
-                        wbsTreeZi.setType(1);
-                        if (wbsTreeZi.getNodeType() == 6) {
-                            wbsTreeZi.setIsConcrete(0);
-                            wbsTreeZi.setIsExpernode(0);
-                        }
-                        break;
-                    }
-                }
-                wbsTree = tree;
-            }
-        }
-        return wbsTree;
-    }
-
     @Override
     public int deleteBatchByProjectNodeId(Long projectNodeId) {
         return baseMapper.deleteBatchProjectNodeId(projectNodeId);
@@ -529,7 +376,7 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
     }
 
     @Override
-    public List<Map> findProjectAndContractList(Long userId) {
+    public List<Map<String,Object>> findProjectAndContractList(Long userId) {
         List<SaveUserInfoByProjectVO2> list = baseMapper.selectListByUserId(userId);
         Map<String, List<SaveUserInfoByProjectVO2>> collect = list.stream().collect(Collectors.groupingBy(SaveUserInfoByProjectVO2::getProjectName));
         return collect.entrySet().stream().map(entity -> {
@@ -572,11 +419,6 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         );
     }
 
-    private boolean updateData(String ancestors, Long id) {
-        Integer row = baseMapper.updateById2(ancestors, id);
-        return row > 0;
-    }
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     //@AvoidRepeatableCommit
@@ -890,7 +732,6 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         return false;
     }
 
-
     @Override
     public WbsTreeAllListVO findWbsTreeList(Integer type) {
         WbsTreeAllListVO wbsTreeAllListVO = new WbsTreeAllListVO();
@@ -989,4 +830,161 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         }
     }
 
+    private boolean updateData(String ancestors, Long id) {
+        Integer row = baseMapper.updateById2(ancestors, id);
+        return row > 0;
+    }
+
+    private boolean importExcel(ArrayList<Map<String, String>> result, WbsTree wbsTreeFu, WbsTree wbsTree1) {
+        List<WbsTree> allNodeData = new ArrayList<>();
+        int sortNumber = 1;
+        for (Map<String, String> map : result) {
+            for (Map.Entry<String, String> maps : map.entrySet()) {
+                if (StringUtils.isNotEmpty(maps.getValue())) {
+                    //初始化节点参数
+                    WbsTree wbsTreeZi = new WbsTree();
+                    wbsTreeZi.setId(SnowFlakeUtil.getId());
+                    wbsTreeZi.setTenantId(AuthUtil.getTenantId());
+                    wbsTreeZi.setNodeName(maps.getValue());
+                    wbsTreeZi.setFullName(maps.getValue());
+                    wbsTreeZi.setNodeType(Integer.valueOf(maps.getKey()));
+                    wbsTreeZi.setWbsId(wbsTreeFu.getWbsId());
+                    wbsTreeZi.setParentId(wbsTreeFu.getParentId());
+                    wbsTreeZi.setAncestors(wbsTreeFu.getAncestors());
+                    wbsTreeZi.setProjectNodeId(wbsTree1.getProjectNodeId());
+                    wbsTreeZi.setMajorDataType(0);
+                    //内页资料
+                    if (wbsTreeZi.getNodeType() == 6 && !(("中间交工证书").equals(wbsTreeZi.getNodeName()) || ("分项工程质量检验评定表").equals(wbsTreeZi.getNodeName()) || ("分项工程开工报告").equals(wbsTreeZi.getNodeName()))) {
+                        wbsTreeZi.setMajorDataType(4);
+                    } else if (wbsTreeZi.getNodeType() == 5 || wbsTreeZi.getNodeType() == 4 || wbsTreeZi.getNodeType() == 3 || wbsTreeZi.getNodeType() == 2) {
+                        if (DiffListUtil.getContains(wbsTreeZi.getNodeName(), "开工报告")) {
+                            wbsTreeZi.setMajorDataType(1);
+                        } else if (DiffListUtil.getContains(wbsTreeZi.getNodeName(), "质量评定")) {
+                            wbsTreeZi.setMajorDataType(2);
+                        } else if (DiffListUtil.getContains(wbsTreeZi.getNodeName(), "中间交工")) {
+                            wbsTreeZi.setMajorDataType(3);
+                        }
+                    }
+
+                    //构建参数
+                    WbsTree wbsTree = buildTreeNode(wbsTreeZi, allNodeData);
+
+                    if (wbsTree == null) {
+                        //构建成功,后置赋值
+                        Long id = wbsTreeZi.getId();
+                        StringBuilder stringBuffer = new StringBuilder();
+                        StringBuilder appendStr = stringBuffer.append(",").append(wbsTreeZi.getParentId());
+                        String ancestors = wbsTreeZi.getAncestors() + appendStr;
+
+                        wbsTreeZi.setAncestors(ancestors);
+
+                        wbsTreeFu.setParentId(id);
+                        wbsTreeFu.setAncestors(ancestors);
+
+                        wbsTreeZi.setSort(sortNumber);
+                        sortNumber++;
+
+                        //返回结果集
+                        allNodeData.add(wbsTreeZi);
+
+                    } else {
+                        //相同节点参数跳过
+                        wbsTreeFu.setParentId(wbsTree.getId());
+                        wbsTreeFu.setAncestors(wbsTree.getAncestors());
+
+                    }
+                }
+            }
+        }
+
+        return this.saveBatch(allNodeData, 1000) && baseMapper.updateById(wbsTree1) > 0;
+
+    }
+
+    private WbsTree buildTreeNode(WbsTree wbsTreeZi, List<WbsTree> allNodeData) {
+        List<WbsTree> wbsTrees = new ArrayList<>();
+        //判重
+        for (WbsTree tree : allNodeData) {
+            if (tree.getNodeName().equals(wbsTreeZi.getNodeName())
+                    && tree.getWbsId().equals(wbsTreeZi.getWbsId())
+                    && tree.getNodeType().equals(wbsTreeZi.getNodeType())
+                    && tree.getProjectNodeId().equals(wbsTreeZi.getProjectNodeId())) {
+                //判断上级节点不同,当前节点名相同的tree选择问题
+                //例如：第X跨的上级有上部构造现场浇筑、上部构造预制和安装,导致下方新增重复节点判断时找到的是前一个 TODO
+                if (!tree.getAncestors().equals(wbsTreeZi.getAncestors())) {
+                    wbsTrees.add(tree);
+                    break;
+                }
+            }
+        }
+
+        WbsTree wbsTree = null;
+        //不重复 直接新增
+        if (wbsTrees.size() <= 0) {
+            wbsTreeZi.setStatus(1);
+            wbsTreeZi.setType(1);
+            if (wbsTreeZi.getNodeType() == 6) {
+                wbsTreeZi.setIsConcrete(0);
+                wbsTreeZi.setIsExpernode(0);
+            }
+        } else {
+            //重复 判断是否为同一父节点,相同父节点跳过,不同新增
+            for (WbsTree tree : wbsTrees) {
+                if (wbsTreeZi.getNodeType() == 2 || wbsTreeZi.getNodeType() == 3
+                        || wbsTreeZi.getNodeType() == 4 || wbsTreeZi.getNodeType() == 5 || wbsTreeZi.getNodeType() == 6) {
+                    if (!wbsTreeZi.getParentId().equals(tree.getParentId()) && wbsTreeZi.getNodeName().equals(tree.getNodeName())) {
+                        wbsTreeZi.setStatus(1);
+                        wbsTreeZi.setType(1);
+                        if (wbsTreeZi.getNodeType() == 6) {
+                            wbsTreeZi.setIsConcrete(0);
+                            wbsTreeZi.setIsExpernode(0);
+                        }
+                        break;
+                    }
+                }
+                wbsTree = tree;
+            }
+        }
+        return wbsTree;
+    }
+
+    private static String getEscapeChar(String str) {
+        if (StringUtils.isBlank(str)) {
+            return str;
+        }
+        if (str.contains("&gt;")) {
+            return str.replace("&gt;", ">");
+        }
+        if (str.contains("&lt;")) {
+            return str.replace("&lt;", "<");
+        }
+        return null;
+    }
+
+    private List<WbsTreeVO2> buildWbsTreeByStream(List<WbsTreeVO2> wbsTreeVO2s) {
+        List<WbsTreeVO2> list = wbsTreeVO2s.stream().filter(f -> f.getParentId() == 0L).collect(Collectors.toList());
+        Map<Long, List<WbsTreeVO2>> map = wbsTreeVO2s.stream().collect(Collectors.groupingBy(WbsTreeVO2::getParentId));
+        this.recursionFnTree(list, map);
+        return list;
+    }
+
+    private void recursionFnTree(List<WbsTreeVO2> list, Map<Long, List<WbsTreeVO2>> map) {
+        for (WbsTreeVO2 wbsTreeVO2 : list) {
+            List<WbsTreeVO2> childrenList = map.get(wbsTreeVO2.getId());
+            wbsTreeVO2.setChildren(childrenList);
+            if (childrenList != null && childrenList.size() > 0) {
+                wbsTreeVO2.setHasChildren(true);
+                recursionFnTree(childrenList, map);
+            }
+        }
+    }
+
+    private Boolean initTable(String tableName) {
+        Integer row = baseMapper.createTable(tableName);
+        if (row >= 0) {
+            return true;
+        }
+        return false;
+    }
+
 }