From b9e53a5ab0c865ea8fec935d8d0b2d4cfdf8c932 Mon Sep 17 00:00:00 2001 From: o2sword <171715986@qq.com> Date: Wed, 26 Aug 2020 15:37:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=AD=E5=BF=83=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E7=BC=93=E5=AD=98=E4=BC=98=E5=8C=962?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processing/factory/QueryFactory.java | 34 +++++++++---------- .../neural/ActionListCalculateWithWork.java | 16 ++++----- .../processing/jaxrs/neural/BaseAction.java | 6 ++-- 3 files changed, 26 insertions(+), 30 deletions(-) diff --git a/o2server/x_query_service_processing/src/main/java/com/x/query/service/processing/factory/QueryFactory.java b/o2server/x_query_service_processing/src/main/java/com/x/query/service/processing/factory/QueryFactory.java index 022d616bd2..a633d9341e 100644 --- a/o2server/x_query_service_processing/src/main/java/com/x/query/service/processing/factory/QueryFactory.java +++ b/o2server/x_query_service_processing/src/main/java/com/x/query/service/processing/factory/QueryFactory.java @@ -7,35 +7,34 @@ import java.util.stream.Collectors; import org.apache.commons.lang3.StringUtils; -import com.x.base.core.project.cache.ApplicationCache; import com.x.base.core.project.tools.StringTools; import com.x.query.core.entity.Query; import com.x.query.service.processing.AbstractFactory; import com.x.query.service.processing.Business; - -import net.sf.ehcache.Ehcache; -import net.sf.ehcache.Element; +import com.x.base.core.project.cache.Cache.CacheCategory; +import com.x.base.core.project.cache.Cache.CacheKey; +import com.x.base.core.project.cache.CacheManager; +import java.util.Optional; public class QueryFactory extends AbstractFactory { - private Ehcache cache; + private CacheCategory cache; public QueryFactory(Business business) throws Exception { super(business); - this.cache = ApplicationCache.instance().getCache(Query.class); + this.cache = new CacheCategory(Query.class); } public List pick(List flags) throws Exception { List list = new ArrayList<>(); for (String str : flags) { - Element element = cache.get(str); - if (null != element) { - if (null != element.getObjectValue()) { - list.add((Query) element.getObjectValue()); - } + CacheKey cacheKey = new CacheKey(str); + Optional optional = CacheManager.get(cache, cacheKey); + if (optional.isPresent()) { + list.add((Query) optional.get()); } else { Query o = this.pickObject(str); - cache.put(new Element(str, o)); + CacheManager.put(cache, cacheKey, o); if (null != o) { list.add(o); } @@ -49,14 +48,13 @@ public class QueryFactory extends AbstractFactory { return null; } Query o = null; - Element element = cache.get(flag); - if (null != element) { - if (null != element.getObjectValue()) { - o = (Query) element.getObjectValue(); - } + CacheKey cacheKey = new CacheKey(flag); + Optional optional = CacheManager.get(cache, cacheKey); + if (optional.isPresent()) { + o = (Query) optional.get(); } else { o = this.pickObject(flag); - cache.put(new Element(flag, o)); + CacheManager.put(cache, cacheKey, o); } return o; } diff --git a/o2server/x_query_service_processing/src/main/java/com/x/query/service/processing/jaxrs/neural/ActionListCalculateWithWork.java b/o2server/x_query_service_processing/src/main/java/com/x/query/service/processing/jaxrs/neural/ActionListCalculateWithWork.java index 1556b90fee..7b2b98aaf0 100644 --- a/o2server/x_query_service_processing/src/main/java/com/x/query/service/processing/jaxrs/neural/ActionListCalculateWithWork.java +++ b/o2server/x_query_service_processing/src/main/java/com/x/query/service/processing/jaxrs/neural/ActionListCalculateWithWork.java @@ -20,7 +20,6 @@ import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.entity.dataitem.DataItemConverter; import com.x.base.core.entity.dataitem.ItemCategory; -import com.x.base.core.project.cache.ApplicationCache; import com.x.base.core.project.config.Config; import com.x.base.core.project.config.StorageMapping; import com.x.base.core.project.exception.ExceptionEntityNotExist; @@ -43,8 +42,9 @@ import com.x.query.service.processing.Business; import com.x.query.service.processing.ThisApplication; import com.x.query.service.processing.helper.ExtractTextHelper; import com.x.query.service.processing.helper.LanguageProcessingHelper; - -import net.sf.ehcache.Element; +import com.x.base.core.project.cache.Cache.CacheKey; +import com.x.base.core.project.cache.CacheManager; +import java.util.Optional; class ActionListCalculateWithWork extends BaseAction { @@ -63,10 +63,10 @@ class ActionListCalculateWithWork extends BaseAction { throw new ExceptionModelNotReady(model.getName()); } NeuralNetwork neuralNetwork = null; - String cacheKey = ApplicationCache.concreteCacheKey(this.getClass(), model.getId()); - Element element = cache.get(cacheKey); - if (null != element && (null != element.getObjectValue())) { - neuralNetwork = ((NeuralNetwork) element.getObjectValue()); + CacheKey cacheKey = new CacheKey(this.getClass(), model.getId()); + Optional optional = CacheManager.get(cache, cacheKey); + if (optional.isPresent()) { + neuralNetwork = ((NeuralNetwork) optional.get()); } else { if (StringUtils.isEmpty(model.getNnet())) { throw new ExceptionModelNotReady(model.getName()); @@ -75,7 +75,7 @@ class ActionListCalculateWithWork extends BaseAction { NeuralNetworkCODEC.array2network( DoubleTools.byteToDoubleArray(ByteTools.decompressBase64String(model.getNnet())), neuralNetwork); - cache.put(new Element(cacheKey, neuralNetwork)); + CacheManager.put(cache, cacheKey, neuralNetwork); } Wo wo = new Wo(); Work work = emc.flag(workId, Work.class); diff --git a/o2server/x_query_service_processing/src/main/java/com/x/query/service/processing/jaxrs/neural/BaseAction.java b/o2server/x_query_service_processing/src/main/java/com/x/query/service/processing/jaxrs/neural/BaseAction.java index 8591da15ac..8a0b11fa83 100644 --- a/o2server/x_query_service_processing/src/main/java/com/x/query/service/processing/jaxrs/neural/BaseAction.java +++ b/o2server/x_query_service_processing/src/main/java/com/x/query/service/processing/jaxrs/neural/BaseAction.java @@ -1,16 +1,14 @@ package com.x.query.service.processing.jaxrs.neural; -import com.x.base.core.project.cache.ApplicationCache; import com.x.base.core.project.jaxrs.StandardJaxrsAction; import com.x.base.core.project.logger.Logger; import com.x.base.core.project.logger.LoggerFactory; import com.x.query.core.entity.neural.Model; - -import net.sf.ehcache.Ehcache; +import com.x.base.core.project.cache.Cache.CacheCategory; abstract class BaseAction extends StandardJaxrsAction { - protected Ehcache cache = ApplicationCache.instance().getCache(Model.class); + protected CacheCategory cache = new CacheCategory(Model.class); private static Logger logger = LoggerFactory.getLogger(BaseAction.class); -- GitLab