From 006bed9652faa2a9a0b40f7bb202b48b9f8fd465 Mon Sep 17 00:00:00 2001 From: xiaojinfei <378266566@qq.com> Date: Wed, 31 Dec 2025 15:49:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E9=9B=86=E4=B8=AD=E5=91=8A=E8=AD=A6?= =?UTF-8?q?=E8=AF=BB=E5=8F=96=E8=BE=93=E5=87=BA=E5=80=BC=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yudao/module/alert/service/warn/WarnServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/warn/WarnServiceImpl.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/warn/WarnServiceImpl.java index d8937b4..153a722 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/warn/WarnServiceImpl.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/warn/WarnServiceImpl.java @@ -87,7 +87,7 @@ public class WarnServiceImpl implements WarnService { try { pointValue = exaUtils.getNowData(EXA_IP, warnDO.getPointId()); - outpointValue = exaUtils.getNowData(EXA_IP, warnDO.getPointId()); + outpointValue = exaUtils.getNowData(EXA_IP, warnDO.getOutputPoint()); } catch (Exception e) { throw exception(EXA_REAL_FAILED, "EXA实时值读取失败: " + e.getMessage()); -- 2.30.2 From c9a639e5a4778ddd7722c858ebe4db68f147fa56 Mon Sep 17 00:00:00 2001 From: xjf <378266566@qq.com> Date: Wed, 31 Dec 2025 17:00:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:warnonline=5Fcfg=E8=AF=BB=E5=8F=96?= =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iocoder/yudao/module/alert/dal/mysql/warn/WarnMapper.java | 4 ++-- .../yudao/module/alert/service/warn/WarnServiceImpl.java | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/warn/WarnMapper.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/warn/WarnMapper.java index fa570ce..4984006 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/warn/WarnMapper.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/warn/WarnMapper.java @@ -37,8 +37,8 @@ public interface WarnMapper extends BaseMapperX { .eqIfPresent(WarnDO::getSystemId,reqVO.getSystem()) .eqIfPresent(WarnDO::getWarnStatus1,reqVO.getWarnStatus1()) .eqIfPresent(WarnDO::getStatusRealtime,reqVO.getStatusRealTime()) - // ⭐ 核心条件：当前时间 - create_time < 表字段阈值 - .apply("TIMESTAMPDIFF(SECOND, create_time, NOW()) > time_duration_threshold") + // ⭐ 核心条件：当前时间 - insert_time < 表字段阈值 + .apply("TIMESTAMPDIFF(SECOND, insert_time, NOW()) > time_duration_threshold") .orderByAsc(WarnDO::getWarnId)); } diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/warn/WarnServiceImpl.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/warn/WarnServiceImpl.java index bddefe4..e750506 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/warn/WarnServiceImpl.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/warn/WarnServiceImpl.java @@ -220,8 +220,7 @@ public class WarnServiceImpl implements WarnService { // 1.1 校验是否可以更新 WarnDO warn = validateWarnForUpdate(updateReqVO.getWarnId()); // 1.2 校验角色的唯一字段是否重复 -// validateRoleDuplicate(updateReqVO.getName(), updateReqVO.getCode(), updateReqVO.getId()); - + //validateRoleDuplicate(updateReqVO.getName(), updateReqVO.getCode(), updateReqVO.getId()); // 2. 更新到数据库 WarnTableDO updateObj = BeanUtils.toBean(updateReqVO, WarnTableDO.class); warnTableMapper.updateById(updateObj); -- 2.30.2