From 9e65d8a1f23ffd623a08af2cf5cf7885c9ed9c81 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期五, 20 六月 2025 11:42:07 +0800
Subject: [PATCH] 预警分析管理-主属性和配置属性
---
src/main/java/com/whyc/service/AlmAnalysisParamService.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/service/AlmAnalysisParamService.java b/src/main/java/com/whyc/service/AlmAnalysisParamService.java
index 8c952cd..b0606c8 100644
--- a/src/main/java/com/whyc/service/AlmAnalysisParamService.java
+++ b/src/main/java/com/whyc/service/AlmAnalysisParamService.java
@@ -9,6 +9,7 @@
import com.whyc.pojo.db_data_history.BattRealdataId;
import com.whyc.pojo.db_data_history.PwrdevHistorydataId;
import com.whyc.pojo.db_param.AlmAnalysisParam;
+import com.whyc.pojo.db_param.AlmSummaryParam;
import com.whyc.pojo.db_param.AppParam;
import com.whyc.util.ActionUtil;
import com.whyc.util.DateUtil;
@@ -36,6 +37,9 @@
@Autowired
private SubTablePageInfoService subTablePageInfoService;
+ @Autowired
+ private AlmSummaryParamService summaryParamService;
+
//鑾峰彇鍛婅almId瀵瑰簲鐨勫垎鏋愰厤缃睘鎬у��
public AlmAnalysisParam getAnalysisParam(Integer almId) {
QueryWrapper wrapper=new QueryWrapper();
@@ -61,6 +65,8 @@
Date cyscleDate=ActionUtil.getDateAdd(ThreadLocalUtil.parse(startTime,1),cycleTime*(-1));
//鑾峰彇cyscleDate鍒扮幇鍦ㄦ墍鏈夌殑鍘嗗彶瀹炴椂鏁版嵁
List<List<Date>> monthTimeList = DateUtil.getMonthTime(cyscleDate,new Date());
+ //鎬荤殑灞炴�ч厤缃�
+ List<AlmSummaryParam> summaryList=summaryParamService.getInfo();
//鑾峰彇鍛婅almId瀵瑰簲鐨勫垎鏋愰厤缃睘鎬у��
AlmAnalysisParam almAnalysisParam=getAnalysisParam(almId);
if(almAnalysisParam==null||almAnalysisParam.getMainFieldType()==null){
@@ -82,7 +88,7 @@
map.put("pwr",pwrHislist);
}
}
- return new Response().setIII(1,true, map,almAnalysisParam,"棰勮鍒嗘瀽绠＄悊-鐢垫簮涓诲睘鎬у拰鍒嗘瀽灞炴��");
+ return new Response().setIII(1,true, map,summaryList,"棰勮鍒嗘瀽绠＄悊-鐢垫簮涓诲睘鎬у拰鍒嗘瀽灞炴��");
}
}
//鍒嗙粍鏌ョ湅闇�瑕佹煡璇㈢數婧�/鐢垫睜瀹炴椂琛ㄧ殑鍝簺鏁版嵁
--
Gitblit v1.9.1