From 37b198e2ed9a87ae52987e0069d7c7d7e01cc7fb Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期五, 13 六月 2025 18:55:34 +0800
Subject: [PATCH] 获取电池组告警参数和获取电源告警参数

---
 src/main/java/com/whyc/service/BattAlmparamService.java |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/whyc/service/BattAlmparamService.java b/src/main/java/com/whyc/service/BattAlmparamService.java
index 04eeb97..49814a8 100644
--- a/src/main/java/com/whyc/service/BattAlmparamService.java
+++ b/src/main/java/com/whyc/service/BattAlmparamService.java
@@ -5,6 +5,7 @@
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.whyc.constant.BattAlarmIdEnum;
+import com.whyc.dto.Param.ParamAlmDto;
 import com.whyc.dto.Real.AlmDto;
 import com.whyc.dto.Response;
 import com.whyc.mapper.BattAlmparamMapper;
@@ -19,13 +20,25 @@
 public class BattAlmparamService {
     @Autowired(required = false)
     private BattAlmparamMapper mapper;
+
+    @Autowired(required = false)
+    private BattInfService binfService;
     //鑾峰彇鐢垫睜鍛婅鍙傛暟
-    public Response getBattAlmParam(Integer battgroupId) {
+    public Response getBattAlmParam(ParamAlmDto dto) {
+        //鏍规嵁鏌ヨ鏉′欢鑾峰彇鐢垫睜缁勯泦鍚�
+        List<Integer> idList=binfService.getBattgroupIdList(dto);
         QueryWrapper wrapper=new QueryWrapper();
-        wrapper.eq("battgroup_id",battgroupId);
+        if(idList!=null){
+            wrapper.in("battgroup_id",idList);
+        }
+        if(dto.getAlmIdList()!=null){
+            wrapper.in("alm_id",dto.getAlmIdList());
+        }
         wrapper.orderByAsc("alm_id");
+        PageHelper.startPage(dto.getPageNum(),dto.getPageSize());
         List<BattAlmparam> list = mapper.selectList(wrapper);
-        return new Response().setII(1,list!=null,list,"鑾峰彇鐢垫睜鍛婅鍙傛暟");
+        PageInfo<BattAlmparam> pageInfo=new PageInfo<>(list);
+        return new Response().setII(1,list!=null,pageInfo,"鑾峰彇鐢垫睜鍛婅鍙傛暟");
     }
     //淇敼鐢垫睜鍛婅鍙傛暟
     public Response setBattAlmParam(List<BattAlmparam> almparamList) {

--
Gitblit v1.9.1