Merge pull request 'dev-xjf' (#73) from dev-xjf into master

Reviewed-on: http://120.26.116.243:3000/root/alert-backend/pulls/73

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<WarnDO> {
                 .eqIfPresent(WarnDO::getSystemId,reqVO.getSystem())
                 .eqIfPresent(WarnDO::getWarnStatus1,reqVO.getWarnStatus1())
                 .eqIfPresent(WarnDO::getStatusRealtime,reqVO.getStatusRealTime())
-                // ⭐ 核心条件：当前时间 - create_time < 表字段阈值
+                // ⭐ 核心条件：当前时间 - insert_time < 表字段阈值
-                .apply("TIMESTAMPDIFF(SECOND, create_time, NOW()) > time_duration_threshold")
+                .apply("TIMESTAMPDIFF(SECOND, insert_time, NOW()) > time_duration_threshold")
                 .orderByAsc(WarnDO::getWarnId));
     }
 

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());
@@ -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);