From 257c8bcbc5453ecfa9c108ed650422013f7c11b6 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 19 六月 2025 21:38:27 +0800
Subject: [PATCH] 预警分析管理-电源告警
---
src/main/resources/mapper/PwrdevAlarmMapper.xml | 31 +++++++++++++++
src/main/resources/mapper/BattalarmDataMapper.xml | 5 --
src/main/java/com/whyc/mapper/PwrdevAlarmMapper.java | 5 ++
src/main/java/com/whyc/controller/AlmParamController.java | 11 +++++
src/main/java/com/whyc/service/PwrdevAlarmParamService.java | 4 +
src/main/java/com/whyc/service/PwrdevAlarmService.java | 10 +++++
6 files changed, 60 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/whyc/controller/AlmParamController.java b/src/main/java/com/whyc/controller/AlmParamController.java
index 09babd2..a2bc13e 100644
--- a/src/main/java/com/whyc/controller/AlmParamController.java
+++ b/src/main/java/com/whyc/controller/AlmParamController.java
@@ -39,6 +39,9 @@
private BattalarmDataService battalarmDataService;
@Autowired
+ private PwrdevAlarmService pwrdevAlarmService;
+
+ @Autowired
private BattRealdataIdService battRealdataIdService;
@@ -140,4 +143,12 @@
return battRealdataIdService.getBattHisRealInAlm(battgroupId,startTime,almId);
}
+ @PostMapping("getPwrtAlmAnalyse")
+ @ApiOperation("棰勮鍒嗘瀽绠＄悊-鐢垫簮鍛婅")
+ public Response getPwrtAlmAnalyse(@RequestBody AlmAnalyseDto dto){
+ Integer uid=ActionUtil.getUser().getId();
+ dto.setUid(uid);
+ return pwrdevAlarmService.getPwrtAlmAnalyse(dto);
+ }
+
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/mapper/PwrdevAlarmMapper.java b/src/main/java/com/whyc/mapper/PwrdevAlarmMapper.java
index 910fec1..873cc86 100644
--- a/src/main/java/com/whyc/mapper/PwrdevAlarmMapper.java
+++ b/src/main/java/com/whyc/mapper/PwrdevAlarmMapper.java
@@ -1,8 +1,10 @@
package com.whyc.mapper;
import com.whyc.dto.AlarmDto;
+import com.whyc.dto.Param.AlmAnalyseDto;
import com.whyc.dto.Real.AlmDto;
import com.whyc.pojo.db_pwrdev_alarm.PwrdevAlarm;
+import com.whyc.pojo.db_pwrdev_alarm.PwrdevAlarmParam;
import com.whyc.pojo.web_site.AlarmInspection;
import java.util.List;
@@ -14,5 +16,6 @@
List<AlarmInspection> getListGreatThan(Long id);
List<AlarmDto> getListByUserId(Integer userId, Integer alarmLevel);
-
+ //棰勮鍒嗘瀽绠＄悊-鐢垫簮鍛婅
+ List<PwrdevAlarm> getPwrtAlmAnalyse(AlmAnalyseDto dto);
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/service/PwrdevAlarmParamService.java b/src/main/java/com/whyc/service/PwrdevAlarmParamService.java
index d53cc6b..d805b8d 100644
--- a/src/main/java/com/whyc/service/PwrdevAlarmParamService.java
+++ b/src/main/java/com/whyc/service/PwrdevAlarmParamService.java
@@ -5,12 +5,15 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
+import com.whyc.constant.BattSingalIdEnum;
import com.whyc.constant.PowerAlarmEnum;
import com.whyc.dto.AlarmParam;
+import com.whyc.dto.Param.AlmAnalyseDto;
import com.whyc.dto.Param.ParamAlmDto;
import com.whyc.dto.Real.AlmDto;
import com.whyc.dto.Response;
import com.whyc.mapper.PwrdevAlarmParamMapper;
+import com.whyc.pojo.db_alarm.BattalarmData;
import com.whyc.pojo.db_param.BattAlmparam;
import com.whyc.pojo.db_pwrdev_alarm.PwrdevAlarmParam;
import com.whyc.pojo.db_station.PowerInf;
@@ -106,5 +109,4 @@
}
return new Response().set(1,true,"淇敼鐢垫簮鍛婅鍙傛暟");
}
-
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/service/PwrdevAlarmService.java b/src/main/java/com/whyc/service/PwrdevAlarmService.java
index 19119fe..2c6c0e8 100644
--- a/src/main/java/com/whyc/service/PwrdevAlarmService.java
+++ b/src/main/java/com/whyc/service/PwrdevAlarmService.java
@@ -8,11 +8,13 @@
import com.whyc.constant.DevAlarmEnum;
import com.whyc.constant.PowerAlarmEnum;
import com.whyc.dto.AlarmDto;
+import com.whyc.dto.Param.AlmAnalyseDto;
import com.whyc.dto.Real.AlmDto;
import com.whyc.dto.Response;
import com.whyc.mapper.PwrdevAlarmMapper;
import com.whyc.pojo.db_alarm.DevalarmData;
import com.whyc.pojo.db_pwrdev_alarm.PwrdevAlarm;
+import com.whyc.pojo.db_pwrdev_alarm.PwrdevAlarmParam;
import com.whyc.pojo.web_site.AlarmInspection;
import com.whyc.util.ActionUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -84,4 +86,12 @@
public List<AlarmDto> getListByUserId(Integer userId,Integer alarmLevel) {
return mapper.getListByUserId(userId,alarmLevel);
}
+
+ //棰勮鍒嗘瀽绠＄悊-鐢垫簮鍛婅
+ public Response getPwrtAlmAnalyse(AlmAnalyseDto dto) {
+ PageHelper .startPage(dto.getPageNum(),dto.getPageSize());
+ List<PwrdevAlarm> list=mapper.getPwrtAlmAnalyse(dto);
+ PageInfo pageInfo=new PageInfo(list);
+ return new Response().setII(1,list!=null,pageInfo,"鐢垫簮鍛婅鍒嗘瀽");
+ }
}
\ No newline at end of file
diff --git a/src/main/resources/mapper/BattalarmDataMapper.xml b/src/main/resources/mapper/BattalarmDataMapper.xml
index bb85780..a7991bc 100644
--- a/src/main/resources/mapper/BattalarmDataMapper.xml
+++ b/src/main/resources/mapper/BattalarmDataMapper.xml
@@ -95,9 +95,6 @@
<if test="stationId!=null">
and tb_station_inf.station_id=#{stationId}
</if>
- <if test="stationId!=null">
- and tb_station_inf.station_id=#{stationId}
- </if>
<if test="battgroupId!=null">
and tb_battalarm_data.battgroup_id=#{battgroupId}
</if>
@@ -119,7 +116,7 @@
and tb_baojigroup_usr.uid=#{uid}
)
</if>
-
+ order by alm_start_time desc
</where>
</select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/PwrdevAlarmMapper.xml b/src/main/resources/mapper/PwrdevAlarmMapper.xml
index 5e67292..c2cb664 100644
--- a/src/main/resources/mapper/PwrdevAlarmMapper.xml
+++ b/src/main/resources/mapper/PwrdevAlarmMapper.xml
@@ -63,4 +63,35 @@
and bu.uid = #{userId}
)
</select>
+ <select id="getPwrtAlmAnalyse" resultType="com.whyc.pojo.db_pwrdev_alarm.PwrdevAlarm">
+ select tb_pwrdev_alarm.*,tb_power_inf.power_name,tb_station_inf.station_name,tb_station_inf.provice,tb_station_inf.city,tb_station_inf.country,tb_station_inf.full_name
+ from db_pwrdev_alarm.tb_pwrdev_alarm,db_station.tb_power_inf,db_station.tb_station_inf
+ <where>
+ tb_pwrdev_alarm.power_id=tb_power_inf.power_id
+ and tb_power_inf.station_id=tb_station_inf.station_id
+ <if test="provice!=null">
+ and tb_station_inf.provice=#{provice}
+ </if>
+ <if test="city!=null">
+ and tb_station_inf.city=#{city}
+ </if>
+ <if test="country!=null">
+ and tb_station_inf.country=#{country}
+ </if>
+ <if test="stationId!=null">
+ and tb_station_inf.station_id=#{stationId}
+ </if>
+ <if test="powerId!=null">
+ and tb_pwrdev_alarm.power_id=#{powerId}
+ </if>
+ <if test="uid>100">
+ and tb_pwrdev_alarm.power_id in(
+ select distinct power_id from db_user.tb_baojigroup_power,db_user.tb_baojigroup_usr
+ where tb_baojigroup_power.baoji_group_id=tb_baojigroup_usr.baoji_group_id
+ and tb_baojigroup_usr.uid=#{uid}
+ )
+ </if>
+ </where>
+ order by alm_start_time desc
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1