From fad53343c7e7939f652227ebaf9299f84b753d4f Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 12 六月 2025 10:32:24 +0800
Subject: [PATCH] 蓄电池组1.2.5，1.2.6右侧图标整合
---
src/main/java/com/whyc/service/BatttestdataInfService.java | 33 ---------------------------------
src/main/java/com/whyc/controller/StatisticController.java | 9 +--------
2 files changed, 1 insertions(+), 41 deletions(-)
diff --git a/src/main/java/com/whyc/controller/StatisticController.java b/src/main/java/com/whyc/controller/StatisticController.java
index 718d865..e4c87fa 100644
--- a/src/main/java/com/whyc/controller/StatisticController.java
+++ b/src/main/java/com/whyc/controller/StatisticController.java
@@ -74,19 +74,12 @@
stic.setUid(uinf.getId());
return battTinfService.getDischr5Statistic(stic);
}
- @ApiOperation(value = "鏈勾搴﹀凡鏀剧數鏁伴噺缁熻鍙充晶鍥捐〃(1.2.5)")
+ @ApiOperation(value = "鏈勾搴﹀凡鏀剧數鏁伴噺缁熻鍙充晶鍥捐〃(1.2.5/6)")
@PostMapping("getDischr5Chart")
public Response getDischr5Chart(){
User uinf= ActionUtil.getUser();
return battTinfService.getDischr5Chart(uinf.getId());
}
- @ApiOperation(value = "鏈勾搴︽湭鏀剧數鏁伴噺缁熻鍙充晶鍥捐〃(1.2.6)")
- @PostMapping("getDischr6Chart")
- public Response getDischr6Chart(){
- User uinf= ActionUtil.getUser();
- return battTinfService.getDischr6Chart(uinf.getId());
- }
-
@ApiOperation(value = "鏈勾搴︽湭鏀剧數鏁伴噺缁熻(1.2.6)")
@PostMapping("getDischr6Statistic")
public Response getDischr6Statistic(@RequestBody DisChargeStic stic){
diff --git a/src/main/java/com/whyc/service/BatttestdataInfService.java b/src/main/java/com/whyc/service/BatttestdataInfService.java
index 2c1f2f6..604b501 100644
--- a/src/main/java/com/whyc/service/BatttestdataInfService.java
+++ b/src/main/java/com/whyc/service/BatttestdataInfService.java
@@ -809,39 +809,6 @@
PageInfo pageInfo=PageInfoUtils.list2PageInfo(reslist, stic.getPageNum(), stic.getPageSize());
return new Response().setII(1,reslist.size()>0,pageInfo,"鏈勾搴︽湭鏀剧數鏁伴噺缁熻");
}
- //鏈勾搴︽湭鏀剧數鏁伴噺缁熻鍙充晶鍥捐〃(1.2.6)
- public Response getDischr6Chart(Integer uid) {
- Map<String, Object> map=new HashMap<>();
- //鏌ヨ鍑烘墍鏈夌殑鐝粍骞惰祴浜堝垵濮嬪��
- setBanZuDefault(map);
- //1鏌ヨ绗﹀悎鏉′欢鐨勭數姹犵粍
- List<BattInf> binfList=battInfService.getDischrChart(uid);
- if(binfList==null||binfList.size()==0){
- return new Response().set(1,false,"褰撳墠鐢ㄦ埛鏈鐞嗘弧瓒虫潯浠剁殑鐢垫睜缁�");
- }
- for (BattInf binf:binfList) {
- //鏌ヨ鐢垫睜缁勬墍鍦ㄧ殑鐝粍
- String groupName=bjService.getGroupName(binf.getPowerId());
- //2.鑾峰彇鐢垫睜缁勫湪缁欏畾鏃堕棿娈电殑鏀剧數璁板綍(鎸囧畾鏃堕棿娈电殑鏍囧噯鏍稿鏀剧數)
- BatttestdataInf tinf =getLastStandardTestDataByTime(binf.getBattgroupId(),null,null);
- if(tinf==null){
- if(!groupName.equals("none")){
- BanZu bz= (BanZu) map.get(groupName);
- int nochargeNum=bz.getNochargeNum();
- bz.setNochargeNum(nochargeNum+1);
- map.put(groupName,bz);
- }
- continue;
- }
- if(!groupName.equals("none")){
- BanZu bz= (BanZu) map.get(groupName);
- int dischargeNum=bz.getDischargeNum();
- bz.setDischargeNum(dischargeNum+1);
- map.put(groupName,bz);
- }
- }
- return new Response().setII(1,true,map,"鏈勾搴﹀凡鏀剧數鏁伴噺缁熻鍙充晶鍥捐〃(1.2.5)");
- }
//2.鑾峰彇鐢垫睜缁勬湭鏀剧數璁板綍(鎸囧畾鏃堕棿娈电殑鏍囧噯鏍稿鏀剧數)
private void getNoDischargeData(Integer battgroupId, Date testStartTime, Date testEndTime, List<Integer> typeList, SticDischarge6Res res) {
List<BatttestdataInf> tinfList=mapper.getNoDischargeData(battgroupId,testStartTime,testEndTime,typeList);
--
Gitblit v1.9.1