From 333cf44d5ce19d08d8ffc3e3fd6c2938d7cde7f9 Mon Sep 17 00:00:00 2001 From: WangGuangYuan Date: Wed, 14 Oct 2026 16:58:19 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=95=B0=E6=8D=AE=E5=88=A0=E9=99=A4=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=B9=B6=E5=90=8C=E6=AD=A5=E9=80=9A=E7=9F=A5=E4=B8=AD?= =?UTF-8?q?=E6=81=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 支持 enabled 开关控制是否推送中恒,inspect.taskStatus-delete-push.enabled:false --- .../api/service/TaskStatusDeletePushService.java | 15 +++++++++++++++ .../controller/PatrolTaskStatusController.java | 14 +++++++++----- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/inspect-main/inspect-main-api/src/main/java/com/inspect/api/service/TaskStatusDeletePushService.java b/inspect-main/inspect-main-api/src/main/java/com/inspect/api/service/TaskStatusDeletePushService.java index d755fcb..ccfe0d3 100644 --- a/inspect-main/inspect-main-api/src/main/java/com/inspect/api/service/TaskStatusDeletePushService.java +++ b/inspect-main/inspect-main-api/src/main/java/com/inspect/api/service/TaskStatusDeletePushService.java @@ -41,6 +41,10 @@ public class TaskStatusDeletePushService { /** token 请求头名称（外部平台固定） */ private static final String TOKEN_HEADER = "joinbright-token"; + /** 是否推送中恒：false 时删除照常执行，只是不发送 MQTT 消息 */ + @Value("${inspect.taskStatus-delete-push.enabled:false}") + private boolean enabled; + /** MQTT 消息发送接口地址 */ @Value("${inspect.taskStatus-delete-push.send-topic-url:http://192.168.129.2:32799/jb-gateway/jb-nessp-external/api/mqtt/sendTopic}") private String sendTopicUrl; @@ -59,12 +63,23 @@ public class TaskStatusDeletePushService { this.extAuthService = extAuthService; } + /** + * 是否启用推送中恒（供调用方判断是否需要取场站编码等推送参数） + */ + public boolean isEnabled() { + return enabled; + } + /** * 推送删除消息，ids 取 patrol_task_status.task_patrolled_id * * @return 是否推送成功 */ public boolean pushTaskDelete(String stationCode, List taskPatrolledIds) { + if (!enabled) { + log.info("[TASK_STATUS_DELETE] 删除数据推送中恒未启用(inspect.taskStatus-delete-push.enabled=false), 跳过推送"); + return false; + } if (StringUtils.isEmpty(stationCode) || taskPatrolledIds == null || taskPatrolledIds.isEmpty()) { log.error("[TASK_STATUS_DELETE] 推送参数为空, stationCode: {}, ids: {}", stationCode, taskPatrolledIds); return false; diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java index 924ee01..c0cea0f 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java @@ -412,11 +412,15 @@ public class PatrolTaskStatusController extends BaseController { int deleteCount = this.patrolTaskStatusService.deletePatrolTaskStatusByTaskPatrolledIds(ids); log.info("[TASK_STATUS_DELETE] 删除完成, taskPatrolledIds: {}, deleteCount: {}", ids, deleteCount); - // 推送消息通知中恒（失败不影响删除结果） - String stationCode = (String) redisService.redisTemplate.opsForValue().get(STATION_CODE_REDIS_KEY); - boolean pushSuccess = taskStatusDeletePushService.pushTaskDelete(stationCode, ids); - if (!pushSuccess) { - log.error("[TASK_STATUS_DELETE] 推送删除消息失败, taskPatrolledIds: {}, stationCode: {}", ids, stationCode); + // 推送消息通知中恒（未启用或推送失败都不影响删除结果） + boolean pushSuccess = false; + String stationCode = null; + if (taskStatusDeletePushService.isEnabled()) { + stationCode = (String) redisService.redisTemplate.opsForValue().get(STATION_CODE_REDIS_KEY); + pushSuccess = taskStatusDeletePushService.pushTaskDelete(stationCode, ids); + if (!pushSuccess) { + log.error("[TASK_STATUS_DELETE] 推送删除消息失败, taskPatrolledIds: {}, stationCode: {}", ids, stationCode); + } } AjaxResult result = AjaxResult.success(); result.put("deleteCount", deleteCount);