From 03f79cde4d1cf1a2892c64816770b07af9887a45 Mon Sep 17 00:00:00 2001 From: o2sword <171715986@qq.com> Date: Mon, 31 Oct 2022 14:24:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=86=85=E5=AE=B9=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=96=87=E6=A1=A3=E5=8F=91=E5=B8=83http=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E7=9A=84body=E4=BD=93=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jaxrs/document/DocumentAction.java | 34 +++++++++---------- .../jaxrs/document/DocumentAction2.java | 6 ++-- .../jaxrs/document/DocumentCipherAction.java | 4 +-- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/DocumentAction.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/DocumentAction.java index b4a6e993fc..4cf39e9a9f 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/DocumentAction.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/DocumentAction.java @@ -50,7 +50,7 @@ public class DocumentAction extends StandardJaxrsAction { } } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result, jsonElement)); } @JaxrsMethodDescribe(value = "变更指定文档的分类信息.", action = ActionPersistChangeCategory.class) @@ -74,7 +74,7 @@ public class DocumentAction extends StandardJaxrsAction { } } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result, jsonElement)); } @JaxrsMethodDescribe(value = "指修改指定文档的数据。", action = ActionPersistBatchModifyData.class) @@ -96,7 +96,7 @@ public class DocumentAction extends StandardJaxrsAction { logger.error(e, effectivePerson, request, null); } } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result, jsonElement)); } @JaxrsMethodDescribe(value = "指修改指定文档的数据。", action = ActionPersistBatchModifyData.class) @@ -118,7 +118,7 @@ public class DocumentAction extends StandardJaxrsAction { logger.error(e, effectivePerson, request, null); } } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result, jsonElement)); } @JaxrsMethodDescribe(value = "根据导入批次号查询导入状态信息.", action = ActionQueryImportStatusWithName.class) @@ -256,7 +256,7 @@ public class DocumentAction extends StandardJaxrsAction { logger.error(e, effectivePerson, request, null); } } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result, jsonElement)); } @JaxrsMethodDescribe(value = "查询符合过滤条件的已发布的信息数量.", action = ActionQueryCountWithFilter.class) @@ -279,7 +279,7 @@ public class DocumentAction extends StandardJaxrsAction { logger.error(e, effectivePerson, request, null); } } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result, jsonElement)); } @JaxrsMethodDescribe(value = "根据ID删除信息发布文档信息.", action = ActionPersistDeleteDocument.class) @@ -401,7 +401,7 @@ public class DocumentAction extends StandardJaxrsAction { } } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result, jsonElement)); } @JaxrsMethodDescribe(value = "根据文档ID正式发布文档，消息通过publishNotify接口发送。", action = ActionPersistPublishAndNotify.class) @@ -426,7 +426,7 @@ public class DocumentAction extends StandardJaxrsAction { } } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result, jsonElement)); } @JaxrsMethodDescribe(value = "直接发布信息内容，创建新的信息发布文档并且直接发布.", action = ActionPersistPublishContent.class) @@ -451,7 +451,7 @@ public class DocumentAction extends StandardJaxrsAction { logger.error(e, effectivePerson, request, null); } } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result, jsonElement)); } @JaxrsMethodDescribe(value = "直接发布信息内容，创建新的信息发布文档并且直接发布.", action = ActionPersistPublishContent.class) @@ -476,7 +476,7 @@ public class DocumentAction extends StandardJaxrsAction { logger.error(e, effectivePerson, request, null); } } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result, jsonElement)); } @JaxrsMethodDescribe(value = "根据ID取消信息内容发布状态，修改为草稿.", action = ActionPersistPublishCancel.class) @@ -712,7 +712,7 @@ public class DocumentAction extends StandardJaxrsAction { } } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result, jsonElement)); } @JaxrsMethodDescribe(value = "文档点赞.", action = ActionPersistCommend.class) @@ -825,7 +825,7 @@ public class DocumentAction extends StandardJaxrsAction { logger.error(e, effectivePerson, request, null); } } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result, jsonElement)); } @JaxrsMethodDescribe(value = "分页查询符合过滤条件的已发布的信息内容.", action = ActionQueryListWithFilterPaging.class) @@ -850,7 +850,7 @@ public class DocumentAction extends StandardJaxrsAction { logger.error(e, effectivePerson, request, null); } } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result, jsonElement)); } @JaxrsMethodDescribe(value = "获取文件访问控制信息.", action = ActionQueryGetControl.class) @@ -937,7 +937,7 @@ public class DocumentAction extends StandardJaxrsAction { logger.error(e, effectivePerson, request, jsonElement); } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result, jsonElement)); } @JaxrsMethodDescribe(value = "列示文档.", action = ActionQueryListDocument.class) @@ -957,7 +957,7 @@ public class DocumentAction extends StandardJaxrsAction { logger.error(e, effectivePerson, request, jsonElement); } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result, jsonElement)); } @JaxrsMethodDescribe(value = "查看文档数据.", action = ActionQueryGetDocumentData.class) @@ -1004,7 +1004,7 @@ public class DocumentAction extends StandardJaxrsAction { logger.error( e, effectivePerson, request, null); } } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result, jsonElement)); } @JaxrsMethodDescribe(value = "已发布文档消息通知。", action = ActionNotify.class) @@ -1023,7 +1023,7 @@ public class DocumentAction extends StandardJaxrsAction { logger.error(e, effectivePerson, request, jsonElement); } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result, jsonElement)); } @JaxrsMethodDescribe(value = "已发布文档发送html文本到webServer下。", action = ActionPublishHtml.class) diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/DocumentAction2.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/DocumentAction2.java index 53d7d32459..1ce9375e4c 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/DocumentAction2.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/DocumentAction2.java @@ -447,7 +447,7 @@ public class DocumentAction2 extends StandardJaxrsAction{ logger.error( e, effectivePerson, request, null); } } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result, jsonElement)); } @JaxrsMethodDescribe(value = "直接发布信息内容，创建新的信息发布文档并且直接发布.", action = ActionPersistPublishContent.class) @@ -471,7 +471,7 @@ public class DocumentAction2 extends StandardJaxrsAction{ logger.error( e, effectivePerson, request, null); } } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result, jsonElement)); } @JaxrsMethodDescribe(value = "根据ID取消信息内容发布状态，修改为草稿.", action = ActionPersistPublishCancel.class) @@ -703,7 +703,7 @@ public class DocumentAction2 extends StandardJaxrsAction{ } } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result, jsonElement)); } @JaxrsMethodDescribe(value = "文档点赞.", action = ActionPersistCommend.class) diff --git a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/DocumentCipherAction.java b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/DocumentCipherAction.java index 92d9bb068e..100e30763e 100644 --- a/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/DocumentCipherAction.java +++ b/o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/DocumentCipherAction.java @@ -52,7 +52,7 @@ public class DocumentCipherAction extends StandardJaxrsAction{ logger.error( e, effectivePerson, request, null); } } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result, jsonElement)); } @JaxrsMethodDescribe(value = "直接发布文档信息.", action = ActionPersistPublishByWorkFlow.class) @@ -74,7 +74,7 @@ public class DocumentCipherAction extends StandardJaxrsAction{ logger.error( e, effectivePerson, request, null); } } - asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result, jsonElement)); } @JaxrsMethodDescribe(value = "分页查询符合过滤条件的已发布的信息内容(管理员和Ciper使用).", action = ActionQueryListWithFilterPagingAdmin.class) -- GitLab