From 9b85345450e2e194a84679bb6612f58a3124aee8 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期五, 20 六月 2025 08:45:13 +0800
Subject: [PATCH] 预警分析管理-电源告警
---
src/main/java/com/whyc/service/BattRealdataIdService.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/whyc/service/BattRealdataIdService.java b/src/main/java/com/whyc/service/BattRealdataIdService.java
index 8a1faed..5c057de 100644
--- a/src/main/java/com/whyc/service/BattRealdataIdService.java
+++ b/src/main/java/com/whyc/service/BattRealdataIdService.java
@@ -227,13 +227,18 @@
return new Response().set(1, dataListSorted);
}
//鐢垫睜鍛婅鐐瑰嚮鍏蜂綋鍛婅淇℃伅鏌ョ湅浠庡憡璀﹀紑濮嬫椂闂村埌鐜板湪鐨勫巻鍙插疄鏃舵暟鎹�
- public Response getBattHisRealInAlm(Integer battgroupId, String startTime, Integer almId) throws ParseException, InterruptedException {
+ public Response getBattHisRealInAlm(Integer battgroupId, String startTime, Integer almId,Integer intervalTime) throws ParseException, InterruptedException {
//鑾峰彇鍛婅almId瀵瑰簲鐨勫垎鏋愰厤缃睘鎬у��
AlmAnalysisParam almAnalysisParam= almAnalysisParamService.getAnalysisParam(almId);
List<RealDateDTO> dataList = new LinkedList<>();
+ Integer cycleTime=0;
//鑾峰彇棰勮鍒嗘瀽鍛ㄦ湡闃堝��
- AppParam appParam = appParamService.getAlarmAnalysisCycle();
- Integer cycleTime=appParam.getParamValue().intValue();
+ if(intervalTime==null){
+ AppParam appParam = appParamService.getAlarmAnalysisCycle();
+ cycleTime=appParam.getParamValue().intValue();
+ }else{
+ cycleTime=intervalTime;
+ }
Date cyscleDate=ActionUtil.getDateAdd(ThreadLocalUtil.parse(startTime,1),cycleTime*(-1));
//鑾峰彇cyscleDate鍒扮幇鍦ㄦ墍鏈夌殑鍘嗗彶瀹炴椂鏁版嵁
List<List<Date>> monthTimeList = DateUtil.getMonthTime(cyscleDate,new Date());
@@ -262,6 +267,5 @@
latch.await(10, TimeUnit.MINUTES);
List dataListSorted = dataList.stream().sorted(Comparator.comparing(RealDateDTO::getRecordTime)).collect(Collectors.toList());
return new Response().setIII(1,true, dataListSorted,almAnalysisParam,"鐢垫睜鍛婅鐐瑰嚮鍏蜂綋鍛婅淇℃伅鏌ョ湅浠庡憡璀﹀紑濮嬫椂闂村埌鐜板湪鐨勫巻鍙插疄鏃舵暟鎹�");
-
}
}
\ No newline at end of file
--
Gitblit v1.9.1