From 4624b6fd58f262ab95f2d60472560b9fc162d677 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期二, 01 四月 2025 14:56:15 +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 | 44 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 40 insertions(+), 4 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 a6f793e..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
@@ -6,10 +6,12 @@
import com.iailab.module.model.mcs.pre.dto.MmItemOutputDTO;
import com.iailab.module.model.mcs.pre.entity.MmItemOutputEntity;
import com.iailab.module.model.mcs.pre.service.MmItemOutputService;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
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;
@@ -30,6 +32,9 @@
@Override
public void saveMmItemOutput(List<MmItemOutputEntity> mmItemOutput) {
+ mmItemOutput.forEach(e -> {
+ e.setId(e.getId().replace("+","").replace("-",""));
+ });
mmItemOutputDao.insert(mmItemOutput);
// 清空缓存
clearCache();
@@ -71,10 +76,21 @@
}
@Override
- public MmItemOutputEntity getByItemid(String itemid, String resultstr) {
+ public MmItemOutputEntity getByItemid(String itemid, String resultstr, String resultIndex) {
QueryWrapper<MmItemOutputEntity> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("itemid", itemid).eq("resultstr", resultstr);
+ queryWrapper.eq("itemid", itemid)
+ .eq("resultstr", resultstr)
+ .eq(StringUtils.isNotBlank(resultIndex), "result_index", resultIndex);
return mmItemOutputDao.selectOne(queryWrapper);
+ }
+
+ @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
@@ -90,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