From 5131f1810e63457d2cf21cfb2824198c5b90c6f6 Mon Sep 17 00:00:00 2001 From: 潘志宝 <979469083@qq.com> Date: 星期三, 12 二月 2025 13:28:51 +0800 Subject: [PATCH] 预测项累计配置 --- iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/PredictResultHandler.java | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/PredictResultHandler.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/PredictResultHandler.java index 86b5052..67ce702 100644 --- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/PredictResultHandler.java +++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/predict/PredictResultHandler.java @@ -5,7 +5,6 @@ import com.iailab.module.model.mcs.pre.service.MmItemResultService; import com.iailab.module.model.mdk.factory.ItemEntityFactory; import com.iailab.module.model.mdk.vo.DataValueVO; -import com.iailab.module.model.mdk.vo.MmItemOutputVO; import com.iailab.module.model.mdk.vo.PredictResultVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; @@ -30,15 +29,15 @@ */ public Map<String, List<DataValueVO>> convertToPredictData(PredictResultVO predictResult) { Map<String, List<DataValueVO>> resultMap = new HashMap<>(); - List<MmItemOutputVO> itemOutPutList = itemEntityFactory.getOutPutByItemId(predictResult.getPredictId()); - - if (!CollectionUtils.isEmpty(predictResult.getPredictList())) { - resultMap.put(itemOutPutList.get(0).getId(), predictResult.getPredictList()); - return resultMap; - } - Map<MmItemOutputEntity, double[]> predictMatrixs = predictResult.getPredictMatrixs(); +// List<MmItemOutputEntity> itemOutPutList = itemEntityFactory.getOutPutByItemId(predictResult.getPredictId()); +// +// if (!CollectionUtils.isEmpty(predictResult.getPredictList())) { +// resultMap.put(itemOutPutList.get(0).getId(), predictResult.getPredictList()); +// return resultMap; +// } + Map<com.iailab.module.model.mcs.pre.entity.MmItemOutputEntity, double[]> predictMatrixs = predictResult.getPredictMatrixs(); HashMap<String,List<DataValueVO>> predictLists = new HashMap<>(); - for (Map.Entry<MmItemOutputEntity, double[]> entry : predictMatrixs.entrySet()) { + for (Map.Entry<com.iailab.module.model.mcs.pre.entity.MmItemOutputEntity, double[]> entry : predictMatrixs.entrySet()) { Integer rows = entry.getValue().length; List<DataValueVO> predictDataList = new ArrayList<>(); Calendar calendar = Calendar.getInstance(); @@ -87,7 +86,6 @@ * * @param predictResult */ - @Async @DSTransactional public void savePredictResult(PredictResultVO predictResult) { Map<String, List<DataValueVO>> resultMap = convertToPredictData(predictResult); @@ -96,12 +94,12 @@ public List<DataValueVO> getPredictValueByItemNo(String itemNo, Date start, Date end) { String itemId = itemEntityFactory.getItemByItemNo(itemNo).getId(); - List<MmItemOutputVO> outputList = itemEntityFactory.getOutPutByItemId(itemId); + List<MmItemOutputEntity> outputList = itemEntityFactory.getOutPutByItemId(itemId); return mmItemResultService.getPredictValue(outputList.get(0).getId(), start, end); } public List<DataValueVO> getPredictValueByItemId(String itemId, Date start, Date end) { - List<MmItemOutputVO> outputList = itemEntityFactory.getOutPutByItemId(itemId); + List<MmItemOutputEntity> outputList = itemEntityFactory.getOutPutByItemId(itemId); return mmItemResultService.getPredictValue(outputList.get(0).getId(), start, end); } } -- Gitblit v1.9.3