From 9b62b1b23cf7b547b231c91f5dec9fd6e9a719d7 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期六, 07 六月 2025 15:12:21 +0800
Subject: [PATCH] 电源近半小时历史实时数据
---
src/main/java/com/whyc/service/PwrdevHistorydataIdService.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java b/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java
index 5f78d5f..26f1e48 100644
--- a/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java
+++ b/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java
@@ -6,6 +6,7 @@
import com.whyc.mapper.CommonMapper;
import com.whyc.pojo.db_data_history.BattRealdataId;
import com.whyc.pojo.db_data_history.PwrdevHistorydataId;
+import com.whyc.pojo.db_station.PowerInf;
import com.whyc.util.ActionUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -20,6 +21,9 @@
private SubTablePageInfoService subTablePageInfoService;
@Resource
private CommonMapper commonMapper;
+
+ @Autowired
+ private PowerInfService powerInfService;
//绯荤粺姒傝鑾峰彇鍗婂皬鏃朵氦娴佽緭鍏ョ粺璁�
public Response getHalfHourPwrHisAcinData(Integer powerId,Integer granularity) {
@@ -42,6 +46,11 @@
return new Response().set(1,false,"褰撳墠鐢垫簮涓嶅瓨鍦ㄥ墠闈㈠皬鏃舵暟鎹�");
}
List<PwrHisRealDcoutInDto> datalist=subTablePageInfoService.getHalfHourPwrHisDcoutData(tableName,granularity);
- return new Response().setII(1,datalist.size()>0,datalist,"鑾峰彇鍗婂皬鏃跺唴鐩存祦杈撳嚭缁熻");
+ Long modelCfg=0l;
+ PowerInf pinf=powerInfService.getPowerInfById(powerId);
+ if(pinf!=null){
+ modelCfg=pinf.getModelCfg();
+ }
+ return new Response().setIII(1,datalist.size()>0,datalist,modelCfg,"鑾峰彇鍗婂皬鏃跺唴鐩存祦杈撳嚭缁熻");
}
}
\ No newline at end of file
--
Gitblit v1.9.1