From a87fc3c9375d5d77017d9dff8dc1ea425acb932d Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期六, 21 六月 2025 16:07:37 +0800
Subject: [PATCH] 修改实时页面电源前N笔数据心跳包
---
src/main/java/com/whyc/service/PwrdevHistorydataIdService.java | 112 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 74 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java b/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java
index c7a72a1..bd78a8d 100644
--- a/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java
+++ b/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java
@@ -1,6 +1,7 @@
package com.whyc.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.whyc.constant.PwrCapperformanceEnum;
import com.whyc.dto.Real.CompareDto;
import com.whyc.dto.Real.PwrHisRealAcInDto;
import com.whyc.dto.Real.PwrHisRealDcoutInDto;
@@ -13,18 +14,21 @@
import com.whyc.pojo.db_param.AppParam;
import com.whyc.pojo.db_param.ApptimeParam;
import com.whyc.pojo.db_param.PowerPropertyParam;
+import com.whyc.pojo.db_param.PowerheartParam;
import com.whyc.pojo.db_station.PowerInf;
import com.whyc.util.ActionUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.lang.reflect.Field;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
@Service
public class PwrdevHistorydataIdService {
@@ -45,13 +49,23 @@
@Autowired
private PowerPropertyParamService propertyParamService;
- //绯荤粺姒傝鑾峰彇鍗婂皬鏃朵氦娴佽緭鍏ョ粺璁�
- public Response getHalfHourPwrHisAcinData(Integer powerId,Integer granularity) {
+ @Autowired
+ private PowerheartParamService heartService;
+
+ //绯荤粺姒傝鍓峃绗斾氦娴佽緭鍏ョ粺璁�
+ public Response getPwrHisAcinData100(Integer powerId) {
String dateTime = ActionUtil.sdfwithOutday.format(new Date());
- //鑾峰彇鍓嶅崐涓皬鏃舵暟鎹�
+ //鑾峰彇鍓嶇瑪鏁�*鏃堕棿闂撮殧
+ PowerheartParam heartParam=heartService.getHeartParamByPowerId(powerId);
+ Integer interverCount=100*10;//榛樿鍊�
+ Integer granularity=10;//榛樿鍊�
+ if(heartParam!=null){
+ interverCount=heartParam.getAcinInterverCfg()*heartParam.getAcinCountCfg();
+ granularity=heartParam.getAcinInterverCfg();
+ }
LocalDateTime now = LocalDateTime.now();
- // 璁＄畻鍗婂皬鏃跺墠鐨勬椂闂寸偣
- LocalDateTime halfHourAgo = now.minusMinutes(30);
+ // 璁＄畻绗旀暟*鏃堕棿闂撮殧鐨勬椂闂寸偣
+ LocalDateTime halfHourAgo = now.minusMinutes(interverCount);
// 鏍煎紡鍖栬緭鍑�
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
String halfHourAgoTime=halfHourAgo.format(formatter);
@@ -64,13 +78,21 @@
return new Response().setII(1,datalist.size()>0,datalist,"鑾峰彇鍗婂皬鏃跺唴浜ゆ祦杈撳叆缁熻");
}
- //绯荤粺姒傝鑾峰彇鍗婂皬鏃剁洿娴佽緭鍑虹粺璁�
- public Response getHalfHourPwrHisDcoutData(Integer powerId,Integer granularity) {
+ //绯荤粺姒傝鑾峰彇鍓峃绗旂洿娴佽緭鍑虹粺璁�
+ public Response getHalfHourPwrHisDcoutData(Integer powerId) {
String dateTime = ActionUtil.sdfwithOutday.format(new Date());
+ //鑾峰彇鍓嶇瑪鏁�*鏃堕棿闂撮殧
+ PowerheartParam heartParam=heartService.getHeartParamByPowerId(powerId);
+ Integer interverCount=100*10;//榛樿鍊�
+ Integer granularity=10;//榛樿鍊�
+ if(heartParam!=null){
+ interverCount=heartParam.getAcinInterverCfg()*heartParam.getAcinCountCfg();
+ granularity=heartParam.getAcinInterverCfg();
+ }
//鑾峰彇鍓嶅崐涓皬鏃舵暟鎹�
LocalDateTime now = LocalDateTime.now();
// 璁＄畻鍗婂皬鏃跺墠鐨勬椂闂寸偣
- LocalDateTime halfHourAgo = now.minusMinutes(30);
+ LocalDateTime halfHourAgo = now.minusMinutes(interverCount);
// 鏍煎紡鍖栬緭鍑�
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
String halfHourAgoTime=halfHourAgo.format(formatter);
@@ -89,7 +111,7 @@
return new Response().setIII(1,datalist.size()>0,datalist,modelCfg,"鑾峰彇鍗婂皬鏃跺唴鐩存祦杈撳嚭缁熻");
}
//1.2.7浼樿壇鐢垫簮缁熻涓婁竴瀛ｅ害鐨勭數婧愭煇涓�灞炴�у拰鍙傛暟闃堝�艰秴杩囩殑娆℃暟
- public Integer getPwrQuarter7(Integer powerId,Integer powerType) {
+ public Integer getPwrQuarter7(Integer powerId,Integer powerType) throws NoSuchFieldException, IllegalAccessException {
Map<String,Integer> map=new HashMap<>();
//鑾峰彇浼樿壇鐢垫簮鎬ц兘缁熻鍦ㄥ钩鍙颁笂鐨勬椂闂村弬鏁拌缃〃
ApptimeParam apptimeParam=apptimeParamService.getPwrPerformanceStrartTime(powerId);
@@ -97,12 +119,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.getAlarmLimithLowper());
- 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;
@@ -111,33 +130,25 @@
if(existTableName == null){
continue;
}
- List<QuarterPwr7Res> datalist=subTablePageInfoService.getPwrQuarter7(tableName);
+ List<PwrdevHistorydataId> datalist=subTablePageInfoService.getPwrQuarter7(tableName,propertyNameList);
// 閬嶅巻 dataList 骞舵瘮杈冨睘鎬у��
- for (QuarterPwr7Res 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 (PwrdevHistorydataId data : datalist) {
+ for (int j=0;j<paramList.size();j++) {
+ PowerPropertyParam param = paramList.get(j);
+ String propertyName = ActionUtil.toCamelCase(param.getPropertyName());
+ Field field = PwrdevHistorydataId.class.getDeclaredField(propertyName);
+ field.setAccessible(true); // 濡傛灉瀛楁鏄鏈夌殑锛岄渶瑕佽缃负鍙闂�
+ Float value = (Float) field.get(data);
+ if ((value > (param.getBasisVal()*param.getAlarmLimithUpper()))||(value <(param.getBasisVal()*param.getAlarmLimitlLower()))) {
+ int limitNum=map.get(param.getPropertyName())==null?0:map.get(param.getPropertyName());
+ map.put(param.getPropertyName(), limitNum+1);
}
}
}
}
-
- return 1;
+ //鍒ゆ柇浼樿壇鐢垫簮鎬ц兘
+ int pwrPerformence=judgePwrPerformence(map);
+ return pwrPerformence;
}
//鍒ゆ柇浼樿壇鐢垫簮鎬ц兘
private Integer judgePwrPerformence(Map<String,Integer> map){
@@ -157,6 +168,31 @@
warningVal=appParam.getParamValue();
}
}
- return 1;
+ Integer performance = PwrCapperformanceEnum.PWRSTATE_1.getStateId(); // 鍒濆鍖栦负鏈�浼樼瓑绾�
+ for (Map.Entry<String, Integer> entry : map.entrySet()) {
+ Integer level = evaluateValue(entry.getValue(), excellentVal, commonlyVal, warningVal);
+ // 鏍规嵁绛夌骇鎺掑簭纭畾褰撳墠鏄惁鏄渶宸瓑绾�
+ if (PwrCapperformanceEnum.PWRSTATE_4.getStateId()==level) {
+ performance = PwrCapperformanceEnum.PWRSTATE_4.getStateId();
+ return performance; // 涓�鏃﹀嚭鐜板樊锛岀洿鎺ヨ繑鍥�
+ } else if (PwrCapperformanceEnum.PWRSTATE_3.getStateId()==level && PwrCapperformanceEnum.PWRSTATE_4.getStateId()!=performance) {
+ performance = PwrCapperformanceEnum.PWRSTATE_3.getStateId();
+ } else if (PwrCapperformanceEnum.PWRSTATE_2.getStateId()==level &&(PwrCapperformanceEnum.PWRSTATE_3.getStateId()!=performance||PwrCapperformanceEnum.PWRSTATE_4.getStateId()!=performance)) {
+ performance = PwrCapperformanceEnum.PWRSTATE_2.getStateId();
+ }
+ }
+ return performance;
+ }
+ // 鍒ゆ柇鍗曚釜鍊肩殑绛夌骇
+ public Integer evaluateValue(Integer value, Float excellentVal, Float commonlyVal, Float warningVal) {
+ if (value <= excellentVal) {
+ return PwrCapperformanceEnum.PWRSTATE_1.getStateId();
+ } else if (value <= commonlyVal&&value > excellentVal) {
+ return PwrCapperformanceEnum.PWRSTATE_2.getStateId();
+ } else if (value <= warningVal&&value > commonlyVal) {
+ return PwrCapperformanceEnum.PWRSTATE_3.getStateId();
+ } else {
+ return PwrCapperformanceEnum.PWRSTATE_4.getStateId();
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.1