From a657d11cb3d3f70a536da25ef54acfa46602f62c Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期六, 07 六月 2025 15:35:30 +0800
Subject: [PATCH] 系统概览获取半小时核容设备信息添加负载电流load_curr

---
 src/main/java/com/whyc/service/BattRealdataIdService.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/whyc/service/BattRealdataIdService.java b/src/main/java/com/whyc/service/BattRealdataIdService.java
index fe934ed..f237c32 100644
--- a/src/main/java/com/whyc/service/BattRealdataIdService.java
+++ b/src/main/java/com/whyc/service/BattRealdataIdService.java
@@ -18,6 +18,8 @@
 
 import javax.annotation.Resource;
 import java.text.ParseException;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -164,11 +166,18 @@
     public Response getHalfHourBattDevData(Integer battgroupId,Integer granularity) {
         String dateTime = ActionUtil.sdfwithOutday.format(new Date());
         String tableName ="db_data_history.tb_batt_realdata_"+battgroupId+"_"+dateTime;
+        //鑾峰彇鍓嶅崐涓皬鏃舵暟鎹�
+        LocalDateTime now = LocalDateTime.now();
+        // 璁$畻鍗婂皬鏃跺墠鐨勬椂闂寸偣
+        LocalDateTime halfHourAgo = now.minusMinutes(30);
+        // 鏍煎紡鍖栬緭鍑�
+        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,"褰撳墠鐢垫睜缁勪笉瀛樺湪鍓嶉潰灏忔椂鏁版嵁");
         }
-        List<BattHisRealDto> datalist=subTablePageInfoService.getHalfHourBattDevData(tableName,granularity);
+        List<BattHisRealDto> datalist=subTablePageInfoService.getHalfHourBattDevData(tableName,granularity,halfHourAgoTime);
         return new Response().setII(1,datalist.size()>0,datalist,"鑾峰彇鍗婂皬鏃跺唴鏍稿璁惧淇℃伅");
     }
     //鍘嗗彶瀹炴椂鏁版嵁

--
Gitblit v1.9.1