From 20dc892fd72e5e9c19a5a5188f7daf9bcd87e0f0 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期五, 22 十一月 2024 09:57:41 +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/MmPredictModelServiceImpl.java |   47 ++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictModelServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictModelServiceImpl.java
index eb61a05..892bae3 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictModelServiceImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictModelServiceImpl.java
@@ -1,45 +1,73 @@
 package com.iailab.module.model.mcs.pre.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.iailab.framework.common.service.impl.BaseServiceImpl;
+import com.iailab.module.model.mcs.pre.dao.MmPredictMergeItemDao;
 import com.iailab.module.model.mcs.pre.dao.MmPredictModelDao;
 import com.iailab.module.model.mcs.pre.entity.MmPredictModelEntity;
 import com.iailab.module.model.mcs.pre.service.MmPredictModelService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * @author PanZhibao
  * @date 2021年04月27日 11:30
  */
-@Service("mmPredictModelService")
-public class MmPredictModelServiceImpl extends BaseServiceImpl<MmPredictModelDao, MmPredictModelEntity> implements MmPredictModelService {
+@Service
+public class MmPredictModelServiceImpl extends ServiceImpl<MmPredictModelDao, MmPredictModelEntity> implements MmPredictModelService {
+
+    @Autowired
+    private MmPredictModelDao mmPredictModelDao;
+
+    private static Map<String, MmPredictModelEntity> modelEntityMap = new ConcurrentHashMap<>();
 
     @Override
     public void savePredictModel(MmPredictModelEntity predictModel) {
         predictModel.setId(UUID.randomUUID().toString());
-        baseDao.insert(predictModel);
+        mmPredictModelDao.insert(predictModel);
+        clearCache();
     }
 
     @Override
     public void update(MmPredictModelEntity predictModel) {
         this.updateById(predictModel);
+        clearCache();
+    }
+
+    @Override
+    public MmPredictModelEntity getInfoFromCatch(String id) {
+        if (!modelEntityMap.containsKey(id)) {
+            MmPredictModelEntity modelEntity = getInfo(id);
+            if (modelEntity != null) {
+                modelEntityMap.put(id, modelEntity);
+            }
+        }
+        return modelEntityMap.get(id);
+    }
+
+    @Override
+    public void clearCache() {
+        modelEntityMap.clear();
     }
 
     @Override
     public MmPredictModelEntity getInfo(String id) {
-        return baseDao.selectById(id);
+        return mmPredictModelDao.selectById(id);
     }
 
     @Override
     public BigDecimal getSampleLength(String id) {
         BigDecimal result = BigDecimal.ZERO;
-        List<MmPredictModelEntity> list = baseDao.getSampleLength(id);
+        List<MmPredictModelEntity> list = mmPredictModelDao.getSampleLength(id);
         if (CollectionUtils.isEmpty(list)) {
             return result;
         }
@@ -51,13 +79,14 @@
     public void deleteBatch(String[] itemIds) {
         QueryWrapper<MmPredictModelEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.in("itemid", itemIds);
-        baseDao.delete(queryWrapper);
+        mmPredictModelDao.delete(queryWrapper);
+        clearCache();
     }
 
     public MmPredictModelEntity getByItemid(String itemid) {
         QueryWrapper<MmPredictModelEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("itemid", itemid);
-        List<MmPredictModelEntity> list = baseDao.selectList(queryWrapper);
+        List<MmPredictModelEntity> list = mmPredictModelDao.selectList(queryWrapper);
         if (CollectionUtils.isEmpty(list)) {
             return new MmPredictModelEntity();
         }
@@ -66,11 +95,11 @@
 
     @Override
     public List<MmPredictModelEntity> getNoSettingmapPredictModel(Map<String, Object> params) {
-        return baseDao.getNoSettingmapPredictModel(params);
+        return mmPredictModelDao.getNoSettingmapPredictModel(params);
     }
 
     @Override
     public List<MmPredictModelEntity> getActiveModelByItemId(String itemId) {
-        return baseDao.getActiveModelByItemId(itemId);
+        return mmPredictModelDao.getActiveModelByItemId(itemId);
     }
 }

--
Gitblit v1.9.3