From 350ad51d45f4a25f4d7ecbad8bbfb420f56708c6 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期二, 08 四月 2025 14:40:54 +0800
Subject: [PATCH] 更新电池告警及历史接口
---
src/main/java/com/whyc/service/BattTestInfService.java | 39 +++++++++++++++++++++------------------
1 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/whyc/service/BattTestInfService.java b/src/main/java/com/whyc/service/BattTestInfService.java
index 811f037..bf8221a 100644
--- a/src/main/java/com/whyc/service/BattTestInfService.java
+++ b/src/main/java/com/whyc/service/BattTestInfService.java
@@ -1,4 +1,3 @@
-/*
package com.whyc.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -13,6 +12,8 @@
import com.whyc.mapper.BattInfMapper;
import com.whyc.mapper.BattTestInfMapper;
import com.whyc.pojo.*;
+import com.whyc.pojo.db_batt.BattInf;
+import com.whyc.pojo.db_dis_batt.BattTestInf;
import com.whyc.util.ActionUtil;
import com.whyc.util.PageInfoUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -40,15 +41,16 @@
//鏌ヨ鍏呮斁鐢佃褰�
- public Response getTinfHis(int binfId, int pageNum, int pageSize) {
- PageHelper.startPage(pageNum,pageSize);
- QueryWrapper wrapper= Wrappers.query();
- wrapper.eq("binf_id",binfId);
- List<BattTestInf> list=mapper.selectList(wrapper);
- PageInfo pageInfo=new PageInfo(list);
- return new Response().setII(1,list!=null,pageInfo,"鏌ヨ鍏呮斁鐢佃褰�");
+ public Response getPageByBattGroupId(int battGroupId, int pageNum, int pageSize) {
+ PageHelper.startPage(pageNum, pageSize);
+ QueryWrapper wrapper = Wrappers.query();
+ wrapper.eq("binf_id", battGroupId);
+ List<BattTestInf> list = mapper.selectList(wrapper);
+ PageInfo pageInfo = new PageInfo(list);
+ return new Response().set(1, pageInfo);
}
+ /*
//1.4鐢垫睜鎬ц兘璇勪及
public Response searchGroupAssess(int pageNum, int pageSize, ReportBattDTO tinf, int userId){
//List<BattInf> battinfList = binfMapper.searchGroupAssess(tinf, userId);
@@ -201,11 +203,11 @@
}
*/
-/*鍔ｅ寲锛氭湰骞村害鏈斁鐢碉紝鍐呴樆鍛婅锛堥鍛婅锛堥噸瑕侊級锛屽憡璀︼紙绱ф�ワ級锛�
- *瀹归噺灏忎簬鍔ｅ寲闃堝�硷紝澶т簬鎹熷潖闃堝�硷紝鍐呴樆鍛婅(棰勫憡璀︼紝鍛婅)
- * 瀹归噺灏忎簬鍔ｅ寲闃堝�硷紝鍐呴樆姝ｅ父
- * 瀹归噺姝ｅ父锛屽唴闃诲憡璀�(棰勫憡璀︼紝鍛婅)
- *//*
+ /*鍔ｅ寲锛氭湰骞村害鏈斁鐢碉紝鍐呴樆鍛婅锛堥鍛婅锛堥噸瑕侊級锛屽憡璀︼紙绱ф�ワ級锛�
+ *瀹归噺灏忎簬鍔ｅ寲闃堝�硷紝澶т簬鎹熷潖闃堝�硷紝鍐呴樆鍛婅(棰勫憡璀︼紝鍛婅)
+ * 瀹归噺灏忎簬鍔ｅ寲闃堝�硷紝鍐呴樆姝ｅ父
+ * 瀹归噺姝ｅ父锛屽唴闃诲憡璀�(棰勫憡璀︼紝鍛婅)
+ *//*
if (((disNum==0)&&(listALmRes.size()>0))
||((disNum>0)&&(realCap <= capAlarm * monCapStd && realCap >= capChange * monCapStd)&&(listALmRes.size()>0))
@@ -225,7 +227,7 @@
}
//鏌ヨ鐢垫睜鍛婅(2024銆�4.15淇敼)
*/
-/*鏈斁鐢碉細鏈勾搴︽湭鏀剧數
+ /*鏈斁鐢碉細鏈勾搴︽湭鏀剧數
*浼樼锛氭湰骞村害宸叉斁鐢碉紝涓斿閲忓仴搴凤紝鏃犲唴闃诲憡璀︼紙棰勫憡璀︼紙閲嶈锛夛紝鍛婅锛堢揣鎬ワ級锛�
*鍔ｅ寲锛氭湰骞村害鏈斁鐢碉紝鍐呴樆鍛婅锛堥鍛婅锛堥噸瑕侊級锛屽憡璀︼紙绱ф�ワ級锛�
* 瀹归噺灏忎簬鍔ｅ寲闃堝�硷紝澶т簬鎹熷潖闃堝�硷紝鍐呴樆鍛婅(棰勫憡璀︼紝鍛婅)
@@ -274,9 +276,9 @@
map.put("flag", 1);
}
*/
-/*鍔ｅ寲锛�
- *瀹归噺灏忎簬鍔ｅ寲闃堝�硷紝澶т簬鎹熷潖闃堝��
- *//*
+ /*鍔ｅ寲锛�
+ *瀹归噺灏忎簬鍔ｅ寲闃堝�硷紝澶т簬鎹熷潖闃堝��
+ *//*
if (((disNum > 0) && (realCap <= capAlarm * monCapStd && realCap >= capChange * monCapStd))) {
map.put("flag", 2);
@@ -315,4 +317,5 @@
return new Response().set(1, map, "鏌ヨ鎴愬姛");
}
-}*/
+ }*/
+}
\ No newline at end of file
--
Gitblit v1.9.1