From 7e20ce95c0f5ec811d89228b6720dec82326eca0 Mon Sep 17 00:00:00 2001 From: o2sword <171715986@qq.com> Date: Tue, 19 Oct 2021 10:06:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=85=E5=AE=B9=E7=AE=A1=E7=90=86=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E6=94=AF=E6=8C=81=E6=95=B0=E6=8D=AE=E6=98=A0=E5=B0=84?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E4=BA=86=E9=83=A8=E5=88=86=E8=AF=AD?= =?UTF-8?q?=E6=B3=95=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cms/assemble/control/ThisApplication.java | 2 +- .../control/jaxrs/appdict/BaseAction.java | 2 +- .../control/jaxrs/appdict/WrapOutAppDict.java | 4 +- .../jaxrs/appinfo/ActionAppInfoExport.java | 38 ++-- .../control/jaxrs/appinfo/BaseAction.java | 12 +- .../control/jaxrs/comment/ActionSave.java | 22 +-- .../document/ActionPersistPublishContent.java | 2 +- .../document/ActionPersistSaveDocument.java | 2 +- .../document/ActionQueryGetDocument.java | 4 +- .../document/ActionQueryGetDocumentData.java | 16 +- .../document/ActionQueryListDocumentData.java | 20 +- .../ActionQueryListDraftNextWithFilter.java | 8 +- .../ActionQueryListNextWithFilter.java | 50 ++--- .../ActionQueryListPrevWithFilter.java | 50 ++--- ...ActionQueryListViewRecordByFilterNext.java | 20 +- .../ActionQueryListViewRecordByPerson.java | 22 +-- .../ActionQueryListWithFilterPaging.java | 4 +- .../ActionQueryListWithFilterPagingAdmin.java | 4 +- .../document/ActionQueryViewDocument.java | 4 +- .../jaxrs/document/WrapInDocumentFilter.java | 180 +++++++++++++----- .../jaxrs/document/WrapOutDocumentList.java | 138 +++++++++++--- .../control/jaxrs/file/ActionListNext.java | 2 +- .../control/jaxrs/file/ActionListPrev.java | 4 +- .../control/jaxrs/file/ActionListWithApp.java | 4 +- .../control/jaxrs/fileinfo/ActionGet.java | 18 +- .../control/jaxrs/fileinfo/ActionListAll.java | 22 +-- .../jaxrs/fileinfo/ActionListByDocId.java | 4 +- .../control/jaxrs/form/ActionGet.java | 16 +- .../jaxrs/form/ActionGetWithAppInfo.java | 16 +- .../control/jaxrs/form/ActionListAll.java | 26 +-- .../control/jaxrs/form/ActionListByApp.java | 26 +-- .../jaxrs/form/ActionListNextWithFilter.java | 10 +- .../jaxrs/form/ActionListPrevWithFilter.java | 14 +- .../control/jaxrs/form/ActionSave.java | 4 +- .../assemble/control/jaxrs/log/ActionGet.java | 14 +- .../control/jaxrs/log/ActionListByAppId.java | 14 +- .../jaxrs/log/ActionListByCategory.java | 14 +- .../jaxrs/log/ActionListByDocument.java | 14 +- .../control/jaxrs/log/ActionListByLevel.java | 12 +- .../jaxrs/log/ActionListNextWithFilter.java | 6 +- .../control/jaxrs/log/ActionListPaging.java | 2 +- .../jaxrs/log/ActionListPrevWithFilter.java | 10 +- .../control/jaxrs/output/ActionList.java | 6 +- .../control/jaxrs/queryview/ActionFlag.java | 8 +- .../control/jaxrs/queryview/ActionList.java | 12 +- .../jaxrs/queryview/ActionListAll.java | 22 +-- .../jaxrs/queryviewdesign/ActionCreate.java | 36 ++-- .../jaxrs/queryviewdesign/ActionFlag.java | 2 +- .../jaxrs/queryviewdesign/ActionGet.java | 10 +- .../jaxrs/queryviewdesign/ActionListNext.java | 6 +- .../jaxrs/queryviewdesign/ActionListPrev.java | 6 +- .../ActionListWithApplication.java | 10 +- .../jaxrs/queryviewdesign/ActionUpdate.java | 44 ++--- .../control/jaxrs/script/ActionGet.java | 2 +- .../jaxrs/script/ActionGetWithAppAndName.java | 32 ++-- .../control/jaxrs/script/ActionListNext.java | 2 +- .../control/jaxrs/script/ActionListPrev.java | 6 +- .../script/ActionListWithApplication.java | 32 ++-- ...ActionListAppSearchFilterForDocStatus.java | 32 ++-- .../control/jaxrs/view/ActionGet.java | 14 +- .../control/jaxrs/view/ActionListAll.java | 28 +-- .../control/jaxrs/view/ActionListByApp.java | 22 +-- .../jaxrs/view/ActionListByCategory.java | 26 +-- .../control/jaxrs/view/ActionListByForm.java | 28 +-- .../view/ActionListNextPageViewData.java | 2 +- .../control/jaxrs/view/ActionSave.java | 4 +- .../control/jaxrs/viewcategory/ActionGet.java | 6 +- .../jaxrs/viewcategory/ActionListAll.java | 24 +-- .../viewcategory/ActionListByCategory.java | 24 +-- .../jaxrs/viewcategory/ActionListByView.java | 24 +-- .../jaxrs/viewcategory/ActionSave.java | 32 ++-- .../jaxrs/viewfieldconfig/ActionGet.java | 18 +- .../jaxrs/viewfieldconfig/ActionListAll.java | 26 +-- .../viewfieldconfig/ActionListByViewId.java | 24 +-- .../jaxrs/viewfieldconfig/ActionSave.java | 54 +++--- .../queue/QueueSendDocumentNotify.java | 4 +- .../control/service/CategoryInfoService.java | 125 ++++++------ .../CmsBatchOperationProcessService.java | 12 +- .../control/wrapin/WrapInTemplateForm.java | 4 +- .../assemble/control/wrapin/WrapInView.java | 4 +- .../control/wrapout/WrapFormSimple.java | 6 +- .../control/wrapout/WrapOutAppInfo.java | 6 +- .../control/wrapout/WrapOutFormField.java | 2 +- .../control/wrapout/WrapOutTemplateForm.java | 2 +- .../wrapout/WrapOutTemplateFormSimple.java | 4 +- .../assemble/control/wrapout/WrapOutView.java | 2 +- .../java/com/x/cms/core/entity/Document.java | 32 ++++ 87 files changed, 955 insertions(+), 728 deletions(-) diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/ThisApplication.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/ThisApplication.java index b136a9f81f..6673dbe213 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/ThisApplication.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/ThisApplication.java @@ -33,7 +33,7 @@ public class ThisApplication { // 执行数据库中的批处理操作 public static final QueueBatchOperation queueBatchOperation = new QueueBatchOperation(); // Document发布时，向所有阅读者推送通知 - public static QueueSendDocumentNotify queueSendDocumentNotify = new QueueSendDocumentNotify(); + public static final QueueSendDocumentNotify queueSendDocumentNotify = new QueueSendDocumentNotify(); // 执行文档的数据映射 public static final ProjectionExecuteQueue projectionExecuteQueue = new ProjectionExecuteQueue(); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appdict/BaseAction.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appdict/BaseAction.java index 37c1958273..1784559e6c 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appdict/BaseAction.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appdict/BaseAction.java @@ -20,7 +20,7 @@ import com.x.cms.core.entity.element.AppDictItem; abstract class BaseAction extends StandardJaxrsAction { static WrapCopier copier = WrapCopierFactory.wo(AppDict.class, - WrapOutAppDict.class, null, WrapOutAppDict.Excludes); + WrapOutAppDict.class, null, WrapOutAppDict.excludes); JsonElement get(Business business, AppDict appDict, String... paths) throws Exception { List list = business.getAppDictItemFactory().listWithAppDictWithPath(appDict.getId(), paths); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appdict/WrapOutAppDict.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appdict/WrapOutAppDict.java index 660fe13605..1dee41d931 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appdict/WrapOutAppDict.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appdict/WrapOutAppDict.java @@ -10,7 +10,7 @@ import com.x.processplatform.core.entity.element.ApplicationDict; public class WrapOutAppDict extends ApplicationDict { private static final long serialVersionUID = 49779311317884168L; - public static List Excludes = new ArrayList<>(JpaObject.FieldsInvisible); + public static List excludes = new ArrayList<>(JpaObject.FieldsInvisible); private JsonElement data; @@ -22,4 +22,4 @@ public class WrapOutAppDict extends ApplicationDict { this.data = data; } -} \ No newline at end of file +} diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionAppInfoExport.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionAppInfoExport.java index d8549de77f..c3289f28f5 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionAppInfoExport.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionAppInfoExport.java @@ -41,7 +41,7 @@ public class ActionAppInfoExport extends BaseAction { Wo wo = null; AppInfo appInfo = null; Boolean check = true; - + if( StringUtils.isEmpty(appInfoId) ){ check = false; Exception exception = new ExceptionAppInfoIdEmpty(); @@ -138,9 +138,9 @@ public class ActionAppInfoExport extends BaseAction { private static final long serialVersionUID = -5076990764713538973L; - public static List Excludes = new ArrayList<>(); + public static List excludes = new ArrayList<>(); - public static WrapCopier copier = WrapCopierFactory.wo( AppInfo.class, Wo.class, null, Wo.Excludes ); + public static final WrapCopier copier = WrapCopierFactory.wo( AppInfo.class, Wo.class, null, Wo.excludes ); @FieldDescribe("栏目内所有的分类信息列表") private List categories = null; @@ -216,9 +216,9 @@ public class ActionAppInfoExport extends BaseAction { private static final long serialVersionUID = -5076990764713538973L; - public static List Excludes = new ArrayList<>(); + public static List excludes = new ArrayList<>(); - public static WrapCopier copier = WrapCopierFactory.wo( CategoryInfo.class, WoCategory.class, null, WoCategory.Excludes ); + public static final WrapCopier copier = WrapCopierFactory.wo( CategoryInfo.class, WoCategory.class, null, WoCategory.excludes ); } @@ -229,9 +229,9 @@ public class ActionAppInfoExport extends BaseAction { private static final long serialVersionUID = -5076990764713538973L; - public static List Excludes = new ArrayList<>(); + public static List excludes = new ArrayList<>(); - public static WrapCopier copier = WrapCopierFactory.wo( Form.class, WoForm.class, null, WoForm.Excludes ); + public static final WrapCopier copier = WrapCopierFactory.wo( Form.class, WoForm.class, null, WoForm.excludes ); } @@ -242,9 +242,9 @@ public class ActionAppInfoExport extends BaseAction { private static final long serialVersionUID = -5076990764713538973L; - public static List Excludes = new ArrayList<>(); + public static List excludes = new ArrayList<>(); - public static WrapCopier< View, WoView > copier = WrapCopierFactory.wo( View.class, WoView.class, null, WoView.Excludes ); + public static final WrapCopier< View, WoView > copier = WrapCopierFactory.wo( View.class, WoView.class, null, WoView.excludes ); @FieldDescribe("列表视图内所有的列表列信息") private List fields = null; @@ -276,9 +276,9 @@ public class ActionAppInfoExport extends BaseAction { private static final long serialVersionUID = -5076990764713538973L; - public static List Excludes = new ArrayList<>(); + public static List excludes = new ArrayList<>(); - public static WrapCopier copier = WrapCopierFactory.wo( View.class, WoQueryView.class, null, WoQueryView.Excludes ); + public static final WrapCopier copier = WrapCopierFactory.wo( View.class, WoQueryView.class, null, WoQueryView.excludes ); } @@ -289,9 +289,9 @@ public class ActionAppInfoExport extends BaseAction { private static final long serialVersionUID = -5076990764713538973L; - public static List Excludes = new ArrayList<>(); + public static List excludes = new ArrayList<>(); - public static WrapCopier copier = WrapCopierFactory.wo( Script.class, WoScript.class, null, WoScript.Excludes ); + public static final WrapCopier copier = WrapCopierFactory.wo( Script.class, WoScript.class, null, WoScript.excludes ); } @@ -302,9 +302,9 @@ public class ActionAppInfoExport extends BaseAction { private static final long serialVersionUID = -5076990764713538973L; - public static List Excludes = new ArrayList<>(); + public static List excludes = new ArrayList<>(); - public static WrapCopier copier = WrapCopierFactory.wo( Script.class, WoScript.class, null, WoScript.Excludes ); + public static final WrapCopier copier = WrapCopierFactory.wo( Script.class, WoScript.class, null, WoScript.excludes ); @FieldDescribe("数据字典中所有的对象列表") private List items = null; @@ -317,9 +317,9 @@ public class ActionAppInfoExport extends BaseAction { private static final long serialVersionUID = -5076990764713538973L; - public static List Excludes = new ArrayList<>(); + public static List excludes = new ArrayList<>(); + + public static final WrapCopier copier = WrapCopierFactory.wo( AppDictItem.class, WoAppDictItem.class, null, WoAppDictItem.excludes ); - public static WrapCopier copier = WrapCopierFactory.wo( AppDictItem.class, WoAppDictItem.class, null, WoAppDictItem.Excludes ); - } -} \ No newline at end of file +} 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 fb77c25eb2..974c34b450 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 @@ -81,14 +81,14 @@ public class BaseAction extends StandardJaxrsAction { if( ListTools.isEmpty( viewableAppInfoIds )) { viewableAppInfoIds.add("NO_APPINFO"); } - + //根据人员的发布权限获取可以发布文档的分类信息ID列表 - viewableCategoryIds = permissionQueryService.listViewableCategoryIdByPerson( personName, isAnonymous, unitNames, groupNames, viewableAppInfoIds, + viewableCategoryIds = permissionQueryService.listViewableCategoryIdByPerson( personName, isAnonymous, unitNames, groupNames, viewableAppInfoIds, null, null, documentType, appType, maxCount, false ); } return composeCategoriesIntoAppInfo( viewableAppInfoIds, viewableCategoryIds, appType ); } - + /** * 当前登录者文档发布栏目分类列表查询
* 1、根据人员的发布权限获取可以发布文档的栏目信息ID列表
@@ -156,7 +156,7 @@ public class BaseAction extends StandardJaxrsAction { } } } - + //循环category_map，将category装配到app_map里相应的app里 Set category_set = category_map.keySet(); Iterator category_iterator = category_set.iterator(); @@ -180,7 +180,7 @@ public class BaseAction extends StandardJaxrsAction { } wo_app.getWrapOutCategoryList().add( woCategory ); app_map.put( wo_app.getId(), wo_app ); - + } //将app_map转移到List里返回 if( wraps == null ) { @@ -217,7 +217,7 @@ public class BaseAction extends StandardJaxrsAction { private static final long serialVersionUID = -5076990764713538973L; - public static List Excludes = new ArrayList(); + public static List excludes = new ArrayList(); @FieldDescribe("栏目下的分类信息列表") private List wrapOutCategoryList = null; 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 293e064b9e..77b6b30fac 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 @@ -32,7 +32,7 @@ public class ActionSave extends BaseAction { documentCommentInfo.setId( wi.getId());; documentCommentInfo.setCreatorName( effectivePerson.getDistinguishedName() ); documentCommentInfo.setAuditorName( "" ); - documentCommentInfo.setCommentAuditStatus( "通过" ); + documentCommentInfo.setCommentAuditStatus( "通过" ); } catch (Exception e) { check = false; Exception exception = new ExceptionCommentPersist(e, "系统在将JSON信息转换为对象时发生异常。JSON:" + jsonElement.toString()); @@ -62,11 +62,11 @@ public class ActionSave extends BaseAction { if (check) { try { documentCommentInfo = documentCommentInfoPersistService.save( documentCommentInfo, wi.getContent(), effectivePerson ); - + // 更新缓存 CacheManager.notify( Document.class ); CacheManager.notify( DocumentCommentInfo.class ); - + Wo wo = new Wo(); wo.setId( documentCommentInfo.getId() ); result.setData( wo ); @@ -78,13 +78,13 @@ public class ActionSave extends BaseAction { } } return result; - } + } public static class Wi { - + @FieldDescribe("评论ID") private String id = ""; - + @FieldDescribe("文档ID") private String documentId = ""; @@ -99,9 +99,9 @@ public class ActionSave extends BaseAction { @FieldDescribe("是否私信评论") private Boolean isPrivate = false; - - public static WrapCopier copier = WrapCopierFactory.wi( Wi.class, DocumentCommentInfo.class, null, null ); - + + public static final WrapCopier copier = WrapCopierFactory.wi( Wi.class, DocumentCommentInfo.class, null, null ); + public String getId() { return id; } @@ -153,5 +153,5 @@ public class ActionSave extends BaseAction { public static class Wo extends WoId { } - -} \ No newline at end of file + +} 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 c1f06473af..581cbc2d36 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 @@ -491,7 +491,7 @@ public class ActionPersistPublishContent extends BaseAction { public static class Wi { - public static WrapCopier copier = WrapCopierFactory.wi( Wi.class, Document.class, null, null); + public static final WrapCopier copier = WrapCopierFactory.wi( Wi.class, Document.class, null, null); private String id = null; diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistSaveDocument.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistSaveDocument.java index 1fef204086..cebdfa8429 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistSaveDocument.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistSaveDocument.java @@ -434,7 +434,7 @@ public class ActionPersistSaveDocument extends BaseAction { @FieldDescribe("业务数据String值03.") private String stringValue03; - public static WrapCopier copier = WrapCopierFactory.wi( Wi.class, Document.class, null, JpaObject.FieldsUnmodifyExcludeId); + public static final WrapCopier copier = WrapCopierFactory.wi( Wi.class, Document.class, null, JpaObject.FieldsUnmodifyExcludeId); public String getId() { return id; 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 498696e60c..6fecf3ac13 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 @@ -385,9 +385,9 @@ public class ActionQueryGetDocument extends BaseAction { private static final long serialVersionUID = -5076990764713538973L; - public static List Excludes = new ArrayList(); + public static List excludes = new ArrayList(); - public static WrapCopier copier = WrapCopierFactory.wo(Document.class, WoDocument.class, + public static final WrapCopier copier = WrapCopierFactory.wo(Document.class, WoDocument.class, null, JpaObject.FieldsInvisible); /** diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryGetDocumentData.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryGetDocumentData.java index 921dfaca44..b4faabf420 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryGetDocumentData.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryGetDocumentData.java @@ -27,7 +27,7 @@ public class ActionQueryGetDocumentData extends BaseAction { ActionResult result = new ActionResult<>(); Wo wo = getDocumentQueryResult(id); result.setData(wo); - return result; + return result; } private Wo getDocumentQueryResult(String id) throws Exception { @@ -86,15 +86,15 @@ public class ActionQueryGetDocumentData extends BaseAction { } } - + public static class WoDocument extends Document { - + private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo( Document.class, WoDocument.class, null,JpaObject.FieldsInvisible); + + public static List excludes = new ArrayList(); + + public static final WrapCopier copier = WrapCopierFactory.wo( Document.class, WoDocument.class, null,JpaObject.FieldsInvisible); } -} \ No newline at end of file +} diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListDocumentData.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListDocumentData.java index 1bae77793e..b2b3ee8a3a 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListDocumentData.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListDocumentData.java @@ -39,7 +39,7 @@ public class ActionQueryListDocumentData extends BaseAction { wos = getDocumentQueryResult(business, wi.getDocIds(), effectivePerson); } result.setData(wos); - return result; + return result; } private List getDocumentQueryResult(Business business, List ids, EffectivePerson effectivePerson) throws Exception { @@ -66,7 +66,7 @@ public class ActionQueryListDocumentData extends BaseAction { wos.add(wo); //} } - + return wos; } @@ -103,16 +103,16 @@ public class ActionQueryListDocumentData extends BaseAction { public void setData(Data data) { this.data = data; } - + } - + public static class WoDocument extends Document { - + private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo( Document.class, WoDocument.class, null,JpaObject.FieldsInvisible); + + public static List excludes = new ArrayList(); + + public static final WrapCopier copier = WrapCopierFactory.wo( Document.class, WoDocument.class, null,JpaObject.FieldsInvisible); } @@ -128,4 +128,4 @@ public class ActionQueryListDocumentData extends BaseAction { this.docIds = docIds; } } -} \ No newline at end of file +} 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 8d3fc5ce8e..fe7a774d64 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 @@ -92,7 +92,7 @@ public class ActionQueryListDraftNextWithFilter extends BaseAction { @FieldDescribe("作为过滤条件的CMS分类ID列表, 可多个, String数组.") private List categoryIdList; - + @FieldDescribe( "文档类型：全部 | 信息 | 数据" ) private String documentType = "信息"; @@ -117,9 +117,9 @@ public class ActionQueryListDraftNextWithFilter extends BaseAction { private static final long serialVersionUID = -5076990764713538973L; - public static List Excludes = new ArrayList(); + public static List excludes = new ArrayList(); - public static WrapCopier copier = WrapCopierFactory.wo(Document.class, Wo.class, null, + public static final WrapCopier copier = WrapCopierFactory.wo(Document.class, Wo.class, null, JpaObject.FieldsInvisible); /** @@ -155,4 +155,4 @@ public class ActionQueryListDraftNextWithFilter extends BaseAction { this.creatorTopUnitNameShort = creatorTopUnitNameShort; } } -} \ No newline at end of file +} diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListNextWithFilter.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListNextWithFilter.java index 49ecbe278c..218ac09ecf 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListNextWithFilter.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListNextWithFilter.java @@ -25,7 +25,7 @@ public class ActionQueryListNextWithFilter extends BaseAction { private static Logger logger = LoggerFactory.getLogger(ActionQueryListNextWithFilter.class); protected ActionResult> execute( HttpServletRequest request, String id, Integer count, JsonElement jsonElement, EffectivePerson effectivePerson ) { - ActionResult> result = new ActionResult<>(); + ActionResult> result = new ActionResult<>(); Long total = 0L; Wi wi = null; List wos = new ArrayList<>(); @@ -36,10 +36,10 @@ public class ActionQueryListNextWithFilter extends BaseAction { Boolean isManager = false; String personName = effectivePerson.getDistinguishedName(); QueryFilter queryFilter = null; - + if ( count == 0 ) { count = 20; } if ( StringUtils.isEmpty( id ) || "(0)".equals( id ) ) { id = null; } - + try { wi = this.convertToWrapIn( jsonElement, Wi.class ); } catch (Exception e ) { @@ -49,25 +49,25 @@ public class ActionQueryListNextWithFilter extends BaseAction { logger.error( e, effectivePerson, request, null); } if ( wi == null ) { wi = new Wi(); } - + if( StringUtils.isEmpty( wi.getDocumentType() )) { wi.setDocumentType( "信息" ); } - + if( StringUtils.isEmpty( wi.getOrderField() )) { wi.setOrderField( "createTime" ); } - + if( StringUtils.isEmpty( wi.getOrderType() )) { wi.setOrderType( "DESC" ); } - + if( ListTools.isEmpty( wi.getStatusList() )) { List status = new ArrayList<>(); status.add( "published" ); wi.setStatusList( status ); } - + if (check) { try { queryFilter = wi.getQueryFilter(); @@ -78,7 +78,7 @@ public class ActionQueryListNextWithFilter extends BaseAction { logger.error(e, effectivePerson, request, null); } } - + if( check ) { try { if( effectivePerson.isManager() || userManagerService.isHasPlatformRole( effectivePerson.getDistinguishedName(), "CMSManager" )) { @@ -91,7 +91,7 @@ public class ActionQueryListNextWithFilter extends BaseAction { logger.error(e, effectivePerson, request, null); } } - + if( check ) { //查询是否已读，需要使用相应的ID进行IN操作，效率有一些低 List readDocIds = null; @@ -133,7 +133,7 @@ public class ActionQueryListNextWithFilter extends BaseAction { } } } - + if (check) { // 从Review表中查询符合条件的对象总数 try { if( isManager ) { //直接从Document忽略权限查询 @@ -148,7 +148,7 @@ public class ActionQueryListNextWithFilter extends BaseAction { logger.error(e, effectivePerson, request, null); } } - + if (check) { //document和Review除了sequence还有5个排序列支持title, appAlias, categoryAlias, categoryName, creatorUnitName的分页查询 //除了sequence和title, appAlias, categoryAlias, categoryName, creatorUnitName之外，其他的列排序全部在内存进行分页 @@ -204,7 +204,7 @@ public class ActionQueryListNextWithFilter extends BaseAction { logger.error(e, effectivePerson, request, null); } } - + if (check) { if ( searchResultList != null ) { Wo wo = null; @@ -239,11 +239,11 @@ public class ActionQueryListNextWithFilter extends BaseAction { result.setCount(total); result.setData(wos); return result; - } + } public class DocumentCacheForFilter { - private Long total = 0L; + private Long total = 0L; private List documentList = null; public Long getTotal() { @@ -260,18 +260,18 @@ public class ActionQueryListNextWithFilter extends BaseAction { public void setDocumentList(List documentList) { this.documentList = documentList; - } + } } - + public static class Wi extends WrapInDocumentFilter{ - + } - + public static class Wo extends WrapOutDocumentList { - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo( Document.class, Wo.class, null,JpaObject.FieldsInvisible); - + + public static List excludes = new ArrayList(); + + public static final WrapCopier copier = WrapCopierFactory.wo( Document.class, Wo.class, null,JpaObject.FieldsInvisible); + } -} \ No newline at end of file +} diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListPrevWithFilter.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListPrevWithFilter.java index 733341ed3c..03dfa15cc8 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListPrevWithFilter.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListPrevWithFilter.java @@ -25,7 +25,7 @@ public class ActionQueryListPrevWithFilter extends BaseAction { private static Logger logger = LoggerFactory.getLogger(ActionQueryListPrevWithFilter.class); protected ActionResult> execute( HttpServletRequest request, String id, Integer count, JsonElement jsonElement, EffectivePerson effectivePerson ) { - ActionResult> result = new ActionResult<>(); + ActionResult> result = new ActionResult<>(); Long total = 0L; Wi wi = null; List wos = new ArrayList<>(); @@ -36,10 +36,10 @@ public class ActionQueryListPrevWithFilter extends BaseAction { Boolean isManager = false; String personName = effectivePerson.getDistinguishedName(); QueryFilter queryFilter = null; - + if ( count == 0 ) { count = 20; } if ( StringUtils.isEmpty( id ) || "(0)".equals( id ) ) { id = null; } - + try { wi = this.convertToWrapIn( jsonElement, Wi.class ); } catch (Exception e ) { @@ -49,25 +49,25 @@ public class ActionQueryListPrevWithFilter extends BaseAction { logger.error( e, effectivePerson, request, null); } if ( wi == null ) { wi = new Wi(); } - + if( StringUtils.isEmpty( wi.getDocumentType() )) { wi.setDocumentType( "信息" ); } - + if( StringUtils.isEmpty( wi.getOrderField() )) { wi.setOrderField( "createTime" ); } - + if( StringUtils.isEmpty( wi.getOrderType() )) { wi.setOrderType( "DESC" ); } - + if( ListTools.isEmpty( wi.getStatusList() )) { List status = new ArrayList<>(); status.add( "published" ); wi.setStatusList( status ); } - + if (check) { try { queryFilter = wi.getQueryFilter(); @@ -78,7 +78,7 @@ public class ActionQueryListPrevWithFilter extends BaseAction { logger.error(e, effectivePerson, request, null); } } - + if( check ) { try { if( effectivePerson.isManager() || userManagerService.isHasPlatformRole( effectivePerson.getDistinguishedName(), "CMSManager" )) { @@ -91,7 +91,7 @@ public class ActionQueryListPrevWithFilter extends BaseAction { logger.error(e, effectivePerson, request, null); } } - + if( check ) { //查询是否已读，需要使用相应的ID进行IN操作，效率有一些低 List readDocIds = null; @@ -133,7 +133,7 @@ public class ActionQueryListPrevWithFilter extends BaseAction { } } } - + if (check) { // 从Review表中查询符合条件的对象总数 try { if( isManager ) { //直接从Document忽略权限查询 @@ -148,7 +148,7 @@ public class ActionQueryListPrevWithFilter extends BaseAction { logger.error(e, effectivePerson, request, null); } } - + if (check) { //document和Review除了sequence还有5个排序列支持title, appAlias, categoryAlias, categoryName, creatorUnitName的分页查询 //除了sequence和title, appAlias, categoryAlias, categoryName, creatorUnitName之外，其他的列排序全部在内存进行分页 @@ -210,7 +210,7 @@ public class ActionQueryListPrevWithFilter extends BaseAction { logger.error(e, effectivePerson, request, null); } } - + if (check) { if ( searchResultList != null ) { Wo wo = null; @@ -245,11 +245,11 @@ public class ActionQueryListPrevWithFilter extends BaseAction { result.setCount(total); result.setData(wos); return result; - } + } public class DocumentCacheForFilter { - private Long total = 0L; + private Long total = 0L; private List documentList = null; public Long getTotal() { @@ -266,18 +266,18 @@ public class ActionQueryListPrevWithFilter extends BaseAction { public void setDocumentList(List documentList) { this.documentList = documentList; - } + } } - + public static class Wi extends WrapInDocumentFilter{ - + } - + public static class Wo extends WrapOutDocumentList { - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo( Document.class, Wo.class, null,JpaObject.FieldsInvisible); - + + public static List excludes = new ArrayList(); + + public static final WrapCopier copier = WrapCopierFactory.wo( Document.class, Wo.class, null,JpaObject.FieldsInvisible); + } -} \ No newline at end of file +} diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListViewRecordByFilterNext.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListViewRecordByFilterNext.java index cd77d48a21..97d056432c 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListViewRecordByFilterNext.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListViewRecordByFilterNext.java @@ -19,13 +19,13 @@ import com.x.cms.core.entity.DocumentViewRecord; public class ActionQueryListViewRecordByFilterNext extends BaseAction { private static Logger logger = LoggerFactory.getLogger( ActionQueryListViewRecordByFilterNext.class ); - + protected ActionResult> execute( HttpServletRequest request, EffectivePerson effectivePerson, String docId, String id, Integer count ) throws Exception { ActionResult> result = new ActionResult<>(); List wraps = null; List documentViewRecordList = null; Long total = null; - Boolean check = true; + Boolean check = true; if( check ){ if( StringUtils.isEmpty(docId) ){ @@ -34,7 +34,7 @@ public class ActionQueryListViewRecordByFilterNext extends BaseAction { result.error( exception ); } } - + if( check ){ try { total = documentViewRecordServiceAdv.countWithDocIds(docId); @@ -76,13 +76,13 @@ public class ActionQueryListViewRecordByFilterNext extends BaseAction { } return result; } - + public static class Wo extends DocumentViewRecord{ - + private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo( DocumentViewRecord.class, Wo.class, null, JpaObject.FieldsInvisible); + + public static List excludes = new ArrayList(); + + public static final WrapCopier copier = WrapCopierFactory.wo( DocumentViewRecord.class, Wo.class, null, JpaObject.FieldsInvisible); } -} \ No newline at end of file +} diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListViewRecordByPerson.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListViewRecordByPerson.java index b09186eea0..60b6568c86 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListViewRecordByPerson.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListViewRecordByPerson.java @@ -19,13 +19,13 @@ import com.x.cms.core.entity.DocumentViewRecord; public class ActionQueryListViewRecordByPerson extends BaseAction { private static Logger logger = LoggerFactory.getLogger( ActionQueryListViewRecordByPerson.class ); - + protected ActionResult> execute( HttpServletRequest request, EffectivePerson effectivePerson, String name ) throws Exception { ActionResult> result = new ActionResult<>(); List wraps = null; List ids = null; List documentViewRecordList = null; - Boolean check = true; + Boolean check = true; if( check ){ if( StringUtils.isEmpty(name) ){ @@ -34,7 +34,7 @@ public class ActionQueryListViewRecordByPerson extends BaseAction { result.error( exception ); } } - + if( check ){ try { ids = documentViewRecordServiceAdv.listByPerson( name, 100 ); @@ -45,7 +45,7 @@ public class ActionQueryListViewRecordByPerson extends BaseAction { logger.error( e, effectivePerson, request, null); } } - + if( check ){ if( ids != null && !ids.isEmpty() ){ try { @@ -75,13 +75,13 @@ public class ActionQueryListViewRecordByPerson extends BaseAction { } return result; } - + public static class Wo extends DocumentViewRecord{ - + private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo( DocumentViewRecord.class, Wo.class, null, JpaObject.FieldsInvisible); + + public static List excludes = new ArrayList(); + + public static final WrapCopier copier = WrapCopierFactory.wo( DocumentViewRecord.class, Wo.class, null, JpaObject.FieldsInvisible); } -} \ No newline at end of file +} diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListWithFilterPaging.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListWithFilterPaging.java index 3183fae59d..cb1831d50e 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListWithFilterPaging.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListWithFilterPaging.java @@ -188,9 +188,9 @@ public class ActionQueryListWithFilterPaging extends BaseAction { public static class Wo extends WrapOutDocumentList { - public static List Excludes = new ArrayList(); + public static List excludes = new ArrayList(); - public static WrapCopier copier = WrapCopierFactory.wo( Document.class, Wo.class, null,JpaObject.FieldsInvisible); + public static final WrapCopier copier = WrapCopierFactory.wo( Document.class, Wo.class, null,JpaObject.FieldsInvisible); } } diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListWithFilterPagingAdmin.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListWithFilterPagingAdmin.java index 5a2a8843fc..bb879a4f85 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListWithFilterPagingAdmin.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionQueryListWithFilterPagingAdmin.java @@ -155,9 +155,9 @@ public class ActionQueryListWithFilterPagingAdmin extends BaseAction { public static class Wo extends WrapOutDocumentList { - public static List Excludes = new ArrayList(); + public static List excludes = new ArrayList(); - public static WrapCopier copier = WrapCopierFactory.wo( Document.class, Wo.class, null,JpaObject.FieldsInvisible); + public static final WrapCopier copier = WrapCopierFactory.wo( Document.class, Wo.class, null,JpaObject.FieldsInvisible); } } 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 d887e99c4b..91efef9613 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 @@ -468,9 +468,9 @@ public class ActionQueryViewDocument extends BaseAction { private static final long serialVersionUID = -5076990764713538973L; - public static List Excludes = new ArrayList(); + public static List excludes = new ArrayList(); - public static WrapCopier copier = WrapCopierFactory.wo( Document.class, WoDocument.class, null,JpaObject.FieldsInvisible); + public static final WrapCopier copier = WrapCopierFactory.wo( Document.class, WoDocument.class, null,JpaObject.FieldsInvisible); /** * 只作显示用 diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/WrapInDocumentFilter.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/WrapInDocumentFilter.java index 52b5d6d6dd..4a4d191891 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/WrapInDocumentFilter.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/WrapInDocumentFilter.java @@ -2,6 +2,7 @@ package com.x.cms.assemble.control.jaxrs.document; import com.x.base.core.project.annotation.FieldDescribe; import com.x.base.core.project.tools.ListTools; +import com.x.cms.core.entity.Document; import com.x.cms.core.express.tools.DateOperation; import com.x.cms.core.express.tools.filter.QueryFilter; import com.x.cms.core.express.tools.filter.term.*; @@ -12,55 +13,55 @@ import java.util.Date; import java.util.List; public class WrapInDocumentFilter { - + @FieldDescribe( "排序列名" ) private String orderField = "publishTime"; - + @FieldDescribe( "排序方式：ASC|DESC." ) private String orderType = "DESC"; - + @FieldDescribe( "是否需要查询数据，默认不查询." ) private Boolean needData = false; - + @FieldDescribe( "是否已读：ALL|READ|UNREAD." ) private String readFlag = "ALL"; - + @FieldDescribe( "是否置顶：ALL|TOP|UNTOP." ) private String topFlag = "ALL"; - + @FieldDescribe( "只查询minutes分钟之类发布的文档，值为null或者为0时不作限制" ) private Integer minutes = null; - + @FieldDescribe( "作为过滤条件的CMS应用ID列表, 可多个, String数组." ) private List appIdList; - + @FieldDescribe( "作为过滤条件的CMS应用名称列表, 可多个, String数组." ) private List appNameList; - + @FieldDescribe( "作为过滤条件的CMS应用别名列表, 可多个, String数组." ) private List appAliasList; - + @FieldDescribe( "作为过滤条件的CMS分类ID列表, 可多个, String数组." ) private List categoryIdList; @FieldDescribe( "作为过滤条件的CMS分类名称列表, 可多个, String数组." ) private List categoryNameList; - + @FieldDescribe( "作为过滤条件的CMS分类别名列表, 可多个, String数组." ) private List categoryAliasList; - + @FieldDescribe( "作为过滤条件的创建者姓名列表, 可多个, String数组." ) private List creatorList; @FieldDescribe( "作为过滤条件的文档状态列表, 可多个, String数组，值：published | draft | archived" ) private List statusList; - + @FieldDescribe( "创建日期列表，可以传入1个(开始时间)或者2个(开始和结束时间), String, yyyy-mm-dd." ) private List createDateList; // - + @FieldDescribe( "发布日期列表，可以传入1个(开始时间)或者2个(开始和结束时间), String, yyyy-mm-dd." ) private List publishDateList; // - + @FieldDescribe( "作为过滤条件的发布者所属组织, 可多个, String数组." ) private List creatorUnitNameList; @@ -68,11 +69,29 @@ public class WrapInDocumentFilter { private String documentType = "信息"; @FieldDescribe( "作为过滤条件的CMS文档关键字, 通常是标题, String, 模糊查询." ) - private String title; + private String title; @FieldDescribe("文件导入的批次号：一般是分类ID+时间缀") private String importBatchName; - + + @FieldDescribe("业务数据String值01.") + private String stringValue01; + + @FieldDescribe("业务数据String值02.") + private String stringValue02; + + @FieldDescribe("业务数据String值03.") + private String stringValue03; + + @FieldDescribe("业务数据String值04.") + private String stringValue04; + + @FieldDescribe("业务数据Long值01.") + private Long longValue01; + + @FieldDescribe("业务数据Long值02.") + private Long longValue02; + public String getTopFlag() { return topFlag; } @@ -144,7 +163,7 @@ public class WrapInDocumentFilter { public void setStatusList(List statusList) { this.statusList = statusList; } - + public List getCreateDateList() { return createDateList == null?new ArrayList<>():createDateList; } @@ -152,7 +171,7 @@ public class WrapInDocumentFilter { public void setCreateDateList(List createDateList) { this.createDateList = createDateList; } - + public String getTitle() { return title; } @@ -208,7 +227,7 @@ public class WrapInDocumentFilter { public void setDocumentType(String documentType) { this.documentType = documentType; } - + public Boolean getNeedData() { return needData; } @@ -216,7 +235,7 @@ public class WrapInDocumentFilter { public void setNeedData(Boolean needData) { this.needData = needData; } - + public List getAppNameList() { return appNameList; } @@ -233,42 +252,90 @@ public class WrapInDocumentFilter { this.categoryNameList = categoryNameList; } + public String getStringValue01() { + return stringValue01; + } + + public void setStringValue01(String stringValue01) { + this.stringValue01 = stringValue01; + } + + public String getStringValue02() { + return stringValue02; + } + + public void setStringValue02(String stringValue02) { + this.stringValue02 = stringValue02; + } + + public String getStringValue03() { + return stringValue03; + } + + public void setStringValue03(String stringValue03) { + this.stringValue03 = stringValue03; + } + + public String getStringValue04() { + return stringValue04; + } + + public void setStringValue04(String stringValue04) { + this.stringValue04 = stringValue04; + } + + public Long getLongValue01() { + return longValue01; + } + + public void setLongValue01(Long longValue01) { + this.longValue01 = longValue01; + } + + public Long getLongValue02() { + return longValue02; + } + + public void setLongValue02(Long longValue02) { + this.longValue02 = longValue02; + } + /** * 根据传入的查询参数，组织一个完整的QueryFilter对象 * @return - * @throws Exception + * @throws Exception */ public QueryFilter getQueryFilter() throws Exception { - QueryFilter queryFilter = new QueryFilter(); + QueryFilter queryFilter = new QueryFilter(); queryFilter.setJoinType( "and" ); - + //组织查询条件对象 if( StringUtils.isNotEmpty( this.getTitle() )) { queryFilter.addLikeTerm( new LikeTerm( "title", this.getTitle() ) ); } - + //文档类型：全部 | 信息 | 数据 - if( StringUtils.isNotEmpty( this.getDocumentType())) { + if( StringUtils.isNotEmpty( this.getDocumentType())) { if( "信息".equals( this.getDocumentType() )) { queryFilter.addEqualsTerm( new EqualsTerm( "documentType", this.getDocumentType() ) ); }else if( "数据".equals( this.getDocumentType() )) { queryFilter.addEqualsTerm( new EqualsTerm( "documentType", this.getDocumentType() ) ); } } - + //是否置顶：ALL|TOP|UNTOP - if( StringUtils.isNotEmpty( this.getTopFlag())) { + if( StringUtils.isNotEmpty( this.getTopFlag())) { if( "TOP".equals( this.getTopFlag() )) { queryFilter.addIsTrueTerm( new IsTrueTerm( "isTop" ) ); }else if( "UNTOP".equals( this.getTopFlag() )) { queryFilter.addIsFalseTerm( new IsFalseTerm( "isTop" ) ); } } - + if( StringUtils.isNotEmpty( this.getImportBatchName())) { queryFilter.addEqualsTerm( new EqualsTerm( "importBatchName", this.getImportBatchName() ) ); } - + if( ListTools.isNotEmpty( this.getAppAliasList())) { if( this.getAppAliasList().size() == 1 ) { //如果只有一个值，就不要用IN，直接使用equals queryFilter.addEqualsTerm( new EqualsTerm( "appAlias", this.getAppAliasList().get(0) ) ); @@ -276,7 +343,7 @@ public class WrapInDocumentFilter { queryFilter.addInTerm( new InTerm( "appAlias", new ArrayList<>( this.getAppAliasList() ) ) ); } } - + if( ListTools.isNotEmpty( this.getAppNameList())) { if( this.getAppNameList().size() == 1 ) { //如果只有一个值，就不要用IN，直接使用equals queryFilter.addEqualsTerm( new EqualsTerm( "appName", this.getAppNameList().get(0) ) ); @@ -284,7 +351,7 @@ public class WrapInDocumentFilter { queryFilter.addInTerm( new InTerm( "appName", new ArrayList<>( this.getAppNameList() ) ) ); } } - + if( ListTools.isNotEmpty( this.getAppIdList())) { if( this.getAppIdList().size() == 1 ) { //如果只有一个值，就不要用IN，直接使用equals queryFilter.addEqualsTerm( new EqualsTerm( "appId", this.getAppIdList().get(0) ) ); @@ -292,7 +359,7 @@ public class WrapInDocumentFilter { queryFilter.addInTerm( new InTerm( "appId", new ArrayList<>( this.getAppIdList() ) ) ); } } - + if( ListTools.isNotEmpty( this.getCategoryAliasList())) { if( this.getCategoryAliasList().size() == 1 ) { //如果只有一个值，就不要用IN，直接使用equals queryFilter.addEqualsTerm( new EqualsTerm( "categoryAlias", this.getCategoryAliasList().get(0) ) ); @@ -300,7 +367,7 @@ public class WrapInDocumentFilter { queryFilter.addInTerm( new InTerm( "categoryAlias", new ArrayList<>( this.getCategoryAliasList() ) ) ); } } - + if( ListTools.isNotEmpty( this.getCategoryNameList())) { if( this.getCategoryNameList().size() == 1 ) { //如果只有一个值，就不要用IN，直接使用equals queryFilter.addEqualsTerm( new EqualsTerm( "categoryName", this.getCategoryNameList().get(0) ) ); @@ -308,7 +375,7 @@ public class WrapInDocumentFilter { queryFilter.addInTerm( new InTerm( "categoryName", new ArrayList<>( this.getCategoryNameList() ) ) ); } } - + if( ListTools.isNotEmpty( this.getCategoryIdList())) { if( this.getCategoryIdList().size() == 1 ) { //如果只有一个值，就不要用IN，直接使用equals queryFilter.addEqualsTerm( new EqualsTerm( "categoryId", this.getCategoryIdList().get(0) ) ); @@ -316,7 +383,7 @@ public class WrapInDocumentFilter { queryFilter.addInTerm( new InTerm( "categoryId", new ArrayList<>( this.getCategoryIdList() ) ) ); } } - + if( ListTools.isNotEmpty( this.getCreatorList())) { if( this.getCreatorList().size() == 1 ) { //如果只有一个值，就不要用IN，直接使用equals queryFilter.addEqualsTerm( new EqualsTerm( "creatorPerson", this.getCreatorList().get(0) ) ); @@ -324,7 +391,7 @@ public class WrapInDocumentFilter { queryFilter.addInTerm( new InTerm( "creatorPerson", new ArrayList<>( this.getCreatorList() ) ) ); } } - + if( ListTools.isNotEmpty( this.getCreatorUnitNameList())) { if( this.getCreatorUnitNameList().size() == 1 ) { //如果只有一个值，就不要用IN，直接使用equals queryFilter.addEqualsTerm( new EqualsTerm( "creatorUnitName", this.getCreatorUnitNameList().get(0) ) ); @@ -342,12 +409,12 @@ public class WrapInDocumentFilter { }else { queryFilter.addEqualsTerm( new EqualsTerm( "docStatus", "published" ) ); } - + if( ListTools.isNotEmpty( this.getCreateDateList())) { Date startDate = null; Date endDate = null; - - if ( this.getCreateDateList().size() == 1 ) { // 从开始时间（yyyy-MM-DD），到现在 + + if ( this.getCreateDateList().size() == 1 ) { // 从开始时间（yyyy-MM-DD），到现在 try { startDate = DateOperation.getDateFromString( this.getCreateDateList().get(0).toString() ); endDate = new Date(); @@ -365,7 +432,7 @@ public class WrapInDocumentFilter { } } } - + if( ListTools.isNotEmpty( this.getPublishDateList())) { Date startDate = null; Date endDate = null; @@ -386,12 +453,37 @@ public class WrapInDocumentFilter { throw new Exception( "Timestamp ‘publishDate’ can not format to date, style with: yyyy-MM-DD, data:" + this.getCreateDateList().get(0).toString() + " and " + this.getCreateDateList().get(1).toString() ); } } - } - + } + if( this.getMinutes() != null && this.getMinutes() > 0 ) { queryFilter.addDateBetweenTerm( "publishTime", new Date ( new Date().getTime() - minutes*60*1000L ), new Date() ); } + + if( StringUtils.isNotEmpty( this.getStringValue01())) { + queryFilter.addEqualsTerm( new EqualsTerm(Document.stringValue01_FIELDNAME, this.getStringValue01() ) ); + } + + if( StringUtils.isNotEmpty( this.getStringValue02())) { + queryFilter.addEqualsTerm( new EqualsTerm(Document.stringValue02_FIELDNAME, this.getStringValue02() ) ); + } + + if( StringUtils.isNotEmpty( this.getStringValue03())) { + queryFilter.addEqualsTerm( new EqualsTerm(Document.stringValue03_FIELDNAME, this.getStringValue03() ) ); + } + + if( StringUtils.isNotEmpty( this.getStringValue04())) { + queryFilter.addEqualsTerm( new EqualsTerm(Document.stringValue04_FIELDNAME, this.getStringValue04() ) ); + } + + if( this.getLongValue01() != null) { + queryFilter.addEqualsTerm( new EqualsTerm(Document.longValue01_FIELDNAME, this.getLongValue01() ) ); + } + + if( this.getLongValue02() != null) { + queryFilter.addEqualsTerm( new EqualsTerm(Document.longValue02_FIELDNAME, this.getLongValue02() ) ); + } + return queryFilter; } - + } diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/WrapOutDocumentList.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/WrapOutDocumentList.java index eeb81a16ab..b44f55581b 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/WrapOutDocumentList.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/WrapOutDocumentList.java @@ -9,46 +9,46 @@ import com.x.base.core.project.gson.GsonPropertyObject; import com.x.cms.core.entity.Document; public class WrapOutDocumentList extends GsonPropertyObject { - + @FieldDescribe( "sequence." ) private String sequence; - + @FieldDescribe( "文档ID." ) private String id = Document.createId(); @FieldDescribe( "创建时间" ) private Date createTime; - + @FieldDescribe("文档发布时间") private Date publishTime; @FieldDescribe( "最近修改时间" ) private Date updateTime; - + @FieldDescribe("文档摘要") private String summary; - + @FieldDescribe("文档标题") private String title; - + @FieldDescribe("文件导入的批次号：一般是分类ID+时间缀") private String importBatchName; - + @FieldDescribe("说明备注，可以填写说明信息，如导入信息检验失败原因等") private String description = null; - + @FieldDescribe( "分类唯一标识" ) private String categoryAlias; - + @FieldDescribe( "分类名称" ) private String categoryName; - + @FieldDescribe( "栏目ID" ) private String appId; - + @FieldDescribe( "分类ID" ) private String categoryId; - + @FieldDescribe("创建人，可能为空，如果由系统创建。") private String creatorPerson; @@ -60,41 +60,65 @@ public class WrapOutDocumentList extends GsonPropertyObject { @FieldDescribe("文档状态: published | draft") private String docStatus = "draft"; - + @FieldDescribe("文档被查看次数") private Long viewCount = 0L; - + @FieldDescribe("文档被评论次数") private Long commentCount = 0L; - + @FieldDescribe("文档被点赞次数") - private Long commendCount = 0L; - + private Long commendCount = 0L; + @FieldDescribe("是否含有首页图片") private Boolean hasIndexPic = false; @FieldDescribe("首页图片列表") - private List pictureList; - + private List pictureList; + @FieldDescribe("文档所有数据信息.") private Map data; - + @FieldDescribe( "是否置顶." ) private Boolean isTop; @FieldDescribe( "是否全员可读." ) private Boolean isAllRead; - + + @FieldDescribe("业务数据String值01.") + private String stringValue01; + + @FieldDescribe("业务数据String值02.") + private String stringValue02; + + @FieldDescribe("业务数据String值03.") + private String stringValue03; + + @FieldDescribe("业务数据String值04.") + private String stringValue04; + + @FieldDescribe("业务数据Long值01.") + private Long longValue01; + + @FieldDescribe("业务数据Long值02.") + private Long longValue02; + + @FieldDescribe("业务数据DateTime值01.") + private Date dateTimeValue01; + + @FieldDescribe("业务数据DateTime值02.") + private Date dateTimeValue02; + /** * 只作显示用 */ private String creatorPersonShort = null; - + private String creatorUnitNameShort = null; - + private String creatorTopUnitNameShort = null; - + public String getImportBatchName() { return importBatchName; } @@ -166,7 +190,7 @@ public class WrapOutDocumentList extends GsonPropertyObject { public String getCreatorPerson() { return creatorPerson; } - + public String getDocStatus() { return docStatus; } @@ -318,4 +342,68 @@ public class WrapOutDocumentList extends GsonPropertyObject { public void setIsAllRead(Boolean isAllRead) { this.isAllRead = isAllRead; } + + public String getStringValue01() { + return stringValue01; + } + + public void setStringValue01(String stringValue01) { + this.stringValue01 = stringValue01; + } + + public String getStringValue02() { + return stringValue02; + } + + public void setStringValue02(String stringValue02) { + this.stringValue02 = stringValue02; + } + + public String getStringValue03() { + return stringValue03; + } + + public void setStringValue03(String stringValue03) { + this.stringValue03 = stringValue03; + } + + public String getStringValue04() { + return stringValue04; + } + + public void setStringValue04(String stringValue04) { + this.stringValue04 = stringValue04; + } + + public Long getLongValue01() { + return longValue01; + } + + public void setLongValue01(Long longValue01) { + this.longValue01 = longValue01; + } + + public Long getLongValue02() { + return longValue02; + } + + public void setLongValue02(Long longValue02) { + this.longValue02 = longValue02; + } + + public Date getDateTimeValue01() { + return dateTimeValue01; + } + + public void setDateTimeValue01(Date dateTimeValue01) { + this.dateTimeValue01 = dateTimeValue01; + } + + public Date getDateTimeValue02() { + return dateTimeValue02; + } + + public void setDateTimeValue02(Date dateTimeValue02) { + this.dateTimeValue02 = dateTimeValue02; + } } diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/file/ActionListNext.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/file/ActionListNext.java index 3a230addd2..35f77f66e0 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/file/ActionListNext.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/file/ActionListNext.java @@ -25,7 +25,7 @@ class ActionListNext extends BaseAction { private static final long serialVersionUID = -7495725325510376323L; - public static WrapCopier copier = WrapCopierFactory.wo(File.class, Wo.class, null, + public static final WrapCopier copier = WrapCopierFactory.wo(File.class, Wo.class, null, ListTools.toList(JpaObject.FieldsInvisible, File.data_FIELDNAME)); @FieldDescribe("排序号") diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/file/ActionListPrev.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/file/ActionListPrev.java index 9c6b26fdcf..a221c5e8a6 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/file/ActionListPrev.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/file/ActionListPrev.java @@ -25,7 +25,7 @@ class ActionListPrev extends BaseAction { private static final long serialVersionUID = -7495725325510376323L; - public static WrapCopier copier = WrapCopierFactory.wo(File.class, Wo.class, null, + public static final WrapCopier copier = WrapCopierFactory.wo(File.class, Wo.class, null, ListTools.toList(JpaObject.FieldsInvisible, File.data_FIELDNAME)); @FieldDescribe("排序号") @@ -50,4 +50,4 @@ class ActionListPrev extends BaseAction { this.contentType = contentType; } } -} \ No newline at end of file +} diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/file/ActionListWithApp.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/file/ActionListWithApp.java index c15915f703..6a9d9f072e 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/file/ActionListWithApp.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/file/ActionListWithApp.java @@ -40,8 +40,8 @@ class ActionListWithApp extends BaseAction { private static final long serialVersionUID = -7495725325510376323L; - public static WrapCopier copier = WrapCopierFactory.wo(File.class, Wo.class, null, + public static final WrapCopier copier = WrapCopierFactory.wo(File.class, Wo.class, null, ListTools.toList(JpaObject.FieldsInvisible, File.data_FIELDNAME)); } -} \ No newline at end of file +} 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 dd01f0bfd9..1f36b3cf84 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 @@ -22,7 +22,7 @@ import com.x.cms.core.entity.FileInfo; import net.sf.ehcache.Element; public class ActionGet extends BaseAction { - + protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, String id, String documentId ) throws Exception { ActionResult result = new ActionResult<>(); Wo wrap = null; @@ -41,7 +41,7 @@ public class ActionGet extends BaseAction { if (null == document) { throw new Exception("document{id:" + documentId + "} not existed."); } - attachmentIds = fileInfoServiceAdv.listIdsWithDocId(documentId); + attachmentIds = fileInfoServiceAdv.listIdsWithDocId(documentId); if ( attachmentIds == null || !attachmentIds.contains(id)) { throw new Exception("document{id" + documentId + "} not contian attachment{id:" + id + "}."); } @@ -57,16 +57,16 @@ public class ActionGet extends BaseAction { th.printStackTrace(); result.error(th); } - } + } return result; } public static class Wo extends FileInfo { - + private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo( FileInfo.class, Wo.class, null, JpaObject.FieldsInvisible); + + public static List excludes = new ArrayList(); + + public static final WrapCopier copier = WrapCopierFactory.wo( FileInfo.class, Wo.class, null, JpaObject.FieldsInvisible); } -} \ No newline at end of file +} 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 f7a40e1759..7bdf25d540 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 @@ -24,7 +24,7 @@ import com.x.cms.core.entity.FileInfo; 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<>(); @@ -37,12 +37,12 @@ public class ActionListAll extends BaseAction { wraps = ( List ) optional.get(); result.setData(wraps); } else { - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - Business business = new Business(emc); + try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { + Business business = new Business(emc); //如判断用户是否有查看所有文件或者附件的权限，如果没权限不允许继续操作 if (!business.fileInfoEditAvailable( effectivePerson )) { throw new Exception("person{name:" + effectivePerson.getDistinguishedName() + "} 用户没有查询全部文件或者附件的权限！"); - } + } //如果有权限，继续操作 FileInfoFactory fileInfoFactory = business.getFileInfoFactory(); List ids = fileInfoFactory.listAll();//获取所有文件或者附件列表 @@ -56,16 +56,16 @@ public class ActionListAll extends BaseAction { result.error(th); } } - + return result; } public static class Wo extends FileInfo { - + private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo( FileInfo.class, Wo.class, null,JpaObject.FieldsInvisible); + + public static List excludes = new ArrayList(); + + public static final WrapCopier copier = WrapCopierFactory.wo( FileInfo.class, Wo.class, null,JpaObject.FieldsInvisible); } -} \ No newline at end of file +} 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 2e32761525..a3775565b1 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 @@ -86,7 +86,7 @@ public class ActionListByDocId extends BaseAction { private static final long serialVersionUID = -5076990764713538973L; - public static List Excludes = new ArrayList(); + public static List excludes = new ArrayList(); private WoControl control = new WoControl(); @@ -98,7 +98,7 @@ public class ActionListByDocId extends BaseAction { this.control = control; } - public static WrapCopier copier = WrapCopierFactory.wo( FileInfo.class, Wo.class, null, JpaObject.FieldsInvisible); + public static final WrapCopier copier = WrapCopierFactory.wo( FileInfo.class, Wo.class, null, JpaObject.FieldsInvisible); } public static class WoControl extends GsonPropertyObject { 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 508d9db8a4..dfb0c010fb 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 @@ -22,11 +22,11 @@ import com.x.cms.core.entity.element.Form; import net.sf.ehcache.Element; public class ActionGet extends BaseAction { - + protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, String id ) throws Exception { ActionResult result = new ActionResult<>(); Wo wo = null; - + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), id ); Optional optional = CacheManager.get(cacheCategory, cacheKey ); @@ -51,13 +51,13 @@ public class ActionGet extends BaseAction { } return result; } - + public static class Wo extends Form { - + private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - public static WrapCopier copier = WrapCopierFactory.wo(Form.class, Wo.class, null, JpaObject.FieldsInvisible); + public static List excludes = new ArrayList(); + + public static final WrapCopier copier = WrapCopierFactory.wo(Form.class, Wo.class, null, JpaObject.FieldsInvisible); } -} \ No newline at end of file +} 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 2484ee83bb..667557a7e1 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 @@ -22,11 +22,11 @@ import com.x.cms.core.entity.element.Form; import net.sf.ehcache.Element; public class ActionGetWithAppInfo extends BaseAction { - + protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, String appFlag, String formFlag ) throws Exception { ActionResult result = new ActionResult<>(); Wo wo = null; - + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), formFlag, appFlag ); Optional optional = CacheManager.get(cacheCategory, cacheKey ); @@ -55,13 +55,13 @@ public class ActionGetWithAppInfo extends BaseAction { } return result; } - + public static class Wo extends Form { - + private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - public static WrapCopier copier = WrapCopierFactory.wo(Form.class, Wo.class, null, JpaObject.FieldsInvisible); + public static List excludes = new ArrayList(); + + public static final WrapCopier copier = WrapCopierFactory.wo(Form.class, Wo.class, null, JpaObject.FieldsInvisible); } -} \ No newline at end of file +} 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 9760092ba1..15e11f8f18 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 @@ -23,12 +23,12 @@ import com.x.cms.core.entity.element.Form; 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; - + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass() ); Optional optional = CacheManager.get(cacheCategory, cacheKey ); @@ -50,22 +50,22 @@ public class ActionListAll extends BaseAction { result.error(th); } } - + return result; } - + public static class Wo extends Form { - + private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - public static WrapCopier copier = WrapCopierFactory.wo(Form.class, Wo.class, null,JpaObject.FieldsInvisible); - + public static List excludes = new ArrayList(); + + public static final WrapCopier copier = WrapCopierFactory.wo(Form.class, Wo.class, null,JpaObject.FieldsInvisible); + static { - Excludes.add("data"); - Excludes.add("mobileData"); + excludes.add("data"); + excludes.add("mobileData"); } - + } -} \ No newline at end of file +} 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 da749ce7f1..686239b642 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 @@ -23,12 +23,12 @@ import com.x.cms.core.entity.element.Form; import net.sf.ehcache.Element; public class ActionListByApp extends BaseAction { - + @SuppressWarnings("unchecked") protected ActionResult> execute( HttpServletRequest request, EffectivePerson effectivePerson, String appId ) throws Exception { ActionResult> result = new ActionResult<>(); List wraps = null; - + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), appId ); Optional optional = CacheManager.get(cacheCategory, cacheKey ); @@ -53,22 +53,22 @@ public class ActionListByApp extends BaseAction { result.error(th); } } - + return result; } - + public static class Wo extends Form { - + private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - public static WrapCopier copier = WrapCopierFactory.wo(Form.class, Wo.class, null, JpaObject.FieldsInvisible); - + public static List excludes = new ArrayList(); + + public static final WrapCopier copier = WrapCopierFactory.wo(Form.class, Wo.class, null, JpaObject.FieldsInvisible); + static { - Excludes.add("data"); - Excludes.add("mobileData"); + excludes.add("data"); + excludes.add("mobileData"); } - + } -} \ No newline at end of file +} diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/form/ActionListNextWithFilter.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/form/ActionListNextWithFilter.java index 74f368b78f..0e9b3c3540 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/form/ActionListNextWithFilter.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/form/ActionListNextWithFilter.java @@ -33,7 +33,7 @@ public class ActionListNextWithFilter extends BaseAction { LikeTerms likes = new LikeTerms(); Wi wrapIn = null; Boolean check = true; - WrapCopier copier = WrapCopierFactory.wo(Form.class, Wo.class, null, Wo.Excludes); + WrapCopier copier = WrapCopierFactory.wo(Form.class, Wo.class, null, Wo.excludes); try { wrapIn = this.convertToWrapIn(jsonElement, Wi.class); @@ -76,9 +76,9 @@ public class ActionListNextWithFilter extends BaseAction { private static final long serialVersionUID = -5076990764713538973L; - public static List Excludes = new ArrayList(); + public static List excludes = new ArrayList(); - public static WrapCopier copier = WrapCopierFactory.wo(Form.class, Wo.class, null, + public static final WrapCopier copier = WrapCopierFactory.wo(Form.class, Wo.class, null, JpaObject.FieldsInvisible); } @@ -131,7 +131,7 @@ public class ActionListNextWithFilter extends BaseAction { public void setStatusList(List statusList) { this.statusList = statusList; } - + public String getKey() { return key; } @@ -141,4 +141,4 @@ public class ActionListNextWithFilter extends BaseAction { } } -} \ No newline at end of file +} diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/form/ActionListPrevWithFilter.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/form/ActionListPrevWithFilter.java index 25502894ce..d2b3be4cf2 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/form/ActionListPrevWithFilter.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/form/ActionListPrevWithFilter.java @@ -33,7 +33,7 @@ public class ActionListPrevWithFilter extends BaseAction { LikeTerms likes = new LikeTerms(); Wi wrapIn = null; Boolean check = true; - WrapCopier copier = WrapCopierFactory.wo(Form.class, Wo.class, null, Wo.Excludes); + WrapCopier copier = WrapCopierFactory.wo(Form.class, Wo.class, null, Wo.excludes); try { wrapIn = this.convertToWrapIn(jsonElement, Wi.class); } catch (Exception e) { @@ -80,13 +80,13 @@ public class ActionListPrevWithFilter extends BaseAction { public void setRank(Long rank) { this.rank = rank; - } - + } + private static final long serialVersionUID = -5076990764713538973L; - public static List Excludes = new ArrayList(); + public static List excludes = new ArrayList(); - public static WrapCopier copier = WrapCopierFactory.wo(Form.class, Wo.class, null, + public static final WrapCopier copier = WrapCopierFactory.wo(Form.class, Wo.class, null, JpaObject.FieldsInvisible); } @@ -107,7 +107,7 @@ public class ActionListPrevWithFilter extends BaseAction { @FieldDescribe("用于标题搜索的关键字.") private String key; - + public List getAppIdList() { return appIdList; } @@ -149,4 +149,4 @@ public class ActionListPrevWithFilter extends BaseAction { } } -} \ No newline at end of file +} diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/form/ActionSave.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/form/ActionSave.java index 161469e8ec..d0799d0c55 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/form/ActionSave.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/form/ActionSave.java @@ -116,9 +116,9 @@ public class ActionSave extends BaseAction { private static final long serialVersionUID = -5076990764713538973L; - public static List Excludes = new ArrayList(JpaObject.FieldsUnmodify); + public static List excludes = new ArrayList(JpaObject.FieldsUnmodify); - public static WrapCopier copier = WrapCopierFactory.wi(Wi.class, Form.class, null, + public static final WrapCopier copier = WrapCopierFactory.wi(Wi.class, Form.class, null, JpaObject.FieldsUnmodify); @FieldDescribe("关联表单") diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/log/ActionGet.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/log/ActionGet.java index 5d400bd572..a7891921ab 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/log/ActionGet.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/log/ActionGet.java @@ -16,7 +16,7 @@ import com.x.cms.assemble.control.Business; import com.x.cms.core.entity.Log; public class ActionGet extends BaseAction { - + protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, String id ) throws Exception { ActionResult result = new ActionResult<>(); Wo wo = null; @@ -34,13 +34,13 @@ public class ActionGet extends BaseAction { } return result; } - + public static class Wo extends Log{ - + private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - public static WrapCopier copier = WrapCopierFactory.wo( Log.class, Wo.class, null, JpaObject.FieldsInvisible); + public static List excludes = new ArrayList(); + + public static final WrapCopier copier = WrapCopierFactory.wo( Log.class, Wo.class, null, JpaObject.FieldsInvisible); } -} \ No newline at end of file +} diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/log/ActionListByAppId.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/log/ActionListByAppId.java index b5ef2a1fb4..49425cc5cb 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/log/ActionListByAppId.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/log/ActionListByAppId.java @@ -18,7 +18,7 @@ import com.x.cms.assemble.control.factory.LogFactory; import com.x.cms.core.entity.Log; public class ActionListByAppId extends BaseAction { - + protected ActionResult> execute( HttpServletRequest request, EffectivePerson effectivePerson, String appId ) throws Exception { ActionResult> result = new ActionResult<>(); List wraps = null; @@ -38,13 +38,13 @@ public class ActionListByAppId extends BaseAction { } return result; } - + public static class Wo extends Log{ - + private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - public static WrapCopier copier = WrapCopierFactory.wo( Log.class, Wo.class, null, JpaObject.FieldsInvisible); + public static List excludes = new ArrayList(); + + public static final WrapCopier copier = WrapCopierFactory.wo( Log.class, Wo.class, null, JpaObject.FieldsInvisible); } -} \ No newline at end of file +} diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/log/ActionListByCategory.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/log/ActionListByCategory.java index 861c74b9d6..6175cb2cb5 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/log/ActionListByCategory.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/log/ActionListByCategory.java @@ -18,7 +18,7 @@ import com.x.cms.assemble.control.factory.LogFactory; import com.x.cms.core.entity.Log; public class ActionListByCategory extends BaseAction { - + protected ActionResult> execute( HttpServletRequest request, EffectivePerson effectivePerson, String categoryId ) throws Exception { ActionResult> result = new ActionResult<>(); List wraps = null; @@ -38,13 +38,13 @@ public class ActionListByCategory extends BaseAction { } return result; } - + public static class Wo extends Log{ - + private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - public static WrapCopier copier = WrapCopierFactory.wo( Log.class, Wo.class, null,JpaObject.FieldsInvisible); + public static List excludes = new ArrayList(); + + public static final WrapCopier copier = WrapCopierFactory.wo( Log.class, Wo.class, null,JpaObject.FieldsInvisible); } -} \ No newline at end of file +} diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/log/ActionListByDocument.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/log/ActionListByDocument.java index 017680e9da..a9f12fe3b3 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/log/ActionListByDocument.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/log/ActionListByDocument.java @@ -18,7 +18,7 @@ import com.x.cms.assemble.control.factory.LogFactory; import com.x.cms.core.entity.Log; public class ActionListByDocument extends BaseAction { - + protected ActionResult> execute( HttpServletRequest request, EffectivePerson effectivePerson, String documentId ) throws Exception { ActionResult> result = new ActionResult<>(); List wraps = null; @@ -38,13 +38,13 @@ public class ActionListByDocument extends BaseAction { } return result; } - + public static class Wo extends Log{ - + private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - public static WrapCopier copier = WrapCopierFactory.wo( Log.class, Wo.class, null, JpaObject.FieldsInvisible); + public static List excludes = new ArrayList(); + + public static final WrapCopier copier = WrapCopierFactory.wo( Log.class, Wo.class, null, JpaObject.FieldsInvisible); } -} \ No newline at end of file +} diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/log/ActionListByLevel.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/log/ActionListByLevel.java index 897dfa10b1..856254ca60 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/log/ActionListByLevel.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/log/ActionListByLevel.java @@ -18,7 +18,7 @@ import com.x.cms.assemble.control.factory.LogFactory; import com.x.cms.core.entity.Log; public class ActionListByLevel extends BaseAction { - + protected ActionResult> execute( HttpServletRequest request, EffectivePerson effectivePerson, String operationLevel ) throws Exception { ActionResult> result = new ActionResult<>(); List wraps = null; @@ -38,13 +38,13 @@ public class ActionListByLevel extends BaseAction { } return result; } - + public static class Wo extends Log{ - + private static final long serialVersionUID = -5076990764713538973L; - + public static List Excludes = new ArrayList(); - public static WrapCopier copier = WrapCopierFactory.wo( Log.class, Wo.class, null, JpaObject.FieldsInvisible); + public static final WrapCopier copier = WrapCopierFactory.wo( Log.class, Wo.class, null, JpaObject.FieldsInvisible); } -} \ No newline at end of file +} diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/log/ActionListNextWithFilter.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/log/ActionListNextWithFilter.java index 7f6f5bba38..adb1122837 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/log/ActionListNextWithFilter.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/log/ActionListNextWithFilter.java @@ -127,9 +127,9 @@ public class ActionListNextWithFilter extends BaseAction { private static final long serialVersionUID = -5076990764713538973L; - public static List Excludes = new ArrayList(); + public static List excludes = new ArrayList(); - public static WrapCopier copier = WrapCopierFactory.wo(Log.class, Wo.class, null, Wo.Excludes); + public static final WrapCopier copier = WrapCopierFactory.wo(Log.class, Wo.class, null, Wo.excludes); } -} \ No newline at end of file +} diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/log/ActionListPaging.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/log/ActionListPaging.java index 356ef84120..899fc9ffce 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/log/ActionListPaging.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/log/ActionListPaging.java @@ -126,6 +126,6 @@ class ActionListPaging extends BaseAction { private static final long serialVersionUID = -5076990764713538973L; - public static WrapCopier copier = WrapCopierFactory.wo(Log.class, Wo.class, null, JpaObject.FieldsInvisible); + public static final WrapCopier copier = WrapCopierFactory.wo(Log.class, Wo.class, null, JpaObject.FieldsInvisible); } } diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/log/ActionListPrevWithFilter.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/log/ActionListPrevWithFilter.java index b6a9babe6b..c56764ac92 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/log/ActionListPrevWithFilter.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/log/ActionListPrevWithFilter.java @@ -133,12 +133,12 @@ public class ActionListPrevWithFilter extends BaseAction { public void setRank(Long rank) { this.rank = rank; - } - + } + private static final long serialVersionUID = -5076990764713538973L; - public static List Excludes = new ArrayList(); + public static List excludes = new ArrayList(); - public static WrapCopier copier = WrapCopierFactory.wo(Log.class, Wo.class, null, Wo.Excludes); + public static final WrapCopier copier = WrapCopierFactory.wo(Log.class, Wo.class, null, Wo.excludes); } -} \ No newline at end of file +} diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/output/ActionList.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/output/ActionList.java index 5505d4a162..b6a6420980 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/output/ActionList.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/output/ActionList.java @@ -59,7 +59,7 @@ class ActionList extends BaseAction { public static WrapCopier fileCopier = WrapCopierFactory.wo(File.class, WrapFile.class, JpaObject.singularAttributeField(File.class, true, true), null); - + public static WrapCopier categoryInfoCopier = WrapCopierFactory.wo( CategoryInfo.class, WrapCategoryInfo.class, JpaObject.singularAttributeField(CategoryInfo.class, true, true), null); @@ -75,7 +75,7 @@ class ActionList extends BaseAction { public static class Wo extends WrapCms { private static final long serialVersionUID = 474265667658465123L; - public static WrapCopier copier = WrapCopierFactory.wo(AppInfo.class, Wo.class, + public static final WrapCopier copier = WrapCopierFactory.wo(AppInfo.class, Wo.class, JpaObject.singularAttributeField(AppInfo.class, true, true), null); } -} \ No newline at end of file +} diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryview/ActionFlag.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryview/ActionFlag.java index d800d557a2..285ab93f6b 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryview/ActionFlag.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryview/ActionFlag.java @@ -42,10 +42,10 @@ public class ActionFlag extends BaseAction { public static class Wo extends QueryView { private static final long serialVersionUID = 2886873983211744188L; - - public static List Excludes = new ArrayList<>(JpaObject.FieldsInvisible); - public static WrapCopier copier = WrapCopierFactory.wo( QueryView.class, Wo.class, null, JpaObject.FieldsInvisible ); + public static List excludes = new ArrayList<>(JpaObject.FieldsInvisible); + + public static final WrapCopier copier = WrapCopierFactory.wo( QueryView.class, Wo.class, null, JpaObject.FieldsInvisible ); } -} \ No newline at end of file +} diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryview/ActionList.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryview/ActionList.java index 0b56e6bdb7..48d936d2d8 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryview/ActionList.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryview/ActionList.java @@ -29,10 +29,10 @@ public class ActionList extends BaseAction { public ActionResult> execute(HttpServletRequest request, EffectivePerson effectivePerson) throws Exception { List identities = null; List unitNames = null; - + identities = userManagerService.listIdentitiesWithPerson( effectivePerson.getDistinguishedName() ); unitNames = userManagerService.listUnitNamesWithPerson( effectivePerson.getDistinguishedName() ); - + try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { Business business = new Business(emc); ActionResult> result = new ActionResult<>(); @@ -72,9 +72,9 @@ public class ActionList extends BaseAction { public static class Wo extends QueryView { private static final long serialVersionUID = 2886873983211744188L; - - public static List Excludes = new ArrayList<>(JpaObject.FieldsInvisible); - public static WrapCopier copier = WrapCopierFactory.wo( QueryView.class, Wo.class, null, JpaObject.FieldsInvisible); + public static List excludes = new ArrayList<>(JpaObject.FieldsInvisible); + + public static final WrapCopier copier = WrapCopierFactory.wo( QueryView.class, Wo.class, null, JpaObject.FieldsInvisible); } -} \ No newline at end of file +} diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryview/ActionListAll.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryview/ActionListAll.java index 9ed8aae3f4..1cd8282f86 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryview/ActionListAll.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryview/ActionListAll.java @@ -55,7 +55,7 @@ public class ActionListAll extends BaseAction { } } SortTools.asc( wraps, true, "appName" ); - } + } result.setData(wraps); return result; } @@ -91,28 +91,28 @@ public class ActionListAll extends BaseAction { public static class Wo extends AppInfo { private static final long serialVersionUID = 2886873983211744188L; - - public static List Excludes = new ArrayList<>(JpaObject.FieldsInvisible); + + public static List excludes = new ArrayList<>(JpaObject.FieldsInvisible); public static WrapCopier copier = WrapCopierFactory.wo( AppInfo.class, Wo.class, null, JpaObject.FieldsInvisible ); - + private List queryViews = null; public List getQueryViews() { return queryViews; } - + public void setQueryViews(List queryViews) { this.queryViews = queryViews; - } + } } - + public static class WoQueryView extends QueryView { private static final long serialVersionUID = 2886873983211744188L; - - public static List Excludes = new ArrayList<>(JpaObject.FieldsInvisible); - public static WrapCopier copier = WrapCopierFactory.wo( QueryView.class, WoQueryView.class, null, JpaObject.FieldsInvisible); + public static List excludes = new ArrayList<>(JpaObject.FieldsInvisible); + + public static final WrapCopier copier = WrapCopierFactory.wo( QueryView.class, WoQueryView.class, null, JpaObject.FieldsInvisible); } -} \ No newline at end of file +} 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 0f26969724..eb2ae61c7e 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 @@ -80,28 +80,28 @@ class ActionCreate extends BaseAction { public static class Wi extends QueryView { private static final long serialVersionUID = -5237741099036357033L; - public static List CreateExcludes = new ArrayList<>(); - public static List UpdateExcludes = new ArrayList<>(); - public static WrapCopier copier = WrapCopierFactory.wi(Wi.class, QueryView.class, null, - Wi.CreateExcludes); - + public static List createExcludes = new ArrayList<>(); + public static List updateExcludes = new ArrayList<>(); + public static final WrapCopier copier = WrapCopierFactory.wi(Wi.class, QueryView.class, null, + Wi.createExcludes); + static { - CreateExcludes.add(JpaObject.distributeFactor_FIELDNAME); - CreateExcludes.add("updateTime"); - CreateExcludes.add("createTime"); - CreateExcludes.add("sequence"); - CreateExcludes.add("lastUpdatePerson"); - CreateExcludes.add("lastUpdateTime"); + createExcludes.add(JpaObject.distributeFactor_FIELDNAME); + createExcludes.add("updateTime"); + createExcludes.add("createTime"); + createExcludes.add("sequence"); + createExcludes.add("lastUpdatePerson"); + createExcludes.add("lastUpdateTime"); } static { - UpdateExcludes.add(JpaObject.distributeFactor_FIELDNAME); - UpdateExcludes.add(JpaObject.id_FIELDNAME); - UpdateExcludes.add("updateTime"); - UpdateExcludes.add("createTime"); - UpdateExcludes.add("sequence"); - UpdateExcludes.add("lastUpdatePerson"); - UpdateExcludes.add("lastUpdateTime"); + updateExcludes.add(JpaObject.distributeFactor_FIELDNAME); + updateExcludes.add(JpaObject.id_FIELDNAME); + updateExcludes.add("updateTime"); + updateExcludes.add("createTime"); + updateExcludes.add("sequence"); + updateExcludes.add("lastUpdatePerson"); + updateExcludes.add("lastUpdateTime"); } } diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryviewdesign/ActionFlag.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryviewdesign/ActionFlag.java index e7680b8480..a3176b97ed 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryviewdesign/ActionFlag.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryviewdesign/ActionFlag.java @@ -24,7 +24,7 @@ class ActionFlag extends BaseAction { private static final long serialVersionUID = 2886873983211744188L; - public static WrapCopier copier = WrapCopierFactory.wo(QueryView.class, Wo.class, null, + public static final WrapCopier copier = WrapCopierFactory.wo(QueryView.class, Wo.class, null, JpaObject.FieldsInvisible); private Long rank; diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryviewdesign/ActionGet.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryviewdesign/ActionGet.java index e39c780ca7..e662b0efbe 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryviewdesign/ActionGet.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryviewdesign/ActionGet.java @@ -21,14 +21,14 @@ class ActionGet extends BaseAction { return result; } } - + public static class Wo extends QueryView { private static final long serialVersionUID = 2886873983211744188L; - - - public static WrapCopier copier = WrapCopierFactory.wo(QueryView.class, Wo.class, null, JpaObject.FieldsInvisible); - + + + public static final WrapCopier copier = WrapCopierFactory.wo(QueryView.class, Wo.class, null, JpaObject.FieldsInvisible); + private Long rank; public Long getRank() { diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryviewdesign/ActionListNext.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryviewdesign/ActionListNext.java index c7d2614b07..5e175fced1 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryviewdesign/ActionListNext.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryviewdesign/ActionListNext.java @@ -21,10 +21,10 @@ class ActionListNext extends BaseAction { private static final long serialVersionUID = 2886873983211744188L; - public static List Excludes = new ArrayList<>(JpaObject.FieldsInvisible); + public static List excludes = new ArrayList<>(JpaObject.FieldsInvisible); - public static WrapCopier copier = WrapCopierFactory.wo(QueryView.class, Wo.class, null, - Wo.Excludes); + public static final WrapCopier copier = WrapCopierFactory.wo(QueryView.class, Wo.class, null, + Wo.excludes); private Long rank; diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryviewdesign/ActionListPrev.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryviewdesign/ActionListPrev.java index 5f3ee4359a..827582502c 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryviewdesign/ActionListPrev.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryviewdesign/ActionListPrev.java @@ -21,10 +21,10 @@ class ActionListPrev extends BaseAction { private static final long serialVersionUID = 2886873983211744188L; - public static List Excludes = new ArrayList<>(JpaObject.FieldsInvisible); + public static List excludes = new ArrayList<>(JpaObject.FieldsInvisible); - public static WrapCopier copier = WrapCopierFactory.wo(QueryView.class, Wo.class, null, - Wo.Excludes); + public static final WrapCopier copier = WrapCopierFactory.wo(QueryView.class, Wo.class, null, + Wo.excludes); private Long rank; diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryviewdesign/ActionListWithApplication.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryviewdesign/ActionListWithApplication.java index 6aa2efa0d2..9f9dcf87dd 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryviewdesign/ActionListWithApplication.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/queryviewdesign/ActionListWithApplication.java @@ -29,14 +29,14 @@ class ActionListWithApplication extends BaseAction { return result; } } - + public static class Wo extends QueryView { private static final long serialVersionUID = 2886873983211744188L; - - - public static WrapCopier copier = WrapCopierFactory.wo(QueryView.class, Wo.class, null, JpaObject.FieldsInvisible); - + + + public static final WrapCopier copier = WrapCopierFactory.wo(QueryView.class, Wo.class, null, JpaObject.FieldsInvisible); + private Long rank; public Long getRank() { 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 ba04f86074..6be094e355 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 @@ -26,7 +26,7 @@ class ActionUpdate extends BaseAction { ActionResult result = new ActionResult<>(); Wi wrapIn = null; Boolean check = true; - + try { wrapIn = this.convertToWrapIn( jsonElement, Wi.class ); } catch (Exception e ) { @@ -40,7 +40,7 @@ class ActionUpdate extends BaseAction { QueryView queryView = emc.find( id, QueryView.class ); if( queryView != null ) { emc.beginTransaction(QueryView.class); - wrapIn.copyTo( queryView, JpaObject.ID_DISTRIBUTEFACTOR ); + wrapIn.copyTo( queryView, JpaObject.ID_DISTRIBUTEFACTOR ); if( StringUtils.isEmpty( queryView.getCreatorPerson() )) { queryView.setCreatorPerson( effectivePerson.getDistinguishedName() ); } @@ -50,7 +50,7 @@ class ActionUpdate extends BaseAction { emc.check(queryView, CheckPersistType.all); emc.commit(); CacheManager.notify(QueryView.class); - + Wo wo = new Wo(); wo.setId( queryView.getId() ); result.setData( wo ); @@ -62,33 +62,33 @@ class ActionUpdate extends BaseAction { } return result; } - + public static class Wi extends QueryView { private static final long serialVersionUID = -5237741099036357033L; - public static List CreateExcludes = new ArrayList<>(); - public static List UpdateExcludes = new ArrayList<>(); - public static WrapCopier copier = WrapCopierFactory .wi( Wi.class, QueryView.class, null, Wi.CreateExcludes); - + public static List createExcludes = new ArrayList<>(); + public static List updateExcludes = new ArrayList<>(); + public static final WrapCopier copier = WrapCopierFactory .wi( Wi.class, QueryView.class, null, Wi.createExcludes); + static { - CreateExcludes.add(JpaObject.distributeFactor_FIELDNAME); - CreateExcludes.add("updateTime"); - CreateExcludes.add("createTime"); - CreateExcludes.add("sequence"); - CreateExcludes.add("lastUpdatePerson"); - CreateExcludes.add("lastUpdateTime"); + createExcludes.add(JpaObject.distributeFactor_FIELDNAME); + createExcludes.add("updateTime"); + createExcludes.add("createTime"); + createExcludes.add("sequence"); + createExcludes.add("lastUpdatePerson"); + createExcludes.add("lastUpdateTime"); } static { - UpdateExcludes.add(JpaObject.distributeFactor_FIELDNAME); - UpdateExcludes.add(JpaObject.id_FIELDNAME); - UpdateExcludes.add("updateTime"); - UpdateExcludes.add("createTime"); - UpdateExcludes.add("sequence"); - UpdateExcludes.add("lastUpdatePerson"); - UpdateExcludes.add("lastUpdateTime"); + updateExcludes.add(JpaObject.distributeFactor_FIELDNAME); + updateExcludes.add(JpaObject.id_FIELDNAME); + updateExcludes.add("updateTime"); + updateExcludes.add("createTime"); + updateExcludes.add("sequence"); + updateExcludes.add("lastUpdatePerson"); + updateExcludes.add("lastUpdateTime"); } } - + public static class Wo extends WoId { } 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 674061de67..e8dde08988 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 @@ -79,7 +79,7 @@ class ActionGet extends BaseAction { private Date lastUpdateTime; - public static WrapCopier copier = WrapCopierFactory.wo(Script.class, Wo.class, null, + public static final WrapCopier copier = WrapCopierFactory.wo(Script.class, Wo.class, null, JpaObject.FieldsInvisible); public Date getCreateTime() { 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 c4e9adb5a2..0eaf183466 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 @@ -23,7 +23,7 @@ import com.x.cms.core.entity.element.Script; import net.sf.ehcache.Element; class ActionGetWithAppAndName extends BaseAction { - + ActionResult execute( EffectivePerson effectivePerson, String appFlag, String name ) throws Exception { ActionResult result = new ActionResult<>(); Wo wrap = null; @@ -61,41 +61,41 @@ class ActionGetWithAppAndName extends BaseAction { } return result; } - + public static class Wo extends GsonPropertyObject { private Date createTime; - + private Date updateTime; - + private String id; - + private String name; - + private String alias; - + private String description; - + private Boolean validated; - + private String appId; private String appName; private String appAlias; - + private String text; - + private List dependScriptList; - + private String creatorPerson; - + private String lastUpdatePerson; - + private Date lastUpdateTime; - public static WrapCopier copier = WrapCopierFactory.wo( Script.class, Wo.class,null,JpaObject.FieldsInvisible ); - + public static final WrapCopier copier = WrapCopierFactory.wo( Script.class, Wo.class,null,JpaObject.FieldsInvisible ); + public Date getCreateTime() { return createTime; } diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/script/ActionListNext.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/script/ActionListNext.java index 24794dddfe..ef129a5758 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/script/ActionListNext.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/script/ActionListNext.java @@ -52,7 +52,7 @@ class ActionListNext extends BaseAction { private Date lastUpdateTime; - public static WrapCopier copier = WrapCopierFactory.wo(Script.class, Wo.class, null, + public static final WrapCopier copier = WrapCopierFactory.wo(Script.class, Wo.class, null, JpaObject.FieldsInvisible); public Date getCreateTime() { diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/script/ActionListPrev.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/script/ActionListPrev.java index fc8fa55250..87d9da2781 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/script/ActionListPrev.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/script/ActionListPrev.java @@ -51,7 +51,7 @@ class ActionListPrev extends BaseAction { private String lastUpdatePerson; private Date lastUpdateTime; - + private Long rank; public Long getRank() { @@ -60,9 +60,9 @@ class ActionListPrev extends BaseAction { public void setRank(Long rank) { this.rank = rank; - } + } - public static WrapCopier copier = WrapCopierFactory.wo(Script.class, Wo.class, null, + public static final WrapCopier copier = WrapCopierFactory.wo(Script.class, Wo.class, null, JpaObject.FieldsInvisible); public Date getCreateTime() { 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 b33886b75c..7b98c77558 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 @@ -22,7 +22,7 @@ import com.x.cms.core.entity.element.Script; import net.sf.ehcache.Element; class ActionListWithApplication extends BaseAction { - + @SuppressWarnings("unchecked") ActionResult> execute( EffectivePerson effectivePerson, String appFlag ) throws Exception { ActionResult> result = new ActionResult<>(); @@ -58,37 +58,37 @@ class ActionListWithApplication extends BaseAction { } return result; } - + public static class Wo extends GsonPropertyObject { private Date createTime; - + private Date updateTime; - + private String id; - + private String name; - + private String alias; - + private String description; - + private Boolean validated; - + private String appId; - + private String text; - + private List dependScriptList; - + private String creatorPerson; - + private String lastUpdatePerson; - + private Date lastUpdateTime; - public static WrapCopier copier = WrapCopierFactory.wo( Script.class, Wo.class ,null,JpaObject.FieldsInvisible); - + public static final WrapCopier copier = WrapCopierFactory.wo( Script.class, Wo.class ,null,JpaObject.FieldsInvisible); + public Date getCreateTime() { return createTime; } diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/search/ActionListAppSearchFilterForDocStatus.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/search/ActionListAppSearchFilterForDocStatus.java index fbe90a5c91..b3aa177b2a 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/search/ActionListAppSearchFilterForDocStatus.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/search/ActionListAppSearchFilterForDocStatus.java @@ -14,12 +14,12 @@ import com.x.cms.assemble.control.service.SearchServiceAdv; import com.x.cms.assemble.control.service.UserManagerService; class ActionListAppSearchFilterForDocStatus extends BaseAction { - + private static Logger logger = LoggerFactory.getLogger(SearchFilterAction.class); private AppInfoServiceAdv appInfoServiceAdv = new AppInfoServiceAdv(); private SearchServiceAdv searchServiceAdv = new SearchServiceAdv(); private UserManagerService userManagerService = new UserManagerService(); - + public ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, String docStatus, String categoryId ) { ActionResult result = new ActionResult<>(); Wo wrap = new Wo(); @@ -39,7 +39,7 @@ class ActionListAppSearchFilterForDocStatus extends BaseAction { isXAdmin = userManagerService.isManager( effectivePerson); } catch (Exception e) { check = false; - Exception exception = new ExceptionSearchProcess(e, + Exception exception = new ExceptionSearchProcess(e, "系统在检查用户是否是平台管理员时发生异常。Name:" + personName); result.error(exception); logger.error(e, effectivePerson, request, null); @@ -63,7 +63,7 @@ class ActionListAppSearchFilterForDocStatus extends BaseAction { personName, isAnonymous, unitNames, groupNames, null, null, documentType, null,1000 ); } catch (Exception e) { check = false; - Exception exception = new ExceptionSearchProcess( e, + Exception exception = new ExceptionSearchProcess( e, "系统在根据用户权限查询所有可见的栏目信息时发生异常。Name:" + personName ); result.error(exception); logger.error(e, effectivePerson, request, null); @@ -77,7 +77,7 @@ class ActionListAppSearchFilterForDocStatus extends BaseAction { appFilterList = searchServiceAdv.listAppInfoSearchFilter(app_ids, docStatus, categoryId ); } catch (Exception e) { check = false; - Exception exception = new ExceptionSearchProcess(e, + Exception exception = new ExceptionSearchProcess(e, "系统在根据可访问栏目ID列表，文档状态以及可访问分类ID统计涉及到的所有栏目名称列表时发生异常。" + "AppIds:" + app_ids + ", DocStatus:" + docStatus @@ -93,7 +93,7 @@ class ActionListAppSearchFilterForDocStatus extends BaseAction { categoryFilterList = searchServiceAdv.listCategorySearchFilter(app_ids, docStatus, categoryId); } catch (Exception e) { check = false; - Exception exception = new ExceptionSearchProcess(e, + Exception exception = new ExceptionSearchProcess(e, "系统在根据可访问栏目ID列表，文档状态以及可访问分类ID统计涉及到的所有分类名称列表时发生异常。" + "AppIds:" + app_ids + ", DocStatus:" + docStatus @@ -108,7 +108,7 @@ class ActionListAppSearchFilterForDocStatus extends BaseAction { topUnitFilterList = searchServiceAdv.listTopUnitSearchFilter(app_ids, docStatus, categoryId); } catch (Exception e) { check = false; - Exception exception = new ExceptionSearchProcess(e, + Exception exception = new ExceptionSearchProcess(e, "系统在根据可访问栏目ID列表，文档状态以及可访问分类ID统计涉及到的所有顶层组织名称列表时发生异常。" + "AppIds:" + app_ids + ", DocStatus:" + docStatus @@ -123,7 +123,7 @@ class ActionListAppSearchFilterForDocStatus extends BaseAction { unitFilterList = searchServiceAdv.listUnitNameSearchFilter(app_ids, docStatus, categoryId); } catch (Exception e) { check = false; - Exception exception = new ExceptionSearchProcess(e, + Exception exception = new ExceptionSearchProcess(e, "系统在根据可访问栏目ID列表，文档状态以及可访问分类ID统计涉及到的所有组织名称列表时发生异常。" + "AppIds:" + app_ids + ", DocStatus:" + docStatus @@ -142,19 +142,19 @@ class ActionListAppSearchFilterForDocStatus extends BaseAction { } return result; } - + public static class Wo { - - public static List Excludes = new ArrayList(); + + public static List excludes = new ArrayList(); private List appfileter_list = null; - + private List categoryfileter_list = null; - + private List topUnitfileter_list = null; - + private List unitfileter_list = null; - + public List getUnitNamefileter_list() { return unitfileter_list; } @@ -186,6 +186,6 @@ class ActionListAppSearchFilterForDocStatus extends BaseAction { public void setCategoryfileter_list(List categoryfileter_list) { this.categoryfileter_list = categoryfileter_list; } - + } } 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 d7cacb8f9c..d9335faf48 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 @@ -18,7 +18,7 @@ import com.x.cms.core.entity.element.View; 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; @@ -50,15 +50,15 @@ public class ActionGet extends BaseAction { } return result; } - + public static class Wo extends View { - + private static final long serialVersionUID = -5076990764713538973L; - + @FieldDescribe("绑定的表单名称.") private String formName = null; - - public static WrapCopier copier = WrapCopierFactory.wo( View.class, Wo.class, null,JpaObject.FieldsInvisible); + + public static final WrapCopier copier = WrapCopierFactory.wo( View.class, Wo.class, null,JpaObject.FieldsInvisible); public String getFormName() { return formName; @@ -68,4 +68,4 @@ public class ActionGet extends BaseAction { this.formName = formName; } } -} \ No newline at end of file +} 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 555a3adf25..d1d3d920fe 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 @@ -24,7 +24,7 @@ import com.x.cms.assemble.control.factory.ViewFactory; import com.x.cms.core.entity.element.View; public class ActionListAll extends BaseAction { - + @SuppressWarnings("unchecked") protected ActionResult> execute( HttpServletRequest request, EffectivePerson effectivePerson ) throws Exception { ActionResult> result = new ActionResult<>(); @@ -37,21 +37,21 @@ public class ActionListAll extends BaseAction { wraps = (List) optional.get(); result.setData(wraps); } else { - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - Business business = new Business(emc); + try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { + Business business = new Business(emc); //如判断用户是否有查看所有视图的权限，如果没权限不允许继续操作 if (!business.viewEditAvailable( effectivePerson )) { throw new Exception("person{name:" + effectivePerson.getDistinguishedName() + "} 用户没有查询全部视图配置的权限！"); - } + } //如果有权限，继续操作 ViewFactory viewFactory = business.getViewFactory(); List ids = viewFactory.listAll();//获取所有视图列表 List viewList = emc.list( View.class, ids );//查询ID IN ids 的所有视图信息列表 - + if( viewList != null && !viewList.isEmpty() ){ wraps = Wo.copier.copy( viewList );//将所有查询出来的有状态的对象转换为可以输出的过滤过属性的对象 SortTools.desc( wraps, "sequence" ); - + for( Wo wo : wraps ){ //根据FormId补充FormName if(StringUtils.isNotEmpty( wo.getFormId() )) { @@ -68,17 +68,17 @@ public class ActionListAll extends BaseAction { } return result; } - + public static class Wo extends View { - + private static final long serialVersionUID = -5076990764713538973L; - + @FieldDescribe("绑定的表单名称.") private String formName = null; - - public static List Excludes = new ArrayList(); - public static WrapCopier copier = WrapCopierFactory.wo( View.class, Wo.class, null, JpaObject.FieldsInvisible); + public static List excludes = new ArrayList(); + + public static final WrapCopier copier = WrapCopierFactory.wo( View.class, Wo.class, null, JpaObject.FieldsInvisible); public String getFormName() { return formName; @@ -86,6 +86,6 @@ public class ActionListAll extends BaseAction { public void setFormName(String formName) { this.formName = formName; - } + } } -} \ No newline at end of file +} 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 616c372f59..221ca92c5f 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 @@ -26,7 +26,7 @@ import com.x.cms.core.entity.element.View; import net.sf.ehcache.Element; public class ActionListByApp extends BaseAction { - + @SuppressWarnings("unchecked") protected ActionResult> execute( HttpServletRequest request, EffectivePerson effectivePerson, String appId ) throws Exception { ActionResult> result = new ActionResult<>(); @@ -39,8 +39,8 @@ public class ActionListByApp extends BaseAction { wraps = (List) optional.get(); result.setData(wraps); } else { - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - Business business = new Business(emc); + try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { + Business business = new Business(emc); //如判断用户是否有查看所有视图的权限，如果没权限不允许继续操作 if (!business.viewEditAvailable( effectivePerson )) { throw new Exception("person{name:" + effectivePerson.getDistinguishedName() + "} 用户没有查询全部视图的权限！"); @@ -53,7 +53,7 @@ public class ActionListByApp extends BaseAction { if( viewList != null && !viewList.isEmpty() ){ wraps = Wo.copier.copy( viewList );//将所有查询出来的有状态的对象转换为可以输出的过滤过属性的对象 SortTools.desc( wraps, "sequence" ); - + for( Wo wo : wraps ){ //根据FormId补充FormName if(StringUtils.isNotEmpty( wo.getFormId() )) { @@ -71,17 +71,17 @@ public class ActionListByApp extends BaseAction { } return result; } - + public static class Wo extends View { - + private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - + + public static List excludes = new ArrayList(); + @FieldDescribe("绑定的表单名称.") private String formName = null; - public static WrapCopier copier = WrapCopierFactory.wo( View.class, Wo.class, null, JpaObject.FieldsInvisible); + public static final WrapCopier copier = WrapCopierFactory.wo( View.class, Wo.class, null, JpaObject.FieldsInvisible); public String getFormName() { return formName; @@ -91,4 +91,4 @@ public class ActionListByApp extends BaseAction { this.formName = formName; } } -} \ No newline at end of file +} 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 df814daf4d..fe4041eb3c 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 @@ -26,12 +26,12 @@ import com.x.cms.core.entity.element.View; import net.sf.ehcache.Element; public class ActionListByCategory extends BaseAction { - + @SuppressWarnings("unchecked") protected ActionResult> execute( HttpServletRequest request, EffectivePerson effectivePerson, String categoryId ) throws Exception { ActionResult> result = new ActionResult<>(); List wraps = null; - + Cache.CacheKey cacheKey = new Cache.CacheKey( this.getClass(), categoryId ); Optional optional = CacheManager.get(cacheCategory, cacheKey ); @@ -39,8 +39,8 @@ public class ActionListByCategory extends BaseAction { wraps = (List) optional.get(); result.setData( wraps ); } else { - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - Business business = new Business(emc); + try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { + Business business = new Business(emc); //如判断用户是否有查看所有视图的权限，如果没权限不允许继续操作 if (!business.viewEditAvailable( effectivePerson )) { throw new Exception("person{name:" + effectivePerson.getDistinguishedName() + "} 用户没有查询全部视图的权限！"); @@ -53,7 +53,7 @@ public class ActionListByCategory extends BaseAction { if( viewList != null && !viewList.isEmpty() ){ wraps = Wo.copier.copy( viewList );//将所有查询出来的有状态的对象转换为可以输出的过滤过属性的对象 SortTools.desc( wraps, "sequence" ); - + for( Wo wo : wraps ){ //根据FormId补充FormName if(StringUtils.isNotEmpty( wo.getFormId() )) { @@ -69,20 +69,20 @@ public class ActionListByCategory extends BaseAction { result.error(th); } } - + return result; } - + public static class Wo extends View { - + private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - + + public static List excludes = new ArrayList(); + @FieldDescribe("绑定的表单名称.") private String formName = null; - public static WrapCopier copier = WrapCopierFactory.wo( View.class, Wo.class, null, JpaObject.FieldsInvisible); + public static final WrapCopier copier = WrapCopierFactory.wo( View.class, Wo.class, null, JpaObject.FieldsInvisible); public String getFormName() { return formName; @@ -92,4 +92,4 @@ public class ActionListByCategory extends BaseAction { this.formName = formName; } } -} \ No newline at end of file +} 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 b60044c6e1..92dcee0951 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 @@ -26,7 +26,7 @@ import com.x.cms.core.entity.element.View; import net.sf.ehcache.Element; public class ActionListByForm extends BaseAction { - + @SuppressWarnings("unchecked") protected ActionResult> execute( HttpServletRequest request, EffectivePerson effectivePerson, String formId ) throws Exception { ActionResult> result = new ActionResult<>(); @@ -39,8 +39,8 @@ public class ActionListByForm extends BaseAction { wraps = (List) optional.get(); result.setData(wraps); } else { - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - Business business = new Business(emc); + try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { + Business business = new Business(emc); //如判断用户是否有查看所有视图的权限，如果没权限不允许继续操作 if (!business.viewEditAvailable( effectivePerson )) { throw new Exception("person{name:" + effectivePerson.getDistinguishedName() + "} 用户没有查询全部视图的权限！"); @@ -53,9 +53,9 @@ public class ActionListByForm extends BaseAction { if( viewList != null && !viewList.isEmpty() ){ wraps = Wo.copier.copy( viewList );//将所有查询出来的有状态的对象转换为可以输出的过滤过属性的对象 SortTools.desc( wraps, "sequence" ); - + String formName = formServiceAdv.getNameWithId( formId ); - + for( Wo wo : wraps ){ //根据FormId补充FormName if(StringUtils.isNotEmpty( wo.getFormId() )) { @@ -71,20 +71,20 @@ public class ActionListByForm extends BaseAction { result.error(th); } } - + return result; } - + public static class Wo extends View { - + private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - + + public static List excludes = new ArrayList(); + @FieldDescribe("绑定的表单名称.") private String formName = null; - public static WrapCopier copier = WrapCopierFactory.wo( View.class, Wo.class, null, JpaObject.FieldsInvisible); + public static final WrapCopier copier = WrapCopierFactory.wo( View.class, Wo.class, null, JpaObject.FieldsInvisible); public String getFormName() { return formName; @@ -92,6 +92,6 @@ public class ActionListByForm extends BaseAction { public void setFormName(String formName) { this.formName = formName; - } + } } -} \ No newline at end of file +} diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/view/ActionListNextPageViewData.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/view/ActionListNextPageViewData.java index 150423a0e5..3269669cb7 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/view/ActionListNextPageViewData.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/view/ActionListNextPageViewData.java @@ -538,7 +538,7 @@ public class ActionListNextPageViewData extends BaseAction { private static final long serialVersionUID = -5076990764713538973L; - public static WrapCopier copier = WrapCopierFactory.wo( Document.class, WoDocument.class, null, JpaObject.FieldsInvisible); + public static final WrapCopier copier = WrapCopierFactory.wo( Document.class, WoDocument.class, null, JpaObject.FieldsInvisible); @FieldDescribe("创建者姓名（简称）") private String creatorPersonShort = null; diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/view/ActionSave.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/view/ActionSave.java index f498c97063..230376c7a7 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/view/ActionSave.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/view/ActionSave.java @@ -85,7 +85,7 @@ public class ActionSave extends BaseAction { private static final long serialVersionUID = -5076990764713538973L; - public static List Excludes = new ArrayList(JpaObject.FieldsUnmodify); + public static List excludes = new ArrayList(JpaObject.FieldsUnmodify); public static WrapCopier copier = WrapCopierFactory.wi(Wi.class, View.class, null, JpaObject.FieldsUnmodify); @@ -105,4 +105,4 @@ public class ActionSave extends BaseAction { public static class Wo extends WoId { } -} \ No newline at end of file +} diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewcategory/ActionGet.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewcategory/ActionGet.java index c739248ae9..587ed94147 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewcategory/ActionGet.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewcategory/ActionGet.java @@ -57,10 +57,10 @@ public class ActionGet extends BaseAction { private static final long serialVersionUID = -5076990764713538973L; - public static List Excludes = new ArrayList(); + public static List excludes = new ArrayList(); - public static WrapCopier copier = WrapCopierFactory.wo(ViewCategory.class, Wo.class, null, + public static final WrapCopier copier = WrapCopierFactory.wo(ViewCategory.class, Wo.class, null, JpaObject.FieldsInvisible); } -} \ No newline at end of file +} diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewcategory/ActionListAll.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewcategory/ActionListAll.java index 0f2ef0f43a..9b42dbb345 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewcategory/ActionListAll.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewcategory/ActionListAll.java @@ -22,7 +22,7 @@ import com.x.cms.core.entity.element.ViewCategory; 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<>(); @@ -34,17 +34,17 @@ public class ActionListAll extends BaseAction { wraps = (List) optional.get(); result.setData(wraps); } else { - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - Business business = new Business(emc); + try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { + Business business = new Business(emc); //如判断用户是否有查看所有视图分类关联信息的权限，如果没权限不允许继续操作 if (!business.viewEditAvailable( effectivePerson )) { throw new Exception("person{name:" + effectivePerson.getDistinguishedName() + "} 用户没有查询全部视图分类关联信息配置的权限！"); - } + } //如果有权限，继续操作 ViewCategoryFactory viewCategoryFactory = business.getViewCategoryFactory(); List ids = viewCategoryFactory.listAll();//获取所有视图分类关联信息列表 List viewCategoryList = emc.list( ViewCategory.class, ids );//查询ID IN ids 的所有视图分类关联信息信息列表 - + wraps = Wo.copier.copy( viewCategoryList );//将所有查询出来的有状态的对象转换为可以输出的过滤过属性的对象 CacheManager.put(cacheCategory, cacheKey, wraps ); @@ -54,16 +54,16 @@ public class ActionListAll extends BaseAction { result.error(th); } } - + return result; } - + public static class Wo extends ViewCategory { - + private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - public static WrapCopier copier = WrapCopierFactory.wo( ViewCategory.class, Wo.class, null, JpaObject.FieldsInvisible); + public static List excludes = new ArrayList(); + + public static final WrapCopier copier = WrapCopierFactory.wo( ViewCategory.class, Wo.class, null, JpaObject.FieldsInvisible); } -} \ No newline at end of file +} diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewcategory/ActionListByCategory.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewcategory/ActionListByCategory.java index 724209b40f..1d41be4ebf 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewcategory/ActionListByCategory.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewcategory/ActionListByCategory.java @@ -22,7 +22,7 @@ import com.x.cms.core.entity.element.ViewCategory; import net.sf.ehcache.Element; public class ActionListByCategory extends BaseAction { - + @SuppressWarnings("unchecked") protected ActionResult> execute( HttpServletRequest request, EffectivePerson effectivePerson, String categoryId ) throws Exception { ActionResult> result = new ActionResult<>(); @@ -34,17 +34,17 @@ public class ActionListByCategory extends BaseAction { wraps = (List) optional.get(); result.setData(wraps); } else { - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - Business business = new Business(emc); + try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { + Business business = new Business(emc); //如判断用户是否有查看所有视图分类关联信息的权限，如果没权限不允许继续操作 if (!business.viewEditAvailable( effectivePerson )) { throw new Exception("person{name:" + effectivePerson.getDistinguishedName() + "} 用户没有查询全部视图分类关联信息的权限！"); - } + } //如果有权限，继续操作 ViewCategoryFactory viewCategoryFactory = business.getViewCategoryFactory(); List ids = viewCategoryFactory.listByCategoryId( categoryId );//获取指定应用的所有视图分类关联信息列表 List viewList = emc.list( ViewCategory.class, ids );//查询ID IN ids 的所有视图分类关联信息信息列表 - + wraps = Wo.copier.copy( viewList );//将所有查询出来的有状态的对象转换为可以输出的过滤过属性的对象 CacheManager.put(cacheCategory, cacheKey, wraps ); @@ -54,16 +54,16 @@ public class ActionListByCategory extends BaseAction { result.error(th); } } - + return result; } - + public static class Wo extends ViewCategory { - + private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - public static WrapCopier copier = WrapCopierFactory.wo( ViewCategory.class, Wo.class, null, JpaObject.FieldsInvisible); + public static List excludes = new ArrayList(); + + public static final WrapCopier copier = WrapCopierFactory.wo( ViewCategory.class, Wo.class, null, JpaObject.FieldsInvisible); } -} \ No newline at end of file +} diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewcategory/ActionListByView.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewcategory/ActionListByView.java index 304f324281..d491fd6959 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewcategory/ActionListByView.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewcategory/ActionListByView.java @@ -22,7 +22,7 @@ import com.x.cms.core.entity.element.ViewCategory; import net.sf.ehcache.Element; public class ActionListByView extends BaseAction { - + @SuppressWarnings("unchecked") protected ActionResult> execute( HttpServletRequest request, EffectivePerson effectivePerson, String viewId ) throws Exception { ActionResult> result = new ActionResult<>(); @@ -34,17 +34,17 @@ public class ActionListByView extends BaseAction { wraps = (List) optional.get(); result.setData(wraps); } else { - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - Business business = new Business(emc); + try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { + Business business = new Business(emc); //如判断用户是否有查看所有视图分类关联信息的权限，如果没权限不允许继续操作 if (!business.viewEditAvailable( effectivePerson )) { throw new Exception("person{name:" + effectivePerson.getDistinguishedName() + "} 用户没有查询全部视图分类关联信息的权限！"); - } + } //如果有权限，继续操作 ViewCategoryFactory viewCategoryFactory = business.getViewCategoryFactory(); List ids = viewCategoryFactory.listByViewId( viewId );//获取指定应用的所有视图分类关联信息列表 List viewList = emc.list( ViewCategory.class, ids );//查询ID IN ids 的所有视图分类关联信息信息列表 - + wraps = Wo.copier.copy( viewList );//将所有查询出来的有状态的对象转换为可以输出的过滤过属性的对象 CacheManager.put(cacheCategory, cacheKey, wraps ); @@ -54,16 +54,16 @@ public class ActionListByView extends BaseAction { result.error(th); } } - + return result; } - + public static class Wo extends ViewCategory { - + private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - public static WrapCopier copier = WrapCopierFactory.wo( ViewCategory.class, Wo.class, null, JpaObject.FieldsInvisible); + public static List excludes = new ArrayList(); + + public static final WrapCopier copier = WrapCopierFactory.wo( ViewCategory.class, Wo.class, null, JpaObject.FieldsInvisible); } -} \ No newline at end of file +} 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 1e259ab15c..b4e847428c 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 @@ -26,15 +26,15 @@ import com.x.cms.core.entity.element.View; import com.x.cms.core.entity.element.ViewCategory; public class ActionSave extends BaseAction { - + private static Logger logger = LoggerFactory.getLogger( ActionSave.class ); - + protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, JsonElement jsonElement ) throws Exception { ActionResult result = new ActionResult<>(); ViewCategory viewCategory = null; Wi wrapIn = null; Boolean check = true; - + try { wrapIn = this.convertToWrapIn( jsonElement, Wi.class ); } catch (Exception e ) { @@ -43,17 +43,17 @@ public class ActionSave extends BaseAction { result.error( exception ); logger.error( e, effectivePerson, request, null); } - + if(check) { if( StringUtils.isNotEmpty( effectivePerson.getDistinguishedName() )) { wrapIn.setEditor( effectivePerson.getDistinguishedName() ); }else { wrapIn.setEditor( effectivePerson.getName() ); - } + } } - + if(check ){ - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { + try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { Business business = new Business(emc); //看看用户是否有权限进行应用信息新增操作 if (!business.viewEditAvailable( effectivePerson )) { @@ -83,18 +83,18 @@ public class ActionSave extends BaseAction { } return result; } - + public static class Wi extends ViewCategory{ - + private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(JpaObject.FieldsUnmodify); - - public static WrapCopier copier = WrapCopierFactory.wi( Wi.class, ViewCategory.class, null, JpaObject.FieldsUnmodify ); - + + public static List excludes = new ArrayList(JpaObject.FieldsUnmodify); + + public static final WrapCopier copier = WrapCopierFactory.wi( Wi.class, ViewCategory.class, null, JpaObject.FieldsUnmodify ); + } - + public static class Wo extends WoId { } -} \ No newline at end of file +} diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewfieldconfig/ActionGet.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewfieldconfig/ActionGet.java index d33bebd483..8e6d800b10 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewfieldconfig/ActionGet.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewfieldconfig/ActionGet.java @@ -48,18 +48,18 @@ public class ActionGet extends BaseAction { result.error(th); } } - + return result; } - + public static class Wo extends ViewFieldConfig { - + private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo( ViewFieldConfig.class, Wo.class, null,JpaObject.FieldsInvisible); + + public static List excludes = new ArrayList(); + + public static final WrapCopier copier = WrapCopierFactory.wo( ViewFieldConfig.class, Wo.class, null,JpaObject.FieldsInvisible); } - -} \ No newline at end of file + +} diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewfieldconfig/ActionListAll.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewfieldconfig/ActionListAll.java index bd990e2c5d..dd42f699b1 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewfieldconfig/ActionListAll.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewfieldconfig/ActionListAll.java @@ -34,17 +34,17 @@ public class ActionListAll extends BaseAction { wraps = (List) optional.get(); result.setData(wraps); } else { - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - Business business = new Business(emc); + try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { + Business business = new Business(emc); //如判断用户是否有查看所有展示列配置信息的权限，如果没权限不允许继续操作 if (!business.viewEditAvailable( effectivePerson )) { throw new Exception("person{name:" + effectivePerson.getDistinguishedName() + "} 用户没有查询全部展示列配置信息配置的权限！"); - } + } //如果有权限，继续操作 ViewFieldConfigFactory viewFieldConfigFactory = business.getViewFieldConfigFactory(); List ids = viewFieldConfigFactory.listAll();//获取所有展示列配置信息列表 List viewFieldConfigList = emc.list( ViewFieldConfig.class, ids );//查询ID IN ids 的所有展示列配置信息信息列表 - + wraps = Wo.copier.copy( viewFieldConfigList );//将所有查询出来的有状态的对象转换为可以输出的过滤过属性的对象 CacheManager.put(cacheCategory, cacheKey, wraps ); @@ -54,18 +54,18 @@ public class ActionListAll extends BaseAction { result.error(th); } } - + return result; } - + public static class Wo extends ViewFieldConfig { - + private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo( ViewFieldConfig.class, Wo.class, null, JpaObject.FieldsInvisible); + + public static List excludes = new ArrayList(); + + public static final WrapCopier copier = WrapCopierFactory.wo( ViewFieldConfig.class, Wo.class, null, JpaObject.FieldsInvisible); } - -} \ No newline at end of file + +} diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewfieldconfig/ActionListByViewId.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewfieldconfig/ActionListByViewId.java index b5fba47af8..a58f484b7e 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewfieldconfig/ActionListByViewId.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewfieldconfig/ActionListByViewId.java @@ -34,17 +34,17 @@ public class ActionListByViewId extends BaseAction { wraps = (List) optional.get(); result.setData(wraps); } else { - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - Business business = new Business(emc); + try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { + Business business = new Business(emc); //如判断用户是否有查看所有展示列配置信息的权限，如果没权限不允许继续操作 if (!business.viewEditAvailable( effectivePerson )) { throw new Exception("person{name:" + effectivePerson.getDistinguishedName() + "} 用户没有查询全部展示列配置信息的权限！"); - } + } //如果有权限，继续操作 ViewFieldConfigFactory viewFieldConfigFactory = business.getViewFieldConfigFactory(); List ids = viewFieldConfigFactory.listByViewId( viewId );//获取指定应用的所有展示列配置信息列表 List viewFieldConfigList = emc.list( ViewFieldConfig.class, ids );//查询ID IN ids 的所有展示列配置信息信息列表 - + wraps = Wo.copier.copy( viewFieldConfigList );//将所有查询出来的有状态的对象转换为可以输出的过滤过属性的对象 CacheManager.put(cacheCategory, cacheKey, wraps ); @@ -54,17 +54,17 @@ public class ActionListByViewId extends BaseAction { result.error(th); } } - + return result; } - + public static class Wo extends ViewFieldConfig { - + private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(); - - public static WrapCopier copier = WrapCopierFactory.wo( ViewFieldConfig.class, Wo.class, null, JpaObject.FieldsInvisible); + + public static List excludes = new ArrayList(); + + public static final WrapCopier copier = WrapCopierFactory.wo( ViewFieldConfig.class, Wo.class, null, JpaObject.FieldsInvisible); } -} \ No newline at end of file +} 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 ed33c79efb..f4908228c8 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 @@ -26,9 +26,9 @@ import com.x.cms.core.entity.element.View; import com.x.cms.core.entity.element.ViewFieldConfig; public class ActionSave extends BaseAction { - + private static Logger logger = LoggerFactory.getLogger( ActionSave.class ); - + protected ActionResult execute( HttpServletRequest request, EffectivePerson effectivePerson, String id, JsonElement jsonElement ) throws Exception { ActionResult result = new ActionResult<>(); ViewFieldConfig viewFieldConfig = null; @@ -36,7 +36,7 @@ public class ActionSave extends BaseAction { Wi wi = null; Wo wrap = null; Boolean check = true; - + try { wi = this.convertToWrapIn( jsonElement, Wi.class ); if( id != null && !id.isEmpty() ){ @@ -48,7 +48,7 @@ public class ActionSave extends BaseAction { result.error( exception ); logger.error( e, effectivePerson, request, null); } - + if( check ){ if( StringUtils.isEmpty(wi.getViewId()) ){ check = false; @@ -56,11 +56,11 @@ public class ActionSave extends BaseAction { result.error( exception ); } } - + if( check ){ //先看看视图信息是否存在，如果不存在 try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - Business business = new Business(emc); + Business business = new Business(emc); //看看用户是否有权限进行应用信息新增操作 if (!business.viewEditAvailable( effectivePerson )) { check = false; @@ -74,18 +74,18 @@ public class ActionSave extends BaseAction { logger.error( e, effectivePerson, request, null); } } - + if( check ){ //先看看视图信息是否存在，如果不存在 try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) { - Business business = new Business(emc); + Business business = new Business(emc); view = business.getViewFactory().get( wi.getViewId() ); if( view == null ){ check = false; Exception exception = new ExceptionViewNotExists( wi.getViewId() ); result.error( exception ); } - + } catch (Exception e) { check = false; Exception exception = new ExceptionViewQueryByIdEmpty( e, wi.getViewId() ); @@ -93,14 +93,14 @@ public class ActionSave extends BaseAction { logger.error( e, effectivePerson, request, null); } } - + if( check ){ try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - //获取到当前用户信息 - Business business = new Business(emc); + //获取到当前用户信息 + Business business = new Business(emc); view = business.getViewFactory().get( wi.getId() ); viewFieldConfig = business.getViewFieldConfigFactory().get( wi.getId() ); - + if( viewFieldConfig == null ){//新增 viewFieldConfig = Wi.copier.copy( wi ); //如果JSON给过来的ID不为空，那么使用用户传入的ID @@ -110,21 +110,21 @@ public class ActionSave extends BaseAction { emc.beginTransaction( ViewFieldConfig.class ); emc.beginTransaction( View.class); emc.persist( viewFieldConfig, CheckPersistType.all ); - + addFieldConfigIdToFieldConfigList( view, viewFieldConfig.getId() ); - + emc.commit(); logService.log( emc, effectivePerson.getDistinguishedName(), viewFieldConfig.getFieldName(), "", "", "", viewFieldConfig.getId(), "VIEWFIELDCONFIG", "新增" ); }else{ //更新 wi.copyTo( viewFieldConfig, JpaObject.FieldsUnmodify ); - + emc.beginTransaction( ViewFieldConfig.class ); emc.beginTransaction( View.class); emc.check( viewFieldConfig, CheckPersistType.all ); addFieldConfigIdToFieldConfigList( view, viewFieldConfig.getId() ); emc.commit(); - + logService.log( emc, effectivePerson.getDistinguishedName(), viewFieldConfig.getFieldName(), "", "", "", viewFieldConfig.getId(), "VIEWFIELDCONFIG", "更新" ); } wrap = new Wo(); @@ -139,7 +139,7 @@ public class ActionSave extends BaseAction { } return result; } - + private void addFieldConfigIdToFieldConfigList( View view, String viewFieldConfigId){ if( view != null ){ if( view.getFieldConfigList() == null ){ @@ -152,18 +152,18 @@ public class ActionSave extends BaseAction { } } } - + public static class Wi extends ViewFieldConfig{ - + private static final long serialVersionUID = -5076990764713538973L; - - public static List Excludes = new ArrayList(JpaObject.FieldsUnmodify); - - public static WrapCopier copier = WrapCopierFactory.wi( Wi.class, ViewFieldConfig.class, null, JpaObject.FieldsUnmodify ); - + + public static List excludes = new ArrayList(JpaObject.FieldsUnmodify); + + public static final WrapCopier copier = WrapCopierFactory.wi( Wi.class, ViewFieldConfig.class, null, JpaObject.FieldsUnmodify ); + } - + public static class Wo extends WoId { } -} \ No newline at end of file +} diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/queue/QueueSendDocumentNotify.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/queue/QueueSendDocumentNotify.java index 1df93669ec..32a164a392 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/queue/QueueSendDocumentNotify.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/queue/QueueSendDocumentNotify.java @@ -118,9 +118,9 @@ public class QueueSendDocumentNotify extends AbstractQueue { public static class MessageWo{ - public static List Excludes = new ArrayList(); + public static List excludes = new ArrayList(); - public static WrapCopier copier = WrapCopierFactory.wo(Document.class, MessageWo.class, null, JpaObject.FieldsInvisible); + public static final WrapCopier copier = WrapCopierFactory.wo(Document.class, MessageWo.class, null, JpaObject.FieldsInvisible); @FieldDescribe("数据库主键,自动生成.") private String id; diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/CategoryInfoService.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/CategoryInfoService.java index e0eef365ab..4c8e94be14 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/CategoryInfoService.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/CategoryInfoService.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +import com.x.cms.core.entity.element.Form; import org.apache.commons.lang3.StringUtils; import com.x.base.core.container.EntityManagerContainer; @@ -30,7 +31,7 @@ public class CategoryInfoService { } return emc.find(id, CategoryInfo.class ); } - + public CategoryInfo getWithFlag( EntityManagerContainer emc, String flag ) throws Exception { if( StringUtils.isEmpty( flag ) ){ return null; @@ -45,7 +46,7 @@ public class CategoryInfoService { Business business = new Business( emc ); return business.getCategoryInfoFactory().listByAppId( appId ); } - + public List listByAppId( String appId ) throws Exception { if( StringUtils.isEmpty(appId ) ){ return null; @@ -70,17 +71,17 @@ public class CategoryInfoService { return business.getCategoryInfoFactory().listByAppIds( appIds, documentType, maxCount ); } - public List listAppPeopleViewableCategoryInfoIds( EntityManagerContainer emc, List inAppInfoIds, List inCategoryIds, + public List listAppPeopleViewableCategoryInfoIds( EntityManagerContainer emc, List inAppInfoIds, List inCategoryIds, List excludCategoryIds, String documentType, Integer maxCount ) throws Exception { Business business = new Business( emc ); - return business.getCategoryInfoFactory().listAllPeopleViewableCategoryInfoIds(inAppInfoIds, inCategoryIds, excludCategoryIds, + return business.getCategoryInfoFactory().listAllPeopleViewableCategoryInfoIds(inAppInfoIds, inCategoryIds, excludCategoryIds, documentType, maxCount); } - public List listAppPeoplePublishableCategoryInfoIds(EntityManagerContainer emc, List inAppInfoIds, List inCategoryIds, + public List listAppPeoplePublishableCategoryInfoIds(EntityManagerContainer emc, List inAppInfoIds, List inCategoryIds, List excludCategoryIds, String documentType, Integer maxCount ) throws Exception { - Business business = new Business( emc ); - return business.getCategoryInfoFactory().listAllPeoplePublishableCategoryInfoIds(inAppInfoIds, inCategoryIds, excludCategoryIds, + Business business = new Business( emc ); + return business.getCategoryInfoFactory().listAllPeoplePublishableCategoryInfoIds(inAppInfoIds, inCategoryIds, excludCategoryIds, documentType, maxCount); } @@ -88,12 +89,12 @@ public class CategoryInfoService { Business business = new Business( emc ); return business.getCategoryInfoFactory().listAll(); } - + public List listAllIds(EntityManagerContainer emc) throws Exception { Business business = new Business( emc ); return business.getCategoryInfoFactory().listAllIds(); } - + public CategoryInfo saveBaseInfo( EntityManagerContainer emc, CategoryInfo categoryInfo ) throws Exception { AppInfo appInfo = null; CategoryInfo categoryInfo_tmp = null; @@ -129,21 +130,21 @@ public class CategoryInfoService { emc.commit(); return categoryInfo; } - + public CategoryInfo save( EntityManagerContainer emc, CategoryInfo object, String extContent ) throws Exception { CategoryInfo categoryInfo = null; CategoryExt categoryExt = null; AppInfo appInfo = null; - + if( object.getId() == null ){ object.setId( CategoryInfo.createId() ); } categoryInfo = emc.find( object.getId(), CategoryInfo.class ); categoryExt = emc.find( object.getId(), CategoryExt.class ); appInfo = emc.find( object.getAppId(), AppInfo.class ); - + if( appInfo == null ){ throw new Exception("应用栏目信息不存在！"); } - + //补全默认列表名称 if ( StringUtils.isNotEmpty( object.getDefaultViewId() ) ) { View queryView = emc.find( object.getDefaultViewId(), View.class ); @@ -153,10 +154,24 @@ public class CategoryInfoService { throw new Exception("category default view not exits. view id:" + object.getDefaultViewId() ); } } - + if( categoryInfo == null ){ categoryInfo = new CategoryInfo(); object.copyTo( categoryInfo ); + if(StringUtils.isBlank(categoryInfo.getReadFormId()) && StringUtils.isNotBlank(appInfo.getDefaultReadForm())){ + Form form = emc.find( appInfo.getDefaultReadForm(), Form.class ); + if(form != null){ + categoryInfo.setReadFormId(form.getId()); + categoryInfo.setReadFormName(form.getName()); + } + } + if(StringUtils.isBlank(categoryInfo.getFormId()) && StringUtils.isNotBlank(appInfo.getDefaultEditForm())){ + Form form = emc.find( appInfo.getDefaultEditForm(), Form.class ); + if(form != null){ + categoryInfo.setFormId(form.getId()); + categoryInfo.setFormName(form.getName()); + } + } categoryInfo.setAppName( appInfo.getAppName() ); if( StringUtils.isEmpty( categoryInfo.getCategoryAlias() )) { categoryInfo.setCategoryAlias( categoryInfo.getAppName() + "-" + categoryInfo.getCategoryName() ); @@ -178,7 +193,7 @@ public class CategoryInfoService { categoryInfo.setAppName( appInfo.getAppName() ); if( StringUtils.isEmpty( categoryInfo.getCategoryAlias() )) { categoryInfo.setCategoryAlias( categoryInfo.getAppName() + "-" + categoryInfo.getCategoryName() ); - } + } if( categoryInfo.getCreateTime() == null ) { categoryInfo.setCreateTime(new Date()); } @@ -188,12 +203,12 @@ public class CategoryInfoService { if( !"信息".equals(categoryInfo.getDocumentType()) && !"数据".equals( categoryInfo.getDocumentType() )) { categoryInfo.setDocumentType( "信息" ); } - + emc.beginTransaction( CategoryInfo.class ); emc.check( categoryInfo, CheckPersistType.all ); emc.commit(); } - + if( categoryExt == null ){ categoryExt = new CategoryExt(); categoryExt.setId(categoryInfo.getId()); @@ -212,8 +227,8 @@ public class CategoryInfoService { emc.beginTransaction( CategoryExt.class ); emc.check( categoryExt, CheckPersistType.all ); emc.commit(); - } - + } + if ( appInfo.getCategoryList() == null ){ appInfo.setCategoryList( new ArrayList()); } @@ -225,7 +240,7 @@ public class CategoryInfoService { emc.commit(); return categoryInfo; } - + // public CategoryInfo save( EntityManagerContainer emc, CategoryInfo temp_categoryInfo, String extContent ) throws Exception { // CategoryInfo categoryInfo = null; // CategoryExt categoryExt = null; @@ -237,18 +252,18 @@ public class CategoryInfoService { // Integer totalWhileCount = 0; // Integer currenteWhileCount = 0; // Integer queryMaxCount = 1000; -// +// // if( temp_categoryInfo.getId() == null ){ // temp_categoryInfo.setId( CategoryInfo.createId() ); // } // categoryInfo = emc.find( temp_categoryInfo.getId(), CategoryInfo.class ); // categoryExt = emc.find( temp_categoryInfo.getId(), CategoryExt.class ); // appInfo = emc.find( temp_categoryInfo.getAppId(), AppInfo.class ); -// +// // if( appInfo == null ){ // throw new Exception("应用栏目信息不存在！"); // } -// +// // if( categoryInfo == null ){ // categoryInfo = new CategoryInfo(); // temp_categoryInfo.copyTo( categoryInfo ); @@ -271,7 +286,7 @@ public class CategoryInfoService { // temp_categoryInfo.copyTo( categoryInfo, JpaObject.FieldsUnmodify ); // categoryInfo.setAppName( appInfo.getAppName() ); // categoryInfo.setCategoryAlias( categoryInfo.getAppName() + "-" + categoryInfo.getCategoryName() ); -// +// // if( categoryInfo.getCreateTime() == null ) { // categoryInfo.setCreateTime(new Date()); // } @@ -280,8 +295,8 @@ public class CategoryInfoService { // } // if( !"信息".equals(categoryInfo.getDocumentType()) && !"数据".equals( categoryInfo.getDocumentType() )) { // categoryInfo.setDocumentType( "信息" ); -// } -// +// } +// // //查询是否修改了名称，如果修改了名称，那么所有的文档相应的名称也都需要修改过来 // if( !oldCategoryName.equals( categoryInfo.getCategoryName() )){ // //对该目录下所有的文档的栏目名称和分类别名进行调整 @@ -291,8 +306,8 @@ public class CategoryInfoService { // if( totalWhileCount > 0 ) { // while( docCount > 0 && currenteWhileCount <= totalWhileCount ) { // //查询1000个文档进行操作 -// document_ids = business.getDocumentFactory().listByCategoryId( categoryInfo.getId(), queryMaxCount ); -// changeDocumentInfoWithCategory( emc, document_ids, categoryInfo ); +// document_ids = business.getDocumentFactory().listByCategoryId( categoryInfo.getId(), queryMaxCount ); +// changeDocumentInfoWithCategory( emc, document_ids, categoryInfo ); // //当前循环次数+1 // currenteWhileCount ++; // //重新查询剩余的文档数量 @@ -301,12 +316,12 @@ public class CategoryInfoService { // } // } // } -// +// // emc.beginTransaction( CategoryInfo.class ); // emc.check( categoryInfo, CheckPersistType.all ); // emc.commit(); // } -// +// // if( categoryExt == null ){ // categoryExt = new CategoryExt(); // categoryExt.setId(categoryInfo.getId()); @@ -325,8 +340,8 @@ public class CategoryInfoService { // emc.beginTransaction( CategoryExt.class ); // emc.check( categoryExt, CheckPersistType.all ); // emc.commit(); -// } -// +// } +// // if ( appInfo.getCategoryList() == null ){ // appInfo.setCategoryList( new ArrayList()); // } @@ -338,7 +353,7 @@ public class CategoryInfoService { // emc.commit(); // return categoryInfo; // } - + // private void changeDocumentInfoWithCategory( EntityManagerContainer emc, List document_ids, CategoryInfo categoryInfo ) throws Exception { // if( ListTools.isNotEmpty( document_ids ) ){ // emc.beginTransaction( Document.class ); @@ -359,14 +374,14 @@ public class CategoryInfoService { // emc.commit(); // } // } - + public CategoryExt saveExtContent( EntityManagerContainer emc, String categoryId, String extContent ) throws Exception { CategoryExt categoryExt = null; - + categoryExt = emc.find( categoryId, CategoryExt.class ); emc.beginTransaction( CategoryExt.class ); - + if( categoryExt == null ){ categoryExt = new CategoryExt(); categoryExt.setId(categoryId); @@ -398,7 +413,7 @@ public class CategoryInfoService { Integer totalWhileCount = 0; Integer currenteWhileCount = 0; Integer queryMaxCount = 1000; - + Business business = new Business( emc ); emc.beginTransaction( AppInfo.class ); emc.beginTransaction( CategoryInfo.class ); @@ -406,10 +421,10 @@ public class CategoryInfoService { emc.beginTransaction( ViewCategory.class ); emc.beginTransaction( Document.class ); emc.beginTransaction( Item.class ); - - categoryInfo = emc.find( id, CategoryInfo.class ); - categoryExt = emc.find( id, CategoryExt.class ); - + + categoryInfo = emc.find( id, CategoryInfo.class ); + categoryExt = emc.find( id, CategoryExt.class ); + ids = business.getViewCategoryFactory().listByCategoryId(id); if( ids != null && !ids.isEmpty() ){ for( String del_id : ids ){ @@ -417,7 +432,7 @@ public class CategoryInfoService { emc.remove( viewCategory ); } } - + if( categoryInfo != null ){ appInfo = emc.find( categoryInfo.getFormId(), AppInfo.class ); if( appInfo != null ){ @@ -427,7 +442,7 @@ public class CategoryInfoService { emc.check( appInfo, CheckPersistType.all ); } } - + //还有文档以及文档权限需要删除 docCount = business.getDocumentFactory().countByCategoryId( id ); if( docCount > 0 ) { @@ -452,7 +467,7 @@ public class CategoryInfoService { }catch( Exception e ) { e.printStackTrace(); } - + //检查是否需要删除热点图片 try { ThisApplication.queueDocumentDelete.send( document.getId() ); @@ -470,15 +485,15 @@ public class CategoryInfoService { } } } - + if( categoryExt != null ) { emc.remove( categoryExt, CheckRemoveType.all ); } - + if( categoryInfo != null ) { emc.remove( categoryInfo, CheckRemoveType.all ); } - + emc.commit(); } @@ -491,7 +506,7 @@ public class CategoryInfoService { cataggoryAliases.add(cataggoryAlias); return business.getCategoryInfoFactory().listByAlias( cataggoryAliases ); } - + public List listByAliases(EntityManagerContainer emc, List cataggoryAliases) throws Exception { if( ListTools.isEmpty( cataggoryAliases ) ){ return null; @@ -515,7 +530,7 @@ public class CategoryInfoService { * @param inCategoryIds * @param excludCategoryIds * @return - * @throws Exception + * @throws Exception */ public List listAllPeoplePublishableCategoryInfoIds( EntityManagerContainer emc, List inAppInfoIds, List inCategoryIds, List excludCategoryIds, String documentType, Integer maxCount ) throws Exception { @@ -523,7 +538,7 @@ public class CategoryInfoService { return business.getCategoryInfoFactory().listAllPeoplePublishableCategoryInfoIds( inAppInfoIds, inCategoryIds, excludCategoryIds, documentType, maxCount); } - + /** * 查询所有用户都可以查看的分类ID列表 * @param emc @@ -531,7 +546,7 @@ public class CategoryInfoService { * @param inCategoryIds * @param excludCategoryIds * @return - * @throws Exception + * @throws Exception */ public List listAllPeopleViewableCategoryInfoIds( EntityManagerContainer emc, List inAppInfoIds, List inCategoryIds, List excludCategoryIds, String documentType, Integer maxCount ) throws Exception { @@ -539,7 +554,7 @@ public class CategoryInfoService { return business.getCategoryInfoFactory().listAllPeopleViewableCategoryInfoIds( inAppInfoIds, inCategoryIds, excludCategoryIds, documentType, maxCount ); } - + /** * 根据权限查询用户可以发布文档的分类ID列表(根据权限，不包含未配置发布权限的全员可发布的分类) * @param emc @@ -550,7 +565,7 @@ public class CategoryInfoService { * @param inCategoryIds * @param excludCategoryIds * @return - * @throws Exception + * @throws Exception */ public List listPublishableCategoryInfoIdsWithPermission(EntityManagerContainer emc, String personName, List unitNames, List groupNames, List inAppInfoIds, List inCategoryIds, @@ -571,7 +586,7 @@ public class CategoryInfoService { * @param inCategoryIds * @param excludCategoryIds * @return - * @throws Exception + * @throws Exception */ public List listViewableCategoryInfoIdsWithPermission(EntityManagerContainer emc, String personName, List unitNames, List groupNames, List inAppInfoIds, List inCategoryIds, @@ -592,7 +607,7 @@ public class CategoryInfoService { * @return * @throws Exception */ - public List listManageableCategoryIds(EntityManagerContainer emc, String personName, List unitNames, + public List listManageableCategoryIds(EntityManagerContainer emc, String personName, List unitNames, List groupNames, List inAppInfoIds, String documentType, Integer maxCount ) throws Exception { if (StringUtils.isEmpty( personName )) { throw new Exception("personName is null!"); 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 800dda0fe6..e66586e02a 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 @@ -24,12 +24,12 @@ import com.x.cms.core.entity.Review; */ public class CmsBatchOperationProcessService { - public static String OPT_OBJ_DOCUMENT = "DOCUMENT"; - public static String OPT_OBJ_CATEGORY = "CATEGORY"; - public static String OPT_OBJ_APPINFO = "APPINFO"; - public static String OPT_TYPE_PERMISSION = "PERMISSION"; - public static String OPT_TYPE_UPDATENAME = "UPDATENAME"; - public static String OPT_TYPE_DELETE = "DELETE"; + public static final String OPT_OBJ_DOCUMENT = "DOCUMENT"; + public static final String OPT_OBJ_CATEGORY = "CATEGORY"; + public static final String OPT_OBJ_APPINFO = "APPINFO"; + public static final String OPT_TYPE_PERMISSION = "PERMISSION"; + public static final String OPT_TYPE_UPDATENAME = "UPDATENAME"; + public static final String OPT_TYPE_DELETE = "DELETE"; private static Logger logger = LoggerFactory.getLogger( CmsBatchOperationProcessService.class ); private DocumentInfoService documentInfoService = new DocumentInfoService(); diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/wrapin/WrapInTemplateForm.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/wrapin/WrapInTemplateForm.java index a560ee502c..a5abc7d5ed 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/wrapin/WrapInTemplateForm.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/wrapin/WrapInTemplateForm.java @@ -9,6 +9,6 @@ import com.x.processplatform.core.entity.element.TemplateForm; public class WrapInTemplateForm extends TemplateForm { private static final long serialVersionUID = 2091352200751493447L; - public static List Excludes = new ArrayList<>(JpaObject.FieldsUnmodify); + public static List excludes = new ArrayList<>(JpaObject.FieldsUnmodify); -} \ No newline at end of file +} diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/wrapin/WrapInView.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/wrapin/WrapInView.java index 0bf9429981..4b094bd0e7 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/wrapin/WrapInView.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/wrapin/WrapInView.java @@ -9,6 +9,6 @@ import com.x.cms.core.entity.element.View; public class WrapInView extends View { private static final long serialVersionUID = -5237741099036357033L; - public static List Excludes = new ArrayList<>(JpaObject.FieldsUnmodify); + public static List excludes = new ArrayList<>(JpaObject.FieldsUnmodify); -} \ No newline at end of file +} diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/wrapout/WrapFormSimple.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/wrapout/WrapFormSimple.java index 418d17955f..be2cea5802 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/wrapout/WrapFormSimple.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/wrapout/WrapFormSimple.java @@ -12,11 +12,11 @@ public class WrapFormSimple extends WrapForm { private Long rank; - public static List Excludes = new ArrayList<>(JpaObject.FieldsInvisible); + public static List excludes = new ArrayList<>(JpaObject.FieldsInvisible); static { - Excludes.add("data"); - Excludes.add("mobileData"); + excludes.add("data"); + excludes.add("mobileData"); } public Long getRank() { diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/wrapout/WrapOutAppInfo.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/wrapout/WrapOutAppInfo.java index e6d40e0df5..42b76e5a4a 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/wrapout/WrapOutAppInfo.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/wrapout/WrapOutAppInfo.java @@ -7,9 +7,9 @@ import com.x.base.core.entity.JpaObject; import com.x.cms.core.entity.AppInfo; public class WrapOutAppInfo extends AppInfo { - + private static final long serialVersionUID = -7648824521711153693L; - - public static List Excludes = new ArrayList<>(JpaObject.FieldsInvisible); + + public static List excludes = new ArrayList<>(JpaObject.FieldsInvisible); } diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/wrapout/WrapOutFormField.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/wrapout/WrapOutFormField.java index 7d2d88ed7f..9c250a66a0 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/wrapout/WrapOutFormField.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/wrapout/WrapOutFormField.java @@ -9,6 +9,6 @@ import com.x.cms.core.entity.element.Form; public class WrapOutFormField extends Form { private static final long serialVersionUID = -3041412588191150480L; - public static List Excludes = new ArrayList<>(JpaObject.FieldsInvisible); + public static List excludes = new ArrayList<>(JpaObject.FieldsInvisible); } diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/wrapout/WrapOutTemplateForm.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/wrapout/WrapOutTemplateForm.java index c11f52f16b..633aa74cda 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/wrapout/WrapOutTemplateForm.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/wrapout/WrapOutTemplateForm.java @@ -10,7 +10,7 @@ import com.x.processplatform.core.entity.element.TemplateForm; public class WrapOutTemplateForm extends TemplateForm { private static final long serialVersionUID = 1551592776065130757L; - public static List Excludes = new ArrayList<>(JpaObject.FieldsInvisible); + public static List excludes = new ArrayList<>(JpaObject.FieldsInvisible); private Control control; diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/wrapout/WrapOutTemplateFormSimple.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/wrapout/WrapOutTemplateFormSimple.java index b1e3242670..a2bde2e875 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/wrapout/WrapOutTemplateFormSimple.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/wrapout/WrapOutTemplateFormSimple.java @@ -5,8 +5,8 @@ public class WrapOutTemplateFormSimple extends WrapOutTemplateForm { private static final long serialVersionUID = 2735294690359613313L; static { - Excludes.add("data"); - Excludes.add("mobileData"); + excludes.add("data"); + excludes.add("mobileData"); } } diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/wrapout/WrapOutView.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/wrapout/WrapOutView.java index 8128969db7..f16f68c0ee 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/wrapout/WrapOutView.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/wrapout/WrapOutView.java @@ -9,7 +9,7 @@ import com.x.cms.core.entity.element.View; public class WrapOutView extends View { private static final long serialVersionUID = 2886873983211744188L; - public static List Excludes = new ArrayList<>(JpaObject.FieldsInvisible); + public static List excludes = new ArrayList<>(JpaObject.FieldsInvisible); private Long rank; diff --git a/o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/Document.java b/o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/Document.java index 8038e1d4da..36e54b2d90 100644 --- a/o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/Document.java +++ b/o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/Document.java @@ -935,6 +935,38 @@ public class Document extends SliceJpaObject { this.stringValue03 = stringValue03; } + public String getStringValue04() { + return stringValue04; + } + + public void setStringValue04(String stringValue04) { + this.stringValue04 = stringValue04; + } + + public Long getLongValue02() { + return longValue02; + } + + public void setLongValue02(Long longValue02) { + this.longValue02 = longValue02; + } + + public Date getDateTimeValue01() { + return dateTimeValue01; + } + + public void setDateTimeValue01(Date dateTimeValue01) { + this.dateTimeValue01 = dateTimeValue01; + } + + public Date getDateTimeValue02() { + return dateTimeValue02; + } + + public void setDateTimeValue02(Date dateTimeValue02) { + this.dateTimeValue02 = dateTimeValue02; + } + // -------------------Reader------------------------- // -------------------2020-06-12 改为只存储DistinguishedName后两段，第一段可能会在运行过程中修改 public void addToReadPersonList(String readPerson) { -- GitLab