From d8475b8670b6b4cbcd1bc9e57d30a6f433d206ab Mon Sep 17 00:00:00 2001
From: DELL <1525436766@qq.com>
Date: 星期一, 23 六月 2025 23:33:54 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/powerIntelligenceSystem
---
src/main/java/com/whyc/service/BattRealdataIdService.java | 65 +++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/whyc/service/BattRealdataIdService.java b/src/main/java/com/whyc/service/BattRealdataIdService.java
index 1a7d628..06a34ad 100644
--- a/src/main/java/com/whyc/service/BattRealdataIdService.java
+++ b/src/main/java/com/whyc/service/BattRealdataIdService.java
@@ -1,9 +1,6 @@
package com.whyc.service;
-import com.whyc.dto.Real.BattHisRealDto;
-import com.whyc.dto.Real.CompareDto;
-import com.whyc.dto.Real.QuarterDto;
-import com.whyc.dto.Real.RealDateDTO;
+import com.whyc.dto.Real.*;
import com.whyc.dto.Response;
import com.whyc.factory.ThreadPoolExecutorFactory;
import com.whyc.mapper.CommonMapper;
@@ -175,30 +172,59 @@
return new Response().setII(1,map.size()>0,map,"鑾峰彇鐢垫睜缁勬渶杩戜竴瀛ｅ害鐨勬俯搴︽暟鎹�");
}
//绯荤粺姒傝鑾峰彇鍓峃绗旀牳瀹硅澶囦俊鎭�
- public Response getBattDevData100(Integer powerId,Integer battgroupId) {
- String dateTime = ActionUtil.sdfwithOutday.format(new Date());
- String tableName ="db_data_history.tb_batt_realdata_"+battgroupId+"_"+dateTime;
+ public Response getBattDevData100(Integer powerId,Integer battgroupId) throws ParseException, InterruptedException {
//鑾峰彇鍓嶇瑪鏁�*鏃堕棿闂撮殧
PowerheartParam heartParam=heartService.getHeartParamByPowerId(powerId);
Integer interverCount=100*10;//榛樿鍊�
- Integer granularity=10;//榛樿鍊�
+ Integer granularity=5;//榛樿鍊�
if(heartParam!=null){
- interverCount=heartParam.getAcinInterverCfg()*heartParam.getAcinCountCfg();
- granularity=heartParam.getAcinInterverCfg();
+ interverCount=heartParam.getHrInterverCfg()*heartParam.getHrCountCfg();
+ granularity=heartParam.getHrInterverCfg();
}
- //鑾峰彇鍓嶅崐涓皬鏃舵暟鎹�
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
LocalDateTime now = LocalDateTime.now();
- // 璁＄畻鍗婂皬鏃跺墠鐨勬椂闂寸偣
+ String dateTime = now.format(formatter);
+ Date endTime=ActionUtil.sdf.parse(dateTime);
+ // 璁＄畻绗旀暟*鏃堕棿闂撮殧鐨勬椂闂寸偣
LocalDateTime halfHourAgo = now.minusMinutes(interverCount);
// 鏍煎紡鍖栬緭鍑�
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
String halfHourAgoTime=halfHourAgo.format(formatter);
- String existTableName = commonMapper.existTable("db_data_history", "tb_batt_realdata_"+battgroupId+"_"+dateTime);
- if(existTableName == null){
- return new Response().set(1,false,"褰撳墠鐢垫睜缁勪笉瀛樺湪鍓嶉潰灏忔椂鏁版嵁");
+ Date startTime=ActionUtil.sdf.parse(halfHourAgoTime);
+ List<List<Date>> monthTimeList = DateUtil.getMonthTime(startTime,endTime);
+ List<RealDateDTO> dataList = new LinkedList<>();
+ ThreadPoolExecutor pool = ThreadPoolExecutorFactory.getPoolExecutor();
+ CountDownLatch latch = new CountDownLatch(monthTimeList.size());
+ for (int i = 0; i < monthTimeList.size(); i++) {
+ int finalI = i;
+ Integer finalGranularity = granularity;
+ pool.execute(() -> {
+ int finalII = finalI;
+ Date recordDatetime=monthTimeList.get(finalII).get(0);
+ Date recordDatetime1=monthTimeList.get(finalII).get(1);
+ String table = battgroupId + "_" + ThreadLocalUtil.format(recordDatetime,2);
+ String tableName="db_data_history.tb_batt_realdata_"+table;
+ //鍒ゆ柇琛ㄦ槸鍚﹀瓨鍦�
+ int tableNum = subTablePageInfoService.judgeTable_realdata(table);
+ List<RealDateDTO> list = new ArrayList();
+ if (tableNum > 0) {
+ //鑾峰彇鎸囧畾鏃堕棿娈靛唴鏈�澶ф渶灏弐ecordNum纭繚鏁版嵁鐨勫畬鏁�
+ List recordNums= subTablePageInfoService.getBattMaxAndMinRecordNum(tableName,recordDatetime,recordDatetime1);
+ Integer maxRecordNum= 0;
+ Integer minRecordNum= 0;
+ if(recordNums.size()>0){
+ maxRecordNum=(Integer)recordNums.get(0);
+ minRecordNum=(Integer)recordNums.get(1);
+ }
+ list = subTablePageInfoService.getBattDevData100(tableName, finalGranularity,recordDatetime,recordDatetime1,maxRecordNum,minRecordNum);
+ }
+ dataList.addAll(list);
+ latch.countDown();
+ });
+ sleep(200);
}
- List<BattHisRealDto> datalist=subTablePageInfoService.getHalfHourBattDevData(tableName,granularity,halfHourAgoTime);
- return new Response().setII(1,datalist.size()>0,datalist,"鑾峰彇鍗婂皬鏃跺唴鏍稿璁惧淇℃伅");
+ latch.await(10, TimeUnit.MINUTES);
+ List dataListSorted = dataList.stream().sorted(Comparator.comparing(RealDateDTO::getRecordTime)).collect(Collectors.toList());
+ return new Response().setII(1,dataList.size()>0,dataListSorted,"鑾峰彇鍗婂皬鏃跺唴鏍稿璁惧淇℃伅");
}
//鍘嗗彶瀹炴椂鏁版嵁
public Response getBattRealDataHis(Integer battgroupId, Integer granularity,String startTime,String endTime) throws ParseException, InterruptedException {
@@ -224,13 +250,14 @@
realdata.setRecordTime(monthTimeList.get(finalII).get(0));
realdata.setRecordTime1(monthTimeList.get(finalII).get(1));
String table = battgroupId + "_" + ThreadLocalUtil.format(realdata.getRecordTime(),2);
+ String tableName="db_data_history.tb_batt_realdata_"+table;
realdata.setTableName(table);//琛ㄥ悕鏃堕棿鏍煎紡閮ㄥ垎
//鍒ゆ柇琛ㄦ槸鍚﹀瓨鍦�
int tableNum = subTablePageInfoService.judgeTable_realdata(table);
List<RealDateDTO> list = new ArrayList();
if (tableNum > 0) {
//鑾峰彇鎸囧畾鏃堕棿娈靛唴鏈�澶ф渶灏弐ecordNum纭繚鏁版嵁鐨勫畬鏁�
- List recordNums= subTablePageInfoService.getMaxAndMinRecordNum(realdata);
+ List recordNums= subTablePageInfoService.getBattMaxAndMinRecordNum(tableName,realdata.getRecordTime(),realdata.getRecordTime1());
Integer maxRecordNum= 0;
Integer minRecordNum= 0;
if(recordNums.size()>0){
--
Gitblit v1.9.1