From 60fa13f76afe72a6f48416de2904d58164859382 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期五, 17 一月 2025 13:51:55 +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 |   54 +++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 43 insertions(+), 11 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 0c69a6b..ff058ab 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,8 +6,10 @@
 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.List;
 import java.util.Map;
@@ -24,47 +26,75 @@
     private MmItemOutputDao mmItemOutputDao;
 
     private static Map<String, MmItemOutputEntity> outputMap = new ConcurrentHashMap<>();
+
+    private static Map<String, List<MmItemOutputEntity>> itemMap = new ConcurrentHashMap<>();
     
     @Override
     public void saveMmItemOutput(List<MmItemOutputEntity> mmItemOutput) {
+        mmItemOutput.forEach(e -> {
+            e.setId(e.getId().replace("+","").replace("-",""));
+        });
         mmItemOutputDao.insert(mmItemOutput);
         // 清空缓存
-        outputMap.clear();
+        clearCache();
     }
 
     @Override
     public void update(MmItemOutputEntity mmItemOutput) {
         mmItemOutputDao.updateById(mmItemOutput);
         // 清空缓存
-        outputMap.clear();
+        clearCache();
     }
 
     public void deleteBatch(String[] itemIds) {
-        QueryWrapper<MmItemOutputEntity> queryWrapper = new QueryWrapper();
+        QueryWrapper<MmItemOutputEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.in("itemid", itemIds);
         mmItemOutputDao.delete(queryWrapper);
         // 清空缓存
+        clearCache();
+    }
+
+    private void clearCache() {
         outputMap.clear();
+        itemMap.clear();
     }
 
     @Override
-    public List<MmItemOutputEntity> getByItemid(String itemid) {
+    public List<MmItemOutputEntity> getByItemid(String itemId) {
+        if (itemMap.containsKey(itemId)) {
+            return itemMap.get(itemId);
+        }
         QueryWrapper<MmItemOutputEntity> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("itemid", itemid).orderByAsc("outputorder");
+        queryWrapper.eq("itemid", itemId).orderByAsc("outputorder");
         List<MmItemOutputEntity> list = mmItemOutputDao.selectList(queryWrapper);
-        return list;
+        if (CollectionUtils.isEmpty(list)) {
+            return null;
+        }
+        itemMap.put(itemId, list);
+        return itemMap.get(itemId);
     }
 
     @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
     public void deleteByItemId(String itemId) {
-        QueryWrapper<MmItemOutputEntity> queryWrapper = new QueryWrapper();
+        QueryWrapper<MmItemOutputEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("itemid", itemId);
         mmItemOutputDao.delete(queryWrapper);
     }
@@ -80,7 +110,9 @@
             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