From 8c635598000e40edfb3edf5934124ad48d60f62d Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期六, 21 六月 2025 19:14:50 +0800
Subject: [PATCH] 实时页面修改

---
 src/main/java/com/whyc/service/AlmAnalysisParamService.java |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/whyc/service/AlmAnalysisParamService.java b/src/main/java/com/whyc/service/AlmAnalysisParamService.java
index 9c76ae8..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){
@@ -206,16 +207,11 @@
         Integer cycleTime=0;
         //鑾峰彇棰勮鍒嗘瀽鍛ㄦ湡闃堝��
         AppParam appParam = appParamService.getAlarmAnalysisCycle();
-        if(res.getIntervalTime()==null){
-            cycleTime=appParam.getParamValue().intValue();
-        }else{
-            //灏嗘暟鎹簱涓椂闂撮棿闅斾慨鏀�
-            appParamService.updateAlarmAnalysisCycle(res.getIntervalTime());
-            cycleTime=res.getIntervalTime();
-        }
+        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