liuyc пре 3 година
родитељ
комит
0d27e656ea

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

@@ -75,7 +75,7 @@ public class ContractInfoController extends BladeController {
     /**
      * 根据项目id查询当前所有合同
      */
-    @GetMapping("/findContractInfoByPid")
+    @GetMapping("/getContractInfoByPid")
     @ApiOperationSupport(order = 8)
     @ApiOperation(value = "根据项目id查询当前所有合同", notes = "传入pid")
     public R<List<ContractInfo>> findContractInfoByPid(String pid) {
@@ -176,7 +176,7 @@ public class ContractInfoController extends BladeController {
     /**
      * 查询角色的岗位
      */
-    @GetMapping("/findJobByRoleId")
+    @GetMapping("/getJobByRoleId")
     @ApiOperationSupport(order = 8)
     @ApiOperation(value = "查询角色下的岗位", notes = "传入id")
     public R<List<CRolePostVO>> findJobByRoleId(@ApiParam(value = "id", required = true)
@@ -192,7 +192,7 @@ public class ContractInfoController extends BladeController {
     /**
      * 根据用户列表
      */
-    @GetMapping("/findUserList")
+    @GetMapping("/getUserList")
     @ApiOperationSupport(order = 11)
     @ApiOperation(value = "", notes = "")
     public R<List<User>> findUserList() {
@@ -207,7 +207,7 @@ public class ContractInfoController extends BladeController {
     /**
      * 根据项目id、合同id、角色id查询当前运维的用户
      */
-    @GetMapping("/findUserListByCondition")
+    @GetMapping("/getUserListByCondition")
     @ApiOperationSupport(order = 10)
     @ApiOperation(value = "查询当前项目角色下的运维用户列表", notes = "传入项目id、角色id、合同id(非必传)、size每页数量、current当前页")
     public R<IPage<User>> findUserListByCondition(FindAllUserByConditionDTO values, Query query) {
@@ -288,7 +288,7 @@ public class ContractInfoController extends BladeController {
     /**
      * 根据项目id、合同id、岗位id查询当前分配的用户-查询当前项目合同岗位下的用户
      */
-    @GetMapping("/findAllUserByCondition")
+    @GetMapping("/getAllUserByCondition")
     @ApiOperationSupport(order = 9)
     @ApiOperation(value = "查询当前项目合同岗位下的用户", notes = "传入项目id、合同id、岗位id、size每页数量、current当前页")
     public R<IPage<UserVO2>> findAllUserByCondition(FindAllUserByConditionDTO values, Query query) {
@@ -477,7 +477,7 @@ public class ContractInfoController extends BladeController {
     /**
      * 查询监理or业主合同段关联信息
      */
-    @GetMapping("/searchContractRelationInfo")
+    @GetMapping("/getContractRelationInfo")
     @ApiOperationSupport(order = 21)
     @ApiOperation(value = "查询监理or业主合同段关联信息", notes = "合同段id")
     @ApiImplicitParam(name = "contractId", value = "合同段id")

+ 1 - 1
blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ImageClassificationConfigController.java

@@ -110,7 +110,7 @@ public class ImageClassificationConfigController extends BladeController {
     /**
      * 根据所属类型查询
      */
-    @GetMapping("/findByType")
+    @GetMapping("/getByType")
     @ApiOperationSupport(order = 8)
     @ApiOperation(value = "根据所属类型查询", notes = "传入type")
     public R<List<ImageClassificationConfig>> findByType(@RequestParam("type") String type) {

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

@@ -162,7 +162,7 @@ public class ProjectInfoController extends BladeController {
     /**
      * 查询业务条数
      */
-    @GetMapping("/listContractInfoCount")
+    @GetMapping("/getListContractInfoCount")
     @ApiOperationSupport(order = 9)
     @ApiOperation(value = "统计合同数", notes = "null")
     public List<ContractlnfoCountVO> selectContractInfoCount() {
@@ -172,7 +172,7 @@ public class ProjectInfoController extends BladeController {
     /**
      * 项目私有库分配wbs树下拉框列表type=1质检 =2实验
      */
-    @GetMapping("/findWbsTreeList")
+    @GetMapping("/getWbsTreeList")
     @ApiOperationSupport(order = 10)
     @ApiOperation(value = "项目合同段私有库分配wbs树下拉框列表", notes = "null")
     public R<WbsTreeAllListVO> findWbsTreeList(Integer type) {
@@ -231,7 +231,7 @@ public class ProjectInfoController extends BladeController {
     /**
      * 根据用户id查询项目合同岗位列表信息(用于展示在用户编辑、详情中)
      */
-    @GetMapping("/findProjectAndContractList")
+    @GetMapping("/getProjectAndContractList")
     @ApiOperationSupport(order = 13)
     @ApiOperation(value = "根据用户id查询项目合同岗位列表信息", notes = "传入用户id")
     public R<List<Map>> findProjectAndContractList(Long userId) {

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

@@ -164,7 +164,7 @@ public class WbsFormElementController extends BladeController {
      */
     @ApiOperationSupport(order = 9)
     @ApiOperation(value = "查询当前节点下所有表单", notes = "传入该节点id")
-    @RequestMapping(value = "/findWbsTreeTableSameLevel", method = RequestMethod.GET)
+    @RequestMapping(value = "/getWbsTreeTableSameLevel", method = RequestMethod.GET)
     public R<List<WbsFormElementDTO2>> findWbsTreeTableSameLevel(@RequestParam("id") String id) {
         List<WbsFormElementDTO2> trees = wbsFormElementService.findWbsTreeTableSameLevel(id);
         return R.data(trees);
@@ -175,7 +175,7 @@ public class WbsFormElementController extends BladeController {
      */
     @ApiOperationSupport(order = 10)
     @ApiOperation(value = "wbs树节点手动排序", notes = "WbsFormElementDTO2集合,id=表单id")
-    @RequestMapping(value = "/wbsTreeTableSort", method = RequestMethod.POST)
+    @RequestMapping(value = "/submitWbsTreeTableSort", method = RequestMethod.POST)
     public R wbsTreeTableSort(@RequestBody List<WbsFormElementDTO2> wbsTreeDTO) {
         boolean b = wbsFormElementService.wbsTreeTableSort(wbsTreeDTO);
         return R.status(b);
@@ -197,7 +197,7 @@ public class WbsFormElementController extends BladeController {
      */
     @ApiOperationSupport(order = 12)
     @ApiOperation(value = "元素识别取消关联公有wbs表", notes = "传入表id、清表id")
-    @RequestMapping(value = "/cancelRelation", method = RequestMethod.GET)
+    @RequestMapping(value = "/cancel-relation", method = RequestMethod.GET)
     public R cancelRelation(String id,String excelTabId) {
         if (wbsFormElementService.cancelRelation(id,excelTabId)) {
             return R.success("取消成功");
@@ -210,7 +210,7 @@ public class WbsFormElementController extends BladeController {
      */
     @ApiOperationSupport(order = 13)
     @ApiOperation(value = "元素识别关联公共WBS模板-查询节点下已关联的所有表单", notes = "传入节点id、清表id")
-    @RequestMapping(value = "/searchNodeTables", method = RequestMethod.GET)
+    @RequestMapping(value = "/getNodeTables", method = RequestMethod.GET)
     public R<List<WbsNodeTableVO>> searchNodeTables(String nodeId, String excelTabId) {
         List<WbsNodeTableVO> list = wbsFormElementService.searchNodeTables(nodeId,excelTabId);
         if (list.size() > 0) {
@@ -224,7 +224,7 @@ public class WbsFormElementController extends BladeController {
      */
     @ApiOperationSupport(order = 14)
     @ApiOperation(value = "元素识别关联公共WBS模板-关联Wbs元素表", notes = "传入FormElementDTO2")
-    @RequestMapping(value = "/saveRelation", method = RequestMethod.POST)
+    @RequestMapping(value = "/save-relation", method = RequestMethod.POST)
     public R relationWbsTab(@RequestBody FormElementDTO2 formElementDTO) {
         boolean b = wbsFormElementService.saveRelation(formElementDTO);
         if (b) {

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

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

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

@@ -153,7 +153,7 @@ public class WbsTreeController extends BladeController {
     /**
      * 查询当前节点下所有表单(根据节点ID查询当前表单)
      */
-    @GetMapping("/selectByNodeTable")
+    @GetMapping("/getByNodeTable")
     @ApiOperationSupport(order = 6)
     @ApiOperation(value = "查询当前节点下所有表单", notes = "传入父节点id")
     public R<List<WbsNodeTableVO>> selectByNodeTable(@ApiParam(value = "父节点id", required = true) @RequestParam String id) {
@@ -194,7 +194,7 @@ public class WbsTreeController extends BladeController {
     /**
      * 根据表单id查询所有元素
      */
-    @GetMapping("/selectFormElements")
+    @GetMapping("/getFormElements")
     @ApiOperationSupport(order = 8)
     @ApiOperation(value = "根据表单id查询所有元素", notes = "传入表单id")
     @ApiImplicitParam(name = "id", value = "表单id", required = true)
@@ -297,7 +297,7 @@ public class WbsTreeController extends BladeController {
      */
     @ApiOperationSupport(order = 13)
     @ApiOperation(value = "查询当前节点所有同级节点", notes = "传入该节点parentId")
-    @RequestMapping(value = "/findWbsTreeSameLevel", method = RequestMethod.GET)
+    @RequestMapping(value = "/getWbsTreeSameLevel", method = RequestMethod.GET)
     public R<List<WbsTreeDTO2>> findWbsTreeSameLevel(@RequestParam("parentId") String parentId) {
         List<WbsTreeDTO2> trees = wbsTreeService.findWbsTreeSameLevel(parentId);
         return R.data(trees);
@@ -308,7 +308,7 @@ public class WbsTreeController extends BladeController {
      */
     @ApiOperationSupport(order = 14)
     @ApiOperation(value = "wbs树节点手动排序", notes = "WbsTreeDTO2集合,id=节点id,sort=节点顺序")
-    @RequestMapping(value = "/wbsTreeSort", method = RequestMethod.POST)
+    @RequestMapping(value = "/submitWbsTreeSort", method = RequestMethod.POST)
     public R wbsTreeSort(@RequestBody List<WbsTreeDTO2> wbsTreeDTO) {
         boolean b = wbsTreeService.wbsTreeSort(wbsTreeDTO);
         return R.status(b);
@@ -357,7 +357,7 @@ public class WbsTreeController extends BladeController {
     @ApiOperation(value = "批量修改节点下元素表基本信息", notes = "传入List<WbsTree>")
     @RequestMapping(value = "/updateBatchNodeTableInfo", method = RequestMethod.POST)
     public R updateBatchNodeTableInfo(@RequestBody List<WbsTree> WbsTrees) {
-        WbsTrees.stream().forEach(wbsTree -> {
+        WbsTrees.forEach(wbsTree -> {
             wbsTree.setFullName(wbsTree.getDeptName());
         });
         return R.status(wbsTreeService.updateBatchById(WbsTrees));

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

@@ -172,7 +172,7 @@ public class WbsTreePrivateController extends BladeController {
     /**
      * 查询当前节点下所有表单(根据节点ID查询当前表单)
      */
-    @GetMapping("/findNodeTableByCondition")
+    @GetMapping("/getNodeTableByCondition")
     @ApiOperationSupport(order = 3)
     @ApiOperation(value = "查询当前节点下所有元素表", notes = "传入父节点id、wbsId、projectId")
     public R<List<WbsNodeTableVO>> findNodeTableByCondition(@RequestParam("parentId") String parentId,
@@ -253,7 +253,7 @@ public class WbsTreePrivateController extends BladeController {
      */
     @ApiOperationSupport(order = 7)
     @ApiOperation(value = "查询当前节点所有同级节点", notes = "传入项目id、当前节点parentId")
-    @RequestMapping(value = "/findWbsTreePrivateSameLevel", method = RequestMethod.GET)
+    @RequestMapping(value = "/getWbsTreePrivateSameLevel", method = RequestMethod.GET)
     public R<List<WbsTreePrivateDTO2>> findWbsTreePrivateSameLevel(@RequestParam("projectId") String projectId,
                                                                    @RequestParam("parentId") String parentId,
                                                                    @RequestParam("wbsId") String wbsId) {
@@ -265,7 +265,7 @@ public class WbsTreePrivateController extends BladeController {
      */
     @ApiOperationSupport(order = 8)
     @ApiOperation(value = "wbs私有树节点手动排序", notes = "WbsTreeDTO2集合,pKeyId=节点pKeyId")
-    @RequestMapping(value = "/wbsTreePrivateSort", method = RequestMethod.POST)
+    @RequestMapping(value = "/submitWbsTreePrivateSort", method = RequestMethod.POST)
     public R wbsTreePrivateSort(@RequestBody List<WbsTreePrivateDTO2> wbsTreeDTO) {
         return R.status(wbsTreePrivateService.wbsTreePrivateSort(wbsTreeDTO));
     }
@@ -276,7 +276,7 @@ public class WbsTreePrivateController extends BladeController {
      */
     @ApiOperationSupport(order = 9)
     @ApiOperation(value = "wbs私有树表单手动排序", notes = "WbsTreeDTO2集合,pKeyId=表单pKeyId")
-    @RequestMapping(value = "/wbsTreePrivateTableSort", method = RequestMethod.POST)
+    @RequestMapping(value = "/submitWbsTreePrivateTableSort", method = RequestMethod.POST)
     public R wbsTreePrivateTableSort(@RequestBody List<WbsTreePrivateDTO2> wbsTreeDTO) {
         return R.status(wbsTreePrivateService.wbsTreePrivateTableSort(wbsTreeDTO));
     }

+ 0 - 3
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeContractServiceImpl.java

@@ -132,7 +132,6 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                         }
                     });
                 });
-
                 this.saveBatch(wbsTreeContracts, 10000);
             }
 
@@ -167,10 +166,8 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                     String names = StringUtils.join(nodeNames, " , ");
                     throw new ServiceException(StringUtil.format("节点下的 {} 中存在填报数据,删除失败!", names));
                 }
-
                 //删除
                 baseMapper.deleteBatch(ids1, pawDTO.getWbsId(), pawDTO.getProjectId(), pawDTO.getContractId());
-
             }
 
             //新增

+ 0 - 1
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreePrivateServiceImpl.java

@@ -165,7 +165,6 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                 String projectId = objPrivate.getProjectId();
                 String wbsId = objPrivate.getWbsId();
                 Long id = objPrivate.getId();
-
                 //合同段wbs树同步排序
                 LambdaUpdateWrapper<WbsTreeContract> updateWrapper = new LambdaUpdateWrapper<>();
                 updateWrapper.eq(WbsTreeContract::getWbsId, wbsId);

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

@@ -1021,7 +1021,6 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
                                 //表
                                 addListData.add(wbsTree);
                             }
-
                         }
                     }