From e50d8c30b43dd30daa77da27101ce21d8ef2fcef Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期一, 17 三月 2025 17:20:10 +0800
Subject: [PATCH] 锂电设备相关代码更新

---
 src/main/resources/mapper/DevLithiumAlarmDataMapper.xml |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mapper/DevAlarmDataMapper.xml b/src/main/resources/mapper/DevLithiumAlarmDataMapper.xml
similarity index 88%
rename from src/main/resources/mapper/DevAlarmDataMapper.xml
rename to src/main/resources/mapper/DevLithiumAlarmDataMapper.xml
index e26274d..2cea23c 100644
--- a/src/main/resources/mapper/DevAlarmDataMapper.xml
+++ b/src/main/resources/mapper/DevLithiumAlarmDataMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.whyc.mapper.DevAlarmDataMapper">
-    <resultMap type="com.whyc.pojo.db_alarm.DevAlarmData" id="almDev">
+<mapper namespace="com.whyc.mapper.DevLithiumAlarmDataMapper">
+    <resultMap type="com.whyc.pojo.db_alarm.DevLithiumAlarmData" id="almDev">
         <id column="num" property="num"/>
         <result column="dev_id" property="devId"/>
         <result column="alm_id" property="almId"/>
@@ -14,7 +14,7 @@
         <result column="alm_endtime" property="almEndtime"/>
         <result column="alm_cleared_type" property="almClearedType"/>
         <!-- 瀹冩槸鐢ㄤ簬鎸囧畾浠庤〃鏂圭殑寮曠敤瀹炰綋灞炴�х殑 -->
-        <association property="devInf" javaType="devInf"
+        <association property="devInf" javaType="DevLithiumInf"
                      select="selectDinf"
                      column="dev_id">
         </association>
@@ -50,10 +50,10 @@
             order by alm_starttime desc
         </where>
     </select>
-    <select id="selectDinf" resultType="devInf" parameterType="int" >
+    <select id="selectDinf" resultType="DevLithiumInf" parameterType="int" >
         select * from db_lithium_ram_db.tb_dev_inf where dev_id = #{dev_id}
     </select>
-    <select id="getDevAlmPopUp" resultMap="almDev">
+    <select id="getPopup" resultMap="almDev">
         select * from db_alarm.tb_devalarm_data
         <where>
             alm_is_confirmed=0

--
Gitblit v1.9.1