diff --git a/shgx-admin/src/main/java/com/shgx/web/controller/dryingroom/DryEquipmentInfoController.java b/shgx-admin/src/main/java/com/shgx/web/controller/dryingroom/DryEquipmentInfoController.java index 4db7b72..072f2af 100644 --- a/shgx-admin/src/main/java/com/shgx/web/controller/dryingroom/DryEquipmentInfoController.java +++ b/shgx-admin/src/main/java/com/shgx/web/controller/dryingroom/DryEquipmentInfoController.java @@ -106,7 +106,7 @@ public class DryEquipmentInfoController extends BaseController /** * 关闭报警 */ - @GetMapping("/closeAlarm") + @GetMapping("/closeAlarm/{id}") public AjaxResult closeAlarm(@PathVariable("id") Long id) { return toAjax(dryEquipmentInfoService.closeAlarm(id)); diff --git a/shgx-dryingroom/src/main/java/com/shgx/dryingroom/collect/AutoCollectService.java b/shgx-dryingroom/src/main/java/com/shgx/dryingroom/collect/AutoCollectService.java index f18b261..6ec2f1d 100644 --- a/shgx-dryingroom/src/main/java/com/shgx/dryingroom/collect/AutoCollectService.java +++ b/shgx-dryingroom/src/main/java/com/shgx/dryingroom/collect/AutoCollectService.java @@ -62,7 +62,7 @@ public class AutoCollectService { /** * 定时任务:每10秒执行一次数据采集 */ - @Scheduled(cron = "0/10 * * * * ?") + @Scheduled(cron = "0/30 * * * * ?") @Transactional(rollbackFor = Exception.class) public void autoCollectData() { log.info("===== 开始执行自动采集任务 ====="); @@ -82,8 +82,8 @@ public class AutoCollectService { boolean isAlarmRound = collectCount % 2 == 0; List alarmEquipCodes = new ArrayList<>(); if (isAlarmRound) { - alarmEquipCodes = selectRandomEquipments(2); - log.info("本次为报警轮次,随机选中2台报警设备:{}", alarmEquipCodes); + alarmEquipCodes = selectRandomEquipments(1); + log.info("本次为报警轮次,随机选中1台报警设备:{}", alarmEquipCodes); } else { log.info("本次为正常轮次(第{}次采集),无报警设备", collectCount); }