From 5976ec50aefe24fe58856c22bda035fb95c80107 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 20 Nov 2023 16:35:50 +0800 Subject: [PATCH] =?UTF-8?q?ci:=20=E6=89=80=E6=9C=89=E6=8E=A5=E5=8F=A3swagg?= =?UTF-8?q?er=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EnterpriseStandardDeclareController.java | 5 ++- .../EnterpriseStandardInspectController.java | 19 +++++----- .../EnterpriseStandardPlanController.java | 14 ++++--- ...terpriseStandardRecheckPlanController.java | 5 ++- ...rpriseStandardReviewMeetingController.java | 9 +++-- .../controller/LawsEnterpriseController.java | 38 +++++++++---------- .../controller/LawsTreeNodeController.java | 25 ++++++------ .../service/impl/LawsTreeNodeServiceImpl.java | 9 ----- 8 files changed, 61 insertions(+), 63 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardDeclareController.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardDeclareController.java index 77e21084..60ab4d6e 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardDeclareController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardDeclareController.java @@ -10,6 +10,7 @@ import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardDeclareVo; import com.jero.modules.laws.enterprise.service.EnterpriseStandardDeclareService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.web.bind.annotation.*; @@ -43,8 +44,8 @@ public class EnterpriseStandardDeclareController extends JeroController queryPageList(ESQueryCommonDTO esDeclare, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + @RequestParam(name="pageNo", defaultValue="1") @ApiParam("页码") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") @ApiParam("页面显示数量") Integer pageSize) { IPage pageList= esDeclareService.queryPageList(esDeclare, pageNo, pageSize); return Result.OK(pageList); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectController.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectController.java index 71d7fa70..78613b90 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectController.java @@ -16,6 +16,7 @@ import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectReportS import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.web.bind.annotation.GetMapping; @@ -62,8 +63,8 @@ public class EnterpriseStandardInspectController extends JeroController queryPageList(ESQueryCommonDTO esInspect, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + @RequestParam(name="pageNo", defaultValue="1") @ApiParam("页码") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") @ApiParam("页面显示数量") Integer pageSize) { IPage pageList = esInspectService.queryPageList(esInspect, pageNo, pageSize); return Result.OK(pageList); } @@ -77,7 +78,7 @@ public class EnterpriseStandardInspectController extends JeroController delayInspect(@RequestParam("id") String inspectId) { + public Result delayInspect(@RequestParam("id") @ApiParam("稽查数据Id") String inspectId) { EnterpriseStandardInspectDelay esInspectDelay = esInspectDelayService.getLastDelayInspect(inspectId); return Result.OK(esInspectDelay); } @@ -91,9 +92,9 @@ public class EnterpriseStandardInspectController extends JeroController inspectReport(@RequestParam("id") String inspectId, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + public Result inspectReport(@RequestParam("id") @ApiParam("稽查数据Id") String inspectId, + @RequestParam(name="pageNo", defaultValue="1") @ApiParam("页码") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") @ApiParam("页面显示数量") Integer pageSize) { IPage pageList = esInspectReportService.getInspectReport(inspectId, pageNo, pageSize); return Result.OK(pageList); } @@ -107,9 +108,9 @@ public class EnterpriseStandardInspectController extends JeroController rectifyPlan(@RequestParam("id") String inspectId, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + public Result rectifyPlan(@RequestParam("id") @ApiParam("稽查数据Id") String inspectId, + @RequestParam(name="pageNo", defaultValue="1") @ApiParam("页码") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") @ApiParam("页面显示数量") Integer pageSize) { IPage pageList = esInspectRectifyPlanService.getRectifyPlan(inspectId, pageNo, pageSize); return Result.OK(pageList); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardPlanController.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardPlanController.java index 35281933..10558e88 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardPlanController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardPlanController.java @@ -14,8 +14,10 @@ import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan; import com.jero.modules.laws.enterprise.entity.dto.ESPlanQueryDTO; import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardPlanVo; import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService; +import com.jero.modules.system.vo.IdMapBody; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.formula.functions.T; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -52,8 +54,8 @@ public class EnterpriseStandardPlanController extends JeroController queryPageList(ESPlanQueryDTO esPlanQueryDTO, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + @RequestParam(name="pageNo", defaultValue="1") @ApiParam("页码") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") @ApiParam("页面显示数量") Integer pageSize) { IPage pageList= esPlanService.queryPageList(esPlanQueryDTO, pageNo, pageSize); return Result.OK(pageList); } @@ -69,7 +71,7 @@ public class EnterpriseStandardPlanController extends JeroController getDetailById(@RequestParam("id") String planId) { + public Result getDetailById(@RequestParam("id") @ApiParam("企标计划ID") String planId) { EnterpriseStandardPlan detail = esPlanService.getDetailById(planId); return Result.OK(detail); } @@ -85,11 +87,11 @@ public class EnterpriseStandardPlanController extends JeroController deleteEN(@RequestBody Map map) { - if(!map.containsKey("id") || org.apache.commons.lang.StringUtils.isEmpty(map.get("id"))){ + public Result deleteEN(@RequestBody IdMapBody map) { + if(map.getId() == null || org.apache.commons.lang.StringUtils.isEmpty(map.getId())){ throw new JeroBootException(MessageUtils.getMessage(ResultCommon.PARAMETERS_CANNOT_BE_NULL)); } - String id = map.get("id"); + String id = map.getId(); EnterpriseStandardPlan esPlan = esPlanService.getById(id); if (esPlan == null) { throw new JeroBootException(MessageUtils.getMessage(ResultCommon.NO_CORRESPONDING_RECORD_FOUND)); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardRecheckPlanController.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardRecheckPlanController.java index 6463975e..572b8814 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardRecheckPlanController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardRecheckPlanController.java @@ -10,6 +10,7 @@ import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO; import com.jero.modules.laws.enterprise.service.EnterpriseStandardRecheckPlanService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.web.bind.annotation.GetMapping; @@ -47,8 +48,8 @@ public class EnterpriseStandardRecheckPlanController extends JeroController queryPageList(ESQueryCommonDTO esDeclare, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + @RequestParam(name="pageNo", defaultValue="1") @ApiParam("页码") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") @ApiParam("页面显示数量") Integer pageSize) { return Result.OK(recheckPlanService.queryPageList(esDeclare, pageNo, pageSize)); } } \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardReviewMeetingController.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardReviewMeetingController.java index 8c29f788..1c5209a4 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardReviewMeetingController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardReviewMeetingController.java @@ -14,6 +14,7 @@ import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardReviewMeetin import com.jero.modules.laws.enterprise.service.EnterpriseStandardReviewMeetingRecordService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.web.bind.annotation.*; @@ -49,8 +50,8 @@ public class EnterpriseStandardReviewMeetingController extends JeroController queryPageList(ESQueryCommonDTO esReviewMeeting, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { + @RequestParam(name = "pageNo", defaultValue = "1") @ApiParam("页码") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") @ApiParam("页面显示数量") Integer pageSize) { IPage pageList = esReviewMeetingService.queryPageList(esReviewMeeting, pageNo, pageSize); return Result.OK(pageList); } @@ -64,7 +65,7 @@ public class EnterpriseStandardReviewMeetingController extends JeroController evaluateDetail(@PathVariable("id") String id) { + public Result evaluateDetail(@PathVariable("id") @ApiParam("企标评审Id") String id) { Map> resultMap = esReviewMeetingService.evaluateDetail(id); return Result.OK(resultMap); } @@ -78,7 +79,7 @@ public class EnterpriseStandardReviewMeetingController extends JeroController setQualityStandards(@RequestParam String standardNos) { + public Result setQualityStandards(@RequestParam @ApiParam("标准编号") String standardNos) { List standardNoList = Arrays.asList(standardNos.split(",")); if (standardNoList.size() > 10) { throw new JeroBootException(MessageUtils.getMessage(ResultCommon.RMR_SET_QUALITY_OVER_TEN)); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java index 660f30cd..67efd3f9 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java @@ -92,7 +92,7 @@ public class LawsEnterpriseController { @PostMapping(value = "/commonAdd") @ApiOperationSupport(order = 3) @RequiresPermissions("enterpriseStandard:add") - public Result commonAdd(@RequestBody Map parameterMap) { + public Result commonAdd(@RequestBody @ApiParam("标签管理") Map parameterMap) { parameterMap.put(FieldCommon.MODULE, MODULE_VALUE); return Result.OK(lawsCommonService.commonAdd(parameterMap)); } @@ -102,7 +102,7 @@ public class LawsEnterpriseController { @PostMapping(value = "/commonEdit") @ApiOperationSupport(order = 4) @RequiresPermissions("enterpriseStandard:edit") - public Result commonEdit(@RequestBody Map parameterMap) { + public Result commonEdit(@RequestBody @ApiParam("标签管理") Map parameterMap) { parameterMap.put(FieldCommon.MODULE, MODULE_VALUE); return Result.OK(lawsCommonService.commonEdit(parameterMap)); } @@ -121,7 +121,7 @@ public class LawsEnterpriseController { @GetMapping(value = "getFormModel") @ApiOperationSupport(order = 6) @RequiresPermissions("enterpriseStandard:search") - public Result> getFormModel(@RequestParam(name="type") String type) { + public Result> getFormModel(@RequestParam(name="type") @ApiParam("类型（1详情，2新增编辑）") String type) { return Result.OK(lawsCommonService.getFormModel(MODULE_VALUE, type)); } @@ -130,9 +130,9 @@ public class LawsEnterpriseController { @GetMapping(value = "getByIdAndModule") @ApiOperationSupport(order = 7) @RequiresPermissions("enterpriseStandard:search") - public Result> getByIdAndModule(@RequestParam(name="id", required = false) String id, - @RequestParam(name="type") String type, - @RequestParam(name="standardNumber", required = false) String standardNumber) { + public Result> getByIdAndModule(@RequestParam(name="id", required = false) @ApiParam("主键") String id, + @RequestParam(name="type") @ApiParam("类型（1详情，2新增编辑）") String type, + @RequestParam(name="standardNumber", required = false) @ApiParam("标准编号") String standardNumber) { lawsCommonService.addLookHistory(id, type, MODULE_VALUE); return Result.OK(lawsCommonService.getByIdAndModule(id, MODULE_VALUE, type, standardNumber)); } @@ -154,7 +154,7 @@ public class LawsEnterpriseController { @PostMapping(value = "singleDelete") @ApiOperationSupport(order = 9) @RequiresPermissions("enterpriseStandard:delete") - public Result singleDelete(@RequestBody Map parameterMap) { + public Result singleDelete(@RequestBody @ApiParam(name = "ids", value = "主键（多个用逗号分隔）") Map parameterMap) { //删除标准时同步删除这个标准的收藏数据 lawsStandardCollectionService.deleteByStandardId((String) parameterMap.get("ids")); lawsStandardSharingService.deleteByStandardId((String) parameterMap.get("ids")); @@ -166,8 +166,8 @@ public class LawsEnterpriseController { @GetMapping(value = "relatedStandard") @ApiOperationSupport(order = 10) @RequiresPermissions("enterpriseStandard:configStandard") - public Result relatedStandard(@RequestParam(name="nodeCode") String nodeCode, - @RequestParam("ids") String ids) { + public Result relatedStandard(@RequestParam(name="nodeCode") @ApiParam("体系编码") String nodeCode, + @RequestParam("ids") @ApiParam("主键（多个用逗号分隔）") String ids) { lawsNodeRelationService.relatedStandard(nodeCode, ids); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } @@ -177,8 +177,8 @@ public class LawsEnterpriseController { @GetMapping(value = "removeStandard") @ApiOperationSupport(order = 11) @RequiresPermissions("enterpriseStandard:removeStandard") - public Result removeStandard(@RequestParam(name="nodeCode") String nodeCode, - @RequestParam("ids") String ids) { + public Result removeStandard(@RequestParam(name="nodeCode") @ApiParam("体系编码") String nodeCode, + @RequestParam("ids") @ApiParam("主键（多个用逗号分隔）") String ids) { lawsNodeRelationService.removeStandard(nodeCode, ids); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } @@ -188,7 +188,7 @@ public class LawsEnterpriseController { @GetMapping(value = "/getUpdateRecordList") @ApiOperationSupport(order = 12) @RequiresPermissions("enterpriseStandard:updateRecord") - public Result> getUpdateRecordList(@RequestParam("standardNumber") String standardNumber) { + public Result> getUpdateRecordList(@RequestParam("standardNumber") @ApiParam("标准编号") String standardNumber) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(LawsUpdateRecord::getUniqueRelationFlag, standardNumber); queryWrapper.orderByDesc(LawsUpdateRecord::getCreateTime); @@ -222,7 +222,7 @@ public class LawsEnterpriseController { @ApiOperation(value = "企业法规标准-企标评价", notes = "企业法规标准-企标评价") @GetMapping(value = "/evaluateDetail/{standardNumber}") @ApiOperationSupport(order = 14) - public Result evaluateDetail(@PathVariable("standardNumber") String standardNumber) { + public Result evaluateDetail(@PathVariable("standardNumber") @ApiParam("标准编号") String standardNumber) { Map> resultMap = esReviewMeetingService.evaluateDetailByStandardNo(standardNumber); return Result.OK(resultMap); } @@ -232,7 +232,7 @@ public class LawsEnterpriseController { @PostMapping("/exportData") @ApiOperationSupport(order = 15) @RequiresPermissions("enterpriseStandard:export") - public void exportData(HttpServletResponse response, @RequestBody(required = false) Map parameterMap) { + public void exportData(HttpServletResponse response, @RequestBody(required = false) @ApiParam("标签管理") Map parameterMap) { parameterMap.put(FieldCommon.MODULE, TableNameEnum.ENTERPRISE_STANDARDS.getValue()); lawsCommonService.commonExport(response, parameterMap, "企业标准", "企业标准"); } @@ -242,7 +242,7 @@ public class LawsEnterpriseController { @PostMapping("/exportDataWithFile") @ApiOperationSupport(order = 16) @RequiresPermissions("enterpriseStandard:fileExport") - public void exportDataWithFile(HttpServletResponse response, @RequestBody(required = false) Map parameterMap) { + public void exportDataWithFile(HttpServletResponse response, @RequestBody(required = false) @ApiParam("标签管理") Map parameterMap) { parameterMap.put(FieldCommon.MODULE, TableNameEnum.ENTERPRISE_STANDARDS.getValue()); lawsCommonService.exportDataWithFile(response, parameterMap, "企业标准", "企业标准"); } @@ -265,7 +265,7 @@ public class LawsEnterpriseController { @PostMapping("/importExcelWithData") @ApiOperationSupport(order = 18) @RequiresPermissions("enterpriseStandard:upload") - public Result importExcelWithData(@RequestParam("file") MultipartFile file) { + public Result importExcelWithData(@RequestParam("file") @ApiParam("上传的文件") MultipartFile file) { List errorMessages = lawsCommonService.importExcelWithData(file, TableNameEnum.ENTERPRISE_STANDARDS.getValue()); if (errorMessages.size() > 0) { return Result.error(MessageUtils.getMessage(ResultCommon.IMPORT_ERROR), errorMessages); @@ -282,7 +282,7 @@ public class LawsEnterpriseController { @ApiOperation(value = "企业法规标准-评分详情", notes = "企业法规标准-评分详情") @GetMapping(value = "/evaluateDetailForESInfo/{standardId}") @ApiOperationSupport(order = 19) - public Result evaluateDetailForESInfo(@PathVariable("standardId") String standardId) { + public Result evaluateDetailForESInfo(@PathVariable("standardId") @ApiParam("标准Id") String standardId) { Map> resultMap = esReviewMeetingService.evaluateDetailForESInfo(standardId); return Result.OK(resultMap); } @@ -296,8 +296,8 @@ public class LawsEnterpriseController { @ApiOperation(value = "企业法规标准-获取是否有查看详情权限", notes = "企业法规标准-获取是否有查看详情权限") @GetMapping(value = "/detailPermission") @ApiOperationSupport(order = 20) - public Result detailPermission(@RequestParam(name="id", required = false) String id, - @RequestParam(name="standardNumber", required = false) String standardNumber) { + public Result detailPermission(@RequestParam(name="id", required = false) @ApiParam("标准Id") String id, + @RequestParam(name="standardNumber", required = false) @ApiParam("标准编号") String standardNumber) { return Result.OK(esAuthUserService.detailPermissionByUser(id, standardNumber, UserUtils.getUserId())); } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsTreeNodeController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsTreeNodeController.java index a71cddc8..62c7d306 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsTreeNodeController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsTreeNodeController.java @@ -1,7 +1,6 @@ package com.jero.modules.laws.standard.controller; import java.util.List; -import java.util.Map; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; @@ -12,7 +11,9 @@ import com.jero.common.api.vo.ResultCommon; import com.jero.modules.laws.enterprise.entity.vo.LawsTreeNodeModel; import com.jero.modules.laws.standard.entity.LawsTreeNode; import com.jero.modules.laws.standard.service.ILawsTreeNodeService; +import com.jero.modules.system.vo.IdMapBody; import com.jero.modules.tag.enums.TableNameEnum; +import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; import com.jero.common.system.base.controller.JeroController; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -46,8 +47,8 @@ public class LawsTreeNodeController extends JeroController> queryENTreeList(@RequestParam(required = false, defaultValue = "") String nodeName, - @RequestParam(required = false) String option) { + public Result> queryENTreeList(@RequestParam(required = false, defaultValue = "") @ApiParam("节点名称") String nodeName, + @RequestParam(required = false) @ApiParam("为空：显示我的收藏 1：不显示我的收藏") String option) { String moduleCode = TableNameEnum.ENTERPRISE_STANDARDS.getValue(); List list = lawsTreeNodeService.queryTreeNodeList(moduleCode, nodeName, option); return Result.OK(list); @@ -57,8 +58,8 @@ public class LawsTreeNodeController extends JeroController> queryGBTreeList(@RequestParam(required = false) String nodeName, - @RequestParam(required = false) String option) { + public Result> queryGBTreeList(@RequestParam(required = false) @ApiParam("节点名称") String nodeName, + @RequestParam(required = false) @ApiParam("为空：显示我的收藏 1：不显示我的收藏") String option) { String moduleCode = TableNameEnum.DOMESTIC_REGULATIONS.getValue(); List list = lawsTreeNodeService.queryTreeNodeList(moduleCode, nodeName, option); return Result.OK(list); @@ -68,8 +69,8 @@ public class LawsTreeNodeController extends JeroController> queryFBTreeList(@RequestParam(required = false) String nodeName, - @RequestParam(required = false) String option) { + public Result> queryFBTreeList(@RequestParam(required = false) @ApiParam("节点名称") String nodeName, + @RequestParam(required = false) @ApiParam("为空：显示我的收藏 1：不显示我的收藏") String option) { String moduleCode = TableNameEnum.FOREIGN_REGULATIONS.getValue(); List list = lawsTreeNodeService.queryTreeNodeList(moduleCode, nodeName, option); return Result.OK(list); @@ -159,8 +160,8 @@ public class LawsTreeNodeController extends JeroController commonDelete(Map map, String moduleCode) { - String id = map.get("id"); + private Result commonDelete(IdMapBody map, String moduleCode) { + String id = map.getId(); if (StringUtils.isBlank(id)) { throw new JeroBootException(ResultCommon.PARAMETERS_CANNOT_BE_NULL); } @@ -184,7 +185,7 @@ public class LawsTreeNodeController extends JeroController deleteEN(@RequestBody Map map) { + public Result deleteEN(@RequestBody IdMapBody map) { return this.commonDelete(map, TableNameEnum.ENTERPRISE_STANDARDS.getValue()); } @@ -192,7 +193,7 @@ public class LawsTreeNodeController extends JeroController deleteGB(@RequestBody Map map) { + public Result deleteGB(@RequestBody IdMapBody map) { return this.commonDelete(map, TableNameEnum.DOMESTIC_REGULATIONS.getValue()); } @@ -200,7 +201,7 @@ public class LawsTreeNodeController extends JeroController deleteFB(@RequestBody Map map) { + public Result deleteFB(@RequestBody IdMapBody map) { return this.commonDelete(map, TableNameEnum.FOREIGN_REGULATIONS.getValue()); } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsTreeNodeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsTreeNodeServiceImpl.java index 03b5f7a9..3a16c8f9 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsTreeNodeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsTreeNodeServiceImpl.java @@ -41,15 +41,6 @@ public class LawsTreeNodeServiceImpl extends ServiceImpl queryTreeNodeList(String moduleCode, String nodeName, String option) { LambdaQueryWrapper query = new LambdaQueryWrapper<>();