From a4891a78db2d8ac9d17ff01d79e72e8aab38785d Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期五, 15 十一月 2024 11:47:56 +0800
Subject: [PATCH] 预测数据查询
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java | 41 ++++++++++++++++++++++-------------------
1 files changed, 22 insertions(+), 19 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 c9b2c35..5a3ddbd 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
@@ -9,6 +9,7 @@
import com.iailab.module.model.api.mcs.dto.*;
import com.iailab.module.model.mcs.pre.entity.DmModuleEntity;
import com.iailab.module.model.mcs.pre.entity.MmItemOutputEntity;
+import com.iailab.module.model.mcs.pre.enums.ItemStatus;
import com.iailab.module.model.mcs.pre.service.*;
import com.iailab.module.model.mcs.pre.vo.MmPredictItemRespVO;
import com.iailab.module.model.mdk.vo.ItemVO;
@@ -64,14 +65,22 @@
moduleOpt.setId(item.getId());
moduleOpt.setLabel(item.getModulename());
List<PredictItemTreeDTO> children = new ArrayList<>();
- Map<String, Object> params = new HashMap<>(2);
- params.put("status", 1);
- params.put("moduleid", item.getId());
- List<MmPredictItemRespVO> itemList = mmPredictItemService.list(params);
+ List<ItemVO> itemList = mmPredictItemService.getByModuleId(item.getId());
itemList.forEach(item1 -> {
PredictItemTreeDTO chd = new PredictItemTreeDTO();
- chd.setLabel(item1.getItemname());
+ chd.setLabel(item1.getItemName());
chd.setId(item1.getId());
+ List<PredictItemTreeDTO> chd1 = new ArrayList<>();
+ List<MmItemOutputEntity> outList = mmItemOutputService.getByItemid(item1.getId());
+ if (!CollectionUtils.isEmpty(outList)) {
+ outList.forEach(out -> {
+ PredictItemTreeDTO chd2 = new PredictItemTreeDTO();
+ chd2.setId(out.getId());
+ chd2.setLabel(out.getResultstr());
+ chd1.add(chd2);
+ });
+ }
+ chd.setChildren(chd1);
children.add(chd);
});
moduleOpt.setChildren(children);
@@ -83,7 +92,7 @@
@Override
public PreDataBarLineRespVO getPreDataCharts(PreDataBarLineReqVO reqVO) {
PreDataBarLineRespVO result = new PreDataBarLineRespVO();
- List<String[]> queryIds = reqVO.getQueryIds();
+ List<String> outIds = reqVO.getOutIds();
List<String> legends = new ArrayList<>();
List<PreDataViewRespDTO> dataViewList = new ArrayList<>();
if (CollectionUtils.isEmpty(reqVO.getQueryIds())) {
@@ -91,15 +100,10 @@
}
Date predictTime = reqVO.getPredictTime();
if (predictTime == null) {
- DmModuleEntity dmModule = dmModuleService.getModuleByItemId(queryIds.get(0)[0]);
- if (dmModule != null) {
- predictTime = dmModule.getPredicttime();
- } else {
- Calendar calendar = Calendar.getInstance();
- calendar.set(Calendar.MILLISECOND, 0);
- calendar.set(Calendar.SECOND, 0);
- predictTime = calendar.getTime();
- }
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(Calendar.MILLISECOND, 0);
+ calendar.set(Calendar.SECOND, 0);
+ predictTime = calendar.getTime();
}
Date startTime = reqVO.getStartTime();
if (startTime == null) {
@@ -116,11 +120,10 @@
endTime = calendar.getTime();
}
- for (int i = 0; i < queryIds.size(); i++) {
+ for (int i = 0; i < outIds.size(); i++) {
PreDataViewRespDTO viewDto = new PreDataViewRespDTO();
- String itemId = queryIds.get(i)[0];
- String outKey = queryIds.get(i)[1];
- MmItemOutputEntity output = mmItemOutputService.getByItemid(itemId, outKey);
+ String outId = outIds.get(i);
+ MmItemOutputEntity output = mmItemOutputService.getOutPutById(outId);
if (output == null) {
continue;
}
--
Gitblit v1.9.3