From eada8042dfebd2137e3e0ce55702912d7a2a3e05 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 12 六月 2025 15:48:01 +0800
Subject: [PATCH] 去除蓄电池组1.2.5，1.2.6右侧图表
---
src/main/java/com/whyc/service/BatttestdataInfService.java | 72 ------------------------------------
src/main/java/com/whyc/controller/StatisticController.java | 6 ---
2 files changed, 0 insertions(+), 78 deletions(-)
diff --git a/src/main/java/com/whyc/controller/StatisticController.java b/src/main/java/com/whyc/controller/StatisticController.java
index a8e4dcf..0735a37 100644
--- a/src/main/java/com/whyc/controller/StatisticController.java
+++ b/src/main/java/com/whyc/controller/StatisticController.java
@@ -74,12 +74,6 @@
stic.setUid(uinf.getId());
return battTinfService.getDischr5Statistic(stic);
}
- @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("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 1700aec..c6dbf82 100644
--- a/src/main/java/com/whyc/service/BatttestdataInfService.java
+++ b/src/main/java/com/whyc/service/BatttestdataInfService.java
@@ -700,78 +700,6 @@
}
PageInfo pageInfo=PageInfoUtils.list2PageInfo(reslist, stic.getPageNum(), stic.getPageSize());
return new Response().setIIII(1,reslist.size()>0,pageInfo,bzmap,xnmap,"鏈勾搴﹀凡鏀剧數鏁伴噺缁熻");
- }//鏈勾搴﹀凡鏀剧數鏁伴噺缁熻鍙充晶鍥捐〃(1.2.5/6)
- public Response getDischr5Chart(Integer uid) {
- //鐝粍
- Map<String, Object> bzmap=new HashMap<>();
- //鎬ц兘
- Map<String, Integer> xnmap=new HashMap<>();
- xnmap.put("浼樼",0);
- xnmap.put("鍔ｅ寲",0);
- xnmap.put("鎹熷潖",0);
- xnmap.put("鏈斁鐢�",0);
- //鏌ヨ鍑烘墍鏈夌殑鐝粍骞惰祴浜堝垵濮嬪��
- setBanZuDefault(bzmap);
- //鑾峰彇鏍稿浼樺姡锛屾崯鍧忓弬鏁�
- List<AppParam> paramList=appParamService.getHrParam();
- Float badValue=0f;
- Float damageValue=0f;
- if(paramList!=null){
- for (AppParam param:paramList) {
- if(param.getParamNamePsx().equals("batt_mon_deteriorate_val")){
- badValue=param.getParamValue();
- }
- if(param.getParamNamePsx().equals("batt_mon_damage_val")){
- damageValue=param.getParamValue();
- }
-
- }
- }
- //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){
- int value=xnmap.get(Capperformance.getValue(Capperformance.BATTSTATE_4.getStateId()));
- xnmap.put(Capperformance.getValue(Capperformance.BATTSTATE_4.getStateId()),value+1);
- if(!groupName.equals("none")){
- BanZu bz= (BanZu) bzmap.get(groupName);
- int nochargeNum=bz.getNochargeNum();
- bz.setNochargeNum(nochargeNum+1);
- bzmap.put(groupName,bz);
- }
- continue;
- }
- if(!groupName.equals("none")){
- BanZu bz= (BanZu) bzmap.get(groupName);
- int dischargeNum=bz.getDischargeNum();
- bz.setDischargeNum(dischargeNum+1);
- bzmap.put(groupName,bz);
- }
- Float moncapStd=binf.getMoncapstd();
- int hourRate = BattCapFactory.GetHourRate(tinf.getTestCap(), tinf.getTestCurr());
- Float grouprealCap = (float) BattCapFactory.GetMonomerCap(tinf.getTestCap(), hourRate, tinf.getTestCap(), tinf.getMaxMonvol(), tinf.getMinMonvol(), tinf.getGroupVol(), BattCapFactory.CapType_Real);
- if(grouprealCap>=moncapStd*badValue){
- int value=xnmap.get(Capperformance.getValue(Capperformance.BATTSTATE_1.getStateId()));
- xnmap.put(Capperformance.getValue(Capperformance.BATTSTATE_1.getStateId()),value+1);
- }
- if(grouprealCap<=moncapStd*damageValue){
- int value=xnmap.get(Capperformance.getValue(Capperformance.BATTSTATE_3.getStateId()));
- xnmap.put(Capperformance.getValue(Capperformance.BATTSTATE_3.getStateId()),value+1);
- }
- if((grouprealCap>moncapStd*damageValue)&&(grouprealCap<moncapStd*badValue)){
- int value=xnmap.get(Capperformance.getValue(Capperformance.BATTSTATE_2.getStateId()));
- xnmap.put(Capperformance.getValue(Capperformance.BATTSTATE_2.getStateId()),value+1);
- }
-
- }
- return new Response().setIII(1,true,bzmap,xnmap,"鏈勾搴﹀凡鏀剧數鏁伴噺缁熻");
}
//鏌ヨ鍑烘墍鏈夌殑鐝粍骞惰祴浜堝垵濮嬪��
--
Gitblit v1.9.1