From 272565b7fc3c7dd196f9203c2dae7d90d4f5a744 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期五, 28 三月 2025 13:49:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemOutputServiceImpl.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemOutputServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemOutputServiceImpl.java
index 0e3bdc7..de4d7a0 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemOutputServiceImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemOutputServiceImpl.java
@@ -11,6 +11,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -84,6 +85,15 @@
}
@Override
+ public List<MmItemOutputEntity> getByItemid(String itemid, String resultstr, List<Integer> resultIndexs) {
+ QueryWrapper<MmItemOutputEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("itemid", itemid)
+ .eq("resultstr", resultstr)
+ .in(!CollectionUtils.isEmpty(resultIndexs), "result_index", resultIndexs);
+ return mmItemOutputDao.selectList(queryWrapper);
+ }
+
+ @Override
public void deleteByItemId(String itemId) {
QueryWrapper<MmItemOutputEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("itemid", itemId);
@@ -96,12 +106,32 @@
}
@Override
+ public List<String> getItemIdByOut(List<String> outIds) {
+ List<String> result = new ArrayList<>();
+ if (CollectionUtils.isEmpty(outIds)) {
+ return result;
+ }
+ QueryWrapper<MmItemOutputEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.in("id", outIds);
+ List<MmItemOutputEntity> list = baseMapper.selectList(queryWrapper);
+ if (CollectionUtils.isEmpty(list)) {
+ return result;
+ }
+ list.forEach(item -> {
+ result.add(item.getItemid());
+ });
+ return result;
+ }
+
+ @Override
public MmItemOutputEntity getOutPutById(String outputid) {
if (outputMap.containsKey(outputid)) {
return outputMap.get(outputid);
}
MmItemOutputEntity entity = mmItemOutputDao.selectById(outputid);
- outputMap.put(outputid, entity);
- return entity;
+ if (entity != null) {
+ outputMap.put(outputid, entity);
+ }
+ return outputMap.get(outputid);
}
}
--
Gitblit v1.9.3