From 2cd86c4d6af83899bae3c0dac9686556c5fd35d8 Mon Sep 17 00:00:00 2001 From: lyf66 Date: Thu, 21 Aug 2025 16:46:08 +0800 Subject: [PATCH] =?UTF-8?q?fix(auto-call):=20=E4=BF=AE=E5=A4=8D=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=91=BC=E5=8F=AB=E4=BB=BB=E5=8A=A1=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 AutoCallTaskScheduled 类中添加任务状态检查，避免继续执行已取消的任务- 优化 QXWarnController 中的代码格式，移除不必要的注释 --- src/main/java/com/whdc/component/AutoCallTaskScheduled.java | 5 +++++ src/main/java/com/whdc/controller/QXWarnController.java | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/whdc/component/AutoCallTaskScheduled.java b/src/main/java/com/whdc/component/AutoCallTaskScheduled.java index 4462df1..c52435b 100644 --- a/src/main/java/com/whdc/component/AutoCallTaskScheduled.java +++ b/src/main/java/com/whdc/component/AutoCallTaskScheduled.java @@ -130,6 +130,11 @@ public class AutoCallTaskScheduled { return; } for (AutoCallPerson person : personList) { + AutoCallTask task = autoCallTaskService.getTaskMapper().selectById(taskId); + if (task.getStatus() == AutoCallTask.STATUS_MANUAL_CLOSE || task.getStatus() == AutoCallTask.STATUS_CANCELLED) { + autoCallTaskService.cancelPerson(person); + continue; + } while (person.getUploadedTimes() < 2) { if (AutoCallPerson.TAG_DONE.equals(person.getTag())) break; //do upload diff --git a/src/main/java/com/whdc/controller/QXWarnController.java b/src/main/java/com/whdc/controller/QXWarnController.java index 063fe58..08b871d 100644 --- a/src/main/java/com/whdc/controller/QXWarnController.java +++ b/src/main/java/com/whdc/controller/QXWarnController.java @@ -149,7 +149,7 @@ public class QXWarnController { /** * 气象预警-正在生效的预警信息 * - * @param dto + * @param * @return */ @ApiOperation(value = "气象预警-正在生效的预警信息") @@ -435,7 +435,7 @@ public class QXWarnController { yearDto.setFilter(filter); String yearstr = HttpUtil.sendPost(getGroupWarning, JSON.toJSONString(yearDto)); JSONObject yearjson = JSON.parseObject(yearstr); - System.out.println("yearstr:" + yearjson); +// System.out.println("yearstr:" + yearjson); if (yearjson != null && yearjson.getInteger("code") == HttpStatus.SC_OK) { List data = yearjson.getJSONArray("data").toJavaList(WarningData.class); //// return ResultJson.ok(getCount(data, publishUnit, warnSignalLevel, warnSignalType));