From 8e85ad8e022d2885c410d0654bce08e2a392b08f Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期一, 14 四月 2025 09:15:55 +0800
Subject: [PATCH] 放电记录查询
---
src/main/resources/mapper/BattTestInfMapper.xml | 9 +++++++++
src/main/java/com/whyc/pojo/db_dis_batt/BattTestInf.java | 6 +++++-
src/main/java/com/whyc/service/BattTestInfService.java | 7 +++++++
src/main/java/com/whyc/mapper/BattTestInfMapper.java | 2 ++
src/main/java/com/whyc/controller/BattTestInfController.java | 11 ++++++++---
5 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/whyc/controller/BattTestInfController.java b/src/main/java/com/whyc/controller/BattTestInfController.java
index 42467c1..549f556 100644
--- a/src/main/java/com/whyc/controller/BattTestInfController.java
+++ b/src/main/java/com/whyc/controller/BattTestInfController.java
@@ -18,20 +18,25 @@
@Autowired
private BattTestInfDataService dataService;
- @ApiOperation("鏌ヨ鍒嗛〉-鐢垫睜缁勭殑鍏呮斁鐢佃褰�")
+ /*@ApiOperation("鏌ヨ鍒嗛〉-鐢垫睜缁勭殑鍏呮斁鐢佃褰�")
@GetMapping("getPageByBattGroupId")
public Response getPageByBattGroupId(@RequestParam int battGroupId
, @RequestParam int pageNum, @RequestParam int pageSize){
return service.getPageByBattGroupId(battGroupId,pageNum,pageSize);
+ }*/
+
+ @GetMapping("getDischargePage")
+ public Response getDischargePage(@RequestParam int pageNum,@RequestParam int pageSize){
+ return service.getDischargePage(pageNum,pageSize);
}
- //鏍规嵁鍏呮斁鐢佃褰曟煡璇㈠崟浣撴斁鐢靛巻鍙茶鎯�
+ /*//鏍规嵁鍏呮斁鐢佃褰曟煡璇㈠崟浣撴斁鐢靛巻鍙茶鎯�
@ApiOperation("鏌ヨ鍗曟鏀剧數璁板綍璇︽儏")
@GetMapping("getByBattGroupIdAndTestRecordCount")
public Response getByBattGroupIdAndTestRecordCount(@RequestParam int battGroupId,@RequestParam int testRecordCount){
Response res=dataService.getByBattGroupIdAndTestRecordCount(battGroupId,testRecordCount);
return res;
- }
+ }*/
/*@PostMapping("searchGroupAssess")
diff --git a/src/main/java/com/whyc/mapper/BattTestInfMapper.java b/src/main/java/com/whyc/mapper/BattTestInfMapper.java
index fabcc27..65f623b 100644
--- a/src/main/java/com/whyc/mapper/BattTestInfMapper.java
+++ b/src/main/java/com/whyc/mapper/BattTestInfMapper.java
@@ -16,4 +16,6 @@
//鑾峰彇鏈夋晥鐨勬斁鐢佃褰�
List<BattTestInf> searchDischarge(int battGroupId);
+
+ List<BattTestInf> getDischargeList();
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/pojo/db_dis_batt/BattTestInf.java b/src/main/java/com/whyc/pojo/db_dis_batt/BattTestInf.java
index b8d27a2..58fe937 100644
--- a/src/main/java/com/whyc/pojo/db_dis_batt/BattTestInf.java
+++ b/src/main/java/com/whyc/pojo/db_dis_batt/BattTestInf.java
@@ -25,7 +25,7 @@
@TableField("binf_id")
@ApiModelProperty("鐢垫睜缁刬d")
- private Integer binfId;
+ private Integer battGroupId;
@TableField("record_time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -95,4 +95,8 @@
@TableField(exist = false)
private float realCap;
+
+ @TableField(exist = false)
+ private String battGroupName;
+
}
\ 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 bf8221a..edecf98 100644
--- a/src/main/java/com/whyc/service/BattTestInfService.java
+++ b/src/main/java/com/whyc/service/BattTestInfService.java
@@ -50,6 +50,13 @@
return new Response().set(1, pageInfo);
}
+ public Response getDischargePage(int pageNum, int pageSize) {
+ PageHelper.startPage(pageNum, pageSize);
+ List<BattTestInf> list =mapper.getDischargeList();
+ PageInfo pageInfo = new PageInfo(list);
+ return new Response().set(1, pageInfo);
+ }
+
/*
//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 7fd98c8..182b343 100644
--- a/src/main/resources/mapper/BattTestInfMapper.xml
+++ b/src/main/resources/mapper/BattTestInfMapper.xml
@@ -53,4 +53,13 @@
</where>
ORDER BY db_dis_batt.batt_test_inf.BattGroupId asc, test_starttime desc
</select>
+ <select id="getDischargeList" resultType="com.whyc.pojo.db_dis_batt.BattTestInf">
+ select
+ binf_name as battGroupName,batt_test_inf.binf_id as battGroupId,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
+ and test_starttype=3 and test_type=3
+ and (test_stoptype in (3, 4, 6)
+ or (test_stoptype=2 and test_timelong>=7200))
+ ORDER BY db_dis_batt.batt_test_inf.test_starttime desc
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1