diff --git a/src/main/java/com/zhgd/xmgl/modules/bridgeCrane/controller/BridgeCraneAlarmController.java b/src/main/java/com/zhgd/xmgl/modules/bridgeCrane/controller/BridgeCraneAlarmController.java index 12d9ae910..a105c6df2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bridgeCrane/controller/BridgeCraneAlarmController.java +++ b/src/main/java/com/zhgd/xmgl/modules/bridgeCrane/controller/BridgeCraneAlarmController.java @@ -21,7 +21,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; @@ -55,7 +55,7 @@ public class BridgeCraneAlarmController { @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(bridgeCraneAlarmService.queryPageList(param)); } // @@ -67,7 +67,7 @@ public class BridgeCraneAlarmController { // @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(bridgeCraneAlarmService.queryList(param)); // } @@ -108,7 +108,7 @@ public class BridgeCraneAlarmController { @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) { bridgeCraneAlarmService.delete(MapUtils.getString(map, "id")); return Result.ok(); } @@ -133,7 +133,7 @@ public class BridgeCraneAlarmController { @ApiImplicitParam(name = "devId", value = "设备编号id", dataType = "String", paramType = "body", required = false), }) @PostMapping(value = "/getNewestBridgeCraneAlarms") - public Result> getNewestBridgeCraneAlarms(@ApiIgnore @RequestBody HashMap paramMap) { + public Result> getNewestBridgeCraneAlarms(@Parameter(hidden = true) @RequestBody HashMap paramMap) { return Result.success(bridgeCraneAlarmService.getNewestBridgeCraneAlarms(paramMap)); } @@ -143,7 +143,7 @@ public class BridgeCraneAlarmController { @ApiImplicitParam(name = "devId", value = "设备编号id", dataType = "String", paramType = "body", required = false), }) @PostMapping(value = "/countAlarmToday") - public Result countAlarmToday(@ApiIgnore @RequestBody HashMap paramMap) { + public Result countAlarmToday(@Parameter(hidden = true) @RequestBody HashMap paramMap) { return Result.success(bridgeCraneAlarmService.countAlarmToday(paramMap)); } @@ -155,7 +155,7 @@ public class BridgeCraneAlarmController { @ApiImplicitParam(name = "devId", value = "设备编号id", dataType = "String", paramType = "body", required = false), }) @PostMapping(value = "/countAlarmByCode") - public Result> countAlarmByCode(@ApiIgnore @RequestBody HashMap paramMap) { + public Result> countAlarmByCode(@Parameter(hidden = true) @RequestBody HashMap paramMap) { return Result.success(bridgeCraneAlarmService.countAlarmByCode(paramMap)); } diff --git a/src/main/java/com/zhgd/xmgl/modules/bridgeCrane/controller/BridgeCraneDataController.java b/src/main/java/com/zhgd/xmgl/modules/bridgeCrane/controller/BridgeCraneDataController.java index 86a3f2a74..bb3701b48 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bridgeCrane/controller/BridgeCraneDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/bridgeCrane/controller/BridgeCraneDataController.java @@ -33,7 +33,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.concurrent.ThreadLocalRandom; @@ -65,7 +65,7 @@ public class BridgeCraneDataController { // @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(bridgeCraneDataService.queryList(param)); // } @Lazy @@ -89,7 +89,7 @@ public class BridgeCraneDataController { @ApiImplicitParam(name = "bridgeCraneDevId", value = "桥机设备主键id", dataType = "Integer", paramType = "body", required = false), }) @GetMapping(value = "/page") - public Result> queryPageList(@ApiIgnore @RequestParam HashMap param) { + public Result> queryPageList(@Parameter(hidden = true) @RequestParam HashMap param) { return Result.success(bridgeCraneDataService.queryPageList(param)); } @@ -137,7 +137,7 @@ public class BridgeCraneDataController { @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) { bridgeCraneDataService.delete(MapUtils.getString(map, "id")); return Result.ok(); } @@ -209,7 +209,7 @@ public class BridgeCraneDataController { @ApiOperation(value = "批量删除桥机工作循环数据数据", notes = "批量删除桥机工作循环数据数据", httpMethod = "POST") @ApiImplicitParam(name = "ids", value = "桥机工作循环数据数据ID字符串(多个以,分割)", paramType = "body", required = true, dataType = "String") @PostMapping(value = "/deleteBatch") - public Result deleteBatch(@ApiIgnore @RequestBody HashMap paramMap) { + public Result deleteBatch(@Parameter(hidden = true) @RequestBody HashMap paramMap) { String ids = MapUtils.getString(paramMap, "ids"); Result result = new Result<>(); if (ids == null || "".equals(ids.trim())) { @@ -229,7 +229,7 @@ public class BridgeCraneDataController { @ApiImplicitParam(name = "devId", value = "设备编号id", dataType = "String", paramType = "body", required = false), }) @PostMapping(value = "/countWorkTimeByDate") - public Result> countWorkTimeByDate(@ApiIgnore @RequestBody HashMap paramMap) { + public Result> countWorkTimeByDate(@Parameter(hidden = true) @RequestBody HashMap paramMap) { return Result.success(bridgeCraneDataService.countWorkTimeByDate(paramMap)); } @@ -239,7 +239,7 @@ public class BridgeCraneDataController { @ApiImplicitParam(name = "devId", value = "设备编号id", dataType = "String", paramType = "body", required = false), }) @PostMapping(value = "/countByToday") - public Result countByToday(@ApiIgnore @RequestBody HashMap paramMap) { + public Result countByToday(@Parameter(hidden = true) @RequestBody HashMap paramMap) { return Result.success(bridgeCraneDataService.countByToday(paramMap)); } @@ -249,7 +249,7 @@ public class BridgeCraneDataController { @ApiImplicitParam(name = "devId", value = "设备编号id", dataType = "String", paramType = "body", required = false), }) @PostMapping(value = "/getNewestData") - public Result getNewestData(@ApiIgnore @RequestBody HashMap param) { + public Result getNewestData(@Parameter(hidden = true) @RequestBody HashMap param) { return Result.success(bridgeCraneDataService.getNewestData(param)); } @@ -261,7 +261,7 @@ public class BridgeCraneDataController { @ApiImplicitParam(name = "devId", value = "设备编号id", dataType = "String", paramType = "body", required = false), }) @PostMapping(value = "/countWorkTimeByWorker") - public Result> countWorkTimeByWorker(@ApiIgnore @RequestBody HashMap paramMap) { + public Result> countWorkTimeByWorker(@Parameter(hidden = true) @RequestBody HashMap paramMap) { return Result.success(bridgeCraneDataService.countWorkTimeByWorker(paramMap)); } } diff --git a/src/main/java/com/zhgd/xmgl/modules/bridgeCrane/controller/BridgeCraneDevController.java b/src/main/java/com/zhgd/xmgl/modules/bridgeCrane/controller/BridgeCraneDevController.java index ab9169ef4..66c28ddda 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bridgeCrane/controller/BridgeCraneDevController.java +++ b/src/main/java/com/zhgd/xmgl/modules/bridgeCrane/controller/BridgeCraneDevController.java @@ -19,7 +19,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 BridgeCraneDevController { @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(bridgeCraneDevService.queryPageList(param)); } @@ -65,7 +65,7 @@ public class BridgeCraneDevController { @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(bridgeCraneDevService.queryList(param)); } @@ -106,7 +106,7 @@ public class BridgeCraneDevController { @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) { bridgeCraneDevService.delete(MapUtils.getString(map, "id")); return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/bridgeCrane/controller/MockBridgeCraneDataConfigController.java b/src/main/java/com/zhgd/xmgl/modules/bridgeCrane/controller/MockBridgeCraneDataConfigController.java index 925330429..93e3a16c9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bridgeCrane/controller/MockBridgeCraneDataConfigController.java +++ b/src/main/java/com/zhgd/xmgl/modules/bridgeCrane/controller/MockBridgeCraneDataConfigController.java @@ -19,7 +19,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 MockBridgeCraneDataConfigController { @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(mockBridgeCraneDataConfigService.queryPageList(param)); } @@ -65,7 +65,7 @@ public class MockBridgeCraneDataConfigController { @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(mockBridgeCraneDataConfigService.queryList(param)); } @@ -106,7 +106,7 @@ public class MockBridgeCraneDataConfigController { @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) { mockBridgeCraneDataConfigService.delete(MapUtils.getString(map, "id")); return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/EnableMessageDevRuleMapper.java b/src/main/java/com/zhgd/xmgl/modules/project/mapper/EnableMessageDevRuleMapper.java index 20e20316b..cc8402e80 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/EnableMessageDevRuleMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/EnableMessageDevRuleMapper.java @@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.annotation.DataScope; import com.zhgd.xmgl.modules.project.entity.EnableMessageDevRule; import com.zhgd.xmgl.modules.project.entity.vo.EnableMessageDevRuleVo; -import liquibase.pro.packaged.D; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/zhgd/xmgl/modules/risk/controller/FourColorDrawController.java b/src/main/java/com/zhgd/xmgl/modules/risk/controller/FourColorDrawController.java index 97a2a51db..717057251 100644 --- a/src/main/java/com/zhgd/xmgl/modules/risk/controller/FourColorDrawController.java +++ b/src/main/java/com/zhgd/xmgl/modules/risk/controller/FourColorDrawController.java @@ -25,7 +25,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.ArrayList; import java.util.HashMap; @@ -63,7 +63,7 @@ public class FourColorDrawController { // @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(fourColorDrawService.queryPageList(param)); // } @Lazy @@ -78,7 +78,7 @@ public class FourColorDrawController { @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(fourColorDrawService.queryList(param)); } @@ -119,7 +119,7 @@ public class FourColorDrawController { @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) { fourColorDrawService.delete(MapUtils.getString(map, "id")); return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/risk/controller/FourColorDrawPaperController.java b/src/main/java/com/zhgd/xmgl/modules/risk/controller/FourColorDrawPaperController.java index 3d1e253ea..75ee51030 100644 --- a/src/main/java/com/zhgd/xmgl/modules/risk/controller/FourColorDrawPaperController.java +++ b/src/main/java/com/zhgd/xmgl/modules/risk/controller/FourColorDrawPaperController.java @@ -24,7 +24,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; @@ -62,7 +62,7 @@ public class FourColorDrawPaperController { @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(fourColorDrawPaperService.queryPageList(param)); } @@ -74,7 +74,7 @@ public class FourColorDrawPaperController { @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(fourColorDrawPaperService.queryList(param)); } @@ -115,7 +115,7 @@ public class FourColorDrawPaperController { @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) { fourColorDrawPaperService.delete(MapUtils.getString(map, "id")); return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityQualityInspectionRecordController.java b/src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityQualityInspectionRecordController.java index 1cc5e9cd0..a67fd6d43 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityQualityInspectionRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityQualityInspectionRecordController.java @@ -807,7 +807,7 @@ public class XzSecurityQualityInspectionRecordController { @ApiOperation(value = "批量删除安全检查记录", notes = "批量删除安全检查记录", httpMethod = "POST") @ApiImplicitParam(name = "ids", value = "安全检查记录ids(多个,分隔)", paramType = "body", required = true, dataType = "String") @PostMapping(value = "/deleteBatch") - public Result deleteBatch(@ApiIgnore @RequestBody Map map) { + public Result deleteBatch(@Parameter(hidden = true) @RequestBody Map map) { Result result = new Result<>(); String ids = MapUtils.getString(map, "ids"); if (ids == null || "".equals(ids.trim())) { diff --git a/src/main/java/com/zhgd/xmgl/task/BridgeCraneTask.java b/src/main/java/com/zhgd/xmgl/task/BridgeCraneTask.java index 6967a4938..15e48dc5c 100644 --- a/src/main/java/com/zhgd/xmgl/task/BridgeCraneTask.java +++ b/src/main/java/com/zhgd/xmgl/task/BridgeCraneTask.java @@ -15,7 +15,7 @@ import com.zhgd.xmgl.modules.bridgeCrane.service.IBridgeCraneDataService; import com.zhgd.xmgl.modules.bridgeCrane.service.IBridgeCraneDevService; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import net.javacrumbs.shedlock.core.SchedulerLock; +import net.javacrumbs.shedlock.spring.annotation.SchedulerLock; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; @@ -52,7 +52,7 @@ public class BridgeCraneTask { * 获取睿郅盾的桥机实时数据 */ @Scheduled(cron = "0 */5 * * * ?") - @SchedulerLock(name = "getBridgeCraneDataTask", lockAtMostFor = 1000 * 60, lockAtLeastFor = 1000 * 60) + @SchedulerLock(name = "getBridgeCraneDataTask", lockAtMostFor = "PT60S", lockAtLeastFor = "PT60S") @RequestMapping("getBridgeCraneDataTask") public void getBridgeCraneDataTask() { if (StrUtil.isBlank(rzdqjToken)) {