From 82614438a300523cc13e22b6d175586a3ec8ed71 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期一, 24 三月 2025 15:46:04 +0800
Subject: [PATCH] 电池告警实时和历史
---
src/main/resources/mapper/BattAlarmMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/BattAlarmMapper.xml b/src/main/resources/mapper/BattAlarmMapper.xml
index 3da2159..4103e8b 100644
--- a/src/main/resources/mapper/BattAlarmMapper.xml
+++ b/src/main/resources/mapper/BattAlarmMapper.xml
@@ -2,8 +2,8 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.whyc.mapper.BattAlarmMapper">
- <select id="getBattAlarm" resultType="com.whyc.pojo.db_alarm.BattAlarm">
- select batt_alarm.*,power_inf.binf_name from db_alarm.batt_alarm,db_batt.power_inf
+ <select id="getList" resultType="com.whyc.pojo.db_alarm.BattAlarm">
+ select batt_alarm.*,batt_alarm.binf_id as battGroupId,power_inf.binf_name as battGroupName,power_inf.power_name from db_alarm.batt_alarm,db_batt.power_inf
<where>
batt_alarm.binf_id=power_inf.binf_id
and batt_alarm.alm_start_time>=#{startTime}
@@ -18,7 +18,7 @@
select batt_alarm.*,power_inf.binf_name from db_alarm.batt_alarm,db_batt.power_inf
<where>
batt_alarm.binf_id=power_inf.binf_id
- and batt_alarm.binf_id=#{binfId}
+ and batt_alarm.binf_id=#{battGroupId}
order by batt_alarm.alm_start_time desc
</where>
</select>
--
Gitblit v1.9.1