diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionGet.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionGet.java index d1bd2edc9dc17100259c0867d2aa13eca2ae15c4..33303923fb2731366e9648bf1ea25e84e670a147 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionGet.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionGet.java @@ -1,6 +1,8 @@ package com.x.cms.assemble.control.jaxrs.appinfo; import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.logger.Logger; @@ -11,6 +13,8 @@ import net.sf.ehcache.Element; import org.apache.commons.lang3.StringUtils; import javax.servlet.http.HttpServletRequest; +import java.util.List; +import java.util.Optional; public class ActionGet extends BaseAction { @@ -28,13 +32,12 @@ public class ActionGet extends BaseAction { Exception exception = new ExceptionAppInfoIdEmpty(); result.error( exception ); } - - String cacheKey = ApplicationCache.concreteCacheKey( flag ); - Element element = cache.get( cacheKey ); - - if (( null != element ) && ( null != element.getObjectValue()) ) { - wo = ( Wo ) element.getObjectValue(); - result.setData( wo ); + + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), flag ); + Optional optional = CacheManager.get(cacheCategory, cacheKey); + + if (optional.isPresent()) { + result.setData((Wo)optional.get()); } else { if( check ){ try { @@ -70,8 +73,7 @@ public class ActionGet extends BaseAction { }else{ wo.setConfig( "{}" ); } - - cache.put(new Element( cacheKey, wo )); + CacheManager.put(cacheCategory, cacheKey, wo); result.setData( wo ); } catch (Exception e) { Exception exception = new ExceptionAppInfoProcess( e, "将查询出来的应用栏目信息对象转换为可输出的数据信息时发生异常。" ); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionGetAnonymous.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionGetAnonymous.java index eca5167544e2a148abc87fc3c75ba1ac64916948..e6453702bbbab0c068e0e0e910ccbb1bde89ee04 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionGetAnonymous.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionGetAnonymous.java @@ -2,6 +2,8 @@ package com.x.cms.assemble.control.jaxrs.appinfo; import javax.servlet.http.HttpServletRequest; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import org.apache.commons.lang3.StringUtils; import com.x.base.core.project.cache.ApplicationCache; @@ -13,6 +15,8 @@ import com.x.cms.core.entity.AppInfo; import net.sf.ehcache.Element; +import java.util.Optional; + public class ActionGetAnonymous extends BaseAction { private static Logger logger = LoggerFactory.getLogger( ActionGetAnonymous.class ); @@ -28,13 +32,12 @@ public class ActionGetAnonymous extends BaseAction { Exception exception = new ExceptionAppInfoIdEmpty(); result.error( exception ); } - - String cacheKey = ApplicationCache.concreteCacheKey( flag ); - Element element = cache.get( cacheKey ); - - if (( null != element ) && ( null != element.getObjectValue()) ) { - wo = ( Wo ) element.getObjectValue(); - result.setData( wo ); + + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), flag ); + Optional optional = CacheManager.get(cacheCategory, cacheKey); + + if (optional.isPresent()) { + result.setData((Wo)optional.get()); } else { if( check ){ try { @@ -60,7 +63,7 @@ public class ActionGetAnonymous extends BaseAction { if( check ){ try { wo = Wo.copier.copy( appInfo ); - cache.put(new Element( cacheKey, wo )); + CacheManager.put(cacheCategory, cacheKey, wo); result.setData( wo ); } catch (Exception e) { Exception exception = new ExceptionAppInfoProcess( e, "将查询出来的应用栏目信息对象转换为可输出的数据信息时发生异常。" ); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionGetByAlias.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionGetByAlias.java index 8936b63fc7e4289655c7c11b028b652d53d690e9..a0160b3b564ad974c7e3141cb1fadcf1afa79441 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionGetByAlias.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionGetByAlias.java @@ -1,9 +1,12 @@ package com.x.cms.assemble.control.jaxrs.appinfo; import java.util.List; +import java.util.Optional; import javax.servlet.http.HttpServletRequest; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import org.apache.commons.lang3.StringUtils; import com.x.base.core.project.cache.ApplicationCache; @@ -32,13 +35,12 @@ public class ActionGetByAlias extends BaseAction { Exception exception = new ExceptionAppInfoIdEmpty(); result.error( exception ); } - - String cacheKey = ApplicationCache.concreteCacheKey( "alias", alias ); - Element element = cache.get( cacheKey ); - - if ((null != element) && ( null != element.getObjectValue()) ) { - wo = ( Wo ) element.getObjectValue(); - result.setData(wo); + + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), alias ); + Optional optional = CacheManager.get(cacheCategory, cacheKey); + + if (optional.isPresent()) { + result.setData((Wo)optional.get()); } else { if( check ){ try { @@ -75,7 +77,7 @@ public class ActionGetByAlias extends BaseAction { if( check ){ try { wo = Wo.copier.copy( appInfo ); - cache.put(new Element( cacheKey, wo )); + CacheManager.put(cacheCategory, cacheKey, wo); result.setData( wo ); } catch (Exception e) { Exception exception = new ExceptionAppInfoProcess( e, "将查询出来的应用栏目信息对象转换为可输出的数据信息时发生异常。" ); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionGetConfig.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionGetConfig.java index abdb4273af58c5bbfe74d015abb4219150c02160..0b3e3c82a04975a5b2d722b4f3a99a1964670bd3 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionGetConfig.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionGetConfig.java @@ -1,6 +1,8 @@ package com.x.cms.assemble.control.jaxrs.appinfo; import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.jaxrs.WoText; @@ -11,6 +13,7 @@ import net.sf.ehcache.Element; import org.apache.commons.lang3.StringUtils; import javax.servlet.http.HttpServletRequest; +import java.util.Optional; public class ActionGetConfig extends BaseAction { @@ -27,13 +30,12 @@ public class ActionGetConfig extends BaseAction { Exception exception = new ExceptionAppInfoIdEmpty(); result.error( exception ); } - - String cacheKey = ApplicationCache.concreteCacheKey( "appConfig", id ); - Element element = cache.get( cacheKey ); - - if (( null != element ) && ( null != element.getObjectValue()) ) { - woText = ( WoText ) element.getObjectValue(); - result.setData( woText ); + + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), id ); + Optional optional = CacheManager.get(cacheCategory, cacheKey); + + if (optional.isPresent()) { + result.setData((WoText)optional.get()); } else { if( check ){ try { @@ -51,7 +53,7 @@ public class ActionGetConfig extends BaseAction { } } if( check ){ - cache.put(new Element( cacheKey, woText )); + CacheManager.put(cacheCategory, cacheKey, woText); result.setData( woText ); } } diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionGetPublishableAppInfo.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionGetPublishableAppInfo.java index 2464bc082a1561f177b16ec98ff41d0dde439a6f..b16480df9cfad4b28c80315ade1ddb96e625b227 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionGetPublishableAppInfo.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionGetPublishableAppInfo.java @@ -2,18 +2,18 @@ package com.x.cms.assemble.control.jaxrs.appinfo; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import javax.servlet.http.HttpServletRequest; -import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.logger.Logger; import com.x.base.core.project.logger.LoggerFactory; import com.x.base.core.project.tools.ListTools; -import net.sf.ehcache.Element; - public class ActionGetPublishableAppInfo extends BaseAction { private static Logger logger = LoggerFactory.getLogger(ActionGetPublishableAppInfo.class); @@ -35,13 +35,12 @@ public class ActionGetPublishableAppInfo extends BaseAction { result.error(exception); logger.error(e, effectivePerson, request, null); } - - String cacheKey = ApplicationCache.concreteCacheKey(personName, "ActionGetPublishableAppInfo", appId, isXAdmin); - Element element = cache.get(cacheKey); - if ((null != element) && (null != element.getObjectValue())) { - Wo wo = (Wo) element.getObjectValue(); - result.setData( wo ); + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), personName, appId, isXAdmin ); + Optional optional = CacheManager.get(cacheCategory, cacheKey); + + if (optional.isPresent()) { + result.setData((Wo)optional.get()); } else { if (check) { if ( isXAdmin ) { // 如果用户管理系统管理，则获取所有的栏目和分类信息 @@ -75,7 +74,7 @@ public class ActionGetPublishableAppInfo extends BaseAction { if(ListTools.isNotEmpty( wos)) { for( Wo wo : wos ) { if( wo.getId().equalsIgnoreCase( appId )) { - cache.put(new Element( cacheKey, wo )); + CacheManager.put(cacheCategory, cacheKey, wo); result.setData( wo ); break; } diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListAll.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListAll.java index 143524bf752ed23c3daa13d405b2b85609f84931..e72b8dc23c66953b840acb383493cef291a0fc98 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListAll.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListAll.java @@ -1,10 +1,13 @@ package com.x.cms.assemble.control.jaxrs.appinfo; import java.util.List; +import java.util.Optional; import javax.servlet.http.HttpServletRequest; import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.logger.Logger; @@ -25,13 +28,12 @@ public class ActionListAll extends BaseAction { List wos = null; List appInfoList = null; Boolean check = true; - - String cacheKey = ApplicationCache.concreteCacheKey( "all" ); - Element element = cache.get( cacheKey ); - - if ((null != element) && ( null != element.getObjectValue()) ) { - wos = ( List ) element.getObjectValue(); - result.setData( wos ); + + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass() ); + Optional optional = CacheManager.get(cacheCategory, cacheKey); + + if (optional.isPresent()) { + result.setData((List)optional.get()); } else { try { appInfoList = appInfoServiceAdv.listAll( null, "全部"); @@ -46,7 +48,7 @@ public class ActionListAll extends BaseAction { try { wos = Wo.copier.copy( appInfoList ); SortTools.desc( wos, "appInfoSeq"); - cache.put(new Element( cacheKey, wos )); + CacheManager.put(cacheCategory, cacheKey, wos); result.setData( wos ); } catch (Exception e) { Exception exception = new ExceptionAppInfoProcess( e, "将查询出来的应用栏目信息对象转换为可输出的数据信息时发生异常。" ); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListAllAppType.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListAllAppType.java index 64e5d459762aae3014b6b9b424634cd0ab906d2b..4b3042aa0aee22486f329353e79cbfeac1154f6c 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListAllAppType.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListAllAppType.java @@ -2,11 +2,14 @@ package com.x.cms.assemble.control.jaxrs.appinfo; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import javax.servlet.http.HttpServletRequest; import com.x.base.core.project.annotation.FieldDescribe; import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.logger.Logger; @@ -37,13 +40,12 @@ public class ActionListAllAppType extends BaseAction { result.error(exception); logger.error(e, effectivePerson, request, null); } - - String cacheKey = ApplicationCache.concreteCacheKey( "allType", personName, isAnonymous, isManager ); - Element element = cache.get( cacheKey ); - - if ((null != element) && ( null != element.getObjectValue()) ) { - wos = ( List ) element.getObjectValue(); - result.setData( wos ); + + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), personName, isAnonymous, isManager ); + Optional optional = CacheManager.get(cacheCategory, cacheKey); + + if (optional.isPresent()) { + result.setData((List)optional.get()); } else { wos = new ArrayList<>(); try { @@ -89,8 +91,7 @@ public class ActionListAllAppType extends BaseAction { if( appIdsForType.size() > 0 ) { wos.add( new Wo( "未分类", Long.parseLong( appIdsForType.size() + "") )); } - - cache.put(new Element( cacheKey, wos )); + CacheManager.put(cacheCategory, cacheKey, wos); result.setData( wos ); } } diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListAllManageableAppType.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListAllManageableAppType.java index c84e91defe2430bb61e55678cc2820dfab2bf8e9..7d42ac3e064e0387c5503735dde537ad86e86ec7 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListAllManageableAppType.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListAllManageableAppType.java @@ -2,11 +2,14 @@ package com.x.cms.assemble.control.jaxrs.appinfo; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import javax.servlet.http.HttpServletRequest; import com.x.base.core.project.annotation.FieldDescribe; import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.logger.Logger; @@ -37,13 +40,12 @@ public class ActionListAllManageableAppType extends BaseAction { result.error(exception); logger.error(e, effectivePerson, request, null); } - - String cacheKey = ApplicationCache.concreteCacheKey( "allManageableType", personName, isAnonymous, isManager ); - Element element = cache.get( cacheKey ); - - if ((null != element) && ( null != element.getObjectValue()) ) { - wos = ( List ) element.getObjectValue(); - result.setData( wos ); + + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), personName, isAnonymous, isManager ); + Optional optional = CacheManager.get(cacheCategory, cacheKey); + + if (optional.isPresent()) { + result.setData((List)optional.get()); } else { wos = new ArrayList<>(); try { @@ -82,6 +84,7 @@ public class ActionListAllManageableAppType extends BaseAction { List groupNames = userManagerService.listGroupNamesByPerson( personName ); appIdsForType = permissionQueryService.listManageableAppIdsByPerson(personName, unitNames, groupNames, appIdsForType, null, null, null, 99 ); } + if( appIdsForType == null ){ appIdsForType = new ArrayList<>(); } @@ -90,7 +93,7 @@ public class ActionListAllManageableAppType extends BaseAction { wos.add( new Wo( "未分类", Long.parseLong( appIdsForType.size() + "") )); } - cache.put(new Element( cacheKey, wos )); + CacheManager.put(cacheCategory, cacheKey, wos); result.setData( wos ); } } diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListNextWithFilter.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListNextWithFilter.java index f0d23a15380923a88b8742e0b714c2805cda523f..42742f4eb9e3a1a4d293a184a9e88d0f3ba3d33d 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListNextWithFilter.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListNextWithFilter.java @@ -21,8 +21,7 @@ public class ActionListNextWithFilter extends BaseAction { private static Logger logger = LoggerFactory.getLogger(ActionListNextWithFilter.class); - protected ActionResult> execute(HttpServletRequest request, EffectivePerson effectivePerson, String id, - Integer count, JsonElement jsonElement) throws Exception { + protected ActionResult> execute(HttpServletRequest request, EffectivePerson effectivePerson, String id, Integer count, JsonElement jsonElement) throws Exception { ActionResult> result = new ActionResult<>(); EqualsTerms equals = new EqualsTerms(); InTerms ins = new InTerms(); @@ -63,8 +62,9 @@ public class ActionListNextWithFilter extends BaseAction { likes.put("appName", key); } } + try { - result = this.standardListNext(Wo.copier, id, count, "sequence", equals, null, likes, ins, null, null, + result = this.standardListNext( Wo.copier, id, count, "sequence", equals, null, likes, ins, null, null, null, null, true, DESC); } catch (Exception e) { result.error(e); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListWhatICanManage.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListWhatICanManage.java index 82b025c3086704a6b4f181afe2e3c0fd93369923..c37910bde80c96e5ee816128018708c54f7028c8 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListWhatICanManage.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListWhatICanManage.java @@ -1,6 +1,8 @@ package com.x.cms.assemble.control.jaxrs.appinfo; import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.logger.Logger; @@ -14,6 +16,7 @@ import net.sf.ehcache.Element; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; +import java.util.Optional; public class ActionListWhatICanManage extends BaseAction { @@ -40,12 +43,11 @@ public class ActionListWhatICanManage extends BaseAction { logger.error(e, effectivePerson, request, null); } - String cacheKey = ApplicationCache.concreteCacheKey(personName, "manage", isXAdmin); - Element element = cache.get(cacheKey); + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), personName, "manage", isXAdmin ); + Optional optional = CacheManager.get(cacheCategory, cacheKey); - if ((null != element) && (null != element.getObjectValue())) { - wos = (List) element.getObjectValue(); - result.setData(wos); + if (optional.isPresent()) { + result.setData((List)optional.get()); } else { if (check) { if (isXAdmin) { @@ -86,7 +88,7 @@ public class ActionListWhatICanManage extends BaseAction { try { wos = Wo.copier.copy(appInfoList); SortTools.asc( wos, "appInfoSeq"); - cache.put(new Element(cacheKey, wos)); + CacheManager.put(cacheCategory, cacheKey, wos); result.setData(wos); } catch (Exception e) { check = false; diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListWhatICanManage_WithAppType.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListWhatICanManage_WithAppType.java index 406db766f25bb01cdedc1c4aa48ec99b09663d51..b8a756297e0bc0d2c29abb823fd3a799e08c84f1 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListWhatICanManage_WithAppType.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListWhatICanManage_WithAppType.java @@ -1,6 +1,8 @@ package com.x.cms.assemble.control.jaxrs.appinfo; import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.logger.Logger; @@ -14,6 +16,7 @@ import net.sf.ehcache.Element; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; +import java.util.Optional; public class ActionListWhatICanManage_WithAppType extends BaseAction { @@ -39,12 +42,12 @@ public class ActionListWhatICanManage_WithAppType extends BaseAction { result.error(exception); logger.error(e, effectivePerson, request, null); } - String cacheKey = ApplicationCache.concreteCacheKey(personName, "manage", "appType", appType, isXAdmin); - Element element = cache.get(cacheKey); - if ((null != element) && (null != element.getObjectValue())) { - wos = (List) element.getObjectValue(); - result.setData(wos); + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), personName, appType, isXAdmin ); + Optional optional = CacheManager.get(cacheCategory, cacheKey); + + if (optional.isPresent()) { + result.setData((List)optional.get()); } else { if (check) { if (isXAdmin) { @@ -85,7 +88,7 @@ public class ActionListWhatICanManage_WithAppType extends BaseAction { try { wos = Wo.copier.copy(appInfoList); SortTools.asc( wos, "appInfoSeq"); - cache.put(new Element(cacheKey, wos)); + CacheManager.put(cacheCategory, cacheKey, wos); result.setData(wos); } catch (Exception e) { check = false; diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListWhatICanPublish.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListWhatICanPublish.java index 660b33766c14d4f0d6086fb706e0c4b4393c9a4a..c28ed0d19a326e0674e033456b76f28fe804f808 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListWhatICanPublish.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListWhatICanPublish.java @@ -1,6 +1,8 @@ package com.x.cms.assemble.control.jaxrs.appinfo; import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.logger.Logger; @@ -12,6 +14,7 @@ import net.sf.ehcache.Element; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; +import java.util.Optional; public class ActionListWhatICanPublish extends BaseAction { @@ -35,15 +38,12 @@ public class ActionListWhatICanPublish extends BaseAction { result.error(exception); logger.error(e, effectivePerson, request, null); } - - String cacheKey = ApplicationCache.concreteCacheKey( personName, "all", "publish", isXAdmin, isAnonymous ); - Element element = cache.get(cacheKey); - if ((null != element) && (null != element.getObjectValue())) { - - wos = (List) element.getObjectValue(); - result.setData( wos ); + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), personName, isAnonymous, isXAdmin ); + Optional optional = CacheManager.get(cacheCategory, cacheKey); + if (optional.isPresent()) { + result.setData((List)optional.get()); } else { if (check) { try { @@ -73,7 +73,7 @@ public class ActionListWhatICanPublish extends BaseAction { } //按appInfoSeq列的值， 排个序 SortTools.asc( wos, "appInfoSeq"); - cache.put(new Element( cacheKey, wos )); + CacheManager.put(cacheCategory, cacheKey, wos); result.setData( wos ); } } diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListWhatICanPublish_WithAppType.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListWhatICanPublish_WithAppType.java index 7efcad8a6a7d19cfb4449e648e82e8bd58e44a2d..9b8c7266838ab7c01e8cf410e381f913425c2d41 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListWhatICanPublish_WithAppType.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListWhatICanPublish_WithAppType.java @@ -1,6 +1,8 @@ package com.x.cms.assemble.control.jaxrs.appinfo; import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.logger.Logger; @@ -12,6 +14,7 @@ import net.sf.ehcache.Element; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; +import java.util.Optional; public class ActionListWhatICanPublish_WithAppType extends BaseAction { @@ -35,13 +38,12 @@ public class ActionListWhatICanPublish_WithAppType extends BaseAction { result.error(exception); logger.error(e, effectivePerson, request, null); } - - String cacheKey = ApplicationCache.concreteCacheKey( personName, appType, "publish", isXAdmin); - Element element = cache.get(cacheKey); - if ((null != element) && (null != element.getObjectValue())) { - wos = (List) element.getObjectValue(); - result.setData( wos ); + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), personName, appType, isAnonymous, isXAdmin ); + Optional optional = CacheManager.get(cacheCategory, cacheKey); + + if (optional.isPresent()) { + result.setData((List)optional.get()); } else { if (check) { try { @@ -70,7 +72,7 @@ public class ActionListWhatICanPublish_WithAppType extends BaseAction { } //按appInfoSeq列的值， 排个序 SortTools.asc( wos, "appInfoSeq"); - cache.put(new Element( cacheKey, wos )); + CacheManager.put(cacheCategory, cacheKey, wos); result.setData( wos ); } } diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListWhatICanViewAllDocType.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListWhatICanViewAllDocType.java index 92a8b98dee5167f7874ea6deca16348daad1a867..ffb830c9e78204ae6dcf8227d42575ebb9d54253 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListWhatICanViewAllDocType.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListWhatICanViewAllDocType.java @@ -1,6 +1,8 @@ package com.x.cms.assemble.control.jaxrs.appinfo; import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.logger.Logger; @@ -12,6 +14,7 @@ import net.sf.ehcache.Element; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; +import java.util.Optional; public class ActionListWhatICanViewAllDocType extends BaseAction { @@ -36,13 +39,12 @@ public class ActionListWhatICanViewAllDocType extends BaseAction { result.error(exception); logger.error(e, effectivePerson, request, null); } - - String cacheKey = ApplicationCache.concreteCacheKey(personName, "ViewAppInfoAll", isXAdmin, isAnonymous); - Element element = cache.get(cacheKey); - if ((null != element) && (null != element.getObjectValue())) { - wos = (List) element.getObjectValue(); - result.setData(wos); + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), personName, isAnonymous, isXAdmin ); + Optional optional = CacheManager.get(cacheCategory, cacheKey); + + if (optional.isPresent()) { + result.setData((List)optional.get()); } else { if (check) { try { @@ -69,7 +71,7 @@ public class ActionListWhatICanViewAllDocType extends BaseAction { } //按appInfoSeq列的值， 排个序 SortTools.asc( wos, "appInfoSeq"); - cache.put(new Element( cacheKey, wos )); + CacheManager.put(cacheCategory, cacheKey, wos); result.setData( wos ); } } diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListWhatICanViewAllDocType_WithAppType.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListWhatICanViewAllDocType_WithAppType.java index cd09d586052df60b019403c49fc51636cb19944a..0cd89dd2d361b48935b4f5804023a2f23ea3a94b 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListWhatICanViewAllDocType_WithAppType.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListWhatICanViewAllDocType_WithAppType.java @@ -1,6 +1,8 @@ package com.x.cms.assemble.control.jaxrs.appinfo; import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.logger.Logger; @@ -12,6 +14,7 @@ import net.sf.ehcache.Element; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; +import java.util.Optional; public class ActionListWhatICanViewAllDocType_WithAppType extends BaseAction { @@ -36,13 +39,12 @@ public class ActionListWhatICanViewAllDocType_WithAppType extends BaseAction { result.error(exception); logger.error(e, effectivePerson, request, null); } - - String cacheKey = ApplicationCache.concreteCacheKey(personName, appType, "AllType", isXAdmin); - Element element = cache.get(cacheKey); - if ((null != element) && (null != element.getObjectValue())) { - wos = (List) element.getObjectValue(); - result.setData(wos); + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), personName, appType, isAnonymous, isXAdmin ); + Optional optional = CacheManager.get(cacheCategory, cacheKey); + + if (optional.isPresent()) { + result.setData((List)optional.get()); } else { if (check) { try { @@ -71,7 +73,7 @@ public class ActionListWhatICanViewAllDocType_WithAppType extends BaseAction { } //按appInfoSeq列的值， 排个序 SortTools.asc( wos, "appInfoSeq"); - cache.put(new Element( cacheKey, wos )); + CacheManager.put(cacheCategory, cacheKey, wos); result.setData( wos ); } } diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListWhatICanViewArticle.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListWhatICanViewArticle.java index 49d3a493b1c401ee04b458b7e011a91d376f8e65..ae207b0d145850956e502c3d28a858dcce344559 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListWhatICanViewArticle.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListWhatICanViewArticle.java @@ -1,6 +1,8 @@ package com.x.cms.assemble.control.jaxrs.appinfo; import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.logger.Logger; @@ -12,6 +14,7 @@ import net.sf.ehcache.Element; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; +import java.util.Optional; public class ActionListWhatICanViewArticle extends BaseAction { @@ -40,13 +43,12 @@ public class ActionListWhatICanViewArticle extends BaseAction { result.error(exception); logger.error(e, effectivePerson, request, null); } - - String cacheKey = ApplicationCache.concreteCacheKey(personName, "all", "Article", isXAdmin); - Element element = cache.get(cacheKey); - if ((null != element) && (null != element.getObjectValue())) { - wos = (List) element.getObjectValue(); - result.setData(wos); + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), personName, isAnonymous, isXAdmin ); + Optional optional = CacheManager.get(cacheCategory, cacheKey); + + if (optional.isPresent()) { + result.setData((List)optional.get()); } else { if (check) { try { @@ -76,7 +78,7 @@ public class ActionListWhatICanViewArticle extends BaseAction { } //按appInfoSeq列的值， 排个序 SortTools.asc( wos, "appInfoSeq"); - cache.put(new Element( cacheKey, wos )); + CacheManager.put(cacheCategory, cacheKey, wos); result.setData( wos ); } } diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListWhatICanViewArticle_WithAppType.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListWhatICanViewArticle_WithAppType.java index 020527efd339859c152aba1b033e6d0371b21762..af52d72c97e069f2fe5ce261af98030cbca7040a 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListWhatICanViewArticle_WithAppType.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListWhatICanViewArticle_WithAppType.java @@ -1,6 +1,8 @@ package com.x.cms.assemble.control.jaxrs.appinfo; import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.logger.Logger; @@ -12,6 +14,7 @@ import net.sf.ehcache.Element; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; +import java.util.Optional; public class ActionListWhatICanViewArticle_WithAppType extends BaseAction { @@ -40,13 +43,12 @@ public class ActionListWhatICanViewArticle_WithAppType extends BaseAction { result.error(exception); logger.error(e, effectivePerson, request, null); } - - String cacheKey = ApplicationCache.concreteCacheKey(personName, "Article", appType, isXAdmin); - Element element = cache.get(cacheKey); - if ((null != element) && (null != element.getObjectValue())) { - wos = (List) element.getObjectValue(); - result.setData(wos); + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), personName, appType, isAnonymous, isXAdmin ); + Optional optional = CacheManager.get(cacheCategory, cacheKey); + + if (optional.isPresent()) { + result.setData((List)optional.get()); } else { if (check) { try { @@ -76,7 +78,7 @@ public class ActionListWhatICanViewArticle_WithAppType extends BaseAction { } //按appInfoSeq列的值， 排个序 SortTools.asc( wos, "appInfoSeq"); - cache.put(new Element( cacheKey, wos )); + CacheManager.put(cacheCategory, cacheKey, wos); result.setData( wos ); } } diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListWhatICanViewData.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListWhatICanViewData.java index a013695fcdd9eff0a33a1aa6f17d7acda1968991..7ffe6698c547d5512b91b249d1ef8bb3a650c644 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListWhatICanViewData.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListWhatICanViewData.java @@ -1,6 +1,8 @@ package com.x.cms.assemble.control.jaxrs.appinfo; import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.logger.Logger; @@ -12,6 +14,7 @@ import net.sf.ehcache.Element; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; +import java.util.Optional; public class ActionListWhatICanViewData extends BaseAction { @@ -36,13 +39,12 @@ public class ActionListWhatICanViewData extends BaseAction { result.error(exception); logger.error(e, effectivePerson, request, null); } - - String cacheKey = ApplicationCache.concreteCacheKey(personName, "all", "Data", isXAdmin); - Element element = cache.get(cacheKey); - if ((null != element) && (null != element.getObjectValue())) { - wos = (List) element.getObjectValue(); - result.setData(wos); + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), personName, isAnonymous, isXAdmin ); + Optional optional = CacheManager.get(cacheCategory, cacheKey); + + if (optional.isPresent()) { + result.setData((List)optional.get()); } else { if (check) { try { @@ -72,7 +74,7 @@ public class ActionListWhatICanViewData extends BaseAction { } //按appInfoSeq列的值， 排个序 SortTools.asc( wos, "appInfoSeq"); - cache.put(new Element( cacheKey, wos )); + CacheManager.put(cacheCategory, cacheKey, wos); result.setData( wos ); } } diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListWhatICanViewData_WithAppType.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListWhatICanViewData_WithAppType.java index e82c13c9efd3c30facdacda86939b31d0cfa84e5..b224f74fc0f920ea056d007b6a46d2d7044f11a4 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListWhatICanViewData_WithAppType.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListWhatICanViewData_WithAppType.java @@ -1,6 +1,8 @@ package com.x.cms.assemble.control.jaxrs.appinfo; import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.logger.Logger; @@ -12,6 +14,7 @@ import net.sf.ehcache.Element; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; +import java.util.Optional; public class ActionListWhatICanViewData_WithAppType extends BaseAction { @@ -36,13 +39,12 @@ public class ActionListWhatICanViewData_WithAppType extends BaseAction { result.error(exception); logger.error(e, effectivePerson, request, null); } - - String cacheKey = ApplicationCache.concreteCacheKey(personName, "Data", appType, isXAdmin); - Element element = cache.get(cacheKey); - if ((null != element) && (null != element.getObjectValue())) { - wos = (List) element.getObjectValue(); - result.setData(wos); + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), personName, appType, isAnonymous, isXAdmin ); + Optional optional = CacheManager.get(cacheCategory, cacheKey); + + if (optional.isPresent()) { + result.setData((List)optional.get()); } else { if (check) { try { @@ -71,7 +73,7 @@ public class ActionListWhatICanViewData_WithAppType extends BaseAction { } //按appInfoSeq列的值， 排个序 SortTools.asc( wos, "appInfoSeq"); - cache.put(new Element( cacheKey, wos )); + CacheManager.put(cacheCategory, cacheKey, wos); result.setData( wos ); } } diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionQueryGetControl.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionQueryGetControl.java index ab985564b4c8e7067f29043593be0fff4afe12a4..de669b0e2cb83bae83feb8a42a2d2d8fd59e212d 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionQueryGetControl.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionQueryGetControl.java @@ -5,6 +5,8 @@ import com.x.base.core.project.annotation.FieldDescribe; import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.gson.GsonPropertyObject; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; @@ -19,6 +21,7 @@ import org.apache.commons.lang3.StringUtils; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; +import java.util.Optional; public class ActionQueryGetControl extends BaseAction { @@ -52,12 +55,12 @@ public class ActionQueryGetControl extends BaseAction { Exception exception = new ExceptionAppInfoIdEmpty(); result.error(exception); } - - String cacheKey = ApplicationCache.concreteCacheKey( id, "getControl", isManager, isAnonymous, effectivePerson.getDistinguishedName() ); - Element element = cache.get(cacheKey); - if ((null != element) && (null != element.getObjectValue())) { - wo = (Wo) element.getObjectValue(); - result.setData(wo); + + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), personName, id, isAnonymous, isManager ); + Optional optional = CacheManager.get(cacheCategory, cacheKey); + + if (optional.isPresent()) { + result.setData((Wo)optional.get()); } else { woControl = new WoControl(); if( check ){ @@ -140,7 +143,7 @@ public class ActionQueryGetControl extends BaseAction { } } wo.setControl(woControl); - cache.put(new Element( cacheKey, wo )); + CacheManager.put(cacheCategory, cacheKey, wo); } } result.setData(wo); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/BaseAction.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/BaseAction.java index 5ee63564e775aaa69994b214d2b7a768dd4d93d5..bffa6359391e6103e72a50760f230be1a727001e 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/BaseAction.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/BaseAction.java @@ -5,11 +5,15 @@ import com.x.base.core.project.annotation.FieldDescribe; import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.Cache; import com.x.base.core.project.jaxrs.StandardJaxrsAction; import com.x.base.core.project.tools.ListTools; import com.x.cms.assemble.control.service.*; import com.x.cms.core.entity.AppInfo; import com.x.cms.core.entity.CategoryInfo; +import com.x.cms.core.entity.element.*; +import com.x.organization.core.entity.*; +import com.x.organization.core.entity.accredit.Empower; import net.sf.ehcache.Ehcache; import org.apache.commons.lang3.StringUtils; @@ -17,19 +21,18 @@ import java.util.*; public class BaseAction extends StandardJaxrsAction { - protected Ehcache cache = ApplicationCache.instance().getCache( AppInfo.class ); + protected Cache.CacheCategory cacheCategory = new Cache.CacheCategory(AppInfo.class, AppDict.class, AppDictItem.class, View.class, + ViewCategory.class, ViewFieldConfig.class); protected AppInfoServiceAdv appInfoServiceAdv = new AppInfoServiceAdv(); protected FormServiceAdv formServiceAdv = new FormServiceAdv(); -// protected ViewServiceAdv viewServiceAdv = new ViewServiceAdv(); protected ScriptServiceAdv scriptServiceAdv = new ScriptServiceAdv(); protected AppDictServiceAdv appDictServiceAdv = new AppDictServiceAdv(); protected CategoryInfoServiceAdv categoryInfoServiceAdv = new CategoryInfoServiceAdv(); protected DocumentQueryService documentServiceAdv = new DocumentQueryService(); protected UserManagerService userManagerService = new UserManagerService(); protected PermissionQueryService permissionQueryService = new PermissionQueryService(); -// protected PermissionOperateService permissionOperateService = new PermissionOperateService(); - + /** * 当前登录者访问栏目分类列表查询 * 1、根据人员的访问权限获取可以访问的栏目信息ID列表 diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionGet.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionGet.java index 5c99c2e49ade7880a1427cd6842a003ddb33e0a8..11307847df5bc88139c56398e30b435cb3b58ff6 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionGet.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionGet.java @@ -1,9 +1,12 @@ package com.x.cms.assemble.control.jaxrs.categoryinfo; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import javax.servlet.http.HttpServletRequest; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import org.apache.commons.lang3.StringUtils; import com.x.base.core.entity.JpaObject; @@ -35,13 +38,12 @@ public class ActionGet extends BaseAction { Exception exception = new ExceptionIdEmpty(); result.error( exception ); } - - String cacheKey = ApplicationCache.concreteCacheKey( flag ); - Element element = cache.get(cacheKey); - - if ((null != element) && ( null != element.getObjectValue()) ) { - wo = ( Wo ) element.getObjectValue(); - result.setData( wo ); + + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), flag ); + Optional optional = CacheManager.get(cacheCategory, cacheKey ); + + if (optional.isPresent()) { + result.setData((Wo)optional.get()); } else { if( check ){ try { @@ -62,8 +64,8 @@ public class ActionGet extends BaseAction { try { wo = Wo.copier.copy( categoryInfo ); wo.setExtContent( categoryInfoServiceAdv.getExtContentWithId( wo.getId() )); - - cache.put(new Element( cacheKey, wo )); + + CacheManager.put(cacheCategory, cacheKey, wo); result.setData( wo ); } catch ( Exception e ) { check = false; diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionGetAnonymous.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionGetAnonymous.java index 7d30990df059cbaaae26c30cd8465f475c164259..6e64be38b0607508e332ed37229d95e3e8f75e0c 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionGetAnonymous.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionGetAnonymous.java @@ -1,9 +1,12 @@ package com.x.cms.assemble.control.jaxrs.categoryinfo; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import javax.servlet.http.HttpServletRequest; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import org.apache.commons.lang3.StringUtils; import com.x.base.core.entity.JpaObject; @@ -35,13 +38,12 @@ public class ActionGetAnonymous extends BaseAction { Exception exception = new ExceptionIdEmpty(); result.error( exception ); } - - String cacheKey = ApplicationCache.concreteCacheKey( flag ); - Element element = cache.get(cacheKey); - - if ((null != element) && ( null != element.getObjectValue()) ) { - wo = ( Wo ) element.getObjectValue(); - result.setData( wo ); + + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), flag ); + Optional optional = CacheManager.get(cacheCategory, cacheKey ); + + if (optional.isPresent()) { + result.setData((Wo)optional.get()); } else { if( check ){ try { @@ -68,8 +70,8 @@ public class ActionGetAnonymous extends BaseAction { if( check ){ try { wo = Wo.copier.copy( categoryInfo ); - wo.setExtContent( categoryInfoServiceAdv.getExtContentWithId( wo.getId() )); - cache.put(new Element( cacheKey, wo )); + wo.setExtContent( categoryInfoServiceAdv.getExtContentWithId( wo.getId() )); + CacheManager.put(cacheCategory, cacheKey, wo); result.setData( wo ); } catch ( Exception e ) { check = false; diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionGetByAlias.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionGetByAlias.java index e0e29cf1230395b21612e072e7d487f347d35ec9..722a44fd5e6e5a2b81051cc3612bcf08882658cb 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionGetByAlias.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionGetByAlias.java @@ -1,9 +1,12 @@ package com.x.cms.assemble.control.jaxrs.categoryinfo; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import javax.servlet.http.HttpServletRequest; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import org.apache.commons.lang3.StringUtils; import com.x.base.core.entity.JpaObject; @@ -36,13 +39,12 @@ public class ActionGetByAlias extends BaseAction { Exception exception = new ExceptionIdEmpty(); result.error( exception ); } - - String cacheKey = ApplicationCache.concreteCacheKey( "alias", alias ); - Element element = cache.get(cacheKey); - - if ((null != element) && ( null != element.getObjectValue()) ) { - wo = ( Wo ) element.getObjectValue(); - result.setData(wo); + + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), alias ); + Optional optional = CacheManager.get(cacheCategory, cacheKey ); + + if (optional.isPresent()) { + result.setData((Wo)optional.get()); } else { if( check ){ try { @@ -78,7 +80,7 @@ public class ActionGetByAlias extends BaseAction { try { wo = Wo.copier.copy( categoryInfo ); wo.setExtContent( categoryInfoServiceAdv.getExtContentWithId( wo.getId() )); - cache.put(new Element( cacheKey, wo )); + CacheManager.put(cacheCategory, cacheKey, wo); result.setData( wo ); } catch ( Exception e ) { check = false; diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionListAll.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionListAll.java index 46aaf084b8c8c47268f37ba49f4416157162dd35..b713e349c71900938d5501172dfc4e603cf373d2 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionListAll.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionListAll.java @@ -2,6 +2,7 @@ package com.x.cms.assemble.control.jaxrs.categoryinfo; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import javax.servlet.http.HttpServletRequest; @@ -9,7 +10,8 @@ import com.x.base.core.entity.JpaObject; import com.x.base.core.project.annotation.FieldDescribe; import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.logger.Logger; @@ -18,8 +20,6 @@ import com.x.base.core.project.tools.ListTools; import com.x.base.core.project.tools.SortTools; import com.x.cms.core.entity.CategoryInfo; -import net.sf.ehcache.Element; - public class ActionListAll extends BaseAction { private static Logger logger = LoggerFactory.getLogger( ActionListAll.class ); @@ -30,13 +30,12 @@ public class ActionListAll extends BaseAction { List wos = null; List categoryInfoList = null; Boolean check = true; - - String cacheKey = ApplicationCache.concreteCacheKey( "all" ); - Element element = cache.get( cacheKey ); - - if ((null != element) && ( null != element.getObjectValue()) ) { - wos = ( List ) element.getObjectValue(); - result.setData(wos); + + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass() ); + Optional optional = CacheManager.get(cacheCategory, cacheKey ); + + if (optional.isPresent()) { + result.setData((List)optional.get()); } else { try { categoryInfoList = categoryInfoServiceAdv.listAll(); @@ -54,7 +53,7 @@ public class ActionListAll extends BaseAction { wo.setExtContent( categoryInfoServiceAdv.getExtContentWithId( wo.getId() )); } SortTools.desc( wos, "categorySeq"); - cache.put(new Element( cacheKey, wos )); + CacheManager.put(cacheCategory, cacheKey, wos); result.setData(wos); } catch ( Exception e ) { check = false; diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionListWhatICanPublish.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionListWhatICanPublish.java index 2604e0091f516e40b76f6a233110a15183cd4f0a..25fe69179dfb63941d1b2a7b7492bb69f95093e7 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionListWhatICanPublish.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionListWhatICanPublish.java @@ -2,9 +2,12 @@ package com.x.cms.assemble.control.jaxrs.categoryinfo; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import javax.servlet.http.HttpServletRequest; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import org.apache.commons.lang3.StringUtils; import com.x.base.core.entity.JpaObject; @@ -86,13 +89,12 @@ public class ActionListWhatICanPublish extends BaseAction { } } } - - String cacheKey = ApplicationCache.concreteCacheKey( personName, appId, "publish", isAnonymous, manager, appManager, appPublisher); - Element element = cache.get(cacheKey); - if ((null != element) && (null != element.getObjectValue())) { - wos = (List) element.getObjectValue(); - result.setData(wos); + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), personName, appId, isAnonymous, manager, appManager, appPublisher ); + Optional optional = CacheManager.get(cacheCategory, cacheKey ); + + if (optional.isPresent()) { + result.setData((List)optional.get()); } else { if (check) { if ( manager || appManager || appPublisher) { @@ -143,7 +145,7 @@ public class ActionListWhatICanPublish extends BaseAction { wo.setExtContent( categoryInfoServiceAdv.getExtContentWithId( wo.getId() )); } SortTools.asc(wos, "categorySeq"); - cache.put(new Element(cacheKey, wos)); + CacheManager.put(cacheCategory, cacheKey, wos); } catch (Exception e) { check = false; Exception exception = new ExceptionCategoryInfoProcess(e, "将查询出来的分类信息对象转换为可输出的数据信息时发生异常。"); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionListWhatICanView_AllType.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionListWhatICanView_AllType.java index a983b419b9d6db2461a255a16caa8c1aaec5b9ae..627bbf20053ace0f346f3dc597d3d186f2a741b4 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionListWhatICanView_AllType.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionListWhatICanView_AllType.java @@ -2,9 +2,12 @@ package com.x.cms.assemble.control.jaxrs.categoryinfo; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import javax.servlet.http.HttpServletRequest; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import org.apache.commons.lang3.StringUtils; import com.x.base.core.entity.JpaObject; @@ -96,12 +99,11 @@ public class ActionListWhatICanView_AllType extends BaseAction { } } - String cacheKey = ApplicationCache.concreteCacheKey( personName, appId, "AllType", isXAdmin, appManager, appPublisher, appViewer ); - Element element = cache.get(cacheKey); + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), personName, appId, isAnonymous, isXAdmin, appManager, appPublisher, appViewer ); + Optional optional = CacheManager.get(cacheCategory, cacheKey ); - if ((null != element) && (null != element.getObjectValue())) { - wos = (List) element.getObjectValue(); - result.setData(wos); + if (optional.isPresent()) { + result.setData((List)optional.get()); } else { if (check) { if ( isXAdmin || appManager || appPublisher || appViewer ) { @@ -151,7 +153,7 @@ public class ActionListWhatICanView_AllType extends BaseAction { wo.setExtContent( categoryInfoServiceAdv.getExtContentWithId( wo.getId() )); } SortTools.asc(wos, "categorySeq"); - cache.put(new Element(cacheKey, wos)); + CacheManager.put(cacheCategory, cacheKey, wos); result.setData(wos); } catch (Exception e) { check = false; diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionListWhatICanView_Article.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionListWhatICanView_Article.java index 80580e4e04c7a6e01dea507a75b5626d7211f5fb..3e61e6ce54c32369f206e26616e2dc6533c15ee5 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionListWhatICanView_Article.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionListWhatICanView_Article.java @@ -2,9 +2,12 @@ package com.x.cms.assemble.control.jaxrs.categoryinfo; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import javax.servlet.http.HttpServletRequest; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import org.apache.commons.lang3.StringUtils; import com.x.base.core.entity.JpaObject; @@ -96,12 +99,11 @@ public class ActionListWhatICanView_Article extends BaseAction { } } - String cacheKey = ApplicationCache.concreteCacheKey( personName, appId, "Article", manager, appManager, appPublisher, appViewer ); - Element element = cache.get(cacheKey); + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), personName, appId, isAnonymous, manager, appManager, appPublisher, appViewer ); + Optional optional = CacheManager.get(cacheCategory, cacheKey ); - if ((null != element) && (null != element.getObjectValue())) { - wos = (List) element.getObjectValue(); - result.setData(wos); + if (optional.isPresent()) { + result.setData((List)optional.get()); } else { if (check) { if ( manager || appManager || appPublisher || appViewer ) { @@ -151,7 +153,7 @@ public class ActionListWhatICanView_Article extends BaseAction { wo.setExtContent( categoryInfoServiceAdv.getExtContentWithId( wo.getId() )); } SortTools.asc(wos, "categorySeq"); - cache.put(new Element(cacheKey, wos)); + CacheManager.put(cacheCategory, cacheKey, wos); result.setData(wos); } catch (Exception e) { check = false; diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionListWhatICanView_Data.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionListWhatICanView_Data.java index a43eb366213afe2030640f59448c39523335c014..ea46aa2ee4b416bcc868500a4d197f85940d992b 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionListWhatICanView_Data.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionListWhatICanView_Data.java @@ -2,9 +2,12 @@ package com.x.cms.assemble.control.jaxrs.categoryinfo; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import javax.servlet.http.HttpServletRequest; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import org.apache.commons.lang3.StringUtils; import com.x.base.core.entity.JpaObject; @@ -96,12 +99,11 @@ public class ActionListWhatICanView_Data extends BaseAction { } } - String cacheKey = ApplicationCache.concreteCacheKey( personName, appId, "Data", isXAdmin, appManager, appPublisher, appViewer ); - Element element = cache.get(cacheKey); + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), personName, appId, isAnonymous, isXAdmin, appManager, appPublisher, appViewer ); + Optional optional = CacheManager.get(cacheCategory, cacheKey ); - if ((null != element) && (null != element.getObjectValue())) { - wos = (List) element.getObjectValue(); - result.setData(wos); + if (optional.isPresent()) { + result.setData((List)optional.get()); } else { if (check) { if ( isXAdmin || appManager || appPublisher || appViewer ) { @@ -152,7 +154,7 @@ public class ActionListWhatICanView_Data extends BaseAction { wo.setExtContent( categoryInfoServiceAdv.getExtContentWithId( wo.getId() )); } SortTools.asc(wos, "categorySeq"); - cache.put(new Element(cacheKey, wos)); + CacheManager.put(cacheCategory, cacheKey, wos); result.setData(wos); } catch (Exception e) { check = false; diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionQueryGetControl.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionQueryGetControl.java index e4daf8717ddf2f0dca09983fef6af365e9491336..8bc3d23b16342cf28a7e0bd85087d9f2d1c35be9 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionQueryGetControl.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionQueryGetControl.java @@ -5,6 +5,8 @@ import com.x.base.core.project.annotation.FieldDescribe; import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.gson.GsonPropertyObject; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; @@ -20,6 +22,7 @@ import org.apache.commons.lang3.StringUtils; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; +import java.util.Optional; public class ActionQueryGetControl extends BaseAction { @@ -54,12 +57,12 @@ public class ActionQueryGetControl extends BaseAction { Exception exception = new ExceptionCategoryIdEmpty(); result.error(exception); } - - String cacheKey = ApplicationCache.concreteCacheKey( id, "getControl", isManager, isAnonymous, effectivePerson.getDistinguishedName() ); - Element element = cache.get(cacheKey); - if ((null != element) && (null != element.getObjectValue())) { - wo = (Wo) element.getObjectValue(); - result.setData(wo); + + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), personName, id, isAnonymous, isManager ); + Optional optional = CacheManager.get(cacheCategory, cacheKey ); + + if (optional.isPresent()) { + result.setData((Wo)optional.get()); } else { woControl = new WoControl(); if( check ){ @@ -206,7 +209,7 @@ public class ActionQueryGetControl extends BaseAction { } } wo.setControl(woControl); - cache.put(new Element( cacheKey, wo )); + CacheManager.put(cacheCategory, cacheKey, wo); } } result.setData(wo); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/BaseAction.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/BaseAction.java index b3a5c64005bce644af109cd33af8b85ee3f0f849..ec6b3c6554d518873f89730c4cfe28fb98c505d6 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/BaseAction.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/BaseAction.java @@ -1,26 +1,27 @@ package com.x.cms.assemble.control.jaxrs.categoryinfo; -import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.Cache; import com.x.base.core.project.jaxrs.StandardJaxrsAction; import com.x.cms.assemble.control.service.AppInfoServiceAdv; import com.x.cms.assemble.control.service.CategoryInfoServiceAdv; import com.x.cms.assemble.control.service.DocumentQueryService; -import com.x.cms.assemble.control.service.PermissionOperateService; import com.x.cms.assemble.control.service.PermissionQueryService; import com.x.cms.assemble.control.service.QueryViewService; import com.x.cms.assemble.control.service.UserManagerService; +import com.x.cms.core.entity.AppInfo; import com.x.cms.core.entity.CategoryInfo; -import net.sf.ehcache.Ehcache; +import com.x.cms.core.entity.Document; +import com.x.cms.core.entity.element.*; public class BaseAction extends StandardJaxrsAction { - protected Ehcache cache = ApplicationCache.instance().getCache(CategoryInfo.class); + protected Cache.CacheCategory cacheCategory = new Cache.CacheCategory(AppInfo.class, CategoryInfo.class, ViewCategory.class, Document.class); + protected QueryViewService queryViewService = new QueryViewService(); protected UserManagerService userManagerService = new UserManagerService(); protected AppInfoServiceAdv appInfoServiceAdv = new AppInfoServiceAdv(); protected CategoryInfoServiceAdv categoryInfoServiceAdv = new CategoryInfoServiceAdv(); protected DocumentQueryService documentServiceAdv = new DocumentQueryService(); protected PermissionQueryService permissionQueryService = new PermissionQueryService(); - protected PermissionOperateService permissionOperateService = new PermissionOperateService(); } diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/comment/ActionGet.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/comment/ActionGet.java index d3dfa4316731f2711a93f2291e09ba4245e191c5..1daae03b3c5768b41a1ad1b35f3b0800f2e1dfac 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/comment/ActionGet.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/comment/ActionGet.java @@ -2,9 +2,13 @@ package com.x.cms.assemble.control.jaxrs.comment; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import javax.servlet.http.HttpServletRequest; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; +import com.x.cms.assemble.control.jaxrs.categoryinfo.ActionListWhatICanView_AllType; import org.apache.commons.lang3.StringUtils; import com.x.base.core.entity.JpaObject; @@ -36,13 +40,12 @@ public class ActionGet extends BaseAction { Exception exception = new ExceptionCommentIdForQueryEmpty(); result.error( exception ); } - - String cacheKey = ApplicationCache.concreteCacheKey( id ); - Element element = commentInfoCache.get( cacheKey ); - - if (( null != element ) && ( null != element.getObjectValue()) ) { - wo = ( Wo ) element.getObjectValue(); - result.setData( wo ); + + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), id ); + Optional optional = CacheManager.get(cacheCategory, cacheKey ); + + if (optional.isPresent()) { + result.setData((Wo)optional.get()); } else { if( check ){ try { @@ -65,7 +68,7 @@ public class ActionGet extends BaseAction { if( wo != null ) { wo.setContent( documentCommentInfoQueryService.getCommentContent(id)); } - commentInfoCache.put(new Element( cacheKey, wo )); + CacheManager.put(cacheCategory, cacheKey, wo); result.setData( wo ); } catch (Exception e) { Exception exception = new CommentQueryException( e, "将查询出来的应用栏目信息对象转换为可输出的数据信息时发生异常。" ); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/comment/ActionListNextWithFilter.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/comment/ActionListNextWithFilter.java index 51a6c5b09b1377d5f135145477b49f8a1d4aeaa3..677342eb20a62a17b1d50b2b0f631192970dd3e5 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/comment/ActionListNextWithFilter.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/comment/ActionListNextWithFilter.java @@ -6,6 +6,8 @@ import com.x.base.core.project.annotation.FieldDescribe; import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.logger.Logger; @@ -19,6 +21,7 @@ import org.apache.commons.lang3.StringUtils; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; +import java.util.Optional; public class ActionListNextWithFilter extends BaseAction { @@ -30,7 +33,6 @@ public class ActionListNextWithFilter extends BaseAction { List wos = new ArrayList<>(); Wi wrapIn = null; Boolean check = true; - String cacheKey = null; Element element = null; QueryFilter queryFilter = null; @@ -51,11 +53,13 @@ public class ActionListNextWithFilter extends BaseAction { queryFilter = wrapIn.getQueryFilter(); } if( check ) { - cacheKey = ApplicationCache.concreteCacheKey( "ActionListNextWithFilter", effectivePerson.getDistinguishedName(), flag, count, + + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), effectivePerson.getDistinguishedName(), flag, count, wrapIn.getOrderField(), wrapIn.getOrderType(), queryFilter.getContentSHA1() ); - element = commentInfoCache.get( cacheKey ); - if ((null != element) && (null != element.getObjectValue())) { - resultObject = (ResultObject) element.getObjectValue(); + Optional optional = CacheManager.get(cacheCategory, cacheKey ); + + if (optional.isPresent()) { + resultObject = (ResultObject) optional.get(); result.setCount( resultObject.getTotal() ); result.setData( resultObject.getWos() ); } else { @@ -71,8 +75,8 @@ public class ActionListNextWithFilter extends BaseAction { } } resultObject = new ResultObject( total, wos ); - commentInfoCache.put(new Element( cacheKey, resultObject )); - + CacheManager.put(cacheCategory, cacheKey, resultObject ); + result.setCount( resultObject.getTotal() ); result.setData( resultObject.getWos() ); } catch (Exception e) { diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/comment/ActionListPageWithFilter.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/comment/ActionListPageWithFilter.java index abb216de407084d97308beb122a9037d24a1c3e7..1d551c595db81ac063d8a92a20c8af6f4b138357 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/comment/ActionListPageWithFilter.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/comment/ActionListPageWithFilter.java @@ -6,6 +6,8 @@ import com.x.base.core.project.annotation.FieldDescribe; import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.logger.Logger; @@ -18,6 +20,7 @@ import net.sf.ehcache.Element; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; +import java.util.Optional; public class ActionListPageWithFilter extends BaseAction { @@ -30,7 +33,6 @@ public class ActionListPageWithFilter extends BaseAction { ResultObject resultObject = null; Wi wrapIn = null; Boolean check = true; - String cacheKey = null; Element element = null; QueryFilter queryFilter = null; @@ -46,17 +48,14 @@ public class ActionListPageWithFilter extends BaseAction { if( check ) { queryFilter = wrapIn.getQueryFilter(); } - + if( check ) { - - cacheKey = ApplicationCache.concreteCacheKey( "ActionListPageWithFilter", effectivePerson.getDistinguishedName(), + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), effectivePerson.getDistinguishedName(), pageNum, count, wrapIn.getOrderField(), wrapIn.getOrderType(), queryFilter.getContentSHA1() ); - element = commentInfoCache.get( cacheKey ); - } - - if( check ) { - if ((null != element) && (null != element.getObjectValue())) { - resultObject = (ResultObject) element.getObjectValue(); + Optional optional = CacheManager.get(cacheCategory, cacheKey ); + + if (optional.isPresent()) { + resultObject = (ResultObject)optional.get(); result.setCount( resultObject.getTotal() ); result.setData( resultObject.getWos() ); } else { @@ -73,7 +72,7 @@ public class ActionListPageWithFilter extends BaseAction { } resultObject = new ResultObject( total, wos ); - commentInfoCache.put(new Element( cacheKey, resultObject )); + CacheManager.put(cacheCategory, cacheKey, resultObject ); result.setCount( resultObject.getTotal() ); result.setData( resultObject.getWos() ); } catch (Exception e) { diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/comment/ActionListPrevWithFilter.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/comment/ActionListPrevWithFilter.java index 5c64a65224627d61cc4ca5c58bbf17d59987d722..dea5f03557da83d3c6d25cbdb24527c735cfb095 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/comment/ActionListPrevWithFilter.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/comment/ActionListPrevWithFilter.java @@ -6,6 +6,8 @@ import com.x.base.core.project.annotation.FieldDescribe; import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.logger.Logger; @@ -19,6 +21,7 @@ import org.apache.commons.lang3.StringUtils; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; +import java.util.Optional; public class ActionListPrevWithFilter extends BaseAction { @@ -30,8 +33,6 @@ public class ActionListPrevWithFilter extends BaseAction { List wos = new ArrayList<>(); Wi wrapIn = null; Boolean check = true; - String cacheKey = null; - Element element = null; QueryFilter queryFilter = null; if ( StringUtils.isEmpty( flag ) || "(0)".equals(flag)) { @@ -52,12 +53,12 @@ public class ActionListPrevWithFilter extends BaseAction { } if( check ) { - cacheKey = ApplicationCache.concreteCacheKey( "ActionListPrevWithFilter", effectivePerson.getDistinguishedName(), + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), effectivePerson.getDistinguishedName(), flag, count, wrapIn.getOrderField(), wrapIn.getOrderType(), queryFilter.getContentSHA1() ); - element = commentInfoCache.get( cacheKey ); - - if ((null != element) && (null != element.getObjectValue())) { - resultObject = (ResultObject) element.getObjectValue(); + Optional optional = CacheManager.get(cacheCategory, cacheKey ); + + if (optional.isPresent()) { + resultObject = (ResultObject)optional.get(); result.setCount( resultObject.getTotal() ); result.setData( resultObject.getWos() ); } else { @@ -74,7 +75,7 @@ public class ActionListPrevWithFilter extends BaseAction { } resultObject = new ResultObject( total, wos ); - commentInfoCache.put(new Element( cacheKey, resultObject )); + CacheManager.put(cacheCategory, cacheKey, resultObject ); result.setCount( resultObject.getTotal() ); result.setData( resultObject.getWos() ); } catch (Exception e) { diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/comment/BaseAction.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/comment/BaseAction.java index 1f7621bfb9137eef0ed6af404c3819be4cc5c041..004d3303bbaed76209646819a23d6bb9fc04168d 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/comment/BaseAction.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/comment/BaseAction.java @@ -1,18 +1,23 @@ package com.x.cms.assemble.control.jaxrs.comment; import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.Cache; import com.x.base.core.project.jaxrs.StandardJaxrsAction; import com.x.cms.assemble.control.service.CommentCommendPersistService; import com.x.cms.assemble.control.service.DocumentCommentInfoPersistService; import com.x.cms.assemble.control.service.DocumentCommentInfoQueryService; import com.x.cms.assemble.control.service.DocumentQueryService; +import com.x.cms.core.entity.AppInfo; +import com.x.cms.core.entity.CategoryInfo; +import com.x.cms.core.entity.Document; import com.x.cms.core.entity.DocumentCommentInfo; +import com.x.cms.core.entity.element.ViewCategory; import net.sf.ehcache.Ehcache; public class BaseAction extends StandardJaxrsAction { - protected Ehcache commentInfoCache = ApplicationCache.instance().getCache( DocumentCommentInfo.class ); + protected Cache.CacheCategory cacheCategory = new Cache.CacheCategory(DocumentCommentInfo.class, Document.class); protected DocumentCommentInfoPersistService documentCommentInfoPersistService = new DocumentCommentInfoPersistService(); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/data/BaseAction.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/data/BaseAction.java index a9de720f2326278b01b8e4b24485dbcebd9b8c34..08397e9fba713a9025d168a29fe92e3727909929 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/data/BaseAction.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/data/BaseAction.java @@ -10,7 +10,6 @@ import com.google.gson.JsonElement; import com.x.base.core.entity.dataitem.DataItemConverter; import com.x.base.core.entity.dataitem.ItemCategory; import com.x.base.core.entity.dataitem.ItemType; -import com.x.base.core.project.cache.ApplicationCache; import com.x.base.core.project.gson.XGsonBuilder; import com.x.base.core.project.jaxrs.StandardJaxrsAction; import com.x.cms.assemble.control.Business; @@ -20,14 +19,11 @@ import com.x.cms.assemble.control.service.UserManagerService; import com.x.cms.core.entity.Document; import com.x.query.core.entity.Item; -import net.sf.ehcache.Ehcache; - public class BaseAction extends StandardJaxrsAction { private static final String title_path = "title"; private static final String subject_path = "subject"; - - protected Ehcache cache = ApplicationCache.instance().getCache( Item.class); +// protected Cache.CacheCategory cacheCategory = new Cache.CacheCategory(Item.class, Document.class); protected UserManagerService userManagerService = new UserManagerService(); protected CategoryInfoServiceAdv categoryInfoServiceAdv = new CategoryInfoServiceAdv(); protected DocumentQueryService documentServiceAdv = new DocumentQueryService(); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryGetControl.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryGetControl.java index c3166bab1d7569e1baea20791941c77dbc9dadbb..3d85de0065cfb3e784aa3e6911c0225a989b7623 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryGetControl.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryGetControl.java @@ -1,9 +1,13 @@ package com.x.cms.assemble.control.jaxrs.document; import java.util.List; +import java.util.Optional; import javax.servlet.http.HttpServletRequest; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; +import com.x.cms.assemble.control.jaxrs.comment.ActionListNextWithFilter; import org.apache.commons.lang3.StringUtils; import com.x.base.core.entity.JpaObject; @@ -90,11 +94,11 @@ public class ActionQueryGetControl extends BaseAction { } } - String cacheKey = ApplicationCache.concreteCacheKey( id, "getControl", isManager, effectivePerson.getDistinguishedName() ); - Element element = cache.get(cacheKey); - if ((null != element) && (null != element.getObjectValue())) { - wo = (Wo) element.getObjectValue(); - result.setData(wo); + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), effectivePerson.getDistinguishedName(), id, isManager ); + Optional optional = CacheManager.get(cacheCategory, cacheKey ); + + if (optional.isPresent()) { + result.setData((Wo) optional.get()); woControl = wo.getControl(); } else { if (check) { @@ -121,7 +125,7 @@ public class ActionQueryGetControl extends BaseAction { if (check) { wo.setControl(woControl); - cache.put(new Element(cacheKey, wo)); + CacheManager.put(cacheCategory, cacheKey, wo ); } } diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryGetDocument.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryGetDocument.java index 9c81af3334fd8c58d621fa76cf979814239382e9..8ff5bdebd311453da80ad89c39d1a30f8c8331a7 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryGetDocument.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryGetDocument.java @@ -2,9 +2,12 @@ package com.x.cms.assemble.control.jaxrs.document; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import javax.servlet.http.HttpServletRequest; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import org.apache.commons.lang3.StringUtils; import com.x.base.core.entity.JpaObject; @@ -68,10 +71,11 @@ public class ActionQueryGetDocument extends BaseAction { } } - String cacheKey = ApplicationCache.concreteCacheKey( id, "get", isManager, effectivePerson.getDistinguishedName() ); - Element element = cache.get(cacheKey); - if ((null != element) && (null != element.getObjectValue())) { - wo = (Wo) element.getObjectValue(); + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), id, effectivePerson.getDistinguishedName(), isManager ); + Optional optional = CacheManager.get(cacheCategory, cacheKey ); + + if (optional.isPresent()) { + wo = (Wo) optional.get(); document = wo.getDocument(); wrapOutDocument = wo.getDocument(); result.setData(wo); @@ -155,7 +159,7 @@ public class ActionQueryGetDocument extends BaseAction { if (check) { wo.setDocumentLogList(new ArrayList()); - cache.put(new Element(cacheKey, wo)); + CacheManager.put(cacheCategory, cacheKey, wo ); } } diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryGetFirstPicture.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryGetFirstPicture.java index b5dbbb08cfe526bcb7817823a025d8aec5f38089..94a1fd0fc6ac03169ef21daf31b27923c7cd3b59 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryGetFirstPicture.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryGetFirstPicture.java @@ -1,9 +1,12 @@ package com.x.cms.assemble.control.jaxrs.document; import java.util.List; +import java.util.Optional; import javax.servlet.http.HttpServletRequest; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import org.apache.commons.lang3.StringUtils; import com.x.base.core.project.annotation.FieldDescribe; @@ -26,11 +29,11 @@ public class ActionQueryGetFirstPicture extends BaseAction { Wo wo = null; Boolean check = true; - String cacheKey = getCacheKeyFormWrapInFilter( "firstpicture", id ); - Element element = cache.get(cacheKey); - - if ((null != element) && ( null != element.getObjectValue()) ) { - wo = ( Wo ) element.getObjectValue(); + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), id ); + Optional optional = CacheManager.get(cacheCategory, cacheKey ); + + if (optional.isPresent()) { + wo = (Wo) optional.get(); result.setData( wo ); result.setCount( 1L ); } else { @@ -63,8 +66,8 @@ public class ActionQueryGetFirstPicture extends BaseAction { wo.setFileName( file.getFileName() ); wo.setFilePath( file.getFilePath() ); wo.setFileType( file.getFileType() ); - - cache.put( new Element( cacheKey, wo ) ); + + CacheManager.put(cacheCategory, cacheKey, wo ); result.setData( wo ); result.setCount( 1L ); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListAllPictures.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListAllPictures.java index ee141fe12f55552430548ae010829fa5fce7a9e8..e4141fba94efde227f3e3a5ecd11503c1253dbc0 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListAllPictures.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListAllPictures.java @@ -2,9 +2,12 @@ package com.x.cms.assemble.control.jaxrs.document; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import javax.servlet.http.HttpServletRequest; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import org.apache.commons.lang3.StringUtils; import com.x.base.core.project.annotation.FieldDescribe; @@ -29,11 +32,11 @@ public class ActionQueryListAllPictures extends BaseAction { Wo wo = null; Boolean check = true; - String cacheKey = getCacheKeyFormWrapInFilter( "pictures", id ); - Element element = cache.get(cacheKey); - - if ((null != element) && ( null != element.getObjectValue()) ) { - wos = ( List ) element.getObjectValue(); + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), id ); + Optional optional = CacheManager.get(cacheCategory, cacheKey ); + + if (optional.isPresent()) { + wos = ( List ) optional.get(); result.setData(wos); result.setCount( Long.parseLong( wos.size() + "" ) ); } else { @@ -69,7 +72,7 @@ public class ActionQueryListAllPictures extends BaseAction { wos.add( wo ); } result.setData( wos ); - cache.put( new Element( cacheKey, wos ) ); + CacheManager.put(cacheCategory, cacheKey, wos ); result.setCount( Long.parseLong( wos.size() + "" ) ); } } diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListDraftNextWithFilter.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListDraftNextWithFilter.java index cbc6aa57db8ba69407ca98fab0c3570aacdb9971..50e154004ad5324138a3f0f913a256766fd6d0ce 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListDraftNextWithFilter.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListDraftNextWithFilter.java @@ -2,6 +2,7 @@ package com.x.cms.assemble.control.jaxrs.document; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import javax.servlet.http.HttpServletRequest; @@ -11,14 +12,14 @@ import com.x.base.core.project.annotation.FieldDescribe; import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.logger.Logger; import com.x.base.core.project.logger.LoggerFactory; import com.x.cms.core.entity.Document; -import net.sf.ehcache.Element; - public class ActionQueryListDraftNextWithFilter extends BaseAction { private static Logger logger = LoggerFactory.getLogger(ActionQueryListDraftNextWithFilter.class); @@ -40,11 +41,11 @@ public class ActionQueryListDraftNextWithFilter extends BaseAction { logger.error(e, effectivePerson, request, null); } - String cacheKey = getCacheKeyFormWrapInFilter("draft", id, count, wi); - Element element = cache.get(cacheKey); + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), id, count, wi ); + Optional optional = CacheManager.get(cacheCategory, cacheKey ); - if ((null != element) && (null != element.getObjectValue())) { - wos = (List) element.getObjectValue(); + if (optional.isPresent()) { + wos = ( List ) optional.get(); result.setData(wos); } else { if (check) { @@ -74,7 +75,7 @@ public class ActionQueryListDraftNextWithFilter extends BaseAction { } } result.setCount(Long.parseLong(documentList.size() + "")); - cache.put(new Element(cacheKey, wos)); + CacheManager.put(cacheCategory, cacheKey, wos ); result.setData(wos); } catch (Exception e) { Exception exception = new ExceptionDocumentInfoProcess(e, "系统在将分页查询结果转换为可输出的数据信息时发生异常。"); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListVisiblePersons.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListVisiblePersons.java index e9f39cd285f4d9ffb40997723951dc08612b4b8b..9aee343d00c2fecf9f67b46174b7aa032a066fb6 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListVisiblePersons.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListVisiblePersons.java @@ -3,9 +3,12 @@ package com.x.cms.assemble.control.jaxrs.document; import java.util.ArrayList; import java.util.HashSet; import java.util.List; +import java.util.Optional; import javax.servlet.http.HttpServletRequest; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import org.apache.commons.lang3.StringUtils; import com.x.base.core.project.cache.ApplicationCache; @@ -51,10 +54,11 @@ public class ActionQueryListVisiblePersons extends BaseAction { result.error(exception); } - String cacheKey = ApplicationCache.concreteCacheKey( id, "ActionQueryListVisiblePersons" ); - Element element = cache.get(cacheKey); - if ((null != element) && (null != element.getObjectValue())) { - wo = (Wo) element.getObjectValue(); + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), id ); + Optional optional = CacheManager.get(cacheCategory, cacheKey ); + + if (optional.isPresent()) { + wo = ( Wo ) optional.get(); result.setData(wo); } else { if (check) { @@ -135,7 +139,7 @@ public class ActionQueryListVisiblePersons extends BaseAction { wo.setValueList(persons); result.setData(wo); result.setCount( Long.parseLong( persons.size() + "")); - cache.put(new Element(cacheKey, wo)); + CacheManager.put(cacheCategory, cacheKey, wo ); } } return result; diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryViewDocument.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryViewDocument.java index 80d63d340d67a690ba5d99b23bdb956f76b3053d..9f11e9346397c751914cb99c78b83064edb6b31d 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryViewDocument.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryViewDocument.java @@ -2,9 +2,12 @@ package com.x.cms.assemble.control.jaxrs.document; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import javax.servlet.http.HttpServletRequest; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import org.apache.commons.lang3.StringUtils; import com.x.base.core.entity.JpaObject; @@ -60,16 +63,16 @@ public class ActionQueryViewDocument extends BaseAction { } } - String cacheKey = ApplicationCache.concreteCacheKey( id, "view", isAnonymous, isManager, effectivePerson.getDistinguishedName() ); - Element element = cache.get(cacheKey); + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), id, isAnonymous, isManager, effectivePerson.getDistinguishedName() ); + Optional optional = CacheManager.get(cacheCategory, cacheKey ); - if ((null != element) && (null != element.getObjectValue())) { - result = (ActionResult) element.getObjectValue(); + if (optional.isPresent()) { + result = (ActionResult) optional.get(); } else { logger.debug(">>>>>>>>>>>>>view document '"+id+"' in database!" ); //继续进行数据查询 result = getDocumentQueryResult( id, request, effectivePerson, isManager ); - cache.put(new Element(cacheKey, result )); + CacheManager.put(cacheCategory, cacheKey, result ); } if (check ) { diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/BaseAction.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/BaseAction.java index 61b3b04e278daa61cc53fd93d32ae3bc7da47fab..de3148c5bcec0c0148857c2cde7c8e0f66e36a6e 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/BaseAction.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/BaseAction.java @@ -1,44 +1,33 @@ package com.x.cms.assemble.control.jaxrs.document; -import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.UUID; - import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.entity.annotation.CheckPersistType; -import com.x.base.core.project.cache.ApplicationCache; -import com.x.base.core.project.config.StorageMapping; +import com.x.base.core.project.cache.Cache; import com.x.base.core.project.jaxrs.StandardJaxrsAction; import com.x.base.core.project.tools.ListTools; import com.x.cms.assemble.control.Business; import com.x.cms.assemble.control.service.AppInfoServiceAdv; import com.x.cms.assemble.control.service.CategoryInfoServiceAdv; import com.x.cms.assemble.control.service.DocCommendPersistService; -import com.x.cms.assemble.control.service.DocCommendQueryService; import com.x.cms.assemble.control.service.DocumentPersistService; import com.x.cms.assemble.control.service.DocumentQueryService; import com.x.cms.assemble.control.service.DocumentViewRecordServiceAdv; import com.x.cms.assemble.control.service.FileInfoServiceAdv; import com.x.cms.assemble.control.service.FormServiceAdv; import com.x.cms.assemble.control.service.LogService; -import com.x.cms.assemble.control.service.PermissionOperateService; import com.x.cms.assemble.control.service.PermissionQueryService; import com.x.cms.assemble.control.service.QueryViewService; import com.x.cms.assemble.control.service.UserManagerService; -import com.x.cms.core.entity.AppInfo; -import com.x.cms.core.entity.CategoryInfo; -import com.x.cms.core.entity.Document; - -import com.x.cms.core.entity.FileInfo; -import net.sf.ehcache.Ehcache; -import org.apache.commons.io.FilenameUtils; -import org.apache.commons.lang3.StringUtils; +import com.x.cms.core.entity.*; +import com.x.query.core.entity.Item; public class BaseAction extends StandardJaxrsAction { - protected Ehcache cache = ApplicationCache.instance().getCache( Document.class); - + + protected Cache.CacheCategory cacheCategory = new Cache.CacheCategory(Item.class, Document.class, DocumentCommentInfo.class); + protected LogService logService = new LogService(); protected QueryViewService queryViewService = new QueryViewService(); protected DocumentViewRecordServiceAdv documentViewRecordServiceAdv = new DocumentViewRecordServiceAdv(); @@ -46,16 +35,14 @@ public class BaseAction extends StandardJaxrsAction { protected DocumentQueryService documentQueryService = new DocumentQueryService(); protected DocCommendPersistService docCommendPersistService = new DocCommendPersistService(); -// protected DocCommendQueryService docCommendQueryService = new DocCommendQueryService(); - + protected FormServiceAdv formServiceAdv = new FormServiceAdv(); protected CategoryInfoServiceAdv categoryInfoServiceAdv = new CategoryInfoServiceAdv(); protected AppInfoServiceAdv appInfoServiceAdv = new AppInfoServiceAdv(); protected UserManagerService userManagerService = new UserManagerService(); protected FileInfoServiceAdv fileInfoServiceAdv = new FileInfoServiceAdv(); protected PermissionQueryService permissionQueryService = new PermissionQueryService(); -// protected PermissionOperateService permissionOperateService = new PermissionOperateService(); - + protected boolean modifyDocStatus( String id, String stauts, String personName ) throws Exception{ Business business = null; Document document = null; diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/ActionFileEdit.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/ActionFileEdit.java index e68051e16cb0a80ae4d14f927175642795271c5c..88cca6b722f1d70624829418c5ea01d2f6164c4d 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/ActionFileEdit.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/ActionFileEdit.java @@ -46,22 +46,7 @@ class ActionFileEdit extends BaseAction { result.error( exception ); logger.error( e, effectivePerson, request, null); } - -// Boolean isAnonymous = effectivePerson.isAnonymous(); -// Boolean isManager = false; -// if (check) { -// try { -// if ( effectivePerson.isManager() ) { -// isManager = true; -// } -// } catch (Exception e) { -// check = false; -// Exception exception = new ExceptionFileInfoProcess(e, "判断用户是否是系统管理员时发生异常！user:" + effectivePerson.getDistinguishedName() ); -// result.error(exception); -// logger.error(e, effectivePerson, request, null); -// } -// } - + if (check) { try { doc = documentQueryService.get(docId); @@ -131,20 +116,7 @@ class ActionFileEdit extends BaseAction { Wo wo = new Wo(); wo.setId(file.getId()); result.setData(wo); -// -// List keys = new ArrayList<>(); -// keys.add( "file.all" ); //清除文档的附件列表缓存 -// keys.add( "file." + id ); //清除指定ID的附件信息缓存 -// keys.add( ApplicationCache.concreteCacheKey( "document", docId, isAnonymous, isManager ) ); //清除文档的附件列表缓存 -// ApplicationCache.notify( FileInfo.class, keys ); -// -// keys.clear(); -// keys.add( ApplicationCache.concreteCacheKey( docId, "view", isAnonymous, isManager ) ); //清除文档阅读缓存 -// keys.add( ApplicationCache.concreteCacheKey( docId, "get", isManager ) ); //清除文档信息获取缓存 -// System.out.println(">>>>>>>>>>>>>clean cache document:" + ApplicationCache.concreteCacheKey( docId, "view", isAnonymous, isManager ) ); -// System.out.println(">>>>>>>>>>>>>clean cache document:" + ApplicationCache.concreteCacheKey( docId, "get", isManager ) ); -// ApplicationCache.notify( Document.class, keys ); - + ApplicationCache.notify( FileInfo.class ); ApplicationCache.notify( Document.class ); } catch (Exception e) { diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/ActionGet.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/ActionGet.java index 222edcd418cf5e06cd6b20c620098fbb32e50ed0..01e07b31e8325922b0a41fad013c47a3bf34adf7 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/ActionGet.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/ActionGet.java @@ -2,6 +2,7 @@ package com.x.cms.assemble.control.jaxrs.fileinfo; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import javax.servlet.http.HttpServletRequest; @@ -11,8 +12,11 @@ import com.x.base.core.entity.JpaObject; import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; +import com.x.cms.assemble.control.jaxrs.comment.ActionListPrevWithFilter; import com.x.cms.core.entity.Document; import com.x.cms.core.entity.FileInfo; @@ -24,11 +28,12 @@ public class ActionGet extends BaseAction { ActionResult result = new ActionResult<>(); Wo wrap = null; List attachmentIds = null; - String cacheKey = ApplicationCache.concreteCacheKey( "file."+id ); - Element element = cache.get(cacheKey); - - if ((null != element) && ( null != element.getObjectValue()) ) { - wrap = ( Wo ) element.getObjectValue(); + + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), id ); + Optional optional = CacheManager.get(cacheCategory, cacheKey ); + + if (optional.isPresent()) { + wrap = ( Wo ) optional.get(); result.setData(wrap); } else { try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { @@ -47,7 +52,7 @@ public class ActionGet extends BaseAction { } //如果信息存在，则需要向客户端返回信息，先将查询出来的JPA对象COPY到一个普通JAVA对象里，再进行返回 wrap = Wo.copier.copy( fileInfo ); - cache.put(new Element( cacheKey, wrap )); + CacheManager.put(cacheCategory, cacheKey, wrap ); result.setData(wrap); } catch (Throwable th) { th.printStackTrace(); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/ActionImageToBase64.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/ActionImageToBase64.java index b86c57fe09bfacc02d6f653164d0fedc78ff3b0b..c7250db205933de298f735cc06f27dc22b351e36 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/ActionImageToBase64.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/ActionImageToBase64.java @@ -3,10 +3,13 @@ package com.x.cms.assemble.control.jaxrs.fileinfo; import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.util.Optional; import javax.imageio.ImageIO; import javax.servlet.http.HttpServletRequest; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; @@ -35,11 +38,12 @@ public class ActionImageToBase64 extends BaseAction { FileInfo fileInfo = null; Integer sizeNum = null; Boolean check = true; - String cacheKey = ApplicationCache.concreteCacheKey( "base64", id, size ); - Element element = cache.get(cacheKey); - - if ((null != element) && ( null != element.getObjectValue()) ) { - wrap = ( WrapOutString ) element.getObjectValue(); + + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), id, size ); + Optional optional = CacheManager.get(cacheCategory, cacheKey ); + + if (optional.isPresent()) { + wrap = ( WrapOutString ) optional.get(); result.setData(wrap); } else { if( check ){ @@ -108,7 +112,7 @@ public class ActionImageToBase64 extends BaseAction { ImageIO.write( image, "png", output ); wrap = new WrapOutString(); wrap.setValue(Base64.encodeBase64String( output.toByteArray() )); - cache.put(new Element( cacheKey, wrap )); + CacheManager.put(cacheCategory, cacheKey, wrap ); result.setData( wrap ); }catch( Exception e ){ check = false; diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/ActionListAll.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/ActionListAll.java index 2fd79628c879420f7e4211926673bc27ea57d86f..4699847b245f3cbe2833ab4d8d68858e6a2d9ae3 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/ActionListAll.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/ActionListAll.java @@ -2,6 +2,7 @@ package com.x.cms.assemble.control.jaxrs.fileinfo; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import javax.servlet.http.HttpServletRequest; @@ -11,8 +12,11 @@ import com.x.base.core.entity.JpaObject; import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; +import com.x.base.core.project.http.WrapOutString; import com.x.base.core.project.tools.SortTools; import com.x.cms.assemble.control.Business; import com.x.cms.assemble.control.factory.FileInfoFactory; @@ -26,11 +30,12 @@ public class ActionListAll extends BaseAction { protected ActionResult> execute( HttpServletRequest request, EffectivePerson effectivePerson ) throws Exception { ActionResult> result = new ActionResult<>(); List wraps = null; - String cacheKey = ApplicationCache.concreteCacheKey( "file.all" ); - Element element = cache.get(cacheKey); - - if ((null != element) && ( null != element.getObjectValue()) ) { - wraps = ( List ) element.getObjectValue(); + + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass() ); + Optional optional = CacheManager.get(cacheCategory, cacheKey ); + + if (optional.isPresent()) { + wraps = ( List ) optional.get(); result.setData(wraps); } else { try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { @@ -45,7 +50,7 @@ public class ActionListAll extends BaseAction { List fileInfoList = emc.list( FileInfo.class, ids );//查询ID IN ids 的所有文件或者附件信息列表 wraps = Wo.copier.copy( fileInfoList );//将所有查询出来的有状态的对象转换为可以输出的过滤过属性的对象 SortTools.asc( wraps, "sequence" ); - cache.put(new Element( cacheKey, wraps )); + CacheManager.put(cacheCategory, cacheKey, wraps ); result.setData(wraps); } catch (Throwable th) { th.printStackTrace(); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/ActionListByDocId.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/ActionListByDocId.java index 4a34c1b9c6041c6a6ef9bc711313753dcc4f7069..0886d77cd78690ce4c5ffe2c6ada088803146e73 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/ActionListByDocId.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/ActionListByDocId.java @@ -3,6 +3,7 @@ package com.x.cms.assemble.control.jaxrs.fileinfo; import java.util.ArrayList; import java.util.Comparator; import java.util.List; +import java.util.Optional; import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; @@ -13,6 +14,8 @@ import com.x.base.core.entity.JpaObject; import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.gson.GsonPropertyObject; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; @@ -33,9 +36,6 @@ public class ActionListByDocId extends BaseAction { protected ActionResult> execute(HttpServletRequest request, EffectivePerson effectivePerson, String docId ) throws Exception { ActionResult> result = new ActionResult<>(); List wos = null; -// AppInfo appInfo = null; -// CategoryInfo categoryInfo = null; -// Document document = null; Boolean isAnonymous = effectivePerson.isAnonymous(); Boolean isManager = false; Boolean check = true; @@ -53,61 +53,13 @@ public class ActionListByDocId extends BaseAction { } } - String cacheKey = ApplicationCache.concreteCacheKey( "document", docId, isAnonymous, isManager, effectivePerson.getDistinguishedName() ); - Element element = cache.get(cacheKey); + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), docId, isAnonymous, isManager, effectivePerson.getDistinguishedName() ); + Optional optional = CacheManager.get(cacheCategory, cacheKey ); - if ( (null != element) && (null != element.getObjectValue()) ) { - wos = (List) element.getObjectValue(); + if (optional.isPresent()) { + wos = (List) optional.get(); result.setData(wos); } else { -// if (check) { -// try { -// document = documentQueryService.get( docId ); -// if (document == null) { -// check = false; -// Exception exception = new ExceptionDocumentNotExists( docId ); -// result.error(exception); -// } -// } catch (Exception e) { -// check = false; -// Exception exception = new ExceptionFileInfoProcess(e, "文档信息获取操作时发生异常。Id:" + docId + ", Name:" + effectivePerson.getDistinguishedName()); -// result.error(exception); -// logger.error(e, effectivePerson, request, null); -// } -// } -// -// if (check) { -// try { -// categoryInfo = categoryInfoServiceAdv.get( document.getCategoryId() ); -// if (categoryInfo == null) { -// check = false; -// Exception exception = new ExceptionCategoryInfoNotExists(document.getCategoryId()); -// result.error(exception); -// } -// } catch (Exception e) { -// check = false; -// Exception exception = new ExceptionFileInfoProcess(e, "系统在根据ID查询分类信息时发生异常！ID：" + document.getCategoryId()); -// result.error(exception); -// logger.error(e, effectivePerson, request, null); -// } -// } -// -// if (check) { -// try { -// appInfo = appInfoServiceAdv.get( categoryInfo.getAppId() ); -// if (appInfo == null) { -// check = false; -// Exception exception = new ExceptionAppInfoNotExists(categoryInfo.getAppId()); -// result.error(exception); -// } -// } catch (Exception e) { -// check = false; -// Exception exception = new ExceptionFileInfoProcess(e, "系统在根据ID查询应用栏目信息时发生异常！ID：" + categoryInfo.getAppId()); -// result.error(exception); -// logger.error(e, effectivePerson, request, null); -// } -// } - if (check) { try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { Business business = new Business(emc); @@ -131,7 +83,7 @@ public class ActionListByDocId extends BaseAction { } } wos = wos.stream().sorted(Comparator.comparing(Wo::getCreateTime)).collect(Collectors.toList()); - cache.put(new Element(cacheKey, wos)); + CacheManager.put(cacheCategory, cacheKey, wos ); result.setData(wos); } catch (Throwable th) { th.printStackTrace(); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/BaseAction.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/BaseAction.java index de94a4a7ebbf7f278e7e5eecde41fee9ab52306e..4ac84e9e786a5f9082f18313c1468b9ba21f43ec 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/BaseAction.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/BaseAction.java @@ -1,21 +1,19 @@ package com.x.cms.assemble.control.jaxrs.fileinfo; -import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.Cache; import com.x.base.core.project.jaxrs.StandardJaxrsAction; import com.x.cms.assemble.control.service.AppInfoServiceAdv; import com.x.cms.assemble.control.service.CategoryInfoServiceAdv; import com.x.cms.assemble.control.service.DocumentQueryService; import com.x.cms.assemble.control.service.FileInfoServiceAdv; import com.x.cms.assemble.control.service.LogService; +import com.x.cms.core.entity.Document; import com.x.cms.core.entity.FileInfo; -import net.sf.ehcache.Ehcache; - public class BaseAction extends StandardJaxrsAction { - - protected Ehcache cache = ApplicationCache.instance().getCache( FileInfo.class); + + protected Cache.CacheCategory cacheCategory = new Cache.CacheCategory(FileInfo.class, Document.class); protected LogService logService = new LogService(); - protected FileInfoServiceAdv fileInfoServiceAdv = new FileInfoServiceAdv(); protected CategoryInfoServiceAdv categoryInfoServiceAdv = new CategoryInfoServiceAdv(); protected AppInfoServiceAdv appInfoServiceAdv = new AppInfoServiceAdv(); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/form/ActionGet.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/form/ActionGet.java index c82ce2f28378c6c1b18397ad573d1f27995967a4..2f48e5a555e2dca47f69522f9d3f50a36092e703 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/form/ActionGet.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/form/ActionGet.java @@ -2,6 +2,7 @@ package com.x.cms.assemble.control.jaxrs.form; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import javax.servlet.http.HttpServletRequest; @@ -11,8 +12,11 @@ import com.x.base.core.entity.JpaObject; import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; +import com.x.base.core.project.http.WrapOutString; import com.x.cms.assemble.control.Business; import com.x.cms.core.entity.element.Form; @@ -24,11 +28,11 @@ public class ActionGet extends BaseAction { ActionResult result = new ActionResult<>(); Wo wo = null; - String cacheKey = ApplicationCache.concreteCacheKey( id ); - Element element = cache.get(cacheKey); - - if ((null != element) && ( null != element.getObjectValue()) ) { - wo = (Wo) element.getObjectValue(); + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), id ); + Optional optional = CacheManager.get(cacheCategory, cacheKey ); + + if (optional.isPresent()) { + wo = (Wo)optional.get(); result.setData( wo ); } else { try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { @@ -39,7 +43,7 @@ public class ActionGet extends BaseAction { } wo = new Wo(); Wo.copier.copy( form, wo ); - cache.put(new Element( cacheKey, wo )); + CacheManager.put(cacheCategory, cacheKey, wo ); result.setData( wo ); } catch (Throwable th) { th.printStackTrace(); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/form/ActionGetWithAppInfo.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/form/ActionGetWithAppInfo.java index ace5528a868071b0d9c8783ae3203d98bbd4c8c9..18fac523464eefa56a59f1f2b27fd9ba701a3805 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/form/ActionGetWithAppInfo.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/form/ActionGetWithAppInfo.java @@ -2,6 +2,7 @@ package com.x.cms.assemble.control.jaxrs.form; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import javax.servlet.http.HttpServletRequest; @@ -11,6 +12,8 @@ import com.x.base.core.entity.JpaObject; import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.cms.assemble.control.Business; @@ -25,11 +28,11 @@ public class ActionGetWithAppInfo extends BaseAction { ActionResult result = new ActionResult<>(); Wo wo = null; - String cacheKey = ApplicationCache.concreteCacheKey( "getWithAppInfo", formFlag, appFlag ); - Element element = cache.get(cacheKey); - - if ((null != element) && ( null != element.getObjectValue()) ) { - wo = (Wo) element.getObjectValue(); + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), formFlag, appFlag ); + Optional optional = CacheManager.get(cacheCategory, cacheKey ); + + if (optional.isPresent()) { + wo = (Wo) optional.get(); result.setData( wo ); } else { try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { @@ -44,7 +47,7 @@ public class ActionGetWithAppInfo extends BaseAction { } wo = new Wo(); Wo.copier.copy( form, wo ); - cache.put(new Element( cacheKey, wo )); + CacheManager.put(cacheCategory, cacheKey, wo ); result.setData( wo ); } catch (Throwable th) { th.printStackTrace(); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/form/ActionListAll.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/form/ActionListAll.java index 1fc9703dc65dc55aaef8284286cb04e46f662218..735ebeb77613e63f571502c6adc37db414ab1f8a 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/form/ActionListAll.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/form/ActionListAll.java @@ -2,6 +2,7 @@ package com.x.cms.assemble.control.jaxrs.form; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import javax.servlet.http.HttpServletRequest; @@ -11,6 +12,8 @@ import com.x.base.core.entity.JpaObject; import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.tools.SortTools; @@ -27,11 +30,11 @@ public class ActionListAll extends BaseAction { ActionResult> result = new ActionResult<>(); List wraps = null; - String cacheKey = ApplicationCache.concreteCacheKey( "all" ); - Element element = cache.get(cacheKey); - - if ((null != element) && ( null != element.getObjectValue()) ) { - wraps = (List) element.getObjectValue(); + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass() ); + Optional optional = CacheManager.get(cacheCategory, cacheKey ); + + if (optional.isPresent()) { + wraps = (List) optional.get(); result.setData(wraps); } else { try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { @@ -39,10 +42,9 @@ public class ActionListAll extends BaseAction { FormFactory formFactory = business.getFormFactory(); List ids = formFactory.listAll();// 获取所有表单模板列表 List
formList = emc.list( Form.class, ids );// 查询ID IN ids 的所有表单模板信息列表 -// formFactory.list(ids); wraps = Wo.copier.copy( formList );// 将所有查询出来的有状态的对象转换为可以输出的过滤过属性的对象 SortTools.desc(wraps, "createTime" ); - cache.put(new Element( cacheKey, wraps )); + CacheManager.put(cacheCategory, cacheKey, wraps ); result.setData(wraps); } catch (Throwable th) { th.printStackTrace(); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/form/ActionListByApp.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/form/ActionListByApp.java index 3cc8df0f07b7122a195cd3950d68864cd4dd6d37..48f65a6c5438d0afc3c45f99d1fee4feee5d29ff 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/form/ActionListByApp.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/form/ActionListByApp.java @@ -2,6 +2,7 @@ package com.x.cms.assemble.control.jaxrs.form; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import javax.servlet.http.HttpServletRequest; @@ -11,6 +12,8 @@ import com.x.base.core.entity.JpaObject; import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.tools.SortTools; @@ -27,11 +30,11 @@ public class ActionListByApp extends BaseAction { ActionResult> result = new ActionResult<>(); List wraps = null; - String cacheKey = ApplicationCache.concreteCacheKey( "appId", appId ); - Element element = cache.get(cacheKey); - - if ((null != element) && ( null != element.getObjectValue()) ) { - wraps = (List) element.getObjectValue(); + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), appId ); + Optional optional = CacheManager.get(cacheCategory, cacheKey ); + + if (optional.isPresent()) { + wraps = (List) optional.get(); result.setData(wraps); } else { try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { @@ -42,10 +45,9 @@ public class ActionListByApp extends BaseAction { FormFactory formFactory = business.getFormFactory(); List ids = formFactory.listByAppId(appId);// 获取指定应用的所有表单模板列表 List formList = emc.list( Form.class, ids ); -// formFactory.list(ids); wraps = Wo.copier.copy(formList);// 将所有查询出来的有状态的对象转换为可以输出的过滤过属性的对象 SortTools.desc( wraps, "createTime" ); - cache.put(new Element( cacheKey, wraps )); + CacheManager.put(cacheCategory, cacheKey, wraps ); result.setData(wraps); } catch (Throwable th) { th.printStackTrace(); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/form/BaseAction.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/form/BaseAction.java index a5df5177a263a0fc8b95dd52bcfa1bdfb08a446d..e0c04e910272668959515990338c7a272b910582 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/form/BaseAction.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/form/BaseAction.java @@ -1,15 +1,16 @@ package com.x.cms.assemble.control.jaxrs.form; -import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.Cache; import com.x.base.core.project.jaxrs.StandardJaxrsAction; import com.x.cms.assemble.control.service.LogService; import com.x.cms.core.entity.element.Form; - -import net.sf.ehcache.Ehcache; +import com.x.cms.core.entity.element.View; +import com.x.cms.core.entity.element.ViewCategory; +import com.x.cms.core.entity.element.ViewFieldConfig; public class BaseAction extends StandardJaxrsAction { - - protected Ehcache cache = ApplicationCache.instance().getCache( Form.class); - + + protected Cache.CacheCategory cacheCategory = new Cache.CacheCategory(Form.class, View.class, ViewFieldConfig.class, ViewCategory.class); + protected LogService logService = new LogService(); } diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/image/BaseAction.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/image/BaseAction.java index a023bddc34a4b03513a8b4be2df8a355eaf6152a..2398222a2266062458ef724a86e63a3bd31c03a5 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/image/BaseAction.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/image/BaseAction.java @@ -1,18 +1,12 @@ package com.x.cms.assemble.control.jaxrs.image; -import com.x.base.core.project.cache.ApplicationCache; import com.x.base.core.project.jaxrs.StandardJaxrsAction; import com.x.cms.assemble.control.service.DocumentQueryService; import com.x.cms.assemble.control.service.FileInfoServiceAdv; import com.x.cms.assemble.control.service.LogService; -import com.x.cms.core.entity.FileInfo; - -import net.sf.ehcache.Ehcache; public class BaseAction extends StandardJaxrsAction { - - protected Ehcache cache = ApplicationCache.instance().getCache( FileInfo.class); - + protected LogService logService = new LogService(); protected FileInfoServiceAdv fileInfoServiceAdv = new FileInfoServiceAdv(); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/input/BaseAction.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/input/BaseAction.java index f9c09f118231d2cc903c9a3c53fd7c42dd482cff..5947666204279d7e9b8eb018b383b8ceab6b3e8e 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/input/BaseAction.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/input/BaseAction.java @@ -9,24 +9,19 @@ import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Root; +import com.x.base.core.project.cache.Cache; import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang3.StringUtils; import com.x.base.core.entity.JpaObject; -import com.x.base.core.project.cache.ApplicationCache; import com.x.base.core.project.jaxrs.StandardJaxrsAction; import com.x.base.core.project.tools.StringTools; import com.x.cms.assemble.control.Business; import com.x.cms.core.entity.AppInfo; import com.x.cms.core.entity.AppInfo_; -import net.sf.ehcache.Ehcache; - abstract class BaseAction extends StandardJaxrsAction { - protected Ehcache inputCache = ApplicationCache.instance().getCache(BaseAction.class.getName(), 100, - ApplicationCache.MINUTES_20, ApplicationCache.MINUTES_20); - public enum Method { cover, create, ignore; } diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/output/ActionSelect.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/output/ActionSelect.java index 31f1d7dffaa5e829a207aa958b2953567ef141e4..86203566a31b21f1ef1d24efe4cc75f1f0dc772b 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/output/ActionSelect.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/output/ActionSelect.java @@ -5,6 +5,7 @@ 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.project.annotation.FieldDescribe; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.tools.ListTools; @@ -55,7 +56,6 @@ class ActionSelect extends BaseAction { String flag = StringTools.uniqueToken(); - cache.put(new Element(flag, outputCacheObject)); Wo wo = gson.fromJson(gson.toJson(wrapAppInfo), Wo.class); wo.setFlag(flag); result.setData(wo); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/output/ActionSelectFile.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/output/ActionSelectFile.java deleted file mode 100644 index 07d8bb22c2d5c0ff86e246f341618644f8e2418f..0000000000000000000000000000000000000000 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/output/ActionSelectFile.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.x.cms.assemble.control.jaxrs.output; - -import com.x.base.core.container.EntityManagerContainer; -import com.x.base.core.container.factory.EntityManagerContainerFactory; -import com.x.base.core.project.http.ActionResult; -import com.x.base.core.project.http.EffectivePerson; -import com.x.base.core.project.jaxrs.WoFile; -import com.x.base.core.project.tools.DefaultCharset; - -import net.sf.ehcache.Element; - -class ActionSelectFile extends BaseAction { - - private static String extension = ".xapp"; - - ActionResult execute(EffectivePerson effectivePerson, String flag) throws Exception { - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - ActionResult result = new ActionResult<>(); - Element element = cache.get(flag); - if (null == element || null == element.getObjectValue()) { - throw new ExceptionFlagNotExist(flag); - } - OutputCacheObject outputCacheObject = (OutputCacheObject) element.getObjectValue(); - Wo wo = new Wo( gson.toJson(outputCacheObject.getCmsAppInfo()).getBytes(DefaultCharset.name ), - this.contentType(true, outputCacheObject.getName() + extension ), - this.contentDisposition(true, outputCacheObject.getName() + extension )); - result.setData(wo); - return result; - } - } - - public static class Wo extends WoFile { - - public Wo(byte[] bytes, String contentType, String contentDisposition) { - super(bytes, contentType, contentDisposition); - } - - } - -} \ No newline at end of file diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/output/BaseAction.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/output/BaseAction.java index cae19fa530ea06238f34a1962107ba3a4af3b7b0..56a8789b0469dabd38dd72e3e854f9d9a4dfee6f 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/output/BaseAction.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/output/BaseAction.java @@ -1,15 +1,16 @@ package com.x.cms.assemble.control.jaxrs.output; import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.Cache; import com.x.base.core.project.jaxrs.StandardJaxrsAction; +import com.x.cms.core.entity.Document; +import com.x.cms.core.entity.FileInfo; import com.x.cms.core.entity.element.wrap.WrapCms; import net.sf.ehcache.Ehcache; abstract class BaseAction extends StandardJaxrsAction { - protected Ehcache cache = ApplicationCache.instance().getCache(OutputCacheObject.class); - public static class OutputCacheObject { private String name; diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/script/ActionGet.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/script/ActionGet.java index aaee327c5e6a78e0a54acfd3696814bd25a1785c..674061de6717b74f8b678aac7bf45dc0e7677698 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/script/ActionGet.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/script/ActionGet.java @@ -2,15 +2,19 @@ package com.x.cms.assemble.control.jaxrs.script; import java.util.Date; import java.util.List; +import java.util.Optional; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.entity.JpaObject; import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.gson.GsonPropertyObject; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; +import com.x.base.core.project.http.WrapOutString; import com.x.cms.core.entity.element.Script; import net.sf.ehcache.Element; @@ -20,11 +24,12 @@ class ActionGet extends BaseAction { ActionResult execute(EffectivePerson effectivePerson, String id) throws Exception { ActionResult result = new ActionResult<>(); Wo wrap = null; - String cacheKey = "script.get." + id; - Element element = null; - element = cache.get(cacheKey); - if (element != null) { - wrap = (Wo) element.getObjectValue(); + + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), id ); + Optional optional = CacheManager.get(cacheCategory, cacheKey ); + + if (optional.isPresent()) { + wrap = (Wo) optional.get(); result.setData(wrap); } else { try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { @@ -36,7 +41,7 @@ class ActionGet extends BaseAction { result.setData(wrap); // 将查询结果放进缓存里 - cache.put(new Element(cacheKey, wrap)); + CacheManager.put(cacheCategory, cacheKey, wrap ); } catch (Throwable th) { th.printStackTrace(); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/script/ActionGetScriptNestedImported.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/script/ActionGetScriptNestedImported.java index a44adba3444743443e77bba7c605bbfc3c3acfe4..13568e0c004ff11179fd44f0d735e821f8b08b34 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/script/ActionGetScriptNestedImported.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/script/ActionGetScriptNestedImported.java @@ -2,6 +2,7 @@ package com.x.cms.assemble.control.jaxrs.script; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import javax.servlet.http.HttpServletRequest; @@ -9,6 +10,8 @@ import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.project.annotation.FieldDescribe; import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.gson.GsonPropertyObject; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; @@ -31,10 +34,12 @@ class ActionGetScriptNestedImported extends BaseAction { if (check) { try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - String cacheKey = ApplicationCache.concreteCacheKey(this.getClass(), uniqueName, flag); - Element element = cache.get(cacheKey); - if ((null != element) && (null != element.getObjectValue())) { - wrap = (Wo) element.getObjectValue(); + + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), uniqueName, flag ); + Optional optional = CacheManager.get(cacheCategory, cacheKey ); + + if (optional.isPresent()) { + wrap = (Wo) optional.get(); } else { Business business = new Business(emc); AppInfo appInfo = business.getAppInfoFactory().flag(flag); @@ -58,7 +63,7 @@ class ActionGetScriptNestedImported extends BaseAction { wrap = new Wo(); wrap.setImportedList(imported); wrap.setText(buffer.toString()); - cache.put(new Element(cacheKey, wrap)); + CacheManager.put(cacheCategory, cacheKey, wrap ); } } catch (Throwable th) { th.printStackTrace(); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/script/ActionGetWithAppAndName.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/script/ActionGetWithAppAndName.java index 831afb5211512113aa0df75a8d5771e95c4089b5..98475613c6e483881289508595429789a46ed235 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/script/ActionGetWithAppAndName.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/script/ActionGetWithAppAndName.java @@ -2,7 +2,10 @@ package com.x.cms.assemble.control.jaxrs.script; import java.util.Date; import java.util.List; +import java.util.Optional; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import org.apache.commons.lang3.StringUtils; import com.x.base.core.container.EntityManagerContainer; @@ -24,11 +27,12 @@ class ActionGetWithAppAndName extends BaseAction { ActionResult execute( EffectivePerson effectivePerson, String appFlag, String name ) throws Exception { ActionResult result = new ActionResult<>(); Wo wrap = null; - String cacheKey = "script.getWithAppWithName.appFlag." + appFlag + ".scriptName." + name; - Element element = null; - element = cache.get(cacheKey); - if (element != null) { - wrap = (Wo) element.getObjectValue(); + + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), appFlag, name ); + Optional optional = CacheManager.get(cacheCategory, cacheKey ); + + if (optional.isPresent()) { + wrap = (Wo) optional.get(); result.setData(wrap); } else { try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { @@ -44,8 +48,9 @@ class ActionGetWithAppAndName extends BaseAction { } else { throw new Exception("[getWithAppWithName]script not existed with name or alias : " + name + "."); } + // 将查询结果放进缓存里 - cache.put(new Element( cacheKey, wrap) ); + CacheManager.put(cacheCategory, cacheKey, wrap ); result.setData(wrap); } catch (Throwable th) { th.printStackTrace(); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/script/ActionListWithApplication.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/script/ActionListWithApplication.java index e74e6ef379aaab5c79697dc93d917fb962f2a78a..b33886b75c870d61d494dda963f9e41d8ca7ec48 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/script/ActionListWithApplication.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/script/ActionListWithApplication.java @@ -3,12 +3,15 @@ package com.x.cms.assemble.control.jaxrs.script; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Optional; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.entity.JpaObject; import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.gson.GsonPropertyObject; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; @@ -25,11 +28,12 @@ class ActionListWithApplication extends BaseAction { ActionResult> result = new ActionResult<>(); List wraps = new ArrayList<>(); Wo wrap = null; - String cacheKey = "script.listWithApp.appFlag." + appFlag; - Element element = null; - element = cache.get(cacheKey); - if (element != null) { - wraps = (List) element.getObjectValue(); + + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), appFlag ); + Optional optional = CacheManager.get(cacheCategory, cacheKey ); + + if (optional.isPresent()) { + wraps = (List) optional.get(); result.setData(wraps); } else { try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { @@ -45,7 +49,7 @@ class ActionListWithApplication extends BaseAction { wraps.add( wrap ); } // 将查询结果放进缓存里 - cache.put(new Element(cacheKey, wraps)); + CacheManager.put(cacheCategory, cacheKey, wraps ); result.setData(wraps); } catch (Throwable th) { th.printStackTrace(); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/script/BaseAction.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/script/BaseAction.java index 8ffc395a7cf8ba0e8bbf3ab823f17866a17cbd89..e1273dbd170153f801693ef3ece4357f9434c435 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/script/BaseAction.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/script/BaseAction.java @@ -1,14 +1,13 @@ package com.x.cms.assemble.control.jaxrs.script; -import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.Cache; import com.x.base.core.project.jaxrs.StandardJaxrsAction; import com.x.cms.assemble.control.service.LogService; +import com.x.cms.core.entity.Document; import com.x.cms.core.entity.element.Script; -import net.sf.ehcache.Ehcache; - - class BaseAction extends StandardJaxrsAction { public LogService logService = new LogService(); - public Ehcache cache = ApplicationCache.instance().getCache(Script.class); + protected Cache.CacheCategory cacheCategory = new Cache.CacheCategory(Script.class, Document.class); + } diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/view/ActionGet.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/view/ActionGet.java index 3ce0603931327f55c277acb49d6643901abeba96..d7cacb8f9c1142198438623607053382aaa2b1fb 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/view/ActionGet.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/view/ActionGet.java @@ -2,32 +2,32 @@ package com.x.cms.assemble.control.jaxrs.view; import javax.servlet.http.HttpServletRequest; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import org.apache.commons.lang3.StringUtils; - import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.entity.JpaObject; import com.x.base.core.project.annotation.FieldDescribe; import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.cache.ApplicationCache; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.cms.assemble.control.Business; import com.x.cms.core.entity.element.View; - -import net.sf.ehcache.Element; +import java.util.Optional; public class ActionGet extends BaseAction { protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, String flag ) throws Exception { ActionResult result = new ActionResult<>(); Wo wrap = null; - String cacheKey = ApplicationCache.concreteCacheKey( flag ); - Element element = cache.get(cacheKey); - - if ((null != element) && ( null != element.getObjectValue()) ) { - wrap = (Wo) element.getObjectValue(); + + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), flag ); + Optional optional = CacheManager.get(cacheCategory, cacheKey ); + + if (optional.isPresent()) { + wrap = (Wo) optional.get(); result.setData(wrap); } else { try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { @@ -41,7 +41,7 @@ public class ActionGet extends BaseAction { if(StringUtils.isNotEmpty( wrap.getFormId() )) { wrap.setFormName( formServiceAdv.getNameWithId( wrap.getFormId() ) ); } - cache.put(new Element( cacheKey, wrap )); + CacheManager.put(cacheCategory, cacheKey, wrap ); result.setData(wrap); } catch (Throwable th) { th.printStackTrace(); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/view/ActionListAll.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/view/ActionListAll.java index f6b32762e009cf2ee46674dea3383f41b6fb39c7..555a3adf25d0f4a1272062ba7c908a75d42c157d 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/view/ActionListAll.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/view/ActionListAll.java @@ -2,9 +2,12 @@ package com.x.cms.assemble.control.jaxrs.view; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import javax.servlet.http.HttpServletRequest; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import org.apache.commons.lang3.StringUtils; import com.x.base.core.container.EntityManagerContainer; @@ -13,7 +16,6 @@ import com.x.base.core.entity.JpaObject; import com.x.base.core.project.annotation.FieldDescribe; import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; -import com.x.base.core.project.cache.ApplicationCache; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.tools.SortTools; @@ -21,19 +23,18 @@ import com.x.cms.assemble.control.Business; import com.x.cms.assemble.control.factory.ViewFactory; import com.x.cms.core.entity.element.View; -import net.sf.ehcache.Element; - public class ActionListAll extends BaseAction { @SuppressWarnings("unchecked") protected ActionResult> execute( HttpServletRequest request, EffectivePerson effectivePerson ) throws Exception { ActionResult> result = new ActionResult<>(); List wraps = null; - String cacheKey = ApplicationCache.concreteCacheKey( "all" ); - Element element = cache.get(cacheKey); - - if ((null != element) && ( null != element.getObjectValue()) ) { - wraps = (List) element.getObjectValue(); + + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass() ); + Optional optional = CacheManager.get(cacheCategory, cacheKey ); + + if (optional.isPresent()) { + wraps = (List) optional.get(); result.setData(wraps); } else { try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { @@ -58,7 +59,7 @@ public class ActionListAll extends BaseAction { } } } - cache.put(new Element( cacheKey, wraps )); + CacheManager.put(cacheCategory, cacheKey, wraps ); result.setData(wraps); } catch (Throwable th) { th.printStackTrace(); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/view/ActionListByApp.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/view/ActionListByApp.java index a0de8adcdf28ddcf2d176b50dd61bfd228832430..ae532895d32306741ecb861b90755cfe19ab9fb0 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/view/ActionListByApp.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/view/ActionListByApp.java @@ -2,9 +2,12 @@ package com.x.cms.assemble.control.jaxrs.view; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import javax.servlet.http.HttpServletRequest; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import org.apache.commons.lang3.StringUtils; import com.x.base.core.container.EntityManagerContainer; @@ -29,11 +32,12 @@ public class ActionListByApp extends BaseAction { protected ActionResult> execute( HttpServletRequest request, EffectivePerson effectivePerson, String appId ) throws Exception { ActionResult> result = new ActionResult<>(); List wraps = null; - String cacheKey = ApplicationCache.concreteCacheKey( "app", appId ); - Element element = cache.get(cacheKey); - - if ((null != element) && ( null != element.getObjectValue()) ) { - wraps = (List) element.getObjectValue(); + + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), appId ); + Optional optional = CacheManager.get(cacheCategory, cacheKey ); + + if (optional.isPresent()) { + wraps = (List) optional.get(); result.setData(wraps); } else { try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { @@ -58,8 +62,8 @@ public class ActionListByApp extends BaseAction { } } } - - cache.put(new Element( cacheKey, wraps )); + + CacheManager.put(cacheCategory, cacheKey, wraps ); result.setData(wraps); } catch (Throwable th) { th.printStackTrace(); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/view/ActionListByCategory.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/view/ActionListByCategory.java index 92a537df08828d704fc0d9d7d8046ee8330f910e..5044f568db09bc19e66afe3ac160daabbdb582f4 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/view/ActionListByCategory.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/view/ActionListByCategory.java @@ -2,9 +2,12 @@ package com.x.cms.assemble.control.jaxrs.view; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import javax.servlet.http.HttpServletRequest; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import org.apache.commons.lang3.StringUtils; import com.x.base.core.container.EntityManagerContainer; @@ -30,11 +33,11 @@ public class ActionListByCategory extends BaseAction { ActionResult> result = new ActionResult<>(); List wraps = null; - String cacheKey = ApplicationCache.concreteCacheKey( "category", categoryId ); - Element element = cache.get(cacheKey); - - if ((null != element) && ( null != element.getObjectValue()) ) { - wraps = (List) element.getObjectValue(); + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), categoryId ); + Optional optional = CacheManager.get(cacheCategory, cacheKey ); + + if (optional.isPresent()) { + wraps = (List) optional.get(); result.setData( wraps ); } else { try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { @@ -59,8 +62,8 @@ public class ActionListByCategory extends BaseAction { } } } - - cache.put(new Element( cacheKey, wraps )); + + CacheManager.put(cacheCategory, cacheKey, wraps ); result.setData(wraps); } catch (Throwable th) { th.printStackTrace(); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/view/ActionListByForm.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/view/ActionListByForm.java index 8c4fed239d385b0cb52aca296faf75a5760d332e..fc7f6bf394c8c52b1456515b40b296558fed4549 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/view/ActionListByForm.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/view/ActionListByForm.java @@ -2,9 +2,12 @@ package com.x.cms.assemble.control.jaxrs.view; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import javax.servlet.http.HttpServletRequest; +import com.x.base.core.project.cache.Cache; +import com.x.base.core.project.cache.CacheManager; import org.apache.commons.lang3.StringUtils; import com.x.base.core.container.EntityManagerContainer; @@ -29,11 +32,12 @@ public class ActionListByForm extends BaseAction { protected ActionResult> execute( HttpServletRequest request, EffectivePerson effectivePerson, String formId ) throws Exception { ActionResult> result = new ActionResult<>(); List wraps = null; - String cacheKey = ApplicationCache.concreteCacheKey( "formId", formId ); - Element element = cache.get(cacheKey); - - if ((null != element) && ( null != element.getObjectValue()) ) { - wraps = (List) element.getObjectValue(); + + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), formId ); + Optional optional = CacheManager.get(cacheCategory, cacheKey ); + + if (optional.isPresent()) { + wraps = (List) optional.get(); result.setData(wraps); } else { try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { @@ -60,8 +64,8 @@ public class ActionListByForm extends BaseAction { } } } - - cache.put(new Element( cacheKey, wraps )); + + CacheManager.put(cacheCategory, cacheKey, wraps ); result.setData(wraps); } catch (Throwable th) { th.printStackTrace(); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/view/BaseAction.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/view/BaseAction.java index 2f194266e13f59c06d8d52db8a59ba0c1a21d929..05e0cbc410f7614ca048d19f2be481f49642365b 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/view/BaseAction.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/view/BaseAction.java @@ -1,6 +1,7 @@ package com.x.cms.assemble.control.jaxrs.view; import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.Cache; import com.x.base.core.project.jaxrs.StandardJaxrsAction; import com.x.cms.assemble.control.service.CategoryInfoServiceAdv; import com.x.cms.assemble.control.service.DocumentQueryService; @@ -9,13 +10,17 @@ import com.x.cms.assemble.control.service.LogService; import com.x.cms.assemble.control.service.PermissionQueryService; import com.x.cms.assemble.control.service.UserManagerService; import com.x.cms.assemble.control.service.ViewServiceAdv; +import com.x.cms.core.entity.Document; +import com.x.cms.core.entity.element.Script; import com.x.cms.core.entity.element.View; +import com.x.cms.core.entity.element.ViewCategory; +import com.x.cms.core.entity.element.ViewFieldConfig; import net.sf.ehcache.Ehcache; public class BaseAction extends StandardJaxrsAction { - protected Ehcache cache = ApplicationCache.instance().getCache( View.class ); + protected Cache.CacheCategory cacheCategory = new Cache.CacheCategory(View.class, ViewFieldConfig.class, ViewCategory.class); protected LogService logService = new LogService(); protected CategoryInfoServiceAdv categoryInfoServiceAdv = new CategoryInfoServiceAdv();