From 2753ad7aee272a5a5a8a0124b1feea5a1e4cc83e Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期五, 20 六月 2025 22:40:52 +0800
Subject: [PATCH] 电源告警参数返回
---
src/main/java/com/whyc/service/PwrdevHistorydataIdService.java | 32 +++++---------------------------
1 files changed, 5 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java b/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java
index 77e9231..7371494 100644
--- a/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java
+++ b/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java
@@ -27,6 +27,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
@Service
public class PwrdevHistorydataIdService {
@@ -99,12 +100,9 @@
List<String> datelist=ActionUtil.getDateListBetweenDates(apptimeParam.getParamValue(), new Date());
//鑾峰彇鐢垫簮浼樿壇鍒ゆ柇鐨勬爣鍑嗗弬鏁板��
List<PowerPropertyParam> paramList=propertyParamService.getPwrStandardParam(powerType);
- /*Map<String,Float> paramValues=new HashMap<>();
- for (PowerPropertyParam param : paramList) {
- paramValues.put(param.getPropertyName()+"_upper", param.getBasisVal()*param.getAlarmLimithUpper());
- paramValues.put(param.getPropertyName()+"_lower", param.getBasisVal()*param.getAlarmLimitlLower());
- map.put(param.getPropertyName(), 0);
- }*/
+ List<String> propertyNameList = paramList.stream()
+ .map(param -> param.getPropertyName())
+ .collect(Collectors.toList());
for (int i=0;i<datelist.size();i++) {
String date=datelist.get(i);
String tableName ="db_data_history.tb_pwrdev_historydata_"+powerId+"_"+date;
@@ -113,29 +111,9 @@
if(existTableName == null){
continue;
}
- List<PwrdevHistorydataId> datalist=subTablePageInfoService.getPwrQuarter7(tableName);
+ List<PwrdevHistorydataId> datalist=subTablePageInfoService.getPwrQuarter7(tableName,propertyNameList);
// 閬嶅巻 dataList 骞舵瘮杈冨睘鎬у��
for (PwrdevHistorydataId data : datalist) {
- /*if(paramValues.get("acin1_vola_upper")!=null){
- if ((data.getAcin1Vola() > paramValues.get("acin1_vola_upper"))||(data.getAcin1Vola() < paramValues.get("acin1_vola_lower"))) {
- map.put("acin1_vola", map.get("acin1_vola") + 1);
- }
- }
- if(paramValues.get("acout_curra_upper")!=null) {
- if ((data.getAcoutCurra() > paramValues.get("acout_curra_upper")) || (data.getAcoutCurra() < paramValues.get("acout_curra_lower"))) {
- map.put("acout_curra", map.get("acout_curra") + 1);
- }
- }
- if(paramValues.get("dcout_vol_upper")!=null) {
- if ((data.getDcoutVol() > paramValues.get("dcout_vol_upper")) || (data.getDcoutVol() < paramValues.get("dcout_vo_lower"))) {
- map.put("dcout_vol", map.get("dcout_vol") + 1);
- }
- }
- if(paramValues.get("dcout_curr_upper")!=null) {
- if ((data.getDcoutCurr() > paramValues.get("dcout_curr_upper")) || (data.getDcoutCurr() < paramValues.get("dcout_curr_lower"))) {
- map.put("dcout_curr", map.get("dcout_curr") + 1);
- }
- }*/
for (int j=0;j<paramList.size();j++) {
PowerPropertyParam param = paramList.get(j);
String propertyName = ActionUtil.toCamelCase(param.getPropertyName());
--
Gitblit v1.9.1