From 64f046ed41c2ae607dc065c82b6d454f64e90584 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 19 六月 2025 21:52:33 +0800
Subject: [PATCH] 预警分析管理-电源告警
---
src/main/java/com/whyc/service/PwrdevAlarmParamService.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/whyc/service/PwrdevAlarmParamService.java b/src/main/java/com/whyc/service/PwrdevAlarmParamService.java
index c9c72fa..d805b8d 100644
--- a/src/main/java/com/whyc/service/PwrdevAlarmParamService.java
+++ b/src/main/java/com/whyc/service/PwrdevAlarmParamService.java
@@ -5,14 +5,18 @@
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;
import com.whyc.util.ActionUtil;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,7 +40,7 @@
//鑾峰彇鐢垫簮鍛婅鍙傛暟
public Response getPwrAlmParam(ParamAlmDto dto) {
//鏍规嵁鏌ヨ鏉′欢鑾峰彇鐢垫簮闆嗗悎
- List<Integer> idList=pinfService.getPowerIdList(dto);
+ PowerInf pinf=pinfService.getPowerIdList(dto.getPowerId());
/*Map<String, List<PwrdevAlarmParam>> map=new HashMap<>();
List<PwrdevAlarmParam> almmap30=new ArrayList<>();
List<PwrdevAlarmParam> almmap31=new ArrayList<>();
@@ -46,14 +50,12 @@
List<PwrdevAlarmParam> almmap35=new ArrayList<>();
List<PwrdevAlarmParam> almmap36=new ArrayList<>();*/
QueryWrapper wrapper=new QueryWrapper();
- if(idList!=null){
- wrapper.in("power_id",idList);
- }
+ wrapper.eq("power_id",dto.getPowerId());
if(dto.getAlmIdList()!=null){
wrapper.in("alm_id",dto.getAlmIdList());
}
wrapper.orderByAsc("alm_id");
- PageHelper.startPage(dto.getPageNum(),dto.getPageSize());
+ //PageHelper.startPage(dto.getPageNum(),dto.getPageSize());
List<PwrdevAlarmParam> list = mapper.selectList(wrapper);
if(list!=null && list.size()>0){
for (PwrdevAlarmParam alm:list) {
@@ -88,8 +90,14 @@
}*/
}
}
- PageInfo<PwrdevAlarmParam> pageInfo=new PageInfo(list);
- return new Response().setII(1,list!=null,pageInfo,"鑾峰彇鐢垫簮鍛婅鍙傛暟");
+ // PageInfo<PwrdevAlarmParam> pageInfo=new PageInfo(list);
+ return new Response().setIII(1,list!=null,list,pinf,"鑾峰彇鐢垫簮鍛婅鍙傛暟");
+ }
+
+ //鑾峰彇鐢垫簮鍛婅鍙傛暟(鏃犲弬鐢ㄤ簬瀵煎嚭)
+ public Response getPwrAlmParamToExport(Integer uid) {
+ List<PwrdevAlarmParam> list = mapper.getPwrAlmParamToExport(uid);
+ return new Response().setII(1,list!=null,list,"鑾峰彇鐢垫簮鍛婅鍙傛暟(鏃犲弬鐢ㄤ簬瀵煎嚭)");
}
//淇敼鐢垫簮鍛婅鍙傛暟
public Response setPwrAlmParam(List<PwrdevAlarmParam> almparamList) {
--
Gitblit v1.9.1