From 6c13a67934178804ba4845ed821a07145e679a0e Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 29 五月 2025 11:25:58 +0800
Subject: [PATCH] 电压上一季度历史实时
---
src/main/java/com/whyc/service/BattRealdataIdService.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/whyc/service/BattRealdataIdService.java b/src/main/java/com/whyc/service/BattRealdataIdService.java
index 846a634..34646a7 100644
--- a/src/main/java/com/whyc/service/BattRealdataIdService.java
+++ b/src/main/java/com/whyc/service/BattRealdataIdService.java
@@ -1,11 +1,10 @@
package com.whyc.service;
-import com.whyc.dto.Real.QuarterData;
+import com.whyc.dto.Real.CompareDto;
+import com.whyc.dto.Real.QuarterDto;
import com.whyc.dto.Response;
import com.whyc.mapper.CommonMapper;
-import com.whyc.pojo.db_data_history.BattRealdataId;
import com.whyc.util.ActionUtil;
-import com.whyc.util.SubTablePageInfoUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -23,16 +22,38 @@
//鑾峰彇鐢垫睜缁勬渶杩戜竴瀛ｅ害鐨勫崟浣撴暟鎹�
public Response getBattQuarter(Integer battgroupId) {
HashMap<String,Object> map = new HashMap<>();
+ Float maxVol=0f;
+ Float minVol=0f;
+ Float avgVol=0f;
+ int num=0;
List<String> datelist = ActionUtil.getLastQuarterYearMonths();
- for (String date:datelist) {
+ 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<QuarterData> list=subTablePageInfoService.getBattRealHis(tableName,"mon_vol");
- map.put(date,list);
+ List<QuarterDto> datalist=subTablePageInfoService.getBattRealHis(tableName,"mon_vol");
+ map.put(date,datalist);
+ //鑾峰彇琛ㄤ腑鏈�澶э紝鏈�灏忥紝骞冲潎鏁版嵁鍊�
+ CompareDto compareData=subTablePageInfoService.getBattCompareHis(tableName,"mon_vol");
+ if(num==0){
+ maxVol=compareData.getMaxValue();
+ minVol=compareData.getMinValue();
+ }
+ if (compareData.getMaxValue() >= maxVol) {
+ maxVol =compareData.getMaxValue();
+ }
+ if (compareData.getMinValue() <= minVol) {
+ minVol = compareData.getMinValue();
+ }
+ avgVol += compareData.getAvgValue();
+ map.put("maxVol",maxVol);
+ map.put("minVol",minVol);
+ map.put("avgVol",avgVol/datelist.size());
+ num++;
}
return new Response().setII(1,map.size()>0,map,"鑾峰彇鐢垫睜缁勬渶杩戜竴瀛ｅ害鐨勬暟鎹�");
}
--
Gitblit v1.9.1