From 5b1cf6811ef296be7ca07a26c31cf03b0cca30bf Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期六, 21 六月 2025 17:32:45 +0800
Subject: [PATCH] 预警分析改为告警开始时间往前推设置时间到告警开始后1小时数据

---
 src/main/java/com/whyc/service/AlmAnalysisParamService.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/whyc/service/AlmAnalysisParamService.java b/src/main/java/com/whyc/service/AlmAnalysisParamService.java
index 3cf2853..060006f 100644
--- a/src/main/java/com/whyc/service/AlmAnalysisParamService.java
+++ b/src/main/java/com/whyc/service/AlmAnalysisParamService.java
@@ -59,8 +59,9 @@
         AppParam appParam = appParamService.getAlarmAnalysisCycle();
         Integer cycleTime=appParam.getParamValue().intValue();
         Date cyscleDate=ActionUtil.getDateAdd(ThreadLocalUtil.parse(startTime,1),cycleTime*(-1));
+        Date endTime=ActionUtil.getDateAdd(ThreadLocalUtil.parse(startTime,1),60);
         //鑾峰彇cyscleDate鍒扮幇鍦ㄦ墍鏈夌殑鍘嗗彶瀹炴椂鏁版嵁
-        List<List<Date>> monthTimeList = DateUtil.getMonthTime(cyscleDate,new Date());
+        List<List<Date>> monthTimeList = DateUtil.getMonthTime(cyscleDate,endTime);
         //鑾峰彇鍛婅almId瀵瑰簲鐨勫垎鏋愰厤缃睘鎬у��
         AlmAnalysisParam almAnalysisParam=getAnalysisParam(almId);
         if(almAnalysisParam==null||almAnalysisParam.getMainFieldType()==null){
@@ -208,8 +209,9 @@
         AppParam appParam = appParamService.getAlarmAnalysisCycle();
         cycleTime=appParam.getParamValue().intValue();
         Date cyscleDate=ActionUtil.getDateAdd(ThreadLocalUtil.parse(res.getStartTime(),1),cycleTime*(-1));
+        Date endTime=ActionUtil.getDateAdd(ThreadLocalUtil.parse(res.getStartTime(),1),60);
         //鑾峰彇cyscleDate鍒扮幇鍦ㄦ墍鏈夌殑鍘嗗彶瀹炴椂鏁版嵁
-        List<List<Date>> monthTimeList = DateUtil.getMonthTime(cyscleDate,new Date());
+        List<List<Date>> monthTimeList = DateUtil.getMonthTime(cyscleDate,endTime);
 
         //鑾峰彇鍛婅almId瀵瑰簲鐨勫垎鏋愰厤缃睘鎬у��
         AlmAnalysisParam almAnalysisParam=new AlmAnalysisParam();

--
Gitblit v1.9.1