diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appdictdesign/ActionCreate.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appdictdesign/ActionCreate.java index 40892537f975cf7f6c1507d96cc221481d774452..da23a8a51511a3424ebd158f77deb195ed295d0a 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appdictdesign/ActionCreate.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appdictdesign/ActionCreate.java @@ -13,6 +13,7 @@ import com.x.base.core.entity.dataitem.ItemCategory; 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.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.jaxrs.WoId; @@ -47,7 +48,7 @@ class ActionCreate extends BaseAction { emc.persist(o, CheckPersistType.all); } emc.commit(); - ApplicationCache.notify(AppDict.class); + CacheManager.notify(AppDict.class); Wo wo = new Wo(); wo.setId(appInfoDict.getId()); result.setData(wo); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appdictdesign/ActionDelete.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appdictdesign/ActionDelete.java index 38aeb22ea8c1e7b5bd6018f8399eab72098d4c04..c69650179092948ab8df09f6397be51ef82fa6ad 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appdictdesign/ActionDelete.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appdictdesign/ActionDelete.java @@ -6,6 +6,7 @@ import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.entity.annotation.CheckRemoveType; import com.x.base.core.project.cache.ApplicationCache; +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.WoId; @@ -37,7 +38,7 @@ class ActionDelete extends BaseAction { emc.beginTransaction(AppDict.class); emc.remove(dict, CheckRemoveType.all); emc.commit(); - ApplicationCache.notify(AppDict.class); + CacheManager.notify(AppDict.class); Wo wo = new Wo(); wo.setId(dict.getId()); result.setData(wo); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appdictdesign/ActionEdit.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appdictdesign/ActionEdit.java index d55a2cb15edca007624e17f847ca1e745688929c..ba187a15143a9c33c64ae64d60e7653f65692af1 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appdictdesign/ActionEdit.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appdictdesign/ActionEdit.java @@ -13,6 +13,7 @@ import com.x.base.core.entity.dataitem.ItemCategory; 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.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.jaxrs.WoId; @@ -63,7 +64,7 @@ class ActionEdit extends BaseAction { emc.persist(o, CheckPersistType.all); } emc.commit(); - ApplicationCache.notify(AppDict.class); + CacheManager.notify(AppDict.class); Wo wo = new Wo(); wo.setId(dict.getId()); result.setData(wo); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionDelete.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionDelete.java index 843758a88fb64cc5ffaa5577349d93f7866e8055..b120fec5bd0da1b957b38b6b74b53c4427a05fc7 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionDelete.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionDelete.java @@ -2,6 +2,7 @@ package com.x.cms.assemble.control.jaxrs.categoryinfo; import com.x.base.core.project.annotation.AuditLog; import com.x.base.core.project.cache.ApplicationCache; +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.WoId; @@ -71,10 +72,10 @@ public class ActionDelete extends BaseAction { CmsBatchOperationProcessService.OPT_TYPE_DELETE, id, id, "删除分类：ID=" + id ); new LogService().log(null, effectivePerson.getDistinguishedName(), categoryInfo.getAppName() + "-" + categoryInfo.getCategoryName(), id, "", "", "", "CATEGORY", "删除"); - - ApplicationCache.notify( AppInfo.class ); - ApplicationCache.notify( CategoryInfo.class ); - ApplicationCache.notify( ViewCategory.class ); + + CacheManager.notify( AppInfo.class ); + CacheManager.notify( CategoryInfo.class ); + CacheManager.notify( ViewCategory.class ); } catch (Exception e) { Exception exception = new ExceptionCategoryInfoProcess(e, "分类信息在删除时发生异常。ID:" + id); result.error(exception); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionSave.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionSave.java index e6bf9a0d5052c9cae9c180a33c666309fbe09423..5e2167129f958438e264916dd937298861b852c6 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionSave.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/categoryinfo/ActionSave.java @@ -7,6 +7,7 @@ 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.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.jaxrs.WoId; @@ -190,11 +191,11 @@ public class ActionSave extends BaseAction { }else { new LogService().log(null, effectivePerson.getDistinguishedName(), categoryInfo.getAppName() + "-" + categoryInfo.getCategoryName(), categoryInfo.getId(), "", "", "", "CATEGORY", "新增"); } - - ApplicationCache.notify(AppInfo.class); - ApplicationCache.notify(CategoryInfo.class); - ApplicationCache.notify(ViewCategory.class); - ApplicationCache.notify(Document.class); + + CacheManager.notify(AppInfo.class); + CacheManager.notify(CategoryInfo.class); + CacheManager.notify(ViewCategory.class); + CacheManager.notify(Document.class); } 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/comment/ActionSave.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/comment/ActionSave.java index fb7cc48b6843ea62e77d4c88aaebc14551e80378..43fdd9207bed2731e7d5ab8946a12d6c165a750c 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/comment/ActionSave.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/comment/ActionSave.java @@ -7,6 +7,7 @@ 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.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.jaxrs.WoId; @@ -64,8 +65,8 @@ public class ActionSave extends BaseAction { documentCommentInfo = documentCommentInfoPersistService.save( documentCommentInfo, wi.getContent(), effectivePerson ); // 更新缓存 - ApplicationCache.notify( Document.class ); - ApplicationCache.notify( DocumentCommentInfo.class ); + CacheManager.notify( Document.class ); + CacheManager.notify( DocumentCommentInfo.class ); Wo wo = new Wo(); wo.setId( documentCommentInfo.getId() ); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistChangeCategory.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistChangeCategory.java index 938db6e6cea3710bd3e2ba026dd0c04aa0cd7bca..3a89adbfb5d0d529fc3d2764446cb9ed92c4ae42 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistChangeCategory.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistChangeCategory.java @@ -4,6 +4,7 @@ import com.google.gson.JsonElement; import com.x.base.core.project.annotation.AuditLog; import com.x.base.core.project.annotation.FieldDescribe; import com.x.base.core.project.cache.ApplicationCache; +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; @@ -123,7 +124,7 @@ public class ActionPersistChangeCategory extends BaseAction { } wo.setFailtureList( failture ); wo.setSuccessList( success ); - ApplicationCache.notify(Document.class); + CacheManager.notify(Document.class); } } result.setCount(Long.parseLong( wo.getTotal().toString() ) ); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishAndNotify.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishAndNotify.java index 7038cbc04df5e69ed48f5e9372da3d0874daed9c..610e9dc8de11d8d3800a337d075459c3b634ef6b 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishAndNotify.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishAndNotify.java @@ -9,6 +9,7 @@ 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.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.jaxrs.WoId; @@ -214,7 +215,7 @@ public class ActionPersistPublishAndNotify extends BaseAction { } } - ApplicationCache.notify( Document.class ); + CacheManager.notify( Document.class ); return result; } diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishContent.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishContent.java index ea518549e6cd5cfbba1039ff63bc0fe9c4680dbb..292e9ba74544d3e3f51c7e4685ee30e662486daa 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishContent.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishContent.java @@ -7,6 +7,7 @@ import java.util.*; import javax.servlet.http.HttpServletRequest; import com.x.base.core.entity.annotation.CheckPersistType; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.config.StorageMapping; import com.x.base.core.project.exception.ExceptionWhen; import com.x.processplatform.core.entity.content.Attachment; @@ -16,12 +17,10 @@ import org.apache.commons.lang3.StringUtils; import com.google.gson.JsonElement; 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.AuditLog; 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.gson.XGsonBuilder; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; @@ -416,8 +415,8 @@ public class ActionPersistPublishContent extends BaseAction { } } - ApplicationCache.notify(FileInfo.class); - ApplicationCache.notify(Document.class); + CacheManager.notify(FileInfo.class); + CacheManager.notify(Document.class); return result; } diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/ActionDelete.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/ActionDelete.java index ce24fcf3b23e3dfe59ed84e4c38cf4ae8bb3aeee..a824ab38cd0f8b3f36fa79345fab124f14c099ae 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/ActionDelete.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/ActionDelete.java @@ -5,6 +5,7 @@ import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.entity.annotation.CheckRemoveType; import com.x.base.core.project.annotation.AuditLog; import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.config.StorageMapping; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; @@ -76,12 +77,12 @@ public class ActionDelete extends BaseAction { keys.add( "file.all" ); //清除文档的附件列表缓存 keys.add( "file." + id ); //清除指定ID的附件信息缓存 keys.add( ApplicationCache.concreteCacheKey( "document", document.getId(), isAnonymous, isManager ) ); //清除文档的附件列表缓存 - ApplicationCache.notify( FileInfo.class, keys ); + CacheManager.notify( FileInfo.class, keys ); keys.clear(); keys.add( ApplicationCache.concreteCacheKey( document.getId(), "view", isAnonymous, isManager ) ); //清除文档阅读缓存 keys.add( ApplicationCache.concreteCacheKey( document.getId(), "get", isManager ) ); //清除文档信息获取缓存 - ApplicationCache.notify( Document.class, keys ); + CacheManager.notify( Document.class, keys ); // 成功删除一个附件信息 logService.log(emc, effectivePerson.getDistinguishedName(), fileInfo.getName(), fileInfo.getAppId(), diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/ActionFileUpdate.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/ActionFileUpdate.java index e112fac770e228d96cd03f13abb3646c6c2a0eed..c12413b0ced76a415deae17e6520754aeaf4efea 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/ActionFileUpdate.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/ActionFileUpdate.java @@ -5,6 +5,7 @@ import java.util.UUID; import javax.servlet.http.HttpServletRequest; +import com.x.base.core.project.cache.CacheManager; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; import org.apache.tika.Tika; @@ -205,9 +206,9 @@ public class ActionFileUpdate extends BaseAction { // keys.add( ApplicationCache.concreteCacheKey( document.getId(), "view", isAnonymous, isManager ) ); //清除文档阅读缓存 // keys.add( ApplicationCache.concreteCacheKey( document.getId(), "get", isManager ) ); //清除文档信息获取缓存 // ApplicationCache.notify( Document.class, keys ); - - ApplicationCache.notify( FileInfo.class ); - ApplicationCache.notify( Document.class ); + + CacheManager.notify( FileInfo.class ); + CacheManager.notify( Document.class ); Wo wo = new Wo(); wo.setId( attachment.getId() ); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/ActionFileUploadCallback.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/ActionFileUploadCallback.java index 133e9ec4fb9c19edcb5206ccedd6cbabcb87bd88..9dbf5dc4b00addab0dae861e1fdfcde9b183c6d0 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/ActionFileUploadCallback.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/ActionFileUploadCallback.java @@ -5,6 +5,7 @@ import java.util.UUID; import javax.servlet.http.HttpServletRequest; +import com.x.base.core.project.cache.CacheManager; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; import org.apache.tika.Tika; @@ -128,9 +129,9 @@ public class ActionFileUploadCallback extends BaseAction { // keys.add( ApplicationCache.concreteCacheKey( document.getId(), "view", isAnonymous, isManager ) ); //清除文档阅读缓存 // keys.add( ApplicationCache.concreteCacheKey( document.getId(), "get", isManager ) ); //清除文档信息获取缓存 // ApplicationCache.notify( Document.class, keys ); - - ApplicationCache.notify( FileInfo.class ); - ApplicationCache.notify( Document.class ); + + CacheManager.notify( FileInfo.class ); + CacheManager.notify( Document.class ); WoObject woObject = new WoObject(); woObject.setId(attachment.getId()); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/permission/ActionAppInfoManagerSave.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/permission/ActionAppInfoManagerSave.java index 4da5edf3420ac98b8ab0dbe04741bfed2087e647..af54341b5fb85b910104f1ade570ad0a6cab58b7 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/permission/ActionAppInfoManagerSave.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/permission/ActionAppInfoManagerSave.java @@ -4,6 +4,7 @@ import com.google.gson.JsonElement; import com.x.base.core.project.annotation.AuditLog; import com.x.base.core.project.annotation.FieldDescribe; import com.x.base.core.project.cache.ApplicationCache; +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.WoId; @@ -70,7 +71,7 @@ public class ActionAppInfoManagerSave extends BaseAction { if( check ){ String description = "栏目："+appId+"权限变更"; new LogService().log( null, effectivePerson.getDistinguishedName(), description, appId, "", "", appId, "APPINFO_MANAGER", "管理权限变更" ); - ApplicationCache.notify( AppInfo.class ); + CacheManager.notify( AppInfo.class ); Wo wo = new Wo(); wo.setId( appId ); result.setData( wo ); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/permission/ActionAppInfoPublisherSave.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/permission/ActionAppInfoPublisherSave.java index 56e8f8c8585b0c5da0a4c04166cb0e7cec638ba9..6f2a1504d6b583db7ab39cfacf1d32f3a02e302a 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/permission/ActionAppInfoPublisherSave.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/permission/ActionAppInfoPublisherSave.java @@ -4,6 +4,7 @@ import com.google.gson.JsonElement; import com.x.base.core.project.annotation.AuditLog; import com.x.base.core.project.annotation.FieldDescribe; import com.x.base.core.project.cache.ApplicationCache; +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.WoId; @@ -70,8 +71,8 @@ public class ActionAppInfoPublisherSave extends BaseAction { if( check ){ String description = "栏目："+appId+"权限变更"; new LogService().log( null, effectivePerson.getDistinguishedName(), description, appId, "", "", appId, "APPINFO_PUBLISHER", "发布权限变更" ); - - ApplicationCache.notify( AppInfo.class ); + + CacheManager.notify( AppInfo.class ); Wo wo = new Wo(); wo.setId( appId ); result.setData( wo ); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/permission/ActionAppInfoViewerSave.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/permission/ActionAppInfoViewerSave.java index 313f81b12ad6f09db2e1504cce55a4b9a96d7510..d012c90ddd527e504e9a28fd0b293a33241e1b7b 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/permission/ActionAppInfoViewerSave.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/permission/ActionAppInfoViewerSave.java @@ -4,6 +4,7 @@ import com.google.gson.JsonElement; import com.x.base.core.project.annotation.AuditLog; import com.x.base.core.project.annotation.FieldDescribe; import com.x.base.core.project.cache.ApplicationCache; +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.WoId; @@ -70,8 +71,8 @@ public class ActionAppInfoViewerSave extends BaseAction { if( check ){ String description = "栏目："+appId+"权限变更"; new LogService().log( null, effectivePerson.getDistinguishedName(), description, appId, "", "", appId, "APPINFO_VIEWER", "可见权限变更" ); - - ApplicationCache.notify( AppInfo.class ); + + CacheManager.notify( AppInfo.class ); Wo wo = new Wo(); wo.setId( appId ); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/permission/ActionCategoryInfoManagerSave.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/permission/ActionCategoryInfoManagerSave.java index a6cb65ee255814889e4d7fa17fd243e73ebd609e..b5353c01bd4782816d523e3050c74f4562233da3 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/permission/ActionCategoryInfoManagerSave.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/permission/ActionCategoryInfoManagerSave.java @@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletRequest; import com.google.gson.JsonElement; import com.x.base.core.project.annotation.FieldDescribe; import com.x.base.core.project.cache.ApplicationCache; +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.WoId; @@ -70,9 +71,9 @@ public class ActionCategoryInfoManagerSave extends BaseAction { if( check ){ String description = "分类："+categoryId+"权限变更"; new LogService().log( null, effectivePerson.getDistinguishedName(), description, categoryId, "", "", categoryId, "CATEGORYINFO_MANAGER", "管理权限变更" ); - - ApplicationCache.notify( AppInfo.class ); - ApplicationCache.notify( CategoryInfo.class ); + + CacheManager.notify( AppInfo.class ); + CacheManager.notify( CategoryInfo.class ); Wo wo = new Wo(); wo.setId( categoryId ); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/permission/ActionCategoryInfoPublisherSave.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/permission/ActionCategoryInfoPublisherSave.java index f7c37aff75fbaef7f38ccb999547cb199012120e..061b9326d005160453d0d21fa74be9863c5d0005 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/permission/ActionCategoryInfoPublisherSave.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/permission/ActionCategoryInfoPublisherSave.java @@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletRequest; import com.google.gson.JsonElement; import com.x.base.core.project.annotation.FieldDescribe; import com.x.base.core.project.cache.ApplicationCache; +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.WoId; @@ -70,9 +71,9 @@ public class ActionCategoryInfoPublisherSave extends BaseAction { if( check ){ String description = "分类："+categoryId+"权限变更"; new LogService().log( null, effectivePerson.getDistinguishedName(), description, categoryId, "", "", categoryId, "CATEGORYINFO_PUBLISHER", "发布权限变更" ); - - ApplicationCache.notify( AppInfo.class ); - ApplicationCache.notify( CategoryInfo.class ); + + CacheManager.notify( AppInfo.class ); + CacheManager.notify( CategoryInfo.class ); Wo wo = new Wo(); wo.setId( categoryId ); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/permission/ActionCategoryInfoViewerSave.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/permission/ActionCategoryInfoViewerSave.java index fd3d3d1bc3d5aab3feca50c13a074e31d49f9d56..bb73ad2ef96405e08b73f9a43346ec9fb2f87472 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/permission/ActionCategoryInfoViewerSave.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/permission/ActionCategoryInfoViewerSave.java @@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletRequest; import com.google.gson.JsonElement; import com.x.base.core.project.annotation.FieldDescribe; import com.x.base.core.project.cache.ApplicationCache; +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.WoId; @@ -70,9 +71,9 @@ public class ActionCategoryInfoViewerSave extends BaseAction { if( check ){ String description = "分类："+categoryId+"权限变更"; new LogService().log( null, effectivePerson.getDistinguishedName(), description, categoryId, "", "", categoryId, "CATEGORYINFO_VIEWER", "可见范围变更" ); - - ApplicationCache.notify( AppInfo.class ); - ApplicationCache.notify( CategoryInfo.class ); + + CacheManager.notify( AppInfo.class ); + CacheManager.notify( CategoryInfo.class ); Wo wo = new Wo(); wo.setId( categoryId ); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/permission/ActionRefreshAllDocumentPermission.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/permission/ActionRefreshAllDocumentPermission.java index e0b86425cab44e1fc09fd909f41a8f1bac340082..10f8a8212d77112bfcd4f6881c7a6c04e0eee295 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/permission/ActionRefreshAllDocumentPermission.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/permission/ActionRefreshAllDocumentPermission.java @@ -2,6 +2,7 @@ package com.x.cms.assemble.control.jaxrs.permission; import com.x.base.core.project.annotation.FieldDescribe; import com.x.base.core.project.cache.ApplicationCache; +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; @@ -34,7 +35,7 @@ public class ActionRefreshAllDocumentPermission extends BaseAction { logger.error(e, effectivePerson, request, null); } } - ApplicationCache.notify(Document.class); + CacheManager.notify(Document.class); return result; } diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/permission/ActionRefreshDocumentPermission.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/permission/ActionRefreshDocumentPermission.java index 17b50e2005984918325c05ca3af1805348812cc9..905af8b77151872ce7df3d67710b614808e25576 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/permission/ActionRefreshDocumentPermission.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/permission/ActionRefreshDocumentPermission.java @@ -5,6 +5,7 @@ import com.x.base.core.entity.JpaObject; import com.x.base.core.project.annotation.AuditLog; import com.x.base.core.project.annotation.FieldDescribe; import com.x.base.core.project.cache.ApplicationCache; +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.WoId; @@ -84,7 +85,7 @@ public class ActionRefreshDocumentPermission extends BaseAction { } - ApplicationCache.notify( Document.class ); + CacheManager.notify( Document.class ); return result; } diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryviewdesign/ActionCreate.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryviewdesign/ActionCreate.java index 683d929225acc200f72e36fef49c429f7b1ed8c3..50de3f2b1afa06b8471857590e523d1b117fc317 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryviewdesign/ActionCreate.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryviewdesign/ActionCreate.java @@ -14,6 +14,7 @@ import com.x.base.core.entity.annotation.CheckPersistType; 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.CacheManager; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.jaxrs.WoId; @@ -59,7 +60,7 @@ class ActionCreate extends BaseAction { emc.beginTransaction(QueryView.class); emc.persist(queryView, CheckPersistType.all); emc.commit(); - ApplicationCache.notify(QueryView.class); + CacheManager.notify(QueryView.class); Wo wo = new Wo(); wo.setId(queryView.getId()); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryviewdesign/ActionDelete.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryviewdesign/ActionDelete.java index bff3150206aacba27090c3ab038ff3c0509e6477..000e8a73abc95dd35561578f7ed5485ff8c77377 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryviewdesign/ActionDelete.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryviewdesign/ActionDelete.java @@ -4,6 +4,7 @@ import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.entity.annotation.CheckRemoveType; import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.exception.ExceptionWhen; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; @@ -22,7 +23,7 @@ class ActionDelete extends BaseAction { //business.applicationEditAvailable(effectivePerson, application, ExceptionWhen.not_allow); emc.remove(queryView, CheckRemoveType.all); emc.commit(); - ApplicationCache.notify(QueryView.class); + CacheManager.notify(QueryView.class); Wo wo = new Wo(); wo.setId( queryView.getId() ); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryviewdesign/ActionUpdate.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryviewdesign/ActionUpdate.java index 886c4ec2055189c581bdcf145b88df34669ed2af..4f3a78e0782642b989681b064db48882b0f2d085 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryviewdesign/ActionUpdate.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryviewdesign/ActionUpdate.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +import com.x.base.core.project.cache.CacheManager; import org.apache.commons.lang3.StringUtils; import com.google.gson.JsonElement; @@ -49,7 +50,7 @@ class ActionUpdate extends BaseAction { this.transQuery(queryView); emc.check(queryView, CheckPersistType.all); emc.commit(); - ApplicationCache.notify(QueryView.class); + CacheManager.notify(QueryView.class); Wo wo = new Wo(); wo.setId( queryView.getId() ); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/templateform/ActionCreate.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/templateform/ActionCreate.java index e8dc5b8ae6ec99b599a77fe558e1178f913ef331..2aa94d171c68dd65d92c5212ab209d16ccaecb3b 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/templateform/ActionCreate.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/templateform/ActionCreate.java @@ -2,6 +2,7 @@ package com.x.cms.assemble.control.jaxrs.templateform; import java.util.Arrays; +import com.x.base.core.project.cache.CacheManager; import org.apache.commons.lang3.StringUtils; import com.google.gson.JsonElement; @@ -44,7 +45,7 @@ class ActionCreate extends BaseAction { emc.persist(o, CheckPersistType.all); } emc.commit(); - ApplicationCache.notify(TemplateForm.class); + CacheManager.notify(TemplateForm.class); Wo wo = new Wo(); wo.setId(o.getId()); result.setData(wo); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/templateform/ActionDelete.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/templateform/ActionDelete.java index 271f70e70dd8033ce82bd789e19f1c0dec00df2f..ab4a8315cb06aea84c3d82103932819674380f53 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/templateform/ActionDelete.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/templateform/ActionDelete.java @@ -4,6 +4,7 @@ import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.entity.annotation.CheckRemoveType; import com.x.base.core.project.cache.ApplicationCache; +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.WoId; @@ -28,7 +29,7 @@ class ActionDelete extends BaseAction { emc.beginTransaction(TemplateForm.class); emc.remove(template, CheckRemoveType.all); emc.commit(); - ApplicationCache.notify(TemplateForm.class); + CacheManager.notify(TemplateForm.class); Wo wo = new Wo(); wo.setId(template.getId()); result.setData(wo); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewcategory/ActionDelete.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewcategory/ActionDelete.java index 996d688eddf9d44fe14110c18e998d8350acbe71..8e946dd8d504d07592fd568e26e3ef23e7086f53 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewcategory/ActionDelete.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewcategory/ActionDelete.java @@ -6,6 +6,7 @@ import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.entity.annotation.CheckRemoveType; import com.x.base.core.project.cache.ApplicationCache; +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.WoId; @@ -39,9 +40,9 @@ public class ActionDelete extends BaseAction { Wo wo = new Wo(); wo.setId( viewCategory.getId() ); result.setData(wo); - - ApplicationCache.notify( View.class ); - ApplicationCache.notify( ViewCategory.class ); + + CacheManager.notify( View.class ); + CacheManager.notify( ViewCategory.class ); } catch (Throwable th) { th.printStackTrace(); result.error(th); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewcategory/ActionSave.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewcategory/ActionSave.java index bfe0d3f9eb4541f0a779546a928badb5fb5b2a3c..aa15e664d1d45a6afd1082533e8a5bd8812369a4 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewcategory/ActionSave.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewcategory/ActionSave.java @@ -5,6 +5,7 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; +import com.x.base.core.project.cache.CacheManager; import org.apache.commons.lang3.StringUtils; import com.google.gson.JsonElement; @@ -74,8 +75,8 @@ public class ActionSave extends BaseAction { Wo wo = new Wo(); wo.setId( viewCategory.getId() ); result.setData(wo); - ApplicationCache.notify( View.class ); - ApplicationCache.notify( ViewCategory.class ); + CacheManager.notify( View.class ); + CacheManager.notify( ViewCategory.class ); } catch (Throwable th) { th.printStackTrace(); result.error(th); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewfieldconfig/ActionDelete.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewfieldconfig/ActionDelete.java index 885328048eac1c7ed4e055f6cca925f6969d6897..f17fce3e0a064c8bd50808fb654e2d672f0da33a 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewfieldconfig/ActionDelete.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewfieldconfig/ActionDelete.java @@ -8,6 +8,7 @@ import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.entity.annotation.CheckRemoveType; import com.x.base.core.project.cache.ApplicationCache; +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.WoId; @@ -59,7 +60,7 @@ public class ActionDelete extends BaseAction { wrap = new Wo(); wrap.setId(viewFieldConfig.getId()); - ApplicationCache.notify(ViewFieldConfig.class); + CacheManager.notify(ViewFieldConfig.class); 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/viewfieldconfig/ActionSave.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewfieldconfig/ActionSave.java index 48306398209b968751092a22fcb76e7e1bd1b226..940b38a25a5f04eb2f31768090dcf35ac03e3056 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewfieldconfig/ActionSave.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewfieldconfig/ActionSave.java @@ -5,6 +5,7 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; +import com.x.base.core.project.cache.CacheManager; import org.apache.commons.lang3.StringUtils; import com.google.gson.JsonElement; @@ -130,8 +131,8 @@ public class ActionSave extends BaseAction { wrap = new Wo(); wrap.setId( viewFieldConfig.getId() ); result.setData(wrap); - ApplicationCache.notify( ViewFieldConfig.class ); - ApplicationCache.notify( View.class ); + CacheManager.notify( ViewFieldConfig.class ); + CacheManager.notify( View.class ); } catch (Throwable th) { th.printStackTrace(); result.error(th); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/queue/QueueDataRowImport.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/queue/QueueDataRowImport.java index 7b49e0cecc5d7a58a485e5f3fe0bcb12f9719183..5554a6abb2f39e1a1194ce34fd36333299c4a938 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/queue/QueueDataRowImport.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/queue/QueueDataRowImport.java @@ -59,7 +59,7 @@ public class QueueDataRowImport extends AbstractQueue { document.setTitle( "无标题" ); } } - + boolean flag = false; try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { emc.beginTransaction( Document.class ); document.setDocStatus( excelReadRuntime.template.getDocStatus() ); //已发布 @@ -102,11 +102,7 @@ public class QueueDataRowImport extends AbstractQueue { data.setDocument( document ); documentDataHelper.update( data ); emc.commit(); - - new CmsBatchOperationPersistService().addOperation( - CmsBatchOperationProcessService.OPT_OBJ_DOCUMENT, - CmsBatchOperationProcessService.OPT_TYPE_PERMISSION, document.getId(), document.getId(), "导入新文档：ID=" + document.getId() ); - + flag = true; dataImportStatus.addDocumentId( document.getId() ); dataImportStatus.increaseSuccessTotal(1); System.out.println( "第" + curRow + "行数据导入成功，已经成功提交到数据库！导入成功共"+ excelReadRuntime.wo.getSuccess_count() +"条"); @@ -116,6 +112,12 @@ public class QueueDataRowImport extends AbstractQueue { dataImportStatus.increaseErrorTotal(1); e.printStackTrace(); } + + if(flag) { + new CmsBatchOperationPersistService().addOperation( + CmsBatchOperationProcessService.OPT_OBJ_DOCUMENT, + CmsBatchOperationProcessService.OPT_TYPE_PERMISSION, document.getId(), document.getId(), "导入新文档：ID=" + document.getId()); + } }else { System.out.println("数据导入不成功，propertyNames为空，无法识别数据列对应的属性！"); } diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/CmsBatchOperationPersistService.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/CmsBatchOperationPersistService.java index 6507f116c60901c55f39ef1aee43b14b66af1b26..4e2ccbfbe70178120fd1cbb52907cd7da8d051a3 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/CmsBatchOperationPersistService.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/CmsBatchOperationPersistService.java @@ -41,16 +41,14 @@ public class CmsBatchOperationPersistService { } if( StringUtils.isEmpty( cmsBatchOperation.getDescription() )) { throw new Exception("description can not empty for save CmsBatchOperation!"); - } + } try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { emc.beginTransaction( CmsBatchOperation.class ); emc.persist( cmsBatchOperation, CheckPersistType.all ); emc.commit(); - //将批量操作信息压入队列 - ThisApplication.queueBatchOperation.send( cmsBatchOperation ); - } catch ( Exception e ) { - throw e; - } + } + //将批量操作信息压入队列 + ThisApplication.queueBatchOperation.send( cmsBatchOperation ); return cmsBatchOperation; } diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/CmsBatchOperationProcessService.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/CmsBatchOperationProcessService.java index 74239dee9c11d8f8232a80eafbd3a62af7b2ed62..acc121aeb5dcb020c0d8876fc851a50394c6cf11 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/CmsBatchOperationProcessService.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/CmsBatchOperationProcessService.java @@ -2,6 +2,7 @@ package com.x.cms.assemble.control.service; import java.util.List; +import com.x.base.core.project.cache.CacheManager; import org.apache.commons.lang3.StringUtils; import com.x.base.core.container.EntityManagerContainer; @@ -213,8 +214,8 @@ public class CmsBatchOperationProcessService { } catch (Exception e) { throw e; } - ApplicationCache.notify( Review.class ); - ApplicationCache.notify( Document.class ); + CacheManager.notify( Review.class ); + CacheManager.notify( Document.class ); } /** @@ -271,8 +272,8 @@ public class CmsBatchOperationProcessService { } catch (Exception e) { throw e; } - ApplicationCache.notify( Review.class ); - ApplicationCache.notify( Document.class ); + CacheManager.notify( Review.class ); + CacheManager.notify( Document.class ); } @@ -343,9 +344,9 @@ public class CmsBatchOperationProcessService { } catch (Exception e) { throw e; } - - ApplicationCache.notify( Document.class ); - ApplicationCache.notify( CategoryInfo.class ); + + CacheManager.notify( Document.class ); + CacheManager.notify( CategoryInfo.class ); } /** @@ -414,8 +415,8 @@ public class CmsBatchOperationProcessService { emc.commit(); } } - ApplicationCache.notify( Document.class ); - ApplicationCache.notify( CategoryInfo.class ); + CacheManager.notify( Document.class ); + CacheManager.notify( CategoryInfo.class ); } /** @@ -479,8 +480,8 @@ public class CmsBatchOperationProcessService { } catch (Exception e) { throw e; } - ApplicationCache.notify( CategoryInfo.class ); - ApplicationCache.notify( Document.class ); + CacheManager.notify( CategoryInfo.class ); + CacheManager.notify( Document.class ); } /** @@ -530,8 +531,8 @@ public class CmsBatchOperationProcessService { } catch (Exception e) { throw e; } - ApplicationCache.notify( Document.class ); - ApplicationCache.notify( CategoryInfo.class ); + CacheManager.notify( Document.class ); + CacheManager.notify( CategoryInfo.class ); } /** diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/DocumentPersistService.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/DocumentPersistService.java index 854639fae61c678c6e2251bd79c2d16a2056a1b7..952328fa978ed38a67963d69da5d01479df20502 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/DocumentPersistService.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/DocumentPersistService.java @@ -6,6 +6,7 @@ import com.x.base.core.container.factory.EntityManagerContainerFactory; import com.x.base.core.entity.annotation.CheckPersistType; import com.x.base.core.entity.dataitem.ItemCategory; import com.x.base.core.project.cache.ApplicationCache; +import com.x.base.core.project.cache.CacheManager; import com.x.base.core.project.tools.ListTools; import com.x.cms.assemble.control.DocumentDataHelper; import com.x.cms.assemble.control.jaxrs.document.ActionPersistBatchModifyData.WiDataChange; @@ -349,7 +350,7 @@ public class DocumentPersistService { } } } - ApplicationCache.notify(Document.class); + CacheManager.notify(Document.class); } } }