From 086e9639f47c407e3a1e5b2f71ca816d397fe9fc Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 29 五月 2025 13:46:44 +0800
Subject: [PATCH] 实时页面内阻测试
---
src/main/java/com/whyc/service/BattRealdataIdService.java | 122 +++++++++++++++++++++++++++++++++++-----
1 files changed, 107 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/whyc/service/BattRealdataIdService.java b/src/main/java/com/whyc/service/BattRealdataIdService.java
index 264b57f..d85892d 100644
--- a/src/main/java/com/whyc/service/BattRealdataIdService.java
+++ b/src/main/java/com/whyc/service/BattRealdataIdService.java
@@ -4,6 +4,9 @@
import com.whyc.dto.Real.QuarterDto;
import com.whyc.dto.Response;
import com.whyc.mapper.CommonMapper;
+import com.whyc.pojo.db_batt_testdata.BattresdataId;
+import com.whyc.pojo.db_batt_testdata.BattresdataInf;
+import com.whyc.pojo.db_station.BattInf;
import com.whyc.util.ActionUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -19,12 +22,19 @@
@Resource
private CommonMapper commonMapper;
+ @Autowired
+ private BattresdataInfService resInfService;
+
+ @Autowired
+ private BattInfService binfService;
+
+
//鑾峰彇鐢垫睜缁勬渶杩戜竴瀛ｅ害鐨勫崟浣撴暟鎹�
- public Response getBattQuarter(Integer battgroupId) {
+ public Response getBattQuarterVol(Integer battgroupId) {
HashMap<String,Object> map = new HashMap<>();
- Float maxVol=0f;
- Float minVol=0f;
- Float avgVol=0f;
+ Float maxData=0f;
+ Float minData=0f;
+ Float avgData=0f;
int num=0;
List<String> datelist = ActionUtil.getLastQuarterYearMonths();
for (int i=0;i<datelist.size();i++) {
@@ -40,21 +50,103 @@
//鑾峰彇琛ㄤ腑鏈�澶э紝鏈�灏忥紝骞冲潎鏁版嵁鍊�
CompareDto compareData=subTablePageInfoService.getBattCompareHis(tableName,"mon_vol");
if(num==0){
- maxVol=compareData.getMaxData();
- minVol=compareData.getMinData();
+ maxData=compareData.getMaxData();
+ minData=compareData.getMinData();
}
- if (compareData.getMaxData() >= maxVol) {
- maxVol =compareData.getMaxData();
+ if (compareData.getMaxData() >= maxData) {
+ maxData =compareData.getMaxData();
}
- if (compareData.getMinData() <= minVol) {
- minVol = compareData.getMinData();
+ if (compareData.getMinData() <= minData) {
+ minData= compareData.getMinData();
}
- avgVol += compareData.getAvgData();
- map.put("maxVol",maxVol);
- map.put("minVol",minVol);
- map.put("avgVol",avgVol/datelist.size());
+ avgData+= compareData.getAvgData();
+ map.put("maxData",maxData);
+ map.put("minData",minData);
+ map.put("avgData",avgData/datelist.size());
num++;
}
- return new Response().setII(1,map.size()>0,map,"鑾峰彇鐢垫睜缁勬渶杩戜竴瀛ｅ害鐨勬暟鎹�");
+ return new Response().setII(1,map.size()>0,map,"鑾峰彇鐢垫睜缁勬渶杩戜竴瀛ｅ害鐨勭數鍘嬫暟鎹�");
+ }
+ //鑾峰彇鐢垫睜缁勬渶杩戜竴瀛ｅ害鐨勫唴闃绘暟鎹�
+ public Response getBattQuarterRes(Integer battgroupId) {
+ HashMap<String,Object> map = new HashMap<>();
+ Float maxData=0f;
+ Float minData=0f;
+ Float avgData=0f;
+ int num=0;
+ List<String> datelist = ActionUtil.getLastQuarterYearMonths();
+ //鑾峰彇鍐呴樆鍒濆鏁版嵁锛堢涓�娆″唴闃绘祴璇曠殑绗竴绗旀暟鎹級
+ List<QuarterDto> list=resInfService.getFirstResData(battgroupId);
+ if(list==null){//褰撳垵濮嬪�间负0鏃朵娇鐢ㄦ爣绉板唴闃�
+ list=binfService.getBinfResStd(battgroupId);
+ }
+ map.put("startRes",list);
+ for (int i=0;i<datelist.size();i++) {
+ String date=datelist.get(i);
+ String tableName ="db_data_history.tb_batt_realdata_"+battgroupId+"_"+date;
+ String existTableName = commonMapper.existTable("db_data_history", "tb_batt_realdata_"+battgroupId+"_"+date);
+ if(existTableName == null){
+ continue;
+ }
+ //鍒ゆ柇琛ㄦ槸鍚﹀瓨鍦�
+ List<QuarterDto> datalist=subTablePageInfoService.getBattRealHis(tableName,"mon_res");
+ map.put(date,datalist);
+ //鑾峰彇琛ㄤ腑鏈�澶э紝鏈�灏忥紝骞冲潎鏁版嵁鍊�
+ CompareDto compareData=subTablePageInfoService.getBattCompareHis(tableName,"mon_res");
+ if(num==0){
+ maxData=compareData.getMaxData();
+ minData=compareData.getMinData();
+ }
+ if (compareData.getMaxData() >= maxData) {
+ maxData =compareData.getMaxData();
+ }
+ if (compareData.getMinData() <= minData) {
+ minData= compareData.getMinData();
+ }
+ avgData+= compareData.getAvgData();
+ map.put("maxData",maxData);
+ map.put("minData",minData);
+ map.put("avgData",avgData/datelist.size());
+ num++;
+ }
+ return new Response().setII(1,map.size()>0,map,"鑾峰彇鐢垫睜缁勬渶杩戜竴瀛ｅ害鐨勫唴闃绘暟鎹�");
+ }
+ //鑾峰彇鐢垫睜缁勬渶杩戜竴瀛ｅ害鐨勬俯搴︽暟鎹�
+ public Response getBattQuarterTmp(Integer battgroupId) {
+ HashMap<String,Object> map = new HashMap<>();
+ Float maxData=0f;
+ Float minData=0f;
+ Float avgData=0f;
+ int num=0;
+ List<String> datelist = ActionUtil.getLastQuarterYearMonths();
+ for (int i=0;i<datelist.size();i++) {
+ String date=datelist.get(i);
+ String tableName ="db_data_history.tb_batt_realdata_"+battgroupId+"_"+date;
+ String existTableName = commonMapper.existTable("db_data_history", "tb_batt_realdata_"+battgroupId+"_"+date);
+ if(existTableName == null){
+ continue;
+ }
+ //鍒ゆ柇琛ㄦ槸鍚﹀瓨鍦�
+ List<QuarterDto> datalist=subTablePageInfoService.getBattRealHis(tableName,"mon_tmp");
+ map.put(date,datalist);
+ //鑾峰彇琛ㄤ腑鏈�澶э紝鏈�灏忥紝骞冲潎鏁版嵁鍊�
+ CompareDto compareData=subTablePageInfoService.getBattCompareHis(tableName,"mon_tmp");
+ if(num==0){
+ maxData=compareData.getMaxData();
+ minData=compareData.getMinData();
+ }
+ if (compareData.getMaxData() >= maxData) {
+ maxData =compareData.getMaxData();
+ }
+ if (compareData.getMinData() <= minData) {
+ minData= compareData.getMinData();
+ }
+ avgData+= compareData.getAvgData();
+ map.put("maxData",maxData);
+ map.put("minData",minData);
+ map.put("avgData",avgData/datelist.size());
+ num++;
+ }
+ return new Response().setII(1,map.size()>0,map,"鑾峰彇鐢垫睜缁勬渶杩戜竴瀛ｅ害鐨勬俯搴︽暟鎹�");
}
}
\ No newline at end of file
--
Gitblit v1.9.1