diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerBuildAcceptanceController.java b/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerBuildAcceptanceController.java index 6e2f4642c..ba4705ada 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerBuildAcceptanceController.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerBuildAcceptanceController.java @@ -9,7 +9,7 @@ import io.swagger.annotations.ApiImplicitParams; import java.util.HashMap; -import springfox.documentation.annotations.ApiIgnore; +import io.swagger.v3.oas.annotations.Parameter; import java.util.Arrays; import java.util.List; @@ -17,8 +17,8 @@ import java.util.Map; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; @@ -78,7 +78,7 @@ public class BigDangerBuildAcceptanceController { @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), }) @GetMapping(value = "/page") - public Result> queryPageList(@ApiIgnore @RequestParam HashMap param) { + public Result> queryPageList(@Parameter(hidden = true) @RequestParam HashMap param) { return Result.success(bigDangerBuildAcceptanceService.queryPageList(param)); } @@ -90,7 +90,7 @@ public class BigDangerBuildAcceptanceController { @OperLog(operModul = "危大清单施工条件验收管理", operType = "列表查询", operDesc = "列表查询危大清单施工条件验收信息") @ApiOperation(value = "列表查询危大清单施工条件验收信息", notes = "列表查询危大清单施工条件验收信息", httpMethod = "GET") @GetMapping(value = "/list") - public Result> queryList(@ApiIgnore @RequestParam HashMap param) { + public Result> queryList(@Parameter(hidden = true) @RequestParam HashMap param) { return Result.success(bigDangerBuildAcceptanceService.queryList(param)); } @@ -131,7 +131,7 @@ public class BigDangerBuildAcceptanceController { @ApiOperation(value = "删除危大清单施工条件验收信息", notes = "删除危大清单施工条件验收信息", httpMethod = "POST") @ApiImplicitParam(name = "id", value = "危大清单施工条件验收ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") @PostMapping(value = "/delete") - public Result delete(@ApiIgnore @RequestBody HashMap map) { + public Result delete(@Parameter(hidden = true) @RequestBody HashMap map) { bigDangerBuildAcceptanceService.delete(MapUtils.getString(map, "id")); return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerBuildPlaceController.java b/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerBuildPlaceController.java index fd703bde8..20fc5113f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerBuildPlaceController.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerBuildPlaceController.java @@ -17,7 +17,7 @@ import org.simpleframework.xml.core.Validate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; +import io.swagger.v3.oas.annotations.Parameter; import java.util.HashMap; import java.util.List; @@ -51,7 +51,7 @@ public class BigDangerBuildPlaceController { @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), }) @GetMapping(value = "/page") - public Result> queryPageList(@ApiIgnore @RequestParam HashMap param) { + public Result> queryPageList(@Parameter(hidden = true) @RequestParam HashMap param) { return Result.success(bigDangerBuildPlaceService.queryPageList(param)); } @@ -63,7 +63,7 @@ public class BigDangerBuildPlaceController { @OperLog(operModul = "危大清单施工部位管理", operType = "列表查询", operDesc = "列表查询危大清单施工部位信息") @ApiOperation(value = "列表查询危大清单施工部位信息", notes = "列表查询危大清单施工部位信息", httpMethod = "GET") @GetMapping(value = "/list") - public Result> queryList(@ApiIgnore @RequestParam HashMap param) { + public Result> queryList(@Parameter(hidden = true) @RequestParam HashMap param) { return Result.success(bigDangerBuildPlaceService.queryList(param)); } @@ -104,7 +104,7 @@ public class BigDangerBuildPlaceController { @ApiOperation(value = "删除危大清单施工部位信息", notes = "删除危大清单施工部位信息", httpMethod = "POST") @ApiImplicitParam(name = "id", value = "危大清单施工部位ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") @PostMapping(value = "/delete") - public Result delete(@ApiIgnore @RequestBody HashMap map) { + public Result delete(@Parameter(hidden = true) @RequestBody HashMap map) { bigDangerBuildPlaceService.delete(MapUtils.getString(map, "id")); return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerBuildProgressController.java b/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerBuildProgressController.java index d0290e0a0..078623ce3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerBuildProgressController.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerBuildProgressController.java @@ -9,7 +9,7 @@ import io.swagger.annotations.ApiImplicitParams; import java.util.HashMap; -import springfox.documentation.annotations.ApiIgnore; +import io.swagger.v3.oas.annotations.Parameter; import java.util.Arrays; import java.util.List; @@ -17,8 +17,8 @@ import java.util.Map; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; @@ -78,7 +78,7 @@ public class BigDangerBuildProgressController { @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), }) @GetMapping(value = "/page") - public Result> queryPageList(@ApiIgnore @RequestParam HashMap param) { + public Result> queryPageList(@Parameter(hidden = true) @RequestParam HashMap param) { return Result.success(bigDangerBuildProgressService.queryPageList(param)); } @@ -90,7 +90,7 @@ public class BigDangerBuildProgressController { @OperLog(operModul = "危大清单施工进度管理", operType = "列表查询", operDesc = "列表查询危大清单施工进度信息") @ApiOperation(value = "列表查询危大清单施工进度信息", notes = "列表查询危大清单施工进度信息", httpMethod = "GET") @GetMapping(value = "/list") - public Result> queryList(@ApiIgnore @RequestParam HashMap param) { + public Result> queryList(@Parameter(hidden = true) @RequestParam HashMap param) { return Result.success(bigDangerBuildProgressService.queryList(param)); } @@ -131,7 +131,7 @@ public class BigDangerBuildProgressController { @ApiOperation(value = "删除危大清单施工进度信息", notes = "删除危大清单施工进度信息", httpMethod = "POST") @ApiImplicitParam(name = "id", value = "危大清单施工进度ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") @PostMapping(value = "/delete") - public Result delete(@ApiIgnore @RequestBody HashMap map) { + public Result delete(@Parameter(hidden = true) @RequestBody HashMap map) { bigDangerBuildProgressService.delete(MapUtils.getString(map, "id")); return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerBuildSideStationController.java b/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerBuildSideStationController.java index d4091bda5..410e1f4dd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerBuildSideStationController.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerBuildSideStationController.java @@ -17,7 +17,7 @@ import org.simpleframework.xml.core.Validate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; +import io.swagger.v3.oas.annotations.Parameter; import java.util.HashMap; import java.util.List; @@ -51,7 +51,7 @@ public class BigDangerBuildSideStationController { @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), }) @GetMapping(value = "/page") - public Result> queryPageList(@ApiIgnore @RequestParam HashMap param) { + public Result> queryPageList(@Parameter(hidden = true) @RequestParam HashMap param) { return Result.success(bigDangerBuildSideStationService.queryPageList(param)); } @@ -63,7 +63,7 @@ public class BigDangerBuildSideStationController { @OperLog(operModul = "危大清单施工旁站管理", operType = "列表查询", operDesc = "列表查询危大清单施工旁站信息") @ApiOperation(value = "列表查询危大清单施工旁站信息", notes = "列表查询危大清单施工旁站信息", httpMethod = "GET") @GetMapping(value = "/list") - public Result> queryList(@ApiIgnore @RequestParam HashMap param) { + public Result> queryList(@Parameter(hidden = true) @RequestParam HashMap param) { return Result.success(bigDangerBuildSideStationService.queryList(param)); } @@ -104,7 +104,7 @@ public class BigDangerBuildSideStationController { @ApiOperation(value = "删除危大清单施工旁站信息", notes = "删除危大清单施工旁站信息", httpMethod = "POST") @ApiImplicitParam(name = "id", value = "危大清单施工旁站ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") @PostMapping(value = "/delete") - public Result delete(@ApiIgnore @RequestBody HashMap map) { + public Result delete(@Parameter(hidden = true) @RequestBody HashMap map) { bigDangerBuildSideStationService.delete(MapUtils.getString(map, "id")); return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerCatalogController.java b/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerCatalogController.java index 8445ce255..e13a0568c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerCatalogController.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerCatalogController.java @@ -18,7 +18,7 @@ import org.simpleframework.xml.core.Validate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; +import io.swagger.v3.oas.annotations.Parameter; import java.util.HashMap; import java.util.List; @@ -52,7 +52,7 @@ public class BigDangerCatalogController { @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), }) @GetMapping(value = "/page") - public Result> queryPageList(@ApiIgnore @RequestParam HashMap param) { + public Result> queryPageList(@Parameter(hidden = true) @RequestParam HashMap param) { return Result.success(bigDangerCatalogService.queryPageList(param)); } @@ -64,7 +64,7 @@ public class BigDangerCatalogController { @OperLog(operModul = "危大目录管理", operType = "列表查询", operDesc = "列表查询危大目录信息") @ApiOperation(value = "列表查询危大目录信息", notes = "列表查询危大目录信息", httpMethod = "GET") @GetMapping(value = "/list") - public Result> queryList(@ApiIgnore @RequestParam HashMap param) { + public Result> queryList(@Parameter(hidden = true) @RequestParam HashMap param) { return Result.success(bigDangerCatalogService.queryList(param)); } @@ -105,7 +105,7 @@ public class BigDangerCatalogController { @ApiOperation(value = "删除危大目录信息", notes = "删除危大目录信息", httpMethod = "POST") @ApiImplicitParam(name = "id", value = "危大目录ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") @PostMapping(value = "/delete") - public Result delete(@ApiIgnore @RequestBody HashMap map) { + public Result delete(@Parameter(hidden = true) @RequestBody HashMap map) { bigDangerCatalogService.delete(MapUtils.getString(map, "id")); return Result.ok(); } @@ -129,7 +129,7 @@ public class BigDangerCatalogController { @ApiImplicitParam(name = "headquartersSn", value = "总公司sn", paramType = "body", required = true, dataType = "String"), }) @GetMapping(value = "tree/list") - public Result treeList(@ApiIgnore @RequestParam HashMap paramMap) { + public Result treeList(@Parameter(hidden = true) @RequestParam HashMap paramMap) { return Result.success(bigDangerCatalogService.treeList(paramMap)); } } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerCatalogTemplateController.java b/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerCatalogTemplateController.java index 07fab6a63..a4c47611b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerCatalogTemplateController.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerCatalogTemplateController.java @@ -9,7 +9,7 @@ import io.swagger.annotations.ApiImplicitParams; import java.util.HashMap; -import springfox.documentation.annotations.ApiIgnore; +import io.swagger.v3.oas.annotations.Parameter; import java.util.Arrays; import java.util.List; @@ -17,8 +17,8 @@ import java.util.Map; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; @@ -78,7 +78,7 @@ public class BigDangerCatalogTemplateController { @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), }) @GetMapping(value = "/page") - public Result> queryPageList(@ApiIgnore @RequestParam HashMap param) { + public Result> queryPageList(@Parameter(hidden = true) @RequestParam HashMap param) { return Result.success(bigDangerCatalogTemplateService.queryPageList(param)); } @@ -90,7 +90,7 @@ public class BigDangerCatalogTemplateController { @OperLog(operModul = "危大目录库模板管理", operType = "列表查询", operDesc = "列表查询危大目录库模板信息") @ApiOperation(value = "列表查询危大目录库模板信息", notes = "列表查询危大目录库模板信息", httpMethod = "GET") @GetMapping(value = "/list") - public Result> queryList(@ApiIgnore @RequestParam HashMap param) { + public Result> queryList(@Parameter(hidden = true) @RequestParam HashMap param) { return Result.success(bigDangerCatalogTemplateService.queryList(param)); } @@ -131,7 +131,7 @@ public class BigDangerCatalogTemplateController { @ApiOperation(value = "删除危大目录库模板信息", notes = "删除危大目录库模板信息", httpMethod = "POST") @ApiImplicitParam(name = "id", value = "危大目录库模板ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") @PostMapping(value = "/delete") - public Result delete(@ApiIgnore @RequestBody HashMap map) { + public Result delete(@Parameter(hidden = true) @RequestBody HashMap map) { bigDangerCatalogTemplateService.delete(MapUtils.getString(map, "id")); return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerExceptionIssueController.java b/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerExceptionIssueController.java index 3f2607be3..1676e52b7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerExceptionIssueController.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerExceptionIssueController.java @@ -9,7 +9,7 @@ import io.swagger.annotations.ApiImplicitParams; import java.util.HashMap; -import springfox.documentation.annotations.ApiIgnore; +import io.swagger.v3.oas.annotations.Parameter; import java.util.Arrays; import java.util.List; @@ -17,8 +17,8 @@ import java.util.Map; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; @@ -78,7 +78,7 @@ public class BigDangerExceptionIssueController { @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), }) @GetMapping(value = "/page") - public Result> queryPageList(@ApiIgnore @RequestParam HashMap param) { + public Result> queryPageList(@Parameter(hidden = true) @RequestParam HashMap param) { return Result.success(bigDangerExceptionIssueService.queryPageList(param)); } @@ -90,7 +90,7 @@ public class BigDangerExceptionIssueController { @OperLog(operModul = "危大清单异常问题管理", operType = "列表查询", operDesc = "列表查询危大清单异常问题信息") @ApiOperation(value = "列表查询危大清单异常问题信息", notes = "列表查询危大清单异常问题信息", httpMethod = "GET") @GetMapping(value = "/list") - public Result> queryList(@ApiIgnore @RequestParam HashMap param) { + public Result> queryList(@Parameter(hidden = true) @RequestParam HashMap param) { return Result.success(bigDangerExceptionIssueService.queryList(param)); } @@ -131,7 +131,7 @@ public class BigDangerExceptionIssueController { @ApiOperation(value = "删除危大清单异常问题信息", notes = "删除危大清单异常问题信息", httpMethod = "POST") @ApiImplicitParam(name = "id", value = "危大清单异常问题ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") @PostMapping(value = "/delete") - public Result delete(@ApiIgnore @RequestBody HashMap map) { + public Result delete(@Parameter(hidden = true) @RequestBody HashMap map) { bigDangerExceptionIssueService.delete(MapUtils.getString(map, "id")); return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerInspectTableLibraryController.java b/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerInspectTableLibraryController.java index 7e4bf23af..375356996 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerInspectTableLibraryController.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerInspectTableLibraryController.java @@ -30,8 +30,8 @@ import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerPlanController.java b/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerPlanController.java index cf43d0f04..91aaae13b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerPlanController.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerPlanController.java @@ -27,7 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; +import io.swagger.v3.oas.annotations.Parameter; import java.util.HashMap; import java.util.List; @@ -72,7 +72,7 @@ public class BigDangerPlanController { @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), }) @GetMapping(value = "/page") - public Result> queryPageList(@ApiIgnore @RequestParam HashMap param) { + public Result> queryPageList(@Parameter(hidden = true) @RequestParam HashMap param) { return Result.success(bigDangerPlanService.queryPageList(param)); } @@ -84,7 +84,7 @@ public class BigDangerPlanController { @OperLog(operModul = "危大清单计划管理", operType = "列表查询", operDesc = "列表查询危大清单计划信息") @ApiOperation(value = "列表查询危大清单计划信息", notes = "列表查询危大清单计划信息", httpMethod = "GET") @GetMapping(value = "/list") - public Result> queryList(@ApiIgnore @RequestParam HashMap param) { + public Result> queryList(@Parameter(hidden = true) @RequestParam HashMap param) { return Result.success(bigDangerPlanService.queryList(param)); } @@ -125,7 +125,7 @@ public class BigDangerPlanController { @ApiOperation(value = "删除危大清单计划信息", notes = "删除危大清单计划信息", httpMethod = "POST") @ApiImplicitParam(name = "id", value = "危大清单计划ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") @PostMapping(value = "/delete") - public Result delete(@ApiIgnore @RequestBody HashMap map) { + public Result delete(@Parameter(hidden = true) @RequestBody HashMap map) { bigDangerPlanService.delete(MapUtils.getString(map, "id")); return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerRecognizeController.java b/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerRecognizeController.java index 1ac8c53e3..cf4a41ce4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerRecognizeController.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerRecognizeController.java @@ -27,7 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; +import io.swagger.v3.oas.annotations.Parameter; import java.util.*; import java.util.function.Function; @@ -60,7 +60,7 @@ public class BigDangerRecognizeController { // @OperLog(operModul = "危大清单辨识记录管理", operType = "列表查询", operDesc = "列表查询危大清单辨识记录信息") // @ApiOperation(value = "列表查询危大清单辨识记录信息", notes = "列表查询危大清单辨识记录信息", httpMethod="GET") // @GetMapping(value = "/list") -// public Result> queryList(@ApiIgnore @RequestParam HashMap param) { +// public Result> queryList(@Parameter(hidden = true) @RequestParam HashMap param) { // return Result.success(bigDangerRecognizeService.queryList(param)); // } @Lazy @@ -85,7 +85,7 @@ public class BigDangerRecognizeController { @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), }) @GetMapping(value = "/page") - public Result> queryPageList(@ApiIgnore @RequestParam HashMap param) { + public Result> queryPageList(@Parameter(hidden = true) @RequestParam HashMap param) { return Result.success(bigDangerRecognizeService.queryPageList(param)); } @@ -126,7 +126,7 @@ public class BigDangerRecognizeController { @ApiOperation(value = "删除危大清单辨识记录信息", notes = "删除危大清单辨识记录信息", httpMethod = "POST") @ApiImplicitParam(name = "id", value = "危大清单辨识记录ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") @PostMapping(value = "/delete") - public Result delete(@ApiIgnore @RequestBody HashMap map) { + public Result delete(@Parameter(hidden = true) @RequestBody HashMap map) { bigDangerRecognizeService.delete(MapUtils.getString(map, "id")); return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerRecognizeDetailController.java b/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerRecognizeDetailController.java index 265934150..dccea538b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerRecognizeDetailController.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerRecognizeDetailController.java @@ -24,7 +24,7 @@ import org.simpleframework.xml.core.Validate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; +import io.swagger.v3.oas.annotations.Parameter; import java.util.Date; import java.util.HashMap; @@ -58,7 +58,7 @@ public class BigDangerRecognizeDetailController { // @OperLog(operModul = "危大清单辨识详情管理", operType = "列表查询", operDesc = "列表查询危大清单辨识详情信息") // @ApiOperation(value = "列表查询危大清单辨识详情信息", notes = "列表查询危大清单辨识详情信息", httpMethod="GET") // @GetMapping(value = "/list") -// public Result> queryList(@ApiIgnore @RequestParam HashMap param) { +// public Result> queryList(@Parameter(hidden = true) @RequestParam HashMap param) { // return Result.success(bigDangerRecognizeDetailService.queryList(param)); // } @@ -77,7 +77,7 @@ public class BigDangerRecognizeDetailController { @ApiImplicitParam(name = "recognizeId", value = "危大清单辨识记录ID(第一次新增不用传,编辑回显需要传)", paramType = "query", required = false, dataType = "Integer"), }) @GetMapping(value = "/page") - public Result> queryPageList(@ApiIgnore @RequestParam HashMap param) { + public Result> queryPageList(@Parameter(hidden = true) @RequestParam HashMap param) { return Result.success(bigDangerRecognizeDetailService.queryPageList(param)); } @@ -118,7 +118,7 @@ public class BigDangerRecognizeDetailController { @ApiOperation(value = "删除危大清单辨识详情信息", notes = "删除危大清单辨识详情信息", httpMethod = "POST") @ApiImplicitParam(name = "id", value = "危大清单辨识详情ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") @PostMapping(value = "/delete") - public Result delete(@ApiIgnore @RequestBody HashMap map) { + public Result delete(@Parameter(hidden = true) @RequestBody HashMap map) { bigDangerRecognizeDetailService.delete(MapUtils.getString(map, "id")); return Result.ok(); } @@ -173,7 +173,7 @@ public class BigDangerRecognizeDetailController { @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "body", required = true, dataType = "Integer"), }) @PostMapping(value = "/getNewestListByDescribe") - public Result> getNewestListByDescribe(@ApiIgnore @RequestBody Map param) { + public Result> getNewestListByDescribe(@Parameter(hidden = true) @RequestBody Map param) { return Result.success(bigDangerRecognizeDetailService.getNewestListByDescribe(param)); } } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerRecordController.java b/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerRecordController.java index 2c268c9c1..5923fc682 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerRecordController.java @@ -29,7 +29,7 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import springfox.documentation.annotations.ApiIgnore; +import io.swagger.v3.oas.annotations.Parameter; import java.util.List; import java.util.Map; @@ -135,7 +135,7 @@ public class BigDangerRecordController { @ApiImplicitParam(name = "id", value = "危大清单ID", paramType = "body", required = true, dataType = "String"), }) @PostMapping(value = "/endEngineer") - public Result endEngineer(@ApiIgnore @RequestBody Map paramMap) { + public Result endEngineer(@Parameter(hidden = true) @RequestBody Map paramMap) { bigDangerRecordService.endEngineer(paramMap); return Result.ok(); } @@ -147,7 +147,7 @@ public class BigDangerRecordController { @ApiImplicitParam(name = "catalogName", value = "目录名称", paramType = "body", required = false, dataType = "String"), }) @PostMapping(value = "/getCatalogListByRecordId") - public Result> getCatalogListByRecordId(@ApiIgnore @RequestBody Map param) { + public Result> getCatalogListByRecordId(@Parameter(hidden = true) @RequestBody Map param) { return Result.success(bigDangerRecordService.getCatalogListByRecordId(param)); } @@ -156,7 +156,7 @@ public class BigDangerRecordController { @ApiImplicitParam(name = "id", value = "危大清单ID", paramType = "body", required = true, dataType = "String"), }) @PostMapping(value = "/getControlItemListByRecordId") - public Result> getControlItemListByRecordId(@ApiIgnore @RequestBody Map param) { + public Result> getControlItemListByRecordId(@Parameter(hidden = true) @RequestBody Map param) { return Result.success(bigDangerRecordService.getControlItemListByRecordId(param)); } @@ -165,7 +165,7 @@ public class BigDangerRecordController { @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), }) @PostMapping(value = "/countRecord") - public Result countRecord(@ApiIgnore @RequestBody Map param) { + public Result countRecord(@Parameter(hidden = true) @RequestBody Map param) { return Result.success(bigDangerRecordService.countRecord(param)); } @@ -175,7 +175,7 @@ public class BigDangerRecordController { @ApiImplicitParam(name = "id", value = "危大清单ID", paramType = "body", required = true, dataType = "String"), }) @PostMapping(value = "/countSecurityByRecordId") - public Result countSecurityByRecordId(@ApiIgnore @RequestBody Map param) { + public Result countSecurityByRecordId(@Parameter(hidden = true) @RequestBody Map param) { return Result.success(bigDangerRecordService.countSecurityByRecordId(param)); } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerRecordFileController.java b/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerRecordFileController.java index 64a21ef51..989014ad8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerRecordFileController.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerRecordFileController.java @@ -17,7 +17,7 @@ import org.simpleframework.xml.core.Validate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; +import io.swagger.v3.oas.annotations.Parameter; import java.util.HashMap; import java.util.List; @@ -53,7 +53,7 @@ public class BigDangerRecordFileController { @ApiImplicitParam(name = "catalogId", value = "危大目录id(未分类资料的传-1)", paramType = "query", required = true, dataType = "Integer"), }) @GetMapping(value = "/page") - public Result> queryPageList(@ApiIgnore @RequestParam HashMap param) { + public Result> queryPageList(@Parameter(hidden = true) @RequestParam HashMap param) { return Result.success(bigDangerRecordFileService.queryPageList(param)); } @@ -65,7 +65,7 @@ public class BigDangerRecordFileController { @OperLog(operModul = "危大清单文件管理", operType = "列表查询", operDesc = "列表查询危大清单文件信息") @ApiOperation(value = "列表查询危大清单文件信息", notes = "列表查询危大清单文件信息", httpMethod = "GET") @GetMapping(value = "/list") - public Result> queryList(@ApiIgnore @RequestParam HashMap param) { + public Result> queryList(@Parameter(hidden = true) @RequestParam HashMap param) { return Result.success(bigDangerRecordFileService.queryList(param)); } @@ -106,7 +106,7 @@ public class BigDangerRecordFileController { @ApiOperation(value = "删除危大清单文件信息", notes = "删除危大清单文件信息", httpMethod = "POST") @ApiImplicitParam(name = "id", value = "危大清单文件ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") @PostMapping(value = "/delete") - public Result delete(@ApiIgnore @RequestBody HashMap map) { + public Result delete(@Parameter(hidden = true) @RequestBody HashMap map) { bigDangerRecordFileService.delete(MapUtils.getString(map, "id")); return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerTypeCatalogController.java b/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerTypeCatalogController.java index ef4892f82..cf396d94a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerTypeCatalogController.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerTypeCatalogController.java @@ -22,7 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; +import io.swagger.v3.oas.annotations.Parameter; import java.util.HashMap; import java.util.List; @@ -58,7 +58,7 @@ public class BigDangerTypeCatalogController { @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), }) @GetMapping(value = "/page") - public Result> queryPageList(@ApiIgnore @RequestParam HashMap param) { + public Result> queryPageList(@Parameter(hidden = true) @RequestParam HashMap param) { return Result.success(bigDangerTypeCatalogService.queryPageList(param)); } @@ -70,7 +70,7 @@ public class BigDangerTypeCatalogController { @OperLog(operModul = "危大工程类别绑定目录管理", operType = "列表查询", operDesc = "列表查询危大工程类别绑定目录信息") @ApiOperation(value = "列表查询危大工程类别绑定目录信息", notes = "列表查询危大工程类别绑定目录信息", httpMethod = "GET") @GetMapping(value = "/list") - public Result> queryList(@ApiIgnore @RequestParam HashMap param) { + public Result> queryList(@Parameter(hidden = true) @RequestParam HashMap param) { return Result.success(bigDangerTypeCatalogService.queryList(param)); } @@ -110,7 +110,7 @@ public class BigDangerTypeCatalogController { @ApiOperation(value = "删除危大工程类别绑定目录信息", notes = "删除危大工程类别绑定目录信息", httpMethod = "POST") @ApiImplicitParam(name = "id", value = "危大工程类别绑定目录ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") @PostMapping(value = "/delete") - public Result delete(@ApiIgnore @RequestBody HashMap map) { + public Result delete(@Parameter(hidden = true) @RequestBody HashMap map) { bigDangerTypeCatalogService.delete(MapUtils.getString(map, "id")); return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerTypeController.java b/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerTypeController.java index 3078b2ffc..cd2d7293f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerTypeController.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerTypeController.java @@ -27,7 +27,7 @@ import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; +import io.swagger.v3.oas.annotations.Parameter; import java.util.*; import java.util.stream.Collectors; @@ -157,7 +157,7 @@ public class BigDangerTypeController { @ApiImplicitParam(name = "name", value = "名称", paramType = "body", required = false, dataType = "String"), }) @GetMapping(value = "/getTopProjectClassifyTypeRecordTree") - public Result> getTopProjectClassifyTypeRecordTree(@ApiIgnore @RequestParam HashMap param) { + public Result> getTopProjectClassifyTypeRecordTree(@Parameter(hidden = true) @RequestParam HashMap param) { String projectSn = MapUtils.getString(param, "projectSn"); String sn = MapUtils.getString(param, "sn"); String projectClassify = MapUtils.getString(param, "projectClassify"); diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdanger/service/impl/BigDangerInspectTableLibraryServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/bigdanger/service/impl/BigDangerInspectTableLibraryServiceImpl.java index 5fda1c04e..260ac6f23 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdanger/service/impl/BigDangerInspectTableLibraryServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdanger/service/impl/BigDangerInspectTableLibraryServiceImpl.java @@ -66,7 +66,7 @@ public class BigDangerInspectTableLibraryServiceImpl extends ServiceImpl 0) { throw new OpenAlertException(MessageUtil.get("nameExistErr")); } @@ -92,7 +92,7 @@ public class BigDangerInspectTableLibraryServiceImpl extends ServiceImpl 0) { throw new OpenAlertException(MessageUtil.get("nameExistErr")); }