From 51ffee7cc01eb4358c2d05ee974150f625706ccd Mon Sep 17 00:00:00 2001 From: zch Date: Sat, 24 May 2025 23:30:32 +0800 Subject: [PATCH] =?UTF-8?q?feat(ems):=20=E6=9B=B4=E6=96=B0=E6=8A=A5?= =?UTF-8?q?=E8=AD=A6=E8=A7=84=E5=88=99=E5=B9=B6=E6=B7=BB=E5=8A=A0=E8=A7=A6?= =?UTF-8?q?=E5=8F=91=E9=98=88=E5=80=BC=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将"触发阈值次数"字段改为"监测字段" - 添加"触发阈值量"字段，用于设置报警阈值 - 移除"设备离线时间"字段 - 更新数据库映射和查询语句以适应这些变更 - 在 RecordIotenvInstant 类中添加"计量设备编号"字段 --- .../ems/record/domain/EmsRecordAlarmRule.java | 42 ++++++++++--------- .../record/domain/RecordIotenvInstant.java | 4 ++ .../ems/record/EmsRecordAlarmRuleMapper.xml | 30 +++++++------ 3 files changed, 40 insertions(+), 36 deletions(-) diff --git a/os-ems/src/main/java/com/os/ems/record/domain/EmsRecordAlarmRule.java b/os-ems/src/main/java/com/os/ems/record/domain/EmsRecordAlarmRule.java index 93f3986..442958f 100644 --- a/os-ems/src/main/java/com/os/ems/record/domain/EmsRecordAlarmRule.java +++ b/os-ems/src/main/java/com/os/ems/record/domain/EmsRecordAlarmRule.java @@ -1,5 +1,6 @@ package com.os.ems.record.domain; +import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -47,17 +48,17 @@ public class EmsRecordAlarmRule extends BaseEntity @Excel(name = "触发规则", readConverterExp = "0=超过阈值,1=设备报警") private Long triggerRule; - /** 触发阈值次数 */ - @Excel(name = "触发阈值次数") - private Long triggerNumber; + /** 监测字段 */ + @Excel(name = "监测字段") + private Long monitorField; /** 时间范围(分) */ @Excel(name = "时间范围(分)") private Long timeRange; - /** 设备离线时间(分) */ - @Excel(name = "设备离线时间(分)") - private Long deviceOfflineTime; + /** 触发阈值量 */ + @Excel(name = "触发阈值量") + private BigDecimal triggerValue; /** 通知用户 */ @Excel(name = "通知用户") @@ -156,15 +157,16 @@ public class EmsRecordAlarmRule extends BaseEntity { return triggerRule; } - public void setTriggerNumber(Long triggerNumber) + public void setMonitorField(Long monitorField) { - this.triggerNumber = triggerNumber; + this.monitorField = monitorField; } - public Long getTriggerNumber() + public Long getMonitorField() { - return triggerNumber; + return monitorField; } + public void setTimeRange(Long timeRange) { this.timeRange = timeRange; @@ -174,15 +176,7 @@ public class EmsRecordAlarmRule extends BaseEntity { return timeRange; } - public void setDeviceOfflineTime(Long deviceOfflineTime) - { - this.deviceOfflineTime = deviceOfflineTime; - } - public Long getDeviceOfflineTime() - { - return deviceOfflineTime; - } public void setNotifyUser(String notifyUser) { this.notifyUser = notifyUser; @@ -202,6 +196,14 @@ public class EmsRecordAlarmRule extends BaseEntity return cause; } + public BigDecimal getTriggerValue() { + return triggerValue; + } + + public void setTriggerValue(BigDecimal triggerValue) { + this.triggerValue = triggerValue; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -212,9 +214,9 @@ public class EmsRecordAlarmRule extends BaseEntity .append("collectTime", getCollectTime()) .append("energyType", getEnergyType()) .append("triggerRule", getTriggerRule()) - .append("triggerNumber", getTriggerNumber()) + .append("monitorField", getMonitorField()) .append("timeRange", getTimeRange()) - .append("deviceOfflineTime", getDeviceOfflineTime()) + .append("triggerValue", getTriggerValue()) .append("notifyUser", getNotifyUser()) .append("cause", getCause()) .append("createBy", getCreateBy()) diff --git a/os-ems/src/main/java/com/os/ems/record/domain/RecordIotenvInstant.java b/os-ems/src/main/java/com/os/ems/record/domain/RecordIotenvInstant.java index fd42577..0cfb0ef 100644 --- a/os-ems/src/main/java/com/os/ems/record/domain/RecordIotenvInstant.java +++ b/os-ems/src/main/java/com/os/ems/record/domain/RecordIotenvInstant.java @@ -82,6 +82,10 @@ public class RecordIotenvInstant extends BaseEntity //关联查询设备名称 private String monitorName; + /** 计量设备编号 */ + @Excel(name = "计量设备编号") + private String monitorCode; + // // public void setObjid(Long objid) diff --git a/os-ems/src/main/resources/mapper/ems/record/EmsRecordAlarmRuleMapper.xml b/os-ems/src/main/resources/mapper/ems/record/EmsRecordAlarmRuleMapper.xml index 304dca7..5f3fde8 100644 --- a/os-ems/src/main/resources/mapper/ems/record/EmsRecordAlarmRuleMapper.xml +++ b/os-ems/src/main/resources/mapper/ems/record/EmsRecordAlarmRuleMapper.xml @@ -14,9 +14,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + @@ -35,9 +35,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" RAL.collect_time, RAL.energy_type, RAL.trigger_rule, - RAL.trigger_number, + RAL.monitor_field, RAL.time_range, - RAL.device_offline_time, + RAL.trigger_value, RAL.notify_user, RAL.cause, RAL.create_by, @@ -45,12 +45,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" RAL.update_by, RAL.update_time, BMI.monitor_code, - BMI.monitor_name, - SUSER.nick_name + BMI.monitor_name FROM ems_record_alarm_rule as RAL - left join ems_base_monitor_info as BMI on RAL.monitor_id = BMI.obj_id - left join sys_user as SUSER on RAL.notify_user = SUSER.user_id + left join ems_base_monitor_info as BMI on RAL.monitor_id = BMI.monitor_code