From 04fa7f8449cd9ccd6b30fb7f4e37a305931f72ce Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期三, 22 一月 2025 09:45:09 +0800
Subject: [PATCH] 删除电力定制化数据接口
---
iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/McsApi.java | 8 ----
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/controller/admin/McsApiController.java | 12 ------
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java | 84 +++++++-----------------------------------
3 files changed, 14 insertions(+), 90 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/McsApi.java b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/McsApi.java
index 6f6d219..a56f5d5 100644
--- a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/McsApi.java
+++ b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/McsApi.java
@@ -107,17 +107,9 @@
@Operation(summary = "获取最后预测值")
Map<String, BigDecimal> getPredictLastValue(@RequestBody PredictLastValueReqVO reqVO);
- @GetMapping("/predict-data/electric")
- @Operation(summary = "电力功率因数预测结果查询")
- Map<String,List<Object[]>> getElectricPredictData(String itemCode);
-
@GetMapping("/schedule-data/last")
@Operation(summary = "调度模型最新结果查询")
List<StScheduleRecordVO> getLastScheduleData(@RequestParam("scheduleCode") String scheduleCode,@RequestParam("limit") Integer limit);
-
- @GetMapping("/machineRealTimeStatus")
- @Operation(summary = "发电机组实时状态查询")
- List<Map<String, Object>> getRealTimeStatus(@RequestBody List<Map<String, Object>> machines);
@PostMapping("/predict-data/itemNo")
@Operation(summary = "查询时间范围内预测结果")
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 faa7294..3c58720 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
@@ -667,43 +667,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;
@@ -712,46 +675,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.getStartTime()) {
+ 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());
}};
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/controller/admin/McsApiController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/controller/admin/McsApiController.java
index 6d57df8..a4c747b 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/controller/admin/McsApiController.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/controller/admin/McsApiController.java
@@ -179,12 +179,6 @@
return CommonResult.success(data);
}
- @GetMapping("/predict-data/electric")
- @Operation(summary = "电力功率因数预测结果查询")
- public CommonResult<Map<String,List<Object[]>>> getElectricPredictData(@RequestParam String itemCode) {
- Map<String,List<Object[]>> data = mcsApi.getElectricPredictData(itemCode);
- return CommonResult.success(data);
- }
@GetMapping("/schedule-data/last")
@Operation(summary = "调度模型最新结果查询")
public CommonResult<List<StScheduleRecordVO>> getLastScheduleData(@RequestParam String scheduleCode, @RequestParam Integer limit) {
@@ -214,12 +208,6 @@
result.put(scheduleCode,mcsApi.getLastScheduleData(scheduleCode, limit));
}
return CommonResult.success(result);
- }
-
- @PostMapping("/machineRealTimeStatus")
- @Operation(summary = "发电机组实时状态查询")
- CommonResult<List<Map<String, Object>>> getRealTimeStatus(@RequestBody List<Map<String, Object>> machines) {
- return CommonResult.success(mcsApi.getRealTimeStatus(machines));
}
@PostMapping("/predict-data/itemNo")
--
Gitblit v1.9.3