From 2753ad7aee272a5a5a8a0124b1feea5a1e4cc83e Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期五, 20 六月 2025 22:40:52 +0800
Subject: [PATCH] 电源告警参数返回
---
src/main/java/com/whyc/service/BattAlmparamService.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/whyc/service/BattAlmparamService.java b/src/main/java/com/whyc/service/BattAlmparamService.java
index 49814a8..9a63a18 100644
--- a/src/main/java/com/whyc/service/BattAlmparamService.java
+++ b/src/main/java/com/whyc/service/BattAlmparamService.java
@@ -10,11 +10,13 @@
import com.whyc.dto.Response;
import com.whyc.mapper.BattAlmparamMapper;
import com.whyc.pojo.db_param.BattAlmparam;
+import com.whyc.pojo.db_station.BattInf;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Arrays;
import java.util.List;
+import java.util.stream.Collectors;
@Service
public class BattAlmparamService {
@@ -25,20 +27,24 @@
private BattInfService binfService;
//鑾峰彇鐢垫睜鍛婅鍙傛暟
public Response getBattAlmParam(ParamAlmDto dto) {
- //鏍规嵁鏌ヨ鏉′欢鑾峰彇鐢垫睜缁勯泦鍚�
- List<Integer> idList=binfService.getBattgroupIdList(dto);
+ //鏍规嵁鏌ヨ鏉′欢鑾峰彇鐢垫睜缁�
+ BattInf binf=binfService.getBattgroupIdInf(dto.getBattgroupId());
QueryWrapper wrapper=new QueryWrapper();
- if(idList!=null){
- wrapper.in("battgroup_id",idList);
- }
+ wrapper.eq("battgroup_id",dto.getBattgroupId());
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<BattAlmparam> list = mapper.selectList(wrapper);
- PageInfo<BattAlmparam> pageInfo=new PageInfo<>(list);
- return new Response().setII(1,list!=null,pageInfo,"鑾峰彇鐢垫睜鍛婅鍙傛暟");
+ //PageInfo<BattAlmparam> pageInfo=new PageInfo<>(list);
+ return new Response().setIII(1,list!=null,list,binf,"鑾峰彇鐢垫睜鍛婅鍙傛暟");
+ }
+ //鑾峰彇鐢垫睜鍛婅鍙傛暟(鏃犲弬鐢ㄤ簬瀵煎嚭)
+ public Response getBattAlmParamToExport(Integer uid) {
+ //鑾峰彇鎵�鏈夌殑鐢垫睜缁刬d
+ List<BattAlmparam> list = mapper.getBattAlmParamToExport(uid);
+ return new Response().setII(1,list!=null,list,"鑾峰彇鐢垫睜鍛婅鍙傛暟");
}
//淇敼鐢垫睜鍛婅鍙傛暟
public Response setBattAlmParam(List<BattAlmparam> almparamList) {
--
Gitblit v1.9.1