From e54ce4959bca1fdeda01701989f8debd9467d4bd Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期五, 03 一月 2025 10:08:20 +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/mcs/pre/service/impl/MmPredictItemServiceImpl.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictItemServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictItemServiceImpl.java
index d058b4c..0bd305c 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictItemServiceImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictItemServiceImpl.java
@@ -118,6 +118,14 @@
MmPredictMergeItemEntity mMmPredictMergeItem = mmPredictItemDto.getMmPredictMergeItem();
mMmPredictMergeItem.setItemid(predictItem.getId());
mmPredictMergeItemService.savePredictMergeItem(mMmPredictMergeItem);
+ // 添加一条默认output
+ List<MmItemOutputEntity> mergeItemOutput = new ArrayList<>(1);
+ MmItemOutputEntity entity = new MmItemOutputEntity();
+ entity.setPointid(mmPredictItemDto.getPointId());
+ entity.setResultName(mmPredictItemDto.getMmPredictItem().getItemname());
+ entity.setResultstr("result");
+ mergeItemOutput.add(entity);
+ mmPredictItemDto.setMmItemOutputList(mergeItemOutput);
}
mmPredictItemDao.insert(predictItem);
DmModuleItemEntity dmModuleItem = mmPredictItemDto.getDmModuleItem();
@@ -160,6 +168,19 @@
} else if (itemType != null && ItemTypeEnum.MERGE_ITEM.getName().equals(itemType.getItemtypename())) {
MmPredictMergeItemEntity mMmPredictMergeItem = mmPredictItemDto.getMmPredictMergeItem();
mmPredictMergeItemService.update(mMmPredictMergeItem);
+ // 修改默认output
+ List<MmItemOutputEntity> mmItemOutputList = mmPredictItemDto.getMmItemOutputList();
+ if (CollectionUtils.isEmpty(mmItemOutputList)) {
+ mmItemOutputList = new ArrayList<>(1);
+ MmItemOutputEntity entity = new MmItemOutputEntity();
+ entity.setPointid(mmPredictItemDto.getPointId());
+ entity.setResultName(mmPredictItemDto.getMmPredictItem().getItemname());
+ entity.setResultstr("result");
+ mmItemOutputList.add(entity);
+ mmPredictItemDto.setMmItemOutputList(mmItemOutputList);
+ } else {
+ mmPredictItemDto.getMmItemOutputList().forEach(e -> e.setPointid(mmPredictItemDto.getPointId()));
+ }
}
DmModuleItemEntity dmModuleItem = mmPredictItemDto.getDmModuleItem();
if (!"".equals(dmModuleItem.getId()) && dmModuleItem.getId() != null) {
@@ -215,6 +236,9 @@
mmPredictItemDto.setMmModelParamList(new ArrayList<>());
mmPredictItemDto.setMmPredictMergeItem(new MmPredictMergeItemEntity());
mmPredictItemDto.setMmPredictMergeItem(mmPredictMergeItemService.getByItemid(id));
+ if (!CollectionUtils.isEmpty(mmPredictItemDto.getMmItemOutputList())) {
+ mmPredictItemDto.setPointId(mmPredictItemDto.getMmItemOutputList().get(0).getPointid());
+ }
}
return mmPredictItemDto;
}
--
Gitblit v1.9.3