From 210efc8a9b3d3c5a6a3f453dd4ce14f735d63f9b Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期六, 21 六月 2025 17:23:50 +0800
Subject: [PATCH] 实时页面时间间隔显示电源心跳包数据修改
---
src/main/java/com/whyc/service/SubTablePageInfoService.java | 14 +++----
src/main/java/com/whyc/service/PowerheartParamService.java | 2
src/main/java/com/whyc/service/PwrdevHistorydataIdService.java | 64 +++++++++++++++++++++++--------
src/main/java/com/whyc/controller/RealContoller.java | 2
4 files changed, 55 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/whyc/controller/RealContoller.java b/src/main/java/com/whyc/controller/RealContoller.java
index 49a9e9c..0fe7730 100644
--- a/src/main/java/com/whyc/controller/RealContoller.java
+++ b/src/main/java/com/whyc/controller/RealContoller.java
@@ -33,7 +33,7 @@
@ApiOperation(value = "绯荤粺姒傝鑾峰彇鍓嶄竴鐧炬瘮鏃堕棿闂撮殧鏁版嵁浜ゆ祦杈撳叆缁熻")
@GetMapping("getPwrHisAcinData100")
- public Response getPwrHisAcinData100(@RequestParam Integer powerId){
+ public Response getPwrHisAcinData100(@RequestParam Integer powerId) throws ParseException, InterruptedException {
return pwrdevHistorydataIdService.getPwrHisAcinData100(powerId);
}
diff --git a/src/main/java/com/whyc/service/PowerheartParamService.java b/src/main/java/com/whyc/service/PowerheartParamService.java
index f946c2b..733d1cd 100644
--- a/src/main/java/com/whyc/service/PowerheartParamService.java
+++ b/src/main/java/com/whyc/service/PowerheartParamService.java
@@ -13,7 +13,7 @@
//鑾峰彇鍓嶇瑪鏁�*鏃堕棿闂撮殧
public PowerheartParam getHeartParamByPowerId(Integer powerId) {
QueryWrapper wrapper=new QueryWrapper();
- wrapper.eq("powerId",powerId);
+ wrapper.eq("power_id",powerId);
wrapper.last("limit 1");
return mapper.selectOne(wrapper);
}
diff --git a/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java b/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java
index bd78a8d..ca1b960 100644
--- a/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java
+++ b/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java
@@ -2,12 +2,14 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.whyc.constant.PwrCapperformanceEnum;
+import com.whyc.dto.AnalysisAlm.ResAnalysis;
import com.whyc.dto.Real.CompareDto;
import com.whyc.dto.Real.PwrHisRealAcInDto;
import com.whyc.dto.Real.PwrHisRealDcoutInDto;
import com.whyc.dto.Real.QuarterDto;
import com.whyc.dto.Response;
import com.whyc.dto.Statistic.QuarterPwr7Res;
+import com.whyc.factory.ThreadPoolExecutorFactory;
import com.whyc.mapper.CommonMapper;
import com.whyc.pojo.db_data_history.BattRealdataId;
import com.whyc.pojo.db_data_history.PwrdevHistorydataId;
@@ -17,18 +19,23 @@
import com.whyc.pojo.db_param.PowerheartParam;
import com.whyc.pojo.db_station.PowerInf;
import com.whyc.util.ActionUtil;
+import com.whyc.util.DateUtil;
+import com.whyc.util.ThreadLocalUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.lang.reflect.Field;
+import java.text.ParseException;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
+
+import static java.lang.Thread.sleep;
@Service
public class PwrdevHistorydataIdService {
@@ -53,29 +60,52 @@
private PowerheartParamService heartService;
//绯荤粺姒傝鍓峃绗斾氦娴佽緭鍏ョ粺璁�
- public Response getPwrHisAcinData100(Integer powerId) {
- String dateTime = ActionUtil.sdfwithOutday.format(new Date());
+ public Response getPwrHisAcinData100(Integer powerId) throws ParseException, InterruptedException {
//鑾峰彇鍓嶇瑪鏁�*鏃堕棿闂撮殧
PowerheartParam heartParam=heartService.getHeartParamByPowerId(powerId);
- Integer interverCount=100*10;//榛樿鍊�
- Integer granularity=10;//榛樿鍊�
+ 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);
// 鏍煎紡鍖栬緭鍑�
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
String halfHourAgoTime=halfHourAgo.format(formatter);
- String tableName ="db_data_history.tb_pwrdev_historydata_"+powerId+"_"+dateTime;
- String existTableName = commonMapper.existTable("db_data_history", "tb_pwrdev_historydata_"+powerId+"_"+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<PwrHisRealAcInDto> 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 = powerId + "_" + ThreadLocalUtil.format(recordDatetime,2);
+ String tableName="db_data_history.tb_pwrdev_historydata_"+table;
+ //鍒ゆ柇琛ㄦ槸鍚﹀瓨鍦�
+ int tableNum = subTablePageInfoService.judgeTable_pwrhis(table);
+ List<PwrHisRealAcInDto> list = new ArrayList();
+ if (tableNum > 0) {
+ list=subTablePageInfoService.getHalfHourPwrHisAcinData(tableName, finalGranularity,recordDatetime,recordDatetime1);
+ }
+ dataList.addAll(list);
+ latch.countDown();
+ });
+ sleep(200);
}
- List<PwrHisRealAcInDto> datalist=subTablePageInfoService.getHalfHourPwrHisAcinData(tableName,granularity,halfHourAgoTime);
- return new Response().setII(1,datalist.size()>0,datalist,"鑾峰彇鍗婂皬鏃跺唴浜ゆ祦杈撳叆缁熻");
+ latch.await(10, TimeUnit.MINUTES);
+ List dataListSorted = dataList.stream().sorted(Comparator.comparing(PwrHisRealAcInDto::getRecordDatetime)).collect(Collectors.toList());
+ return new Response().setII(1,dataList.size()>0,dataListSorted,"鑾峰彇鍗婂皬鏃跺唴浜ゆ祦杈撳叆缁熻");
}
//绯荤粺姒傝鑾峰彇鍓峃绗旂洿娴佽緭鍑虹粺璁�
@@ -83,8 +113,8 @@
String dateTime = ActionUtil.sdfwithOutday.format(new Date());
//鑾峰彇鍓嶇瑪鏁�*鏃堕棿闂撮殧
PowerheartParam heartParam=heartService.getHeartParamByPowerId(powerId);
- Integer interverCount=100*10;//榛樿鍊�
- Integer granularity=10;//榛樿鍊�
+ Integer interverCount=100*5;//榛樿鍊�
+ Integer granularity=5;//榛樿鍊�
if(heartParam!=null){
interverCount=heartParam.getAcinInterverCfg()*heartParam.getAcinCountCfg();
granularity=heartParam.getAcinInterverCfg();
diff --git a/src/main/java/com/whyc/service/SubTablePageInfoService.java b/src/main/java/com/whyc/service/SubTablePageInfoService.java
index b071132..473555c 100644
--- a/src/main/java/com/whyc/service/SubTablePageInfoService.java
+++ b/src/main/java/com/whyc/service/SubTablePageInfoService.java
@@ -593,14 +593,12 @@
return list;
}
//绯荤粺姒傝鑾峰彇鍗婂皬鏃朵氦娴佽緭鍏ョ粺璁�
- public List<PwrHisRealAcInDto> getHalfHourPwrHisAcinData(String tableName,Integer granularity,String halfHourAgoTime) {
- String sql="select distinct record_datetime,acin1_vola,acin1_volb,acin1_volc,acin2_vola,acin2_volb,acin2_volc " +
- ",acin1_curra,acin1_currb,acin1_currc,acin2_curra,acin2_currb,acin2_currc " +
- "from (select a.*, (@i:= @i+1) as number " +
- " from (select * from "+tableName+" "+
- " where record_datetime>='"+halfHourAgoTime+"') a, " +
- " (select @i:=0) b) c "+
- " where c.number%"+granularity+"=0 or c.number=1 ";
+ public List<PwrHisRealAcInDto> getHalfHourPwrHisAcinData(String tableName,Integer granularity,Date recordDatetime,Date recordDatetime1) {
+ String sql=" select distinct record_datetime,acin1_vola,acin1_volb,acin1_volc,acin2_vola,acin2_volb,acin2_volc " +
+ " ,acin1_curra,acin1_currb,acin1_currc,acin2_curra,acin2_currb,acin2_currc " +
+ " from "+tableName+" where record_datetime>='"+ActionUtil.sdf.format(recordDatetime)+"'" +
+ " and record_datetime<='"+ActionUtil.sdf.format(recordDatetime1)+
+ "' and record_num%"+granularity+"=0 or record_num=1 or record_num=100 ";
sql+=" order by record_datetime asc";
List<PwrHisRealAcInDto> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
@Override
--
Gitblit v1.9.1