diff --git a/ruoyi-module/src/main/java/com/ruoyi/record/domain/RecordBusbarAlarm.java b/ruoyi-module/src/main/java/com/ruoyi/record/domain/RecordBusbarAlarm.java index d33a931..5df961b 100644 --- a/ruoyi-module/src/main/java/com/ruoyi/record/domain/RecordBusbarAlarm.java +++ b/ruoyi-module/src/main/java/com/ruoyi/record/domain/RecordBusbarAlarm.java @@ -69,6 +69,8 @@ public class RecordBusbarAlarm extends BaseEntity private String alarmContent; + private String busbarAlias; + public void setObjId(Long objId) { this.objId = objId; @@ -186,6 +188,14 @@ public class RecordBusbarAlarm extends BaseEntity this.alarmContent = alarmContent; } + public String getBusbarAlias() { + return busbarAlias; + } + + public void setBusbarAlias(String busbarAlias) { + this.busbarAlias = busbarAlias; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -202,6 +212,7 @@ public class RecordBusbarAlarm extends BaseEntity .append("isFlag", getIsFlag()) .append("recordTime", getRecordTime()) .append("alarmContent", getAlarmContent()) + .append("busbarAlias", getBusbarAlias()) .toString(); } } diff --git a/ruoyi-module/src/main/resources/mapper/record/RecordBusbarAlarmMapper.xml b/ruoyi-module/src/main/resources/mapper/record/RecordBusbarAlarmMapper.xml index dd08edf..c4eba6c 100644 --- a/ruoyi-module/src/main/resources/mapper/record/RecordBusbarAlarmMapper.xml +++ b/ruoyi-module/src/main/resources/mapper/record/RecordBusbarAlarmMapper.xml @@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -33,9 +34,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" rba.temp_min, rba.temp_avg, rba.temp_diff, rba.file_path, rba.alarm_type, rba.alarm_value, rba.is_flag, rba.record_time, - bai.alarm_content + bai.alarm_content, + bbi.busbar_alias from record_busbar_alarm rba LEFT JOIN base_alarm_info bai ON rba.busbar_code = bai.busbar_code + left join base_busbar_info bbi on rba.busbar_code = bbi.busbar_code