From 0bd3f501e16d26e6026bd2e2c6decf04b116aa2a Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 12 十二月 2024 10:13:29 +0800
Subject: [PATCH] 告警实时
---
src/main/java/com/whyc/mapper/PowerAlarmMapper.java | 2 +-
src/main/resources/mapper/PowerAlarmMapper.xml | 2 +-
src/main/java/com/whyc/service/PowerInfService.java | 7 +++++++
src/main/java/com/whyc/controller/PowerAlarmController.java | 8 ++++++++
src/main/resources/mapper/BattAlarmMapper.xml | 2 +-
src/main/java/com/whyc/controller/BattAlarmController.java | 7 +++++++
6 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/controller/BattAlarmController.java b/src/main/java/com/whyc/controller/BattAlarmController.java
index af0a474..95a2e77 100644
--- a/src/main/java/com/whyc/controller/BattAlarmController.java
+++ b/src/main/java/com/whyc/controller/BattAlarmController.java
@@ -24,6 +24,13 @@
@Autowired
private BattAlarmHisService hisService;
+ @ApiOperation("鍦ㄧ敤鐢垫睜缁勫疄鏃舵帹閫佸憡璀︿俊鎭�")
+ @GetMapping("getResBattAlm")
+ public Response getResBattAlm(@RequestParam(required = false) int binfId){
+ Response res=service.getResBattAlm(binfId);
+ return res;
+ }
+
@ApiOperation("鏌ヨ鐢垫睜鍛婅")
@GetMapping("getBattAlarm")
public Response getBattAlarm(@RequestParam(required = false) int almLevel,@RequestParam String startTime,@RequestParam String endTime
diff --git a/src/main/java/com/whyc/controller/PowerAlarmController.java b/src/main/java/com/whyc/controller/PowerAlarmController.java
index ca0f9fb..e6c9403 100644
--- a/src/main/java/com/whyc/controller/PowerAlarmController.java
+++ b/src/main/java/com/whyc/controller/PowerAlarmController.java
@@ -24,6 +24,14 @@
@Autowired
private PowerAlarmHistoryService hisService;
+ @ApiOperation("鍦ㄧ敤鐢垫簮瀹炴椂鎺ㄩ�佸憡璀︿俊鎭�")
+ @GetMapping("getResPowerAlm")
+ public Response getResPowerAlm(@RequestParam(required = false) int pinfId){
+ Response res=service.getResPowerAlm(pinfId);
+ return res;
+ }
+
+
@ApiOperation("鏌ヨ鐢垫簮鍛婅")
@GetMapping("getPowerAlarm")
public Response getPowerAlarm(@RequestParam(required = false) int almLevel, @RequestParam String startTime, @RequestParam String endTime
diff --git a/src/main/java/com/whyc/mapper/PowerAlarmMapper.java b/src/main/java/com/whyc/mapper/PowerAlarmMapper.java
index 325be49..2713c26 100644
--- a/src/main/java/com/whyc/mapper/PowerAlarmMapper.java
+++ b/src/main/java/com/whyc/mapper/PowerAlarmMapper.java
@@ -8,7 +8,7 @@
public interface PowerAlarmMapper extends CustomMapper<PowerAlarm>{
//鏌ヨ鐢垫簮鍛婅
- List<PowerAlarm> getPowerAlarm(int almLevel, Date parse, Date parse1);
+ List<PowerAlarm> getPowerAlarm(int almLevel, Date startTime, Date endTime);
//鍦ㄧ敤鐢垫簮瀹炴椂鎺ㄩ�佸憡璀︿俊鎭�
List<PowerAlarm> getResPowerAlm(int pinfId);
diff --git a/src/main/java/com/whyc/service/PowerInfService.java b/src/main/java/com/whyc/service/PowerInfService.java
index 1aed6ce..c0565b7 100644
--- a/src/main/java/com/whyc/service/PowerInfService.java
+++ b/src/main/java/com/whyc/service/PowerInfService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.whyc.mapper.*;
import com.whyc.pojo.db_batt.PowerInf;
+import com.whyc.pojo.db_power_alarm.PowerAlarm;
import com.whyc.pojo.db_real_batt.RtData;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -28,6 +29,9 @@
@Autowired(required = false)
private PowerRealRt3Mapper realRt3Mapper;
+ @Autowired(required = false)
+ private PowerAlarmMapper pAlarmMapper;
+
//鏍规嵁id鑾峰彇鐢垫簮淇℃伅
public Map<String,Object> getInfById(int powerId) {
Map<String,Object> map=new HashMap<>();
@@ -43,6 +47,9 @@
}
Object obj=getRealRt(powerId,devType);
map.put("realRt"+devType,obj);
+
+ List<PowerAlarm> powerAlarmList=pAlarmMapper.getResPowerAlm(powerId);
+ map.put("powerAlarm",powerAlarmList);
return map;
}
//鑾峰彇鐢电數婧愪俊鎭�
diff --git a/src/main/resources/mapper/BattAlarmMapper.xml b/src/main/resources/mapper/BattAlarmMapper.xml
index 42130bd..3da2159 100644
--- a/src/main/resources/mapper/BattAlarmMapper.xml
+++ b/src/main/resources/mapper/BattAlarmMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.whyc.mapper.BattAlarmMapper">
<select id="getBattAlarm" resultType="com.whyc.pojo.db_alarm.BattAlarm">
- select batt_alarm.*,batt_inf.binf_name from db_alarm.batt_alarm,db_batt.power_inf
+ 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.alm_start_time>=#{startTime}
diff --git a/src/main/resources/mapper/PowerAlarmMapper.xml b/src/main/resources/mapper/PowerAlarmMapper.xml
index 01fc0c8..9dcd4f5 100644
--- a/src/main/resources/mapper/PowerAlarmMapper.xml
+++ b/src/main/resources/mapper/PowerAlarmMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.whyc.mapper.PowerAlarmMapper">
<select id="getPowerAlarm" resultType="com.whyc.pojo.db_power_alarm.PowerAlarm">
- select power_alarm.*,batt_inf.power_name from db_power_alarm.power_alarm,db_batt.power_inf
+ select power_alarm.*,power_inf.power_name from db_power_alarm.power_alarm,db_batt.power_inf
<where>
power_alarm.power_id=power_inf.power_id
and power_alarm.alm_start_time>=#{startTime}
--
Gitblit v1.9.1