From 22c2a663c059ac237b4dca14a126a9a65145ec96 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期二, 27 五月 2025 15:39:57 +0800
Subject: [PATCH] 追加根据电池组查询记录
---
src/main/resources/mapper/BattTestInfMapper.xml | 3 +++
src/main/java/com/whyc/service/BattTestInfService.java | 15 +++++++++++++--
src/main/java/com/whyc/mapper/BattTestInfMapper.java | 2 +-
src/main/java/com/whyc/controller/BattTestInfController.java | 5 +++--
4 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/whyc/controller/BattTestInfController.java b/src/main/java/com/whyc/controller/BattTestInfController.java
index 549f556..e491033 100644
--- a/src/main/java/com/whyc/controller/BattTestInfController.java
+++ b/src/main/java/com/whyc/controller/BattTestInfController.java
@@ -26,8 +26,9 @@
}*/
@GetMapping("getDischargePage")
- public Response getDischargePage(@RequestParam int pageNum,@RequestParam int pageSize){
- return service.getDischargePage(pageNum,pageSize);
+ public Response getDischargePage(@RequestParam int pageNum,@RequestParam int pageSize,
+ @RequestParam(required = false) Integer battGroupId){
+ return service.getDischargePage(pageNum,pageSize,battGroupId);
}
/*//鏍规嵁鍏呮斁鐢佃褰曟煡璇㈠崟浣撴斁鐢靛巻鍙茶鎯�
diff --git a/src/main/java/com/whyc/mapper/BattTestInfMapper.java b/src/main/java/com/whyc/mapper/BattTestInfMapper.java
index 65f623b..0aa01dd 100644
--- a/src/main/java/com/whyc/mapper/BattTestInfMapper.java
+++ b/src/main/java/com/whyc/mapper/BattTestInfMapper.java
@@ -17,5 +17,5 @@
//鑾峰彇鏈夋晥鐨勬斁鐢佃褰�
List<BattTestInf> searchDischarge(int battGroupId);
- List<BattTestInf> getDischargeList();
+ List<BattTestInf> getDischargeList(Integer battGroupId);
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/service/BattTestInfService.java b/src/main/java/com/whyc/service/BattTestInfService.java
index b077a23..5076c44 100644
--- a/src/main/java/com/whyc/service/BattTestInfService.java
+++ b/src/main/java/com/whyc/service/BattTestInfService.java
@@ -44,9 +44,9 @@
return new Response().set(1, pageInfo);
}
- public Response getDischargePage(int pageNum, int pageSize) {
+ public Response getDischargePage(int pageNum, int pageSize, Integer battGroupId) {
PageHelper.startPage(pageNum, pageSize);
- List<BattTestInf> list =mapper.getDischargeList();
+ List<BattTestInf> list =mapper.getDischargeList(battGroupId);
list.forEach(item->{
//灏忔椂鐜�
int hourRate = BattCapFactory.GetHourRate(item.getMonCap(), item.getTestCurr());
@@ -70,6 +70,17 @@
return mapper.selectOne(query);
}
+ public BattTestInf getDischargeRecord(int battGroupId, int testRecordCount) {
+ QueryWrapper<BattTestInf> query = Wrappers.query();
+ query.eq("binf_id", battGroupId);
+ query.eq("test_record_count", testRecordCount);
+ //query.eq("test_type",3);
+ //query.ge("test_timelong",1800);
+
+ query.last(" limit 1");
+ return mapper.selectOne(query);
+ }
+
/*
//1.4鐢垫睜鎬ц兘璇勪及
public Response searchGroupAssess(int pageNum, int pageSize, ReportBattDTO tinf, int userId){
diff --git a/src/main/resources/mapper/BattTestInfMapper.xml b/src/main/resources/mapper/BattTestInfMapper.xml
index 7758177..94f69a3 100644
--- a/src/main/resources/mapper/BattTestInfMapper.xml
+++ b/src/main/resources/mapper/BattTestInfMapper.xml
@@ -57,6 +57,9 @@
select
binf_name as battGroupName,batt_test_inf.binf_id as battGroupId,mon_cap,mon_vol,test_record_count,group_vol,test_curr,max_monvol,min_monvol,test_cap,test_starttime,record_time,test_timelong,test_stoptype
from db_dis_batt.batt_test_inf,db_batt.power_inf where db_batt.power_inf.binf_id=db_dis_batt.batt_test_inf.binf_id
+ <if test="battGroupId!=null">
+ and db_dis_batt.batt_test_inf.binf_id=#{battGroupId}
+ </if>
and test_type=3
and test_timelong > 1800
ORDER BY db_dis_batt.batt_test_inf.test_starttime desc
--
Gitblit v1.9.1