refactor(utils): 注释掉日志输出语句

- 在 HttpUtil 类中，注释掉了四处 log.info("响应参数: " + jstr) 语句 - 这些日志输出语句可能会影响性能或不必要的日志记录
fix(auto-call): 修复自动呼叫任务取消问题
2025-08-21 17:10:19 +08:00 · 2025-08-21 16:46:08 +08:00 · 2025-08-21 09:28:19 +08:00 · 2025-08-15 14:41:31 +08:00 · 2025-08-15 14:41:18 +08:00
4 changed files with 58 additions and 48 deletions
--- a/src/main/java/com/whdc/component/AutoCallTaskScheduled.java
+++ b/src/main/java/com/whdc/component/AutoCallTaskScheduled.java
@ -45,12 +45,17 @@ public class AutoCallTaskScheduled {

    @EventListener(ApplicationReadyEvent.class)
    public void initialize() throws Exception {
-        autoCallHelper.getToken();
-        log.info("token1 {}", autoCallHelper.getToken());
-        autoCallHelper.getToken();
-        log.info("token2 {}", autoCallHelper.getToken());
-        initialized.set(true);
-        log.info("AutoCallTaskScheduled初始化完成");
+        try {
+            autoCallHelper.getToken();
+            log.info("token1 {}", autoCallHelper.getToken());
+            autoCallHelper.getToken();
+            log.info("token2 {}", autoCallHelper.getToken());
+            log.info("AutoCallTaskScheduled初始化完成");
+        } catch (Exception ignore) {
+
+        } finally {
+            initialized.set(true);
+        }
    }

    @Scheduled(cron = "*/3 * * * * ?")
@ -125,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
--- 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<WarningData> data = yearjson.getJSONArray("data").toJavaList(WarningData.class);
 ////            return ResultJson.ok(getCount(data, publishUnit, warnSignalLevel, warnSignalType));
--- a/src/main/java/com/whdc/service/autocall/AutoCallTaskService2.java
+++ b/src/main/java/com/whdc/service/autocall/AutoCallTaskService2.java
@ -73,7 +73,7 @@ public class AutoCallTaskService2 {
        task.setWarnCnnm("钟祥 ");
        taskMapper.insert(task);
        generatePerson(task);
-//
+
 //        warn = qxWarningMapper.selectOne(
 //                new QueryWrapper<QXWarning>()
 //                        .orderByDesc("WARNID")
@ -89,21 +89,21 @@ public class AutoCallTaskService2 {
 //        taskMapper.insert(task);
 //        generatePerson(task);
 //
-        warn = qxWarningMapper.selectOne(
-                new QueryWrapper<QXWarning>()
-                        .orderByDesc("WARNID")
-                        .last("limit 1")
-        );
-        warn.setCtnm("荆州市");
-        warn.setCnnm("枣阳 ");
-        taskList = newTask(warn);
-        task = taskList.get(0);
-        task.setStatus(0);
-        task.setCreateTm(new Date());
-        task.setWarnCnnm("枣阳 ");
-        taskMapper.insert(task);
-        generatePerson(task);
-
+//        warn = qxWarningMapper.selectOne(
+//                new QueryWrapper<QXWarning>()
+//                        .orderByDesc("WARNID")
+//                        .last("limit 1")
+//        );
+//        warn.setCtnm("荆州市");
+//        warn.setCnnm("枣阳 ");
+//        taskList = newTask(warn);
+//        task = taskList.get(0);
+//        task.setStatus(0);
+//        task.setCreateTm(new Date());
+//        task.setWarnCnnm("枣阳 ");
+//        taskMapper.insert(task);
+//        generatePerson(task);
+//
 //        warn = qxWarningMapper.selectOne(
 //                new QueryWrapper<QXWarning>()
 //                        .orderByDesc("WARNID")
@ -124,7 +124,7 @@ public class AutoCallTaskService2 {
 //                        .orderByDesc("WARNID")
 //                        .last("limit 1")
 //        );
-
+//
 //        warn.setCtnm("荆州市");
 //        warn.setCnnm("英山 ");
 //        taskList = newTask(warn);
@ -150,20 +150,20 @@ public class AutoCallTaskService2 {
 //        taskMapper.insert(task);
 //        generatePerson(task);

-//        warn = qxWarningMapper.selectOne(
-//                new QueryWrapper<QXWarning>()
-//                        .orderByDesc("WARNID")
-//                        .last("limit 1")
-//        );
-//        warn.setCtnm("荆州市");
-//        warn.setCnnm("阳新 ");
-//        taskList = newTask(warn);
-//        task = taskList.get(0);
-//        task.setStatus(0);
-//        task.setCreateTm(new Date());
-//        task.setWarnCnnm("阳新 ");
-//        taskMapper.insert(task);
-//        generatePerson(task);
+        warn = qxWarningMapper.selectOne(
+                new QueryWrapper<QXWarning>()
+                        .orderByDesc("WARNID")
+                        .last("limit 1")
+        );
+        warn.setCtnm("荆州市");
+        warn.setCnnm("阳新 ");
+        taskList = newTask(warn);
+        task = taskList.get(0);
+        task.setStatus(0);
+        task.setCreateTm(new Date());
+        task.setWarnCnnm("阳新 ");
+        taskMapper.insert(task);
+        generatePerson(task);

 //        warn = qxWarningMapper.selectOne(
 //                new QueryWrapper<QXWarning>()
@ -194,7 +194,7 @@ public class AutoCallTaskService2 {
 //        task.setWarnCnnm("宜城 ");
 //        taskMapper.insert(task);
 //        generatePerson(task);
-//
+
 //        warn = qxWarningMapper.selectOne(
 //                new QueryWrapper<QXWarning>()
 //                        .orderByDesc("WARNID")
@ -209,7 +209,7 @@ public class AutoCallTaskService2 {
 //        task.setWarnCnnm("孝南 ");
 //        taskMapper.insert(task);
 //        generatePerson(task);
-//
+
 //        warn = qxWarningMapper.selectOne(
 //                new QueryWrapper<QXWarning>()
 //                        .orderByDesc("WARNID")
@ -224,7 +224,7 @@ public class AutoCallTaskService2 {
 //        task.setWarnCnnm("孝感 ");
 //        taskMapper.insert(task);
 //        generatePerson(task);
-//
+
 //        warn = qxWarningMapper.selectOne(
 //                new QueryWrapper<QXWarning>()
 //                        .orderByDesc("WARNID")
@ -239,7 +239,7 @@ public class AutoCallTaskService2 {
 //        task.setWarnCnnm("襄州 ");
 //        taskMapper.insert(task);
 //        generatePerson(task);
-//
+
 //        warn = qxWarningMapper.selectOne(
 //                new QueryWrapper<QXWarning>()
 //                        .orderByDesc("WARNID")
@ -285,7 +285,7 @@ public class AutoCallTaskService2 {
 //        task.setWarnCnnm("秭归 ");
 //        taskMapper.insert(task);
 //        generatePerson(task);
-
+//
 //        warn = qxWarningMapper.selectOne(
 //                new QueryWrapper<QXWarning>()
 //                        .orderByDesc("WARNID")
--- a/src/main/java/com/whdc/utils/HttpUtil.java
+++ b/src/main/java/com/whdc/utils/HttpUtil.java
@ -90,7 +90,7 @@ public class HttpUtil {
                    }
                    jstr = sb.toString();

-                    log.info("响应参数: " + jstr);
+//                    log.info("响应参数: " + jstr);

                    jstr = jsonFormat(jstr);

@ -169,7 +169,7 @@ public class HttpUtil {
                    }
                    jstr = sb.toString();

-                    log.info("响应参数: " + jstr);
+//                    log.info("响应参数: " + jstr);

                    jstr = jsonFormat(jstr);

@ -243,7 +243,7 @@ public class HttpUtil {
                    }
                    jstr = sb.toString();

-                    log.info("响应参数: " + jstr);
+//                    log.info("响应参数: " + jstr);

                    jstr = jsonFormat(jstr);

@ -317,7 +317,7 @@ public class HttpUtil {
                    }
                    jstr = sb.toString();

-                    log.info("响应参数: " + jstr);
+//                    log.info("响应参数: " + jstr);

                    jstr = jsonFormat(jstr);
Author	SHA1	Message	Date
李一帆	4780f01f7d	refactor(utils): 注释掉日志输出语句 - 在 HttpUtil 类中，注释掉了四处 log.info("响应参数: " + jstr) 语句 - 这些日志输出语句可能会影响性能或不必要的日志记录	2025-08-21 17:10:19 +08:00
李一帆	2cd86c4d6a	fix(auto-call): 修复自动呼叫任务取消问题 - 在 AutoCallTaskScheduled 类中添加任务状态检查，避免继续执行已取消的任务- 优化 QXWarnController 中的代码格式，移除不必要的注释	2025-08-21 16:46:08 +08:00
李一帆	adf1a57079	修改测试数据	2025-08-21 09:28:19 +08:00
李一帆	b9b3120e20	调增测试对象	2025-08-15 14:41:31 +08:00
李一帆	e310f16e58	start(AutoCallTaskScheduled):优化初始化流程 - 在 initialize 方法中添加了 try-catch块，捕获并忽略可能发生的异常 - 将 initialized.set(true) 放入 finally 块中，确保在初始化完成后设置状态	2025-08-15 14:41:18 +08:00