From 5e011096f3de823ea0d58e6e40f671940b85acfb Mon Sep 17 00:00:00 2001
From: wg <2023838292@qq.com>
Date: Tue, 17 Dec 2024 14:54:17 +0800
Subject: [PATCH] =?UTF-8?q?feat(record):=20=E6=B7=BB=E5=8A=A0=E6=8A=A5?=
 =?UTF-8?q?=E8=AD=A6=E5=86=85=E5=AE=B9=E5=AD=97=E6=AE=B5=E5=8F=8A=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../record/domain/RecordBusbarAlarm.java      | 11 +++++
 .../mapper/record/RecordBusbarAlarmMapper.xml | 40 ++++++++++++-------
 2 files changed, 37 insertions(+), 14 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 77c066c..d33a931 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
@@ -67,6 +67,8 @@ public class RecordBusbarAlarm extends BaseEntity
     @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date recordTime;
 
+    private String alarmContent;
+
     public void setObjId(Long objId)
     {
         this.objId = objId;
@@ -176,6 +178,14 @@ public class RecordBusbarAlarm extends BaseEntity
         return recordTime;
     }
 
+    public String getAlarmContent() {
+        return alarmContent;
+    }
+
+    public void setAlarmContent(String alarmContent) {
+        this.alarmContent = alarmContent;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -191,6 +201,7 @@ public class RecordBusbarAlarm extends BaseEntity
             .append("alarmValue", getAlarmValue())
             .append("isFlag", getIsFlag())
             .append("recordTime", getRecordTime())
+                .append("alarmContent", getAlarmContent())
             .toString();
     }
 }
diff --git a/ruoyi-module/src/main/resources/mapper/record/RecordBusbarAlarmMapper.xml b/ruoyi-module/src/main/resources/mapper/record/RecordBusbarAlarmMapper.xml
index 83948a6..dd08edf 100644
--- a/ruoyi-module/src/main/resources/mapper/record/RecordBusbarAlarmMapper.xml
+++ b/ruoyi-module/src/main/resources/mapper/record/RecordBusbarAlarmMapper.xml
@@ -17,6 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="alarmValue"    column="alarm_value"    />
         <result property="isFlag"    column="is_flag"    />
         <result property="recordTime"    column="record_time"    />
+        <result property="alarmContent"   column="alarm_content" />
     </resultMap>
 
     <resultMap type="RecordBusbarAlarmCountResult" id="RecordBusbarAlarmCountResult">
@@ -25,30 +26,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectRecordBusbarAlarmVo">
-        select objId, busbar_code, cabinet_code, temp_max, temp_min, temp_avg, temp_diff, file_path, alarm_type, alarm_value, is_flag, record_time from record_busbar_alarm
+        select rba.objId,
+               rba.busbar_code,
+               rba.cabinet_code,
+               rba.temp_max,
+               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
+        from record_busbar_alarm rba
+                 LEFT JOIN base_alarm_info bai ON rba.busbar_code = bai.busbar_code
     </sql>
 
     <select id="selectRecordBusbarAlarmList" parameterType="RecordBusbarAlarm" resultMap="RecordBusbarAlarmResult">
         <include refid="selectRecordBusbarAlarmVo"/>
         <where>
-            <if test="objId != null "> and objId = #{objId}</if>
-            <if test="busbarCode != null "> and busbar_code = #{busbarCode}</if>
-            <if test="cabinetCode != null "> and cabinet_code = #{cabinetCode}</if>
-            <if test="tempMax != null "> and temp_max = #{tempMax}</if>
-            <if test="tempMin != null "> and temp_min = #{tempMin}</if>
-            <if test="tempAvg != null "> and temp_avg = #{tempAvg}</if>
-            <if test="tempDiff != null "> and temp_diff = #{tempDiff}</if>
-            <if test="filePath != null  and filePath != ''"> and file_path = #{filePath}</if>
-            <if test="alarmType != null "> and alarm_type = #{alarmType}</if>
-            <if test="alarmValue != null "> and alarm_value = #{alarmValue}</if>
-            <if test="isFlag != null "> and is_flag = #{isFlag}</if>
-            <if test="params.beginRecordTime != null and params.beginRecordTime != '' and params.endRecordTime != null and params.endRecordTime != ''"> and record_time between #{params.beginRecordTime} and #{params.endRecordTime}</if>
+            <if test="objId != null "> and rba.objId = #{objId}</if>
+            <if test="busbarCode != null "> and rba.busbar_code = #{busbarCode}</if>
+            <if test="cabinetCode != null "> and rba.cabinet_code = #{cabinetCode}</if>
+            <if test="tempMax != null "> and rba.temp_max = #{tempMax}</if>
+            <if test="tempMin != null "> and rba.temp_min = #{tempMin}</if>
+            <if test="tempAvg != null "> and rba.temp_avg = #{tempAvg}</if>
+            <if test="tempDiff != null "> and rba.temp_diff = #{tempDiff}</if>
+            <if test="filePath != null  and filePath != ''"> and rba.file_path = #{filePath}</if>
+            <if test="alarmType != null "> and rba.alarm_type = #{alarmType}</if>
+            <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>
+
         </where>
     </select>
 
     <select id="selectRecordBusbarAlarmByObjId" parameterType="Long" resultMap="RecordBusbarAlarmResult">
         <include refid="selectRecordBusbarAlarmVo"/>
-        where objId = #{objId}
+        where rba.objId = #{objId}
     </select>
 
     <insert id="insertRecordBusbarAlarm" parameterType="RecordBusbarAlarm">