From 0cbbe2c1cbfbf73e02e1796d921c2911c96d370b Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 23 十二月 2024 11:46:31 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/iailab-plat
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/MdkApiImpl.java | 132 +++++++++++++++++++++++++++++--------------
1 files changed, 88 insertions(+), 44 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/MdkApiImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/MdkApiImpl.java
index 8f73d14..0d95528 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/MdkApiImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/MdkApiImpl.java
@@ -4,7 +4,6 @@
import com.iailab.framework.common.util.object.ConvertUtils;
import com.iailab.module.model.api.mdk.MdkApi;
import com.iailab.module.model.api.mdk.dto.*;
-import com.iailab.framework.common.pojo.CommonResult;
import com.iailab.module.model.mcs.pre.entity.DmModuleEntity;
import com.iailab.module.model.mcs.pre.service.DmModuleService;
import com.iailab.module.model.mcs.pre.service.MmPredictItemService;
@@ -13,22 +12,18 @@
import com.iailab.module.model.mdk.predict.PredictItemHandler;
import com.iailab.module.model.mdk.predict.PredictModuleHandler;
import com.iailab.module.model.mdk.predict.PredictResultHandler;
+import com.iailab.module.model.mdk.schedule.ScheduleModelHandler;
import com.iailab.module.model.mdk.vo.DataValueVO;
import com.iailab.module.model.mdk.vo.ItemVO;
import com.iailab.module.model.mdk.vo.PredictResultVO;
+import com.iailab.module.model.mdk.vo.ScheduleResultVO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
-import javax.validation.Valid;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
import static com.iailab.framework.common.pojo.CommonResult.error;
@@ -62,6 +57,9 @@
@Autowired
private PredictResultHandler predictResultHandler;
+ @Autowired
+ private ScheduleModelHandler scheduleModelHandler;
+
/**
* 按模块预测
*
@@ -69,8 +67,11 @@
* @return
*/
@Override
- public CommonResult<MdkPredictModuleRespDTO> predictModule(MdkPredictReqDTO reqDTO) {
+ public MdkPredictModuleRespDTO predictModule(MdkPredictReqDTO reqDTO) {
MdkPredictModuleRespDTO resp = new MdkPredictModuleRespDTO();
+ resp.setPredictTime(reqDTO.getPredictTime());
+ resp.setModuleType(reqDTO.getModuleType());
+
Map<String, MdkPredictItemRespDTO> predictItemRespMap = new HashMap<>();
try {
if (reqDTO.getPredictTime() == null) {
@@ -79,6 +80,11 @@
if (reqDTO.getModuleType() == null) {
throw new Exception("ModuleType不能为空");
}
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(reqDTO.getPredictTime());
+ calendar.set(Calendar.MILLISECOND, 0);
+ calendar.set(Calendar.SECOND, 0);
+ reqDTO.setPredictTime(calendar.getTime());
log.info("预测参数：" + JSON.toJSONString(reqDTO));
MdkPredictModuleRespDTO result = new MdkPredictModuleRespDTO();
result.setPredictTime(reqDTO.getPredictTime());
@@ -91,26 +97,48 @@
intervalTime = (int) (reqDTO.getPredictTime().getTime() - module.getPredicttime().getTime()) / (1000 * 60);
}
List<ItemVO> predictItemList = mmPredictItemService.getByModuleId(module.getId());
- Map<String, PredictResultVO> predictResultMap = predictModuleHandler.predict(predictItemList, reqDTO.getPredictTime(), intervalTime);
+ Map<String, PredictResultVO> predictResultMap = new HashMap<>(predictItemList.size());
+ // 分组，先运行normal预测项，再将结果传递给merge预测项
+ List<ItemVO> normalItems = predictItemList.stream().filter(e -> e.getItemType().equals("NormalItem")).collect(Collectors.toList());
+ if (!CollectionUtils.isEmpty(normalItems)) {
+ predictModuleHandler.predict(normalItems, reqDTO.getPredictTime(), intervalTime,predictResultMap);
+ List<ItemVO> mergeItems = predictItemList.stream().filter(e -> e.getItemType().equals("MergeItem")).collect(Collectors.toList());
+ if (!CollectionUtils.isEmpty(mergeItems)) {
+ predictModuleHandler.predict(mergeItems, reqDTO.getPredictTime(), intervalTime,predictResultMap);
+ }
+ }
+ // 更新Module时间
+ dmModuleService.updatePredictTime(module.getId(), reqDTO.getPredictTime());
+ if (reqDTO.getIsResult() == null || !reqDTO.getIsResult()) {
+ return resp;
+ }
for (Map.Entry<String, PredictResultVO> entry : predictResultMap.entrySet()) {
- List<MdkPredictDataDTO> predictData = entry.getValue().getPredictList().stream().map(t-> {
- MdkPredictDataDTO dto1 = new MdkPredictDataDTO();
- dto1.setDataTime(t.getDataTime());
- dto1.setDataValue(t.getDataValue());
- return dto1;
- }).collect(Collectors.toList());
MdkPredictItemRespDTO itemResp = new MdkPredictItemRespDTO();
- itemResp.setItemId(entry.getValue().getPredictId());
- itemResp.setPredictData(predictData);
+ itemResp.setItemId(entry.getKey());
+ itemResp.setPredictTime(reqDTO.getPredictTime());
+ Map<String, List<MdkPredictDataDTO>> itemPredictData = new HashMap<>();
+
+ Map<String, List<DataValueVO>> predictLists = predictResultHandler.convertToPredictData2(entry.getValue());
+ for (Map.Entry<String, List<DataValueVO>> dataListEntry : predictLists.entrySet()) {
+ List<MdkPredictDataDTO> predictData = dataListEntry.getValue().stream().map(t -> {
+ MdkPredictDataDTO dto1 = new MdkPredictDataDTO();
+ dto1.setDataTime(t.getDataTime());
+ dto1.setDataValue(t.getDataValue());
+ return dto1;
+ }).collect(Collectors.toList());
+ itemPredictData.put(dataListEntry.getKey(), predictData);
+ }
+ itemResp.setPredictData(itemPredictData);
predictItemRespMap.put(entry.getKey(), itemResp);
}
}
log.info("预测计算结束: " + System.currentTimeMillis());
} catch (Exception ex) {
- return error(999, ex.getMessage());
+ ex.printStackTrace();
+ return resp;
}
resp.setPredictItemRespMap(predictItemRespMap);
- return success(resp);
+ return resp;
}
/**
@@ -120,31 +148,36 @@
* @return
*/
@Override
- public CommonResult<MdkPredictItemRespDTO> predictItem(@Valid @RequestBody MdkPredictReqDTO reqDTO) {
+ public MdkPredictItemRespDTO predictItem(MdkPredictReqDTO reqDTO) {
MdkPredictItemRespDTO resp = new MdkPredictItemRespDTO();
-
try {
- log.info("预测计算开始: " + System.currentTimeMillis());
- List<MdkPredictDataDTO> predictData = new ArrayList<>();
- ItemVO predictItem = itemEntityFactory.getItemByItemNo(reqDTO.getItemNo());
- PredictItemHandler predictItemHandler = (PredictItemHandler)predictItemFactory.create(predictItem.getId());
- PredictResultVO predictResult = predictItemHandler.predict(reqDTO.getPredictTime(), predictItem);
- Map<String, List<DataValueVO>> resultMap = predictResultHandler.convertToPredictData(predictResult);
- if (!CollectionUtils.isEmpty(resultMap)) {
- for (Map.Entry<String, List<DataValueVO>> entry : resultMap.entrySet()) {
- predictData = ConvertUtils.sourceToTarget(entry.getValue(), MdkPredictDataDTO.class);
- }
+
+ ItemVO itemByItemNo = mmPredictItemService.getItemByItemNo(reqDTO.getItemNo());
+ List<ItemVO> predictItemList = new ArrayList<>();
+ predictItemList.add(itemByItemNo);
+ Map<String, PredictResultVO> predictResultMap = new HashMap<>(predictItemList.size());
+ predictModuleHandler.predict(predictItemList, reqDTO.getPredictTime(), 0,predictResultMap);
+
+ Map<String, List<MdkPredictDataDTO>> itemPredictData = new HashMap<>();
+
+ Map<String, List<DataValueVO>> predictLists = predictResultHandler.convertToPredictData2(predictResultMap.get(reqDTO.getItemNo()));
+ for (Map.Entry<String, List<DataValueVO>> dataListEntry : predictLists.entrySet()) {
+ List<MdkPredictDataDTO> predictData = dataListEntry.getValue().stream().map(t -> {
+ MdkPredictDataDTO dto1 = new MdkPredictDataDTO();
+ dto1.setDataTime(t.getDataTime());
+ dto1.setDataValue(t.getDataValue());
+ return dto1;
+ }).collect(Collectors.toList());
+ itemPredictData.put(dataListEntry.getKey(), predictData);
}
- resp.setPredictData(predictData);
- resp.setItemId(predictItem.getId());
+ resp.setItemId(reqDTO.getItemNo());
resp.setPredictTime(reqDTO.getPredictTime());
- log.info("预测计算结束: " + System.currentTimeMillis());
- } catch (Exception ex) {
- log.info("预测计算异常: " + System.currentTimeMillis());
- ex.printStackTrace();
+ resp.setPredictData(itemPredictData);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
}
- return success(resp);
+ return resp;
}
/**
@@ -154,10 +187,10 @@
* @return
*/
@Override
- public CommonResult<Boolean> predictAutoAdjust(@Valid @RequestBody MdkPredictReqDTO reqDTO) {
+ public Boolean predictAutoAdjust(MdkPredictReqDTO reqDTO) {
- return success(true);
+ return true;
}
/**
@@ -167,9 +200,20 @@
* @return
*/
@Override
- public CommonResult<MdkScheduleRespDTO> doSchedule(@Valid @RequestBody MdkScheduleReqDTO reqDTO) {
+ public MdkScheduleRespDTO doSchedule(MdkScheduleReqDTO reqDTO) {
MdkScheduleRespDTO resp = new MdkScheduleRespDTO();
-
- return success(resp);
+ resp.setScheduleCode(reqDTO.getScheduleCode());
+ resp.setScheduleTime(reqDTO.getScheduleTime());
+ try {
+ log.info("调度计算开始: " + System.currentTimeMillis());
+ ScheduleResultVO scheduleResult = scheduleModelHandler.doSchedule(reqDTO.getScheduleCode(), reqDTO.getScheduleTime());
+ resp.setResult(scheduleResult.getResult());
+ log.info("预测计算结束: " + System.currentTimeMillis());
+ } catch (Exception ex) {
+ log.info("调度计算异常: " + System.currentTimeMillis());
+// ex.printStackTrace();
+ return resp;
+ }
+ return resp;
}
}
\ No newline at end of file
--
Gitblit v1.9.3