From b2bc24d2e8b75a447a3859ca15535c37383651f0 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 17 Nov 2023 09:11:37 +0800 Subject: [PATCH] =?UTF-8?q?ci:=20=E6=8E=A5=E5=8F=A3=E6=B3=A8=E8=A7=A3?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EnterpriseStandardPlanController.java | 7 ++++ ...terpriseStandardRecheckPlanController.java | 4 +++ .../controller/LawsEnterpriseController.java | 33 +++++++++++++------ 3 files changed, 34 insertions(+), 10 deletions(-) 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 30f4579a..35281933 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 @@ -1,6 +1,8 @@ package com.jero.modules.laws.enterprise.controller; 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.aspect.annotation.Translation; @@ -29,6 +31,7 @@ import java.util.Map; * @Date: 2022-02-12 * @Version: V1.0 */ +@ApiSupport(order = 505) @Api(tags="企标计划") @RestController @RequestMapping("/enterprise/plan") @@ -47,6 +50,7 @@ public class EnterpriseStandardPlanController extends JeroController queryPageList(ESPlanQueryDTO esPlanQueryDTO, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { @@ -61,6 +65,7 @@ public class EnterpriseStandardPlanController extends JeroController deleteEN(@RequestBody Map map) { @@ -95,6 +101,7 @@ public class EnterpriseStandardPlanController extends JeroController queryPageList(ESQueryCommonDTO esDeclare, 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 824b19c2..fb2c8dd1 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 @@ -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.exception.JeroBootException; @@ -41,6 +43,7 @@ import java.util.Objects; * @Date: 2023/8/25 16:26 * @Description: 企业法规标准 */ +@ApiSupport(order = 502) @Api(tags="企业法规标准") @RestController @RequestMapping("/laws/standard/enterprise") @@ -73,6 +76,7 @@ public class LawsEnterpriseController { @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)); @@ -81,6 +85,7 @@ public class LawsEnterpriseController { @AutoLog(value = "企业法规标准-获取列表表头") @ApiOperation(value="企业法规标准-获取列表表头", notes="企业法规标准-获取列表表头") @GetMapping(value = "getCommonHeader") + @ApiOperationSupport(order = 2) public Result> getCommonHeader() { return Result.OK(lawsCommonService.getCommonHeader(MODULE_VALUE)); } @@ -88,6 +93,7 @@ public class LawsEnterpriseController { @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)); @@ -96,6 +102,7 @@ public class LawsEnterpriseController { @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)); @@ -104,6 +111,7 @@ public class LawsEnterpriseController { @AutoLog(value = "企业法规标准-获取查询条件") @ApiOperation(value="企业法规标准-获取查询条件", notes="企业法规标准-获取查询条件") @GetMapping(value = "getQueryCondition") + @ApiOperationSupport(order = 5) public Result> getQueryCondition() { return Result.OK(lawsCommonService.getQueryCondition(MODULE_VALUE)); } @@ -111,6 +119,7 @@ public class LawsEnterpriseController { @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)); } @@ -118,6 +127,7 @@ public class LawsEnterpriseController { @AutoLog(value = "企业法规标准-根据id和模块标识获取信息") @ApiOperation(value="企业法规标准-根据id和模块标识获取信息", notes="企业法规标准-根据id和模块标识获取信息") @GetMapping(value = "getByIdAndModule") + @ApiOperationSupport(order = 7) public Result> getByIdAndModule(@RequestParam(name="id", required = false) String id, @RequestParam(name="type") String type, @RequestParam(name="standardNumber", required = false) String standardNumber) { @@ -128,6 +138,7 @@ public class LawsEnterpriseController { @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")); @@ -138,6 +149,7 @@ public class LawsEnterpriseController { @AutoLog(value = "企业法规标准-列表删除") @ApiOperation(value="企业法规标准-列表删除", notes="企业法规标准-列表删除") @PostMapping(value = "singleDelete") + @ApiOperationSupport(order = 9) public Result singleDelete(@RequestBody Map parameterMap) { //删除标准时同步删除这个标准的收藏数据 lawsStandardCollectionService.deleteByStandardId((String) parameterMap.get("ids")); @@ -148,6 +160,7 @@ public class LawsEnterpriseController { @AutoLog(value = "企业法规标准-配置标准") @ApiOperation(value="企业法规标准-配置标准", notes="企业法规标准-配置标准") @GetMapping(value = "relatedStandard") + @ApiOperationSupport(order = 10) public Result relatedStandard(@RequestParam(name="nodeCode") String nodeCode, @RequestParam("ids") String ids) { lawsNodeRelationService.relatedStandard(nodeCode, ids); @@ -157,6 +170,7 @@ public class LawsEnterpriseController { @AutoLog(value = "企业法规标准-移除标准") @ApiOperation(value="企业法规标准-移除标准", notes="企业法规标准-移除标准") @GetMapping(value = "removeStandard") + @ApiOperationSupport(order = 11) public Result removeStandard(@RequestParam(name="nodeCode") String nodeCode, @RequestParam("ids") String ids) { lawsNodeRelationService.removeStandard(nodeCode, ids); @@ -166,6 +180,7 @@ public class LawsEnterpriseController { @AutoLog(value = "企业法规标准-法规更新记录") @ApiOperation(value="企业法规标准-法规更新记录", notes="企业法规标准-法规更新记录") @GetMapping(value = "/getUpdateRecordList") + @ApiOperationSupport(order = 12) public Result> getUpdateRecordList(@RequestParam("standardNumber") String standardNumber) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(LawsUpdateRecord::getUniqueRelationFlag, standardNumber); @@ -177,6 +192,7 @@ public class LawsEnterpriseController { @AutoLog(value = "企业法规标准-临时权限设置") @ApiOperation(value="企业法规标准-临时权限设置", notes="企业法规标准-临时权限设置") @PostMapping(value = "/tempPermission") + @ApiOperationSupport(order = 13) public Result tempPermission(@RequestBody LawsStandardTempPermission lawsStandardTempPermission) { String userIds = lawsStandardTempPermission.getUserIds(); String deptIds = lawsStandardTempPermission.getDeptIds(); @@ -197,6 +213,7 @@ public class LawsEnterpriseController { @AutoLog(value = "企业法规标准-企标评价") @ApiOperation(value = "企业法规标准-企标评价", notes = "企业法规标准-企标评价") @GetMapping(value = "/evaluateDetail/{standardNumber}") + @ApiOperationSupport(order = 14) public Result evaluateDetail(@PathVariable("standardNumber") String standardNumber) { Map> resultMap = esReviewMeetingService.evaluateDetailByStandardNo(standardNumber); return Result.OK(resultMap); @@ -205,6 +222,7 @@ public class LawsEnterpriseController { @AutoLog(value = "企业法规标准-导出") @ApiOperation(value="企业法规标准-导出", notes="企业法规标准-导出") @PostMapping("/exportData") + @ApiOperationSupport(order = 15) public void exportData(HttpServletResponse response, @RequestBody(required = false) Map parameterMap) { parameterMap.put(FieldCommon.MODULE, TableNameEnum.ENTERPRISE_STANDARDS.getValue()); lawsCommonService.commonExport(response, parameterMap, "企业标准", "企业标准"); @@ -213,6 +231,7 @@ public class LawsEnterpriseController { @AutoLog(value = "企业法规标准-带文件导出") @ApiOperation(value="企业法规标准-带文件导出", notes="企业法规标准-带文件导出") @PostMapping("/exportDataWithFile") + @ApiOperationSupport(order = 16) public void exportDataWithFile(HttpServletResponse response, @RequestBody(required = false) Map parameterMap) { parameterMap.put(FieldCommon.MODULE, TableNameEnum.ENTERPRISE_STANDARDS.getValue()); lawsCommonService.exportDataWithFile(response, parameterMap, "企业标准", "企业标准"); @@ -221,6 +240,7 @@ public class LawsEnterpriseController { @AutoLog(value = "企业法规标准-模板下载") @ApiOperation(value="企业法规标准-模板下载", notes="企业法规标准-模板下载") @GetMapping("/templateDownload") + @ApiOperationSupport(order = 17) public void templateDownload(HttpServletResponse response) { try { lawsCommonService.esTemplateDownload(response); @@ -232,6 +252,7 @@ public class LawsEnterpriseController { @AutoLog(value = "企业法规标准-导入") @ApiOperation(value="企业法规标准-导入", notes="企业法规标准-导入") @PostMapping("/importExcelWithData") + @ApiOperationSupport(order = 18) public Result importExcelWithData(@RequestParam("file") MultipartFile file) { List errorMessages = lawsCommonService.importExcelWithData(file, TableNameEnum.ENTERPRISE_STANDARDS.getValue()); if (errorMessages.size() > 0) { @@ -240,16 +261,6 @@ public class LawsEnterpriseController { return Result.OK(); } - @AutoLog(value = "企业法规标准-老法规企标数据库Zip导入") - @ApiOperation(value="企业法规标准-老法规企标数据库Zip导入", notes="企业法规标准-老法规企标数据库Zip导入") - @PostMapping("/importOldSystemESZip") - public Result importOldSystemESZip(@RequestParam("file") MultipartFile file, - @ApiParam(value = "0不导入 1导入企标 2导入国标", required = true) - @RequestParam("type") String type) { - enterpriseStandardService.importExcelOldSystem(file, type); - return Result.OK("导入成功"); - } - /** * 企标详情-评分详情 * @@ -258,6 +269,7 @@ public class LawsEnterpriseController { @AutoLog(value = "企业法规标准-评分详情") @ApiOperation(value = "企业法规标准-评分详情", notes = "企业法规标准-评分详情") @GetMapping(value = "/evaluateDetailForESInfo/{standardId}") + @ApiOperationSupport(order = 19) public Result evaluateDetailForESInfo(@PathVariable("standardId") String standardId) { Map> resultMap = esReviewMeetingService.evaluateDetailForESInfo(standardId); return Result.OK(resultMap); @@ -271,6 +283,7 @@ public class LawsEnterpriseController { @AutoLog(value = "企业法规标准-获取是否有查看详情权限") @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) { return Result.OK(esAuthUserService.detailPermissionByUser(id, standardNumber, UserUtils.getUserId()));