From 7f13a635aa80daf755c3fd1f0e6e71ed7fbae11f Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Tue, 17 Dec 2024 15:16:04 +0800
Subject: [PATCH] =?UTF-8?q?feat(record):=20=E6=B7=BB=E5=8A=A0=E6=AF=8D?=
 =?UTF-8?q?=E7=BA=BF=E5=88=AB=E5=90=8D=E5=AD=97=E6=AE=B5=E5=B9=B6=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E7=9B=B8=E5=85=B3=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 RecordBusbarAlarm 模型中添加 busbarAlias 字段
- 更新 RecordBusbarAlarmMapper.xml，加入母线别名的查询和映射
- 优化查询条件，使用 base_alarm_info 和 base_busbar_info 表进行联合查询
---
 .../com/ruoyi/record/domain/RecordBusbarAlarm.java    | 11 +++++++++++
 .../mapper/record/RecordBusbarAlarmMapper.xml         |  8 ++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

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"
         <result property="isFlag"    column="is_flag"    />
         <result property="recordTime"    column="record_time"    />
         <result property="alarmContent"   column="alarm_content" />
+        <result property="busbarAlias" column="busbar_alias" />
     </resultMap>
 
     <resultMap type="RecordBusbarAlarmCountResult" id="RecordBusbarAlarmCountResult">
@@ -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
     </sql>
 
     <select id="selectRecordBusbarAlarmList" parameterType="RecordBusbarAlarm" resultMap="RecordBusbarAlarmResult">
@@ -53,8 +56,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="alarmValue != null "> and rba.alarm_value = #{alarmValue}</if>
             <if test="isFlag != null "> and rba.is_flag = #{isFlag}</if>
             <if test="params.beginRecordTime != null and params.beginRecordTime != '' and params.endRecordTime != null and params.endRecordTime != ''"> and rba.record_time between #{params.beginRecordTime} and #{params.endRecordTime}</if>
-            <if test="alarmContent != null "> and rba.alarm_content = #{alarmContent}</if>
 
+            <if test="alarmContent != null "> and bai.alarm_content = #{alarmContent}</if>
+            <if test="busbarAlias != null "> and bbi.busbar_alias = #{busbarAlias}</if>
         </where>
     </select>