From a6018ae593fc2d2fb3ccfa4e7c34f28387326f6b Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 19 六月 2025 15:06:25 +0800
Subject: [PATCH] 3.1电池/电源告警参数,1.2.7优良电源统计
---
src/main/java/com/whyc/service/PwrdevAlarmParamService.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/whyc/service/PwrdevAlarmParamService.java b/src/main/java/com/whyc/service/PwrdevAlarmParamService.java
index 966a277..cbee80c 100644
--- a/src/main/java/com/whyc/service/PwrdevAlarmParamService.java
+++ b/src/main/java/com/whyc/service/PwrdevAlarmParamService.java
@@ -13,6 +13,7 @@
import com.whyc.mapper.PwrdevAlarmParamMapper;
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 +37,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,9 +47,7 @@
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());
}
@@ -89,7 +88,7 @@
}
}
// PageInfo<PwrdevAlarmParam> pageInfo=new PageInfo(list);
- return new Response().setII(1,list!=null,list,"鑾峰彇鐢垫簮鍛婅鍙傛暟");
+ return new Response().setIII(1,list!=null,list,pinf,"鑾峰彇鐢垫簮鍛婅鍙傛暟");
}
//淇敼鐢垫簮鍛婅鍙傛暟
public Response setPwrAlmParam(List<PwrdevAlarmParam> almparamList) {
--
Gitblit v1.9.1