From 4be71b860f8c69cae782db20e82562722b1f27e5 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期五, 24 一月 2025 17:16:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java | 41 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 40 insertions(+), 1 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
index 3c58720..2329579 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
@@ -34,6 +34,7 @@
import com.iailab.module.model.mdk.vo.ItemVO;
import com.iailab.module.model.mpk.service.ChartParamService;
import com.iailab.module.model.mpk.service.ChartService;
+import com.iailab.module.model.mpk.service.ElectricityPriceSegmentedService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -102,6 +103,9 @@
@Autowired
private InfluxDBService influxDBService;
+
+ @Autowired
+ private ElectricityPriceSegmentedService electricityPriceSegmentedService;
private int HOUR_MINS = 60;
@@ -405,6 +409,29 @@
}
}
+ try {
+ String adjValuePoint = chartParams.get(CommonConstant.ADJ_VALUE_POINT);
+ if (StringUtils.isNotBlank(adjValuePoint)) {
+ List<String> pointNos = new ArrayList<>();
+ pointNos.add(adjValuePoint);
+ Map<String, Object> adjValue = dataPointApi.queryPointsRealValue(pointNos);
+ dataView.setAdjValue(new BigDecimal(adjValue.get(adjValuePoint).toString()));
+ }
+
+ String adjValueArrPoint = chartParams.get(CommonConstant.ADJ_VALUE_ARR_POINT);
+ if (StringUtils.isNotBlank(adjValueArrPoint)) {
+ String[] adjPointArr = adjValueArrPoint.split(",");
+ Map<String, Object> adjValue = dataPointApi.queryPointsRealValue(Arrays.asList(adjPointArr));
+ BigDecimal[] adjValueArr = new BigDecimal[adjPointArr.length];
+ for(int i = 0; i < adjPointArr.length; i++) {
+ adjValueArr[i] = new BigDecimal(adjValue.get(adjPointArr[i]).toString());
+ }
+ dataView.setAdjValueArr(adjValueArr);
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+
result.setPredictTime(predictTime);
result.setStartTime(startTime);
result.setEndTime(endTime);
@@ -689,7 +716,7 @@
reqVO.setStartTime(predictItem.getLastTime());
}
// 默认结束时间：运行时间+预测长度*粒度
- if (null == reqVO.getStartTime()) {
+ if (null == reqVO.getEndTime()) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(predictItem.getLastTime());
calendar.add(Calendar.SECOND,predictItem.getPredictLength() * predictItem.getGranularity());
@@ -728,6 +755,18 @@
return result;
}
+ @Override
+ public List<ElectricityPriceSegmentedDTO> getElectricityPriceList(String year, String time) {
+ return electricityPriceSegmentedService.getElectricityPriceList(year, time);
+ }
+
+ @Override
+ public Boolean createElectricityPrice(List<ElectricityPriceSegmentedDTO> list) {
+ electricityPriceSegmentedService.deleteByITimeId(list.get(0).getITimeId());
+ list.forEach(dto -> electricityPriceSegmentedService.create(dto));
+ return true;
+ }
+
/**
* 计算功率因数 p²/（根号：p²+Q²）
**/
--
Gitblit v1.9.3