From c7795eb09f3059f1a0310bc817e2fa0e9e64d29e Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 26 六月 2025 21:15:01 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/powerIntelligenceSystem
---
src/main/java/com/whyc/service/BattRealdataIdService.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 60 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/whyc/service/BattRealdataIdService.java b/src/main/java/com/whyc/service/BattRealdataIdService.java
index 06a34ad..1771a88 100644
--- a/src/main/java/com/whyc/service/BattRealdataIdService.java
+++ b/src/main/java/com/whyc/service/BattRealdataIdService.java
@@ -1,6 +1,8 @@
package com.whyc.service;
import com.whyc.dto.Real.*;
+import com.whyc.dto.RealDataStatic.ResRealDataAc;
+import com.whyc.dto.RealDataStatic.SticRealDataAc;
import com.whyc.dto.Response;
import com.whyc.factory.ThreadPoolExecutorFactory;
import com.whyc.mapper.CommonMapper;
@@ -275,4 +277,62 @@
List dataListSorted = dataList.stream().sorted(Comparator.comparing(RealDateDTO::getRecordTime)).collect(Collectors.toList());
return new Response().setIII(1, dataListSorted!=null,dataListSorted,map,"鍘嗗彶瀹炴椂鏌ヨ");
}
+ //瀹炴椂鏁版嵁缁熻鏇茬嚎--鏍稿璁惧
+ public Response getSticRealHrData(SticRealDataAc stic) throws ParseException, InterruptedException {
+ //鑾峰彇鍓嶇瑪鏁�*鏃堕棿闂撮殧
+ PowerheartParam heartParam=heartService.getHeartParamByPowerId(stic.getPowerId());
+ Integer interverCount=100*5;//榛樿鍊�
+ Integer granularity=5;//榛樿鍊�
+ if(heartParam!=null){
+ interverCount=heartParam.getAcinInterverCfg()*heartParam.getAcinCountCfg();
+ granularity=heartParam.getAcinInterverCfg();
+ }
+ 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);
+ // 鏍煎紡鍖栬緭鍑�
+ String halfHourAgoTime=halfHourAgo.format(formatter);
+ Date startTime=ActionUtil.sdf.parse(halfHourAgoTime);
+ //鑾峰彇涓や釜鏃堕棿鍒嗗壊澶氬皯寮犺〃
+ List<List<Date>> monthTimeList = DateUtil.getMonthTime(startTime,endTime);
+ List<ResRealDataAc> 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;
+ BattRealdataId realdata = new BattRealdataId();
+ realdata.setRecordTime(monthTimeList.get(finalII).get(0));
+ realdata.setRecordTime1(monthTimeList.get(finalII).get(1));
+ String table = stic.getBattgroupId() + "_" + ThreadLocalUtil.format(realdata.getRecordTime(),2);
+ String tableName="db_data_history.tb_batt_realdata_"+table;
+ realdata.setTableName(table);//琛ㄥ悕鏃堕棿鏍煎紡閮ㄥ垎
+ //鍒ゆ柇琛ㄦ槸鍚﹀瓨鍦�
+ int tableNum = subTablePageInfoService.judgeTable_realdata(table);
+ List<ResRealDataAc> list = new ArrayList();
+ if (tableNum > 0) {
+ //鑾峰彇鎸囧畾鏃堕棿娈靛唴鏈�澶ф渶灏弐ecordNum纭繚鏁版嵁鐨勫畬鏁�
+ List recordNums= subTablePageInfoService.getBattMaxAndMinRecordNum(tableName,realdata.getRecordTime(),realdata.getRecordTime1());
+ Integer maxRecordNum= 0;
+ Integer minRecordNum= 0;
+ if(recordNums.size()>0){
+ maxRecordNum=(Integer)recordNums.get(0);
+ minRecordNum=(Integer)recordNums.get(1);
+ }
+ list = subTablePageInfoService.getSticRealHrData(realdata, finalGranularity,maxRecordNum,minRecordNum,stic.getPropertyInfo());
+ }
+ dataList.addAll(list);
+ latch.countDown();
+ });
+ sleep(200);
+ }
+ latch.await(10, TimeUnit.MINUTES);
+ List dataListSorted = dataList.stream().sorted(Comparator.comparing(ResRealDataAc::getRecordDatetime)).collect(Collectors.toList());
+ return new Response().setII(1,dataList.size()>0,dataListSorted,"瀹炴椂鏁版嵁缁熻鏇茬嚎--鏍稿璁惧");
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1