From e32d08b4c52359cd4639068f53e28f28e32bb385 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期五, 27 六月 2025 17:43:01 +0800
Subject: [PATCH] 拦截放行退出登录，实时数据统计曲线-核容设备
---
src/main/java/com/whyc/service/PwrdevHistorydataIdService.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java b/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java
index f085e87..605bd83 100644
--- a/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java
+++ b/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java
@@ -306,8 +306,6 @@
}
//瀹炴椂鏁版嵁鏁版嵁鏇茬嚎缁熻-浜ゆ祦鍗曞厓
public Response getSticRealAcData(SticRealDataAc stic) throws ParseException, InterruptedException {
- //鑾峰彇鍓嶇瑪鏁�*鏃堕棿闂撮殧
- PowerheartParam heartParam=heartService.getHeartParamByPowerId(stic.getPowerId());
Integer granularity=2;//榛樿鍊�
Map<String,Date> startAndEndTime=DateUtil.getStartAndEndTime(stic.getSticTime());
//鑾峰彇涓や釜鏃堕棿鍒嗗壊澶氬皯寮犺〃
@@ -349,10 +347,10 @@
String param = entry.getKey();
List<String> valueList = entry.getValue();
for (String value : valueList) {
- float upperLimit=350;
+ float upperLimit=550;
float lowerLimit=50;
//鏌ヨ鐢垫簮瀛楁鐨勫紓鍔�
- List changes= subTablePageInfoService.getChangesRecordNum(tableName,recordDatetime,recordDatetime1,value,upperLimit,lowerLimit);
+ List changes= subTablePageInfoService.getPwrChangesRecordNum(tableName,recordDatetime,recordDatetime1,value,upperLimit,lowerLimit);
List<Integer> numList= (List<Integer>) changes.get(0);//record_num鐨勯泦鍚�
List<String> timeList= (List<String>) changes.get(1);//record_datetime鐨勯泦鍚�
if(numList!=null&&numList.size()>0){
@@ -365,7 +363,7 @@
//鍙湁瀛樺湪寮傚姩鐐归噰鍙栨煡璇㈠紓鍔ㄦ暟鎹�
if(allChangeNums.size()>0){
//鏌ヨ澶х被鍙傛暟涓嬫墍鏈夊紓鍔╮ecordNum鐨勮褰曚箣鍜�
- List<ResRealDataAc> paramList=subTablePageInfoService.getPropertyChangesByRecordNum(tableName,recordDatetime,recordDatetime1,allChangeNums,propertyInfo);
+ List<ResRealDataAc> paramList=subTablePageInfoService.getPwrPropertyChangesByRecordNum(tableName,recordDatetime,recordDatetime1,allChangeNums,propertyInfo);
list.addAll(paramList);
}
}
--
Gitblit v1.9.1