diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java index f6325094..8e77cdbd 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java @@ -2,6 +2,8 @@ package com.jero.modules.laws.standard.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.github.xiaoymin.knife4j.annotations.ApiSupport; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.util.MessageUtils; @@ -30,6 +32,7 @@ import java.util.Map; * @Date: 2023/8/25 16:26 * @Description: 国内法规标准 */ +@ApiSupport(order = 402) @Api(tags="国内法规标准") @RestController @RequestMapping("/laws/standard/domestic") @@ -51,6 +54,7 @@ public class LawsDomesticController { @AutoLog(value = "国内法规标准-分页列表查询") @ApiOperation(value="国内法规标准-分页列表查询", notes="国内法规标准-分页列表查询") @PostMapping(value = "/getCommonPage") + @ApiOperationSupport(order = 1) public Result>> getCommonPage(@RequestBody Map parameterMap) { parameterMap.put(FieldCommon.MODULE, MODULE_VALUE); return Result.OK(lawsCommonService.getCommonPage(parameterMap)); @@ -59,6 +63,7 @@ public class LawsDomesticController { @AutoLog(value = "国内法规标准-获取列表表头") @ApiOperation(value="国内法规标准-获取列表表头", notes="国内法规标准-获取列表表头") @GetMapping(value = "getCommonHeader") + @ApiOperationSupport(order = 2) public Result> getCommonHeader() { return Result.OK(lawsCommonService.getCommonHeader(MODULE_VALUE)); } @@ -66,6 +71,7 @@ public class LawsDomesticController { @AutoLog(value = "国内法规标准-新增数据") @ApiOperation(value="国内法规标准-新增数据", notes="国内法规标准-新增数据") @PostMapping(value = "/commonAdd") + @ApiOperationSupport(order = 3) public Result commonAdd(@RequestBody Map parameterMap) { parameterMap.put(FieldCommon.MODULE, MODULE_VALUE); return Result.OK(lawsCommonService.commonAdd(parameterMap)); @@ -74,6 +80,7 @@ public class LawsDomesticController { @AutoLog(value = "国内法规标准-编辑数据") @ApiOperation(value="国内法规标准-编辑数据", notes="国内法规标准-编辑数据") @PostMapping(value = "/commonEdit") + @ApiOperationSupport(order = 4) public Result commonEdit(@RequestBody Map parameterMap) { parameterMap.put(FieldCommon.MODULE, MODULE_VALUE); return Result.OK(lawsCommonService.commonEdit(parameterMap)); @@ -82,6 +89,7 @@ public class LawsDomesticController { @AutoLog(value = "国内法规标准-获取查询条件") @ApiOperation(value="国内法规标准-获取查询条件", notes="国内法规标准-获取查询条件") @GetMapping(value = "getQueryCondition") + @ApiOperationSupport(order = 5) public Result> getQueryCondition() { return Result.OK(lawsCommonService.getQueryCondition(MODULE_VALUE)); } @@ -89,6 +97,7 @@ public class LawsDomesticController { @AutoLog(value = "国内法规标准-获取表单模型") @ApiOperation(value="国内法规标准-获取表单模型", notes="国内法规标准-获取表单模型") @GetMapping(value = "getFormModel") + @ApiOperationSupport(order = 6) public Result> getFormModel(@RequestParam(name="type") String type) { return Result.OK(lawsCommonService.getFormModel(MODULE_VALUE, type)); } @@ -96,6 +105,7 @@ public class LawsDomesticController { @AutoLog(value = "国内法规标准-根据id和模块标识获取信息") @ApiOperation(value="国内法规标准-根据id和模块标识获取信息", notes="国内法规标准-根据id和模块标识获取信息") @GetMapping(value = "getByIdAndModule") + @ApiOperationSupport(order = 7) public Result> getByIdAndModule(@RequestParam(name="id") String id, @RequestParam(name="type") String type) { lawsCommonService.addLookHistory(id, type, MODULE_VALUE); @@ -105,6 +115,7 @@ public class LawsDomesticController { @AutoLog(value = "国内法规标准-根据ids和模块标识删除信息") @ApiOperation(value="国内法规标准-根据ids和模块标识删除信息", notes="国内法规标准-根据ids和模块标识删除信息") @PostMapping(value = "deleteByIdsAndModule") + @ApiOperationSupport(order = 8) public Result deleteByIdsAndModule(@RequestBody Map parameterMap) { //删除标准时同步删除这个标准的收藏数据 lawsStandardCollectionService.deleteByStandardId((String) parameterMap.get("ids")); @@ -115,6 +126,7 @@ public class LawsDomesticController { @AutoLog(value = "国内法规标准-配置标准") @ApiOperation(value="国内法规标准-配置标准", notes="国内法规标准-配置标准") @GetMapping(value = "relatedStandard") + @ApiOperationSupport(order = 9) public Result relatedStandard(@RequestParam(name="nodeCode") String nodeCode, @RequestParam("ids") String ids) { lawsNodeRelationService.relatedStandard(nodeCode, ids); @@ -124,6 +136,7 @@ public class LawsDomesticController { @AutoLog(value = "国内法规标准-移除标准") @ApiOperation(value="国内法规标准-移除标准", notes="国内法规标准-移除标准") @GetMapping(value = "removeStandard") + @ApiOperationSupport(order = 10) public Result removeStandard(@RequestParam(name="nodeCode") String nodeCode, @RequestParam("ids") String ids) { lawsNodeRelationService.removeStandard(nodeCode, ids); @@ -133,6 +146,7 @@ public class LawsDomesticController { @AutoLog(value = "国内法规标准-法规更新记录") @ApiOperation(value="国内法规标准-法规更新记录", notes="国内法规标准-法规更新记录") @GetMapping(value = "/getUpdateRecordList") + @ApiOperationSupport(order = 11) public Result> getUpdateRecordList(@RequestParam("standardNumber") String standardNumber) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(LawsUpdateRecord::getUniqueRelationFlag, standardNumber); @@ -143,6 +157,7 @@ public class LawsDomesticController { @AutoLog(value = "国内法规标准-导出") @ApiOperation(value="国内法规标准-导出", notes="国内法规标准-导出") @PostMapping("/exportData") + @ApiOperationSupport(order = 12) public void exportData(HttpServletResponse response, @RequestBody(required = false) Map parameterMap) { parameterMap.put(FieldCommon.MODULE, MODULE_VALUE); lawsCommonService.commonExport(response, parameterMap, "国内标准", "国内标准"); @@ -151,6 +166,7 @@ public class LawsDomesticController { @AutoLog(value = "国内法规标准-带文件导出") @ApiOperation(value="国内法规标准-带文件导出", notes="国内法规标准-带文件导出") @PostMapping("/exportDataWithFile") + @ApiOperationSupport(order = 13) public void exportDataWithFile(HttpServletResponse response, @RequestBody(required = false) Map parameterMap) { parameterMap.put(FieldCommon.MODULE, MODULE_VALUE); lawsCommonService.exportDataWithFile(response, parameterMap, "国内标准", "国内标准"); @@ -159,6 +175,7 @@ public class LawsDomesticController { @AutoLog(value = "国内法规标准-模板下载") @ApiOperation(value="国内法规标准-模板下载", notes="国内法规标准-模板下载") @GetMapping("/templateDownload") + @ApiOperationSupport(order = 14) public void templateDownload(HttpServletResponse response) { lawsCommonService.templateDownload(response, TableNameEnum.DOMESTIC_REGULATIONS.getTableName()); } @@ -166,6 +183,7 @@ public class LawsDomesticController { @AutoLog(value = "国内法规标准-导入") @ApiOperation(value="国内法规标准-导入", notes="国内法规标准-导入") @PostMapping("/importExcelWithData") + @ApiOperationSupport(order = 15) public Result importExcelWithData(@RequestParam("file") MultipartFile file) { List errorMessages = lawsCommonService.importExcelWithData(file, TableNameEnum.DOMESTIC_REGULATIONS.getValue()); if (errorMessages.size() > 0) { diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsNewsFeedController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsNewsFeedController.java index ed6fe0de..2e6cc18d 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsNewsFeedController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsNewsFeedController.java @@ -2,6 +2,8 @@ package com.jero.modules.laws.standard.controller; import java.util.*; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.github.xiaoymin.knife4j.annotations.ApiSupport; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.Translation; import com.jero.common.exception.JeroBootException; @@ -29,6 +31,7 @@ import org.apache.poi.ss.formula.functions.T; * @Date: 2023-09-11 * @Version: V1.0 */ +@ApiSupport(order = 409) @Api(tags = "动态消息") @RestController @RequestMapping("/laws/standard/lawsNewsFeed") @@ -49,6 +52,7 @@ public class LawsNewsFeedController extends JeroController> queryPageList(LawsNewsFeed lawsNewsFeed, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { @@ -66,6 +70,7 @@ public class LawsNewsFeedController extends JeroController> queryList(LawsNewsFeed lawsNewsFeed) { List list = lawsNewsFeedService.queryList(lawsNewsFeed); return Result.OK(list); @@ -75,6 +80,7 @@ public class LawsNewsFeedController extends JeroController save(@Validated @RequestBody LawsNewsFeed lawsNewsFeed) { // 第一次保存,附上初值 if (Objects.isNull(lawsNewsFeed.getReleaseStatus())) { @@ -94,6 +100,7 @@ public class LawsNewsFeedController extends JeroController release(@Validated @RequestBody LawsNewsFeed lawsNewsFeed) { // 第一次发布,赋初值 if (Objects.isNull(lawsNewsFeed.getReleaseStatus())) { @@ -116,6 +123,7 @@ public class LawsNewsFeedController extends JeroController delete(@RequestBody Map map) { if (!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))) { throw new JeroBootException(ResultCommon.SELECT_DATA); @@ -134,6 +142,7 @@ public class LawsNewsFeedController extends JeroController deleteBatch(@RequestBody Map map) { if (!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))) { throw new JeroBootException(ResultCommon.SELECT_DATA); @@ -153,6 +162,7 @@ public class LawsNewsFeedController extends JeroController queryById(@RequestParam(name = "id") String id, @RequestParam(name = "type") String type) { LawsNewsFeed lawsNewsFeed = lawsNewsFeedService.queryById(id, type); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java index 3c3de4fe..41855eb6 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java @@ -2,6 +2,8 @@ package com.jero.modules.laws.standard.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.github.xiaoymin.knife4j.annotations.ApiSupport; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.util.MessageUtils; @@ -30,6 +32,7 @@ import java.util.Map; * @Date: 2023/8/25 16:26 * @Description: 海外法规标准 */ +@ApiSupport(order = 405) @Api(tags="海外法规标准") @RestController @RequestMapping("/laws/standard/overseas") @@ -51,6 +54,7 @@ public class LawsOverseasController { @AutoLog(value = "海外法规标准-分页列表查询") @ApiOperation(value="海外法规标准-分页列表查询", notes="海外法规标准-分页列表查询") @PostMapping(value = "/getCommonPage") + @ApiOperationSupport(order = 1) public Result>> getCommonPage(@RequestBody Map parameterMap) { parameterMap.put(FieldCommon.MODULE, MODULE_VALUE); return Result.OK(lawsCommonService.getCommonPage(parameterMap)); @@ -59,6 +63,7 @@ public class LawsOverseasController { @AutoLog(value = "海外法规标准-获取列表表头") @ApiOperation(value="海外法规标准-获取列表表头", notes="海外法规标准-获取列表表头") @GetMapping(value = "getCommonHeader") + @ApiOperationSupport(order = 2) public Result> getCommonHeader() { return Result.OK(lawsCommonService.getCommonHeader(MODULE_VALUE)); } @@ -66,6 +71,7 @@ public class LawsOverseasController { @AutoLog(value = "海外法规标准-新增数据") @ApiOperation(value="海外法规标准-新增数据", notes="海外法规标准-新增数据") @PostMapping(value = "/commonAdd") + @ApiOperationSupport(order = 3) public Result commonAdd(@RequestBody Map parameterMap) { parameterMap.put(FieldCommon.MODULE, MODULE_VALUE); return Result.OK(lawsCommonService.commonAdd(parameterMap)); @@ -74,6 +80,7 @@ public class LawsOverseasController { @AutoLog(value = "海外法规标准-编辑数据") @ApiOperation(value="海外法规标准-编辑数据", notes="海外法规标准-编辑数据") @PostMapping(value = "/commonEdit") + @ApiOperationSupport(order = 4) public Result commonEdit(@RequestBody Map parameterMap) { parameterMap.put(FieldCommon.MODULE, MODULE_VALUE); return Result.OK(lawsCommonService.commonEdit(parameterMap)); @@ -82,6 +89,7 @@ public class LawsOverseasController { @AutoLog(value = "海外法规标准-获取查询条件") @ApiOperation(value="海外法规标准-获取查询条件", notes="海外法规标准-获取查询条件") @GetMapping(value = "getQueryCondition") + @ApiOperationSupport(order = 5) public Result> getQueryCondition() { return Result.OK(lawsCommonService.getQueryCondition(MODULE_VALUE)); } @@ -89,6 +97,7 @@ public class LawsOverseasController { @AutoLog(value = "海外法规标准-获取表单模型") @ApiOperation(value="海外法规标准-获取表单模型", notes="海外法规标准-获取表单模型") @GetMapping(value = "getFormModel") + @ApiOperationSupport(order = 6) public Result> getFormModel(@RequestParam(name="type") String type) { return Result.OK(lawsCommonService.getFormModel(MODULE_VALUE, type)); } @@ -96,6 +105,7 @@ public class LawsOverseasController { @AutoLog(value = "海外法规标准-根据id和模块标识获取信息") @ApiOperation(value="海外法规标准-根据id和模块标识获取信息", notes="海外法规标准-根据id和模块标识获取信息") @GetMapping(value = "getByIdAndModule") + @ApiOperationSupport(order = 7) public Result> getByIdAndModule(@RequestParam(name="id") String id, @RequestParam(name="type") String type) { lawsCommonService.addLookHistory(id, type, MODULE_VALUE); @@ -105,6 +115,7 @@ public class LawsOverseasController { @AutoLog(value = "海外法规标准-根据ids和模块标识删除信息") @ApiOperation(value="海外法规标准-根据ids和模块标识删除信息", notes="海外法规标准-根据ids和模块标识删除信息") @PostMapping(value = "deleteByIdsAndModule") + @ApiOperationSupport(order = 8) public Result deleteByIdsAndModule(@RequestBody Map parameterMap) { //删除标准时同步删除这个标准的收藏数据 lawsStandardCollectionService.deleteByStandardId((String) parameterMap.get("ids")); @@ -115,6 +126,7 @@ public class LawsOverseasController { @AutoLog(value = "海外法规标准-配置标准") @ApiOperation(value="海外法规标准-配置标准", notes="海外法规标准-配置标准") @GetMapping(value = "relatedStandard") + @ApiOperationSupport(order = 9) public Result relatedStandard(@RequestParam(name="nodeCode") String nodeCode, @RequestParam("ids") String ids) { lawsNodeRelationService.relatedStandard(nodeCode, ids); @@ -124,6 +136,7 @@ public class LawsOverseasController { @AutoLog(value = "海外法规标准-移除标准") @ApiOperation(value="海外法规标准-移除标准", notes="海外法规标准-移除标准") @GetMapping(value = "removeStandard") + @ApiOperationSupport(order = 10) public Result removeStandard(@RequestParam(name="nodeCode") String nodeCode, @RequestParam("ids") String ids) { lawsNodeRelationService.removeStandard(nodeCode, ids); @@ -133,6 +146,7 @@ public class LawsOverseasController { @AutoLog(value = "海外法规标准-法规更新记录") @ApiOperation(value="海外法规标准-法规更新记录", notes="海外法规标准-法规更新记录") @GetMapping(value = "/getUpdateRecordList") + @ApiOperationSupport(order = 11) public Result> getUpdateRecordList(@RequestParam("standardNumber") String standardNumber) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(LawsUpdateRecord::getUniqueRelationFlag, standardNumber); @@ -143,6 +157,7 @@ public class LawsOverseasController { @AutoLog(value = "海外法规标准-导出") @ApiOperation(value="海外法规标准-导出", notes="海外法规标准-导出") @PostMapping("/exportData") + @ApiOperationSupport(order = 12) public void exportData(HttpServletResponse response, @RequestBody(required = false) Map parameterMap) { parameterMap.put(FieldCommon.MODULE, MODULE_VALUE); lawsCommonService.commonExport(response, parameterMap, "海外标准", "海外标准"); @@ -151,6 +166,7 @@ public class LawsOverseasController { @AutoLog(value = "海外法规标准-带文件导出") @ApiOperation(value="海外法规标准-带文件导出", notes="海外法规标准-带文件导出") @PostMapping("/exportDataWithFile") + @ApiOperationSupport(order = 13) public void exportDataWithFile(HttpServletResponse response, @RequestBody(required = false) Map parameterMap) { parameterMap.put(FieldCommon.MODULE, MODULE_VALUE); lawsCommonService.exportDataWithFile(response, parameterMap, "海外标准", "海外标准"); @@ -159,6 +175,7 @@ public class LawsOverseasController { @AutoLog(value = "海外法规标准-模板下载") @ApiOperation(value="海外法规标准-模板下载", notes="海外法规标准-模板下载") @GetMapping("/templateDownload") + @ApiOperationSupport(order = 14) public void templateDownload(HttpServletResponse response) { lawsCommonService.templateDownload(response, TableNameEnum.FOREIGN_REGULATIONS.getTableName()); } @@ -166,6 +183,7 @@ public class LawsOverseasController { @AutoLog(value = "海外法规标准-导入") @ApiOperation(value="海外法规标准-导入", notes="海外法规标准-导入") @PostMapping("/importExcelWithData") + @ApiOperationSupport(order = 15) public Result importExcelWithData(@RequestParam("file") MultipartFile file) { List errorMessages = lawsCommonService.importExcelWithData(file, TableNameEnum.FOREIGN_REGULATIONS.getValue()); if (errorMessages.size() > 0) {