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 | 102 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 80 insertions(+), 22 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 059ae27..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,14 +6,15 @@
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 com.iailab.module.model.mdk.vo.MmItemOutputVO;
+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.UUID;
+import java.util.concurrent.ConcurrentHashMap;
/**
* @author PanZhibao
@@ -24,33 +25,79 @@
@Autowired
private MmItemOutputDao mmItemOutputDao;
+
+ private static Map<String, MmItemOutputEntity> outputMap = new ConcurrentHashMap<>();
+
+ private static Map<String, List<MmItemOutputEntity>> itemMap = new ConcurrentHashMap<>();
@Override
- public void saveMmItemOutput(MmItemOutputEntity mmItemOutput) {
- mmItemOutput.setId(UUID.randomUUID().toString());
+ public void saveMmItemOutput(List<MmItemOutputEntity> mmItemOutput) {
+ mmItemOutput.forEach(e -> {
+ e.setId(e.getId().replace("+","").replace("-",""));
+ });
mmItemOutputDao.insert(mmItemOutput);
+ // 清空缓存
+ clearCache();
}
@Override
public void update(MmItemOutputEntity mmItemOutput) {
mmItemOutputDao.updateById(mmItemOutput);
+ // 清空缓存
+ 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 MmItemOutputEntity getByItemid(String itemid) {
- QueryWrapper<MmItemOutputEntity> queryWrapper = new QueryWrapper();
- queryWrapper.eq("itemid", 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");
List<MmItemOutputEntity> list = mmItemOutputDao.selectList(queryWrapper);
if (CollectionUtils.isEmpty(list)) {
- return new MmItemOutputEntity();
+ return null;
}
- return list.get(0);
+ itemMap.put(itemId, list);
+ return itemMap.get(itemId);
+ }
+
+ @Override
+ public MmItemOutputEntity getByItemid(String itemid, String resultstr, String resultIndex) {
+ QueryWrapper<MmItemOutputEntity> queryWrapper = new QueryWrapper<>();
+ 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.eq("itemid", itemId);
+ mmItemOutputDao.delete(queryWrapper);
}
@Override
@@ -59,21 +106,32 @@
}
@Override
- public MmItemOutputVO getOutPutById(String outputid) {
- List<MmItemOutputVO> list = mmItemOutputDao.getOutPutById(outputid);
- if (CollectionUtils.isEmpty(list)) {
- return null;
+ public List<String> getItemIdByOut(List<String> outIds) {
+ List<String> result = new ArrayList<>();
+ if (CollectionUtils.isEmpty(outIds)) {
+ return result;
}
- return list.get(0);
+ 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 List<MmItemOutputVO> getOutPutByItemId(String itemid) {
- return mmItemOutputDao.getOutPutByItemId(itemid);
- }
-
- @Override
- public List<MmItemOutputVO> getOutPutByPointId(String pointid) {
- return mmItemOutputDao.getOutPutByPointId(pointid);
+ public MmItemOutputEntity getOutPutById(String outputid) {
+ if (outputMap.containsKey(outputid)) {
+ return outputMap.get(outputid);
+ }
+ MmItemOutputEntity entity = mmItemOutputDao.selectById(outputid);
+ if (entity != null) {
+ outputMap.put(outputid, entity);
+ }
+ return outputMap.get(outputid);
}
}
--
Gitblit v1.9.3