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/PwrdevHistorydataIdService.java | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java b/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java
index 7371494..bd78a8d 100644
--- a/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java
+++ b/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java
@@ -14,6 +14,7 @@
import com.whyc.pojo.db_param.AppParam;
import com.whyc.pojo.db_param.ApptimeParam;
import com.whyc.pojo.db_param.PowerPropertyParam;
+import com.whyc.pojo.db_param.PowerheartParam;
import com.whyc.pojo.db_station.PowerInf;
import com.whyc.util.ActionUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -48,13 +49,23 @@
@Autowired
private PowerPropertyParamService propertyParamService;
- //绯荤粺姒傝鑾峰彇鍗婂皬鏃朵氦娴佽緭鍏ョ粺璁�
- public Response getHalfHourPwrHisAcinData(Integer powerId,Integer granularity) {
+ @Autowired
+ private PowerheartParamService heartService;
+
+ //绯荤粺姒傝鍓峃绗斾氦娴佽緭鍏ョ粺璁�
+ public Response getPwrHisAcinData100(Integer powerId) {
String dateTime = ActionUtil.sdfwithOutday.format(new Date());
- //鑾峰彇鍓嶅崐涓皬鏃舵暟鎹�
+ //鑾峰彇鍓嶇瑪鏁�*鏃堕棿闂撮殧
+ 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);
@@ -67,13 +78,21 @@
return new Response().setII(1,datalist.size()>0,datalist,"鑾峰彇鍗婂皬鏃跺唴浜ゆ祦杈撳叆缁熻");
}
- //绯荤粺姒傝鑾峰彇鍗婂皬鏃剁洿娴佽緭鍑虹粺璁�
- public Response getHalfHourPwrHisDcoutData(Integer powerId,Integer granularity) {
+ //绯荤粺姒傝鑾峰彇鍓峃绗旂洿娴佽緭鍑虹粺璁�
+ public Response getHalfHourPwrHisDcoutData(Integer powerId) {
String dateTime = ActionUtil.sdfwithOutday.format(new Date());
+ //鑾峰彇鍓嶇瑪鏁�*鏃堕棿闂撮殧
+ 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