From af9c8a0bbafc62673b1b44e683479e09310451d8 Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期三, 22 一月 2025 17:12:18 +0800
Subject: [PATCH] 新增参数
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java | 102 +++++++++++++++------------------------------------
1 files changed, 30 insertions(+), 72 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 31e61c8..4f8e690 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;
@@ -391,8 +395,7 @@
dataView.setPreMax(new BigDecimal(curList.stream().mapToDouble(Double::doubleValue).max().getAsDouble()).setScale(2, BigDecimal.ROUND_HALF_UP));
dataView.setPreMin(new BigDecimal(curList.stream().mapToDouble(Double::doubleValue).min().getAsDouble()).setScale(2, BigDecimal.ROUND_HALF_UP));
dataView.setPreLast(new BigDecimal(curList.get(curList.size() - 1)));
- dataView.setPreCumulant(new BigDecimal(curList.stream().mapToDouble(Double::doubleValue).sum())
- .divide(new BigDecimal(HOUR_MINS), 2, BigDecimal.ROUND_HALF_UP));
+ dataView.setPreCumulant(new BigDecimal(curList.stream().mapToDouble(Double::doubleValue).sum()));
}
String alarmObj = chartParams.get(CommonConstant.ALARM_OBJ);
@@ -668,43 +671,6 @@
}
@Override
- public Map<String,List<Object[]>> getElectricPredictData(String itemCode) {
- ItemVO predictItem = mmPredictItemService.getItemByItemNo(itemCode);
- if (null == predictItem) {
- return new HashMap<>();
- }
- List<Integer> resultIndexs = new ArrayList<>();
- resultIndexs.add(0);
- resultIndexs.add(1);
- resultIndexs.add(2);
- List<MmItemOutputEntity> outPuts = mmItemOutputService.getByItemid(predictItem.getId(),"predictValues",resultIndexs);
- if (CollectionUtils.isEmpty(outPuts)) {
- return new HashMap<>();
- }
- InfluxModelResultByOutPutIdsPOJO pojo = new InfluxModelResultByOutPutIdsPOJO();
- pojo.setOutPutIds(outPuts.stream().map(MmItemOutputEntity::getId).collect(Collectors.toList()));
- pojo.setType(DataTypeEnum.FLOAT.getCode());
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(predictItem.getLastTime());
- calendar.add(Calendar.DAY_OF_YEAR, 7);
- Map<String, List<InfluxModelResultVO>> outPutDatas = influxDBService.queryModelResultsByOutPutIds(pojo, predictItem.getLastTime(), calendar.getTime());
- Map<String,List<Object[]>> result = new HashMap<>(outPuts.size());
- for (MmItemOutputEntity outPut : outPuts) {
- String outPutId = outPut.getId();
- if (outPutDatas.containsKey(outPutId)) {
- List<InfluxModelResultVO> influxModelResultVOS = outPutDatas.get(outPutId);
- result.put(null == outPut.getResultIndex() ? outPut.getResultstr() : outPut.getResultstr()+"_"+outPut.getResultIndex(),influxModelResultVOS.stream().map(e -> {
- Object[] values = new Object[2];
- values[0] = DateUtils.format(Date.from(e.getTimestamp()), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND);
- values[1] = Double.valueOf(e.getValue().toString());
- return values;
- }).collect(Collectors.toList()));
- }
- }
- return result;
- }
-
- @Override
public List<StScheduleRecordVO> getLastScheduleData(String scheduleCode, Integer limit) {
if (StringUtils.isBlank(scheduleCode)) {
return null;
@@ -713,46 +679,27 @@
}
@Override
- public List<Map<String, Object>> getRealTimeStatus(List<Map<String, Object>> machines) {
- List<String> pointNos = new ArrayList<>(16);
- for (Map<String, Object> machine : machines) {
- List<String> list = (List<String>) machine.get("pointNos");
- pointNos.addAll(list);
- }
- Map<String, Object> pointValues = dataPointApi.queryPointsRealValue(pointNos);
- List<Map<String, Object>> results = new ArrayList<>();
- for (Map<String, Object> machine : machines) {
- List<String> pointNoList = (List<String>) machine.get("pointNos");
- if (!pointValues.containsKey(pointNoList.get(0)) || !pointValues.containsKey(pointNoList.get(1))) {
- machine.put("status",false);
- machine.put("num",0);
- results.add(machine);
- continue;
- }
- Double PValue = Double.valueOf(pointValues.get(pointNoList.get(0)).toString());
- Double QValue = Double.valueOf(pointValues.get(pointNoList.get(1)).toString());
- Double cos = calculateCos(PValue, QValue);
- if (cos.equals(0.0)) {
- machine.put("status",false);
- machine.put("num",0);
- }else {
- machine.put("status",true);
- machine.put("num",cos);
- }
- results.add(machine);
- }
- return results;
- }
-
- @Override
public Map<String, List<Object[]>> getPredictDataItemNo(PreDataItemNoReqVO reqVO) {
- if (StringUtils.isBlank(reqVO.getItemNo()) || null == reqVO.getStartTime() || null == reqVO.getEndTime()) {
+ if (StringUtils.isBlank(reqVO.getItemNo())) {
return new HashMap<>();
}
ItemVO predictItem = mmPredictItemService.getItemByItemNo(reqVO.getItemNo());
if (null == predictItem) {
return new HashMap<>();
}
+
+ // 默认开始时间：运行时间
+ if (null == reqVO.getStartTime()) {
+ reqVO.setStartTime(predictItem.getLastTime());
+ }
+ // 默认结束时间：运行时间+预测长度*粒度
+ if (null == reqVO.getEndTime()) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(predictItem.getLastTime());
+ calendar.add(Calendar.SECOND,predictItem.getPredictLength() * predictItem.getGranularity());
+ reqVO.setEndTime(calendar.getTime());
+ }
+
List<String> itemNos = new ArrayList<String>(){{
add(reqVO.getItemNo());
}};
@@ -785,6 +732,17 @@
return result;
}
+ @Override
+ public List<ElectricityPriceSegmentedDTO> getElectricityPriceList(String year) {
+ return electricityPriceSegmentedService.getElectricityPriceList(year);
+ }
+
+ @Override
+ public Boolean createElectricityPrice(ElectricityPriceSegmentedDTO dto) {
+ electricityPriceSegmentedService.create(dto);
+ return true;
+ }
+
/**
* 计算功率因数 p²/（根号：p²+Q²）
**/
--
Gitblit v1.9.3