From a87fc3c9375d5d77017d9dff8dc1ea425acb932d Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期六, 21 六月 2025 16:07:37 +0800
Subject: [PATCH] 修改实时页面电源前N笔数据心跳包
---
src/main/java/com/whyc/service/BattRealdataIdService.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/service/BattRealdataIdService.java b/src/main/java/com/whyc/service/BattRealdataIdService.java
index cfa95d3..1a7d628 100644
--- a/src/main/java/com/whyc/service/BattRealdataIdService.java
+++ b/src/main/java/com/whyc/service/BattRealdataIdService.java
@@ -11,6 +11,7 @@
import com.whyc.pojo.db_data_history.BattRealdataId;
import com.whyc.pojo.db_param.AlmAnalysisParam;
import com.whyc.pojo.db_param.AppParam;
+import com.whyc.pojo.db_param.PowerheartParam;
import com.whyc.pojo.db_ram_db.BattRtstate;
import com.whyc.pojo.db_station.BattInf;
import com.whyc.util.ActionUtil;
@@ -47,6 +48,9 @@
@Autowired(required = false)
private BattRtstateService rtstateService;
+
+ @Autowired
+ private PowerheartParamService heartService;
@@ -170,14 +174,22 @@
}
return new Response().setII(1,map.size()>0,map,"鑾峰彇鐢垫睜缁勬渶杩戜竴瀛ｅ害鐨勬俯搴︽暟鎹�");
}
- //绯荤粺姒傝鑾峰彇鍗婂皬鏃舵牳瀹硅澶囦俊鎭�
- public Response getHalfHourBattDevData(Integer battgroupId,Integer granularity) {
+ //绯荤粺姒傝鑾峰彇鍓峃绗旀牳瀹硅澶囦俊鎭�
+ public Response getBattDevData100(Integer powerId,Integer battgroupId) {
String dateTime = ActionUtil.sdfwithOutday.format(new Date());
String tableName ="db_data_history.tb_batt_realdata_"+battgroupId+"_"+dateTime;
+ //鑾峰彇鍓嶇瑪鏁�*鏃堕棿闂撮殧
+ PowerheartParam heartParam=heartService.getHeartParamByPowerId(powerId);
+ Integer interverCount=100*10;//榛樿鍊�
+ Integer granularity=10;//榛樿鍊�
+ if(heartParam!=null){
+ interverCount=heartParam.getAcinInterverCfg()*heartParam.getAcinCountCfg();
+ granularity=heartParam.getAcinInterverCfg();
+ }
//鑾峰彇鍓嶅崐涓皬鏃舵暟鎹�
LocalDateTime now = LocalDateTime.now();
// 璁＄畻鍗婂皬鏃跺墠鐨勬椂闂寸偣
- LocalDateTime halfHourAgo = now.minusMinutes(30);
+ LocalDateTime halfHourAgo = now.minusMinutes(interverCount);
// 鏍煎紡鍖栬緭鍑�
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
String halfHourAgoTime=halfHourAgo.format(formatter);
--
Gitblit v1.9.1