diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/entity/JpaObject.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/entity/JpaObject.java index 57a5541e5f18dd4b9b8499441bfece0cf7115e4f..e27110a95339b40e395267463ece7efef9d92098 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/entity/JpaObject.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/entity/JpaObject.java @@ -20,6 +20,7 @@ import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.reflect.FieldUtils; import org.apache.openjpa.persistence.jdbc.ContainerTable; +import org.apache.openjpa.persistence.jdbc.Strategy; import com.x.base.core.entity.annotation.Flag; import com.x.base.core.entity.annotation.RestrictFlag; @@ -309,8 +310,15 @@ public abstract class JpaObject extends GsonPropertyObject implements Serializab if (BooleanUtils.isTrue(excludeInvisible) && FieldsInvisible.contains(field.getName())) { continue; } - if (BooleanUtils.isTrue(excludeLob) && (null != field.getAnnotation(Lob.class))) { - continue; + if (BooleanUtils.isTrue(excludeLob)) { + if (null != field.getAnnotation(Lob.class)) { + continue; + } else { + Strategy strategy = field.getAnnotation(Strategy.class); + if ((null != strategy) && StringUtils.equals(JsonPropertiesValueHandler, strategy.value())) { + continue; + } + } } names.add(field.getName()); } diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ApplicationServer.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ApplicationServer.java index 5b68fc79671a6dbf4e71309569ad8012aa7e8365..e7806774c0a4ae6c01074d944c2f732ef47f217c 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ApplicationServer.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ApplicationServer.java @@ -21,7 +21,7 @@ public class ApplicationServer extends ConfigObject { private static final String DEFAULT_STATEXCLUSIONS = "*.js,*.gif,*.jpg,*.png,*.css,*.ico"; private static final Integer DEFAULT_MAXFORMCONTENT = 20; private static final Boolean DEFAULT_EXPOSEJEST = true; - private static final Boolean DEFAULT_PERSISTENTCONNECTIONSENABLE = false; + private static final Boolean DEFAULT_PERSISTENTCONNECTIONSENABLE = true; public ApplicationServer() { this.enable = true; diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/CenterServer.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/CenterServer.java index 4f2272712b3ad6b352aec101952c428e3daa396e..b126487471044efa1c8ab3a6433fb5ef94a234ac 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/CenterServer.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/CenterServer.java @@ -22,7 +22,7 @@ public class CenterServer extends ConfigObject { private static final String DEFAULT_STATEXCLUSIONS = "*.js,*.gif,*.jpg,*.png,*.css,*.ico"; private static final Integer DEFAULT_MAXFORMCONTENT = 20; private static final Boolean DEFAULT_EXPOSEJEST = true; - private static final Boolean DEFAULT_PERSISTENTCONNECTIONSENABLE = false; + private static final Boolean DEFAULT_PERSISTENTCONNECTIONSENABLE = true; public static CenterServer defaultInstance() { return new CenterServer(); diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Web.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Web.java index 81e5e0200e99bafad926d9d3fbe28638ea44a5b3..ca2e33fc23124963d8b7d4f740eb715e634dcaec 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Web.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Web.java @@ -1,7 +1,6 @@ package com.x.base.core.project.config; -import java.util.ArrayList; -import java.util.List; +import java.util.TreeMap; import com.x.base.core.project.annotation.FieldDescribe; @@ -18,14 +17,19 @@ public class Web extends ConfigObject { } @FieldDescribe("使用Post模拟Put,Get模拟Delete的模块.") - private List mocks = new ArrayList<>(); + private Mock mock = new Mock(); + + public static class Mock extends TreeMap { - public List getMocks() { - return mocks; } - public void setMocks(List mocks) { - this.mocks = mocks; + public static class MockItem { + private MockItemObject put; + private MockItemObject delete; } + public static class MockItemObject { + private String to; + private String append; + } } diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/WebServer.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/WebServer.java index 01e2f842c328fd6943bb4013be838b5af6c1ada3..92ab3f76d616b671ede878de81663c8bf5b32b65 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/WebServer.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/WebServer.java @@ -34,7 +34,7 @@ public class WebServer extends ConfigObject { private static final Integer DEFAULT_CACHECONTROLMAXAGE = 0; private static final Boolean DEFAULT_PROXYCENTERENABLE = true; private static final Boolean DEFAULT_PROXYAPPLICATIONENABLE = true; - private static final Boolean DEFAULT_PERSISTENTCONNECTIONSENABLE = false; + private static final Boolean DEFAULT_PERSISTENTCONNECTIONSENABLE = true; @FieldDescribe("是否启用") private Boolean enable; diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/applicationdict/ApplicationDictAction.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/applicationdict/ApplicationDictAction.java index 95e768a99eb80de5614aff2bfdce94d51e86929d..0d6dc442b79959a3b44d4566c1c3364b2539e2f4 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/applicationdict/ApplicationDictAction.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/applicationdict/ApplicationDictAction.java @@ -303,12 +303,12 @@ public class ApplicationDictAction extends StandardJaxrsAction { asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); } - @JaxrsMethodDescribe(value = "Mock POST to PUT.", action = ActionUpdateDataPath0.class) + @JaxrsMethodDescribe(value = "Mock PUT to POST.", action = ActionUpdateDataPath0.class) @POST - @Path("{applicationDictFlag}/application/{applicationFlag}/{path0}/data/mockpost2put") + @Path("{applicationDictFlag}/application/{applicationFlag}/{path0}/data/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void updateDataPath0MockPost2Put(@Suspended final AsyncResponse asyncResponse, + public void updateDataPath0MockPutToPost(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("数据字典标识") @PathParam("applicationDictFlag") String applicationDictFlag, @JaxrsParameterDescribe("应用标识") @PathParam("applicationFlag") String applicationFlag, @@ -346,12 +346,12 @@ public class ApplicationDictAction extends StandardJaxrsAction { asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); } - @JaxrsMethodDescribe(value = "Mock POST to PUT.", action = ActionUpdateDataPath1.class) + @JaxrsMethodDescribe(value = "Mock PUT to POST.", action = ActionUpdateDataPath1.class) @POST - @Path("{applicationDictFlag}/application/{applicationFlag}/{path0}/{path1}/data/mockpost2put") + @Path("{applicationDictFlag}/application/{applicationFlag}/{path0}/{path1}/data/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void updateDataPath1MockPost2Put(@Suspended final AsyncResponse asyncResponse, + public void updateDataPath1MockPutToPost(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("数据字典标识") @PathParam("applicationDictFlag") String applicationDictFlag, @JaxrsParameterDescribe("应用标识") @PathParam("applicationFlag") String applicationFlag, @@ -392,12 +392,12 @@ public class ApplicationDictAction extends StandardJaxrsAction { asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); } - @JaxrsMethodDescribe(value = "Mock POST to PUT.", action = ActionUpdateDataPath2.class) + @JaxrsMethodDescribe(value = "Mock PUT to POST.", action = ActionUpdateDataPath2.class) @POST - @Path("{applicationDictFlag}/application/{applicationFlag}/{path0}/{path1}/{path2}/data/mockpost2put") + @Path("{applicationDictFlag}/application/{applicationFlag}/{path0}/{path1}/{path2}/data/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void updateDataPath2MockPost2Put(@Suspended final AsyncResponse asyncResponse, + public void updateDataPath2MockPutToPost(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("数据字典标识") @PathParam("applicationDictFlag") String applicationDictFlag, @JaxrsParameterDescribe("应用标识") @PathParam("applicationFlag") String applicationFlag, @@ -440,12 +440,12 @@ public class ApplicationDictAction extends StandardJaxrsAction { asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); } - @JaxrsMethodDescribe(value = "Mock POST to PUT.", action = ActionUpdateDataPath3.class) + @JaxrsMethodDescribe(value = "Mock PUT to POST.", action = ActionUpdateDataPath3.class) @POST - @Path("{applicationDictFlag}/application/{applicationFlag}/{path0}/{path1}/{path2}/{path3}/data/mockpost2put") + @Path("{applicationDictFlag}/application/{applicationFlag}/{path0}/{path1}/{path2}/{path3}/data/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void updateDataPath3MockPost2Put(@Suspended final AsyncResponse asyncResponse, + public void updateDataPath3MockPutToPost(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("数据字典标识") @PathParam("applicationDictFlag") String applicationDictFlag, @JaxrsParameterDescribe("应用标识") @PathParam("applicationFlag") String applicationFlag, @@ -492,10 +492,10 @@ public class ApplicationDictAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock POST to PUT.", action = ActionUpdateDataPath4.class) @POST - @Path("{applicationDictFlag}/application/{applicationFlag}/{path0}/{path1}/{path2}/{path3}/{path4}/data/mockpost2put") + @Path("{applicationDictFlag}/application/{applicationFlag}/{path0}/{path1}/{path2}/{path3}/{path4}/data/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void updateDataPath4MockPost2Put(@Suspended final AsyncResponse asyncResponse, + public void updateDataPath4MockPutToPost(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("数据字典标识") @PathParam("applicationDictFlag") String applicationDictFlag, @JaxrsParameterDescribe("应用标识") @PathParam("applicationFlag") String applicationFlag, @@ -544,10 +544,10 @@ public class ApplicationDictAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock POST to PUT.", action = ActionUpdateDataPath5.class) @POST - @Path("{applicationDictFlag}/application/{applicationFlag}/{path0}/{path1}/{path2}/{path3}/{path4}/{path5}/data/mockpost2put") + @Path("{applicationDictFlag}/application/{applicationFlag}/{path0}/{path1}/{path2}/{path3}/{path4}/{path5}/data/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void updateDataPath5MockPost2Put(@Suspended final AsyncResponse asyncResponse, + public void updateDataPath5MockPutToPost(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("数据字典标识") @PathParam("applicationDictFlag") String applicationDictFlag, @JaxrsParameterDescribe("应用标识") @PathParam("applicationFlag") String applicationFlag, @@ -598,10 +598,10 @@ public class ApplicationDictAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock POST to PUT.", action = ActionUpdateDataPath6.class) @POST - @Path("{applicationDictFlag}/application/{applicationFlag}/{path0}/{path1}/{path2}/{path3}/{path4}/{path5}/{path6}/data/mockpost2put") + @Path("{applicationDictFlag}/application/{applicationFlag}/{path0}/{path1}/{path2}/{path3}/{path4}/{path5}/{path6}/data/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void updateDataPath6MockPost2Put(@Suspended final AsyncResponse asyncResponse, + public void updateDataPath6MockPutToPost(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("数据字典标识") @PathParam("applicationDictFlag") String applicationDictFlag, @JaxrsParameterDescribe("应用标识") @PathParam("applicationFlag") String applicationFlag, @@ -654,10 +654,10 @@ public class ApplicationDictAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock POST to PUT.", action = ActionUpdateDataPath7.class) @POST - @Path("{applicationDictFlag}/application/{applicationFlag}/{path0}/{path1}/{path2}/{path3}/{path4}/{path5}/{path6}/{path7}/data/mockpost2put") + @Path("{applicationDictFlag}/application/{applicationFlag}/{path0}/{path1}/{path2}/{path3}/{path4}/{path5}/{path6}/{path7}/data/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void updateDataPath7MockPost2Put(@Suspended final AsyncResponse asyncResponse, + public void updateDataPath7MockPutToPost(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("数据字典标识") @PathParam("applicationDictFlag") String applicationDictFlag, @JaxrsParameterDescribe("应用标识") @PathParam("applicationFlag") String applicationFlag, @@ -898,10 +898,10 @@ public class ApplicationDictAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Get 2 Delete.", action = ActionDeleteDataPath0.class) @GET - @Path("{applicationDictFlag}/application/{applicationFlag}/{path0}/data/mockget2delete") + @Path("{applicationDictFlag}/application/{applicationFlag}/{path0}/data/mockdeletetoget") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void deleteDataPath0MockGet2Delete(@Suspended final AsyncResponse asyncResponse, + public void deleteDataPath0MockDeleteToGet(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("数据字典标识") @PathParam("applicationDictFlag") String applicationDictFlag, @JaxrsParameterDescribe("应用标识") @PathParam("applicationFlag") String applicationFlag, @@ -940,10 +940,10 @@ public class ApplicationDictAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Get 2 Delete.", action = ActionDeleteDataPath1.class) @GET - @Path("{applicationDictFlag}/application/{applicationFlag}/{path0}/{path1}/data/mockget2delete") + @Path("{applicationDictFlag}/application/{applicationFlag}/{path0}/{path1}/data/mockdeletetoget") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void deleteDataPath1MockGet2Delete(@Suspended final AsyncResponse asyncResponse, + public void deleteDataPath1MockDeleteToGet(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("数据字典标识") @PathParam("applicationDictFlag") String applicationDictFlag, @JaxrsParameterDescribe("应用标识") @PathParam("applicationFlag") String applicationFlag, @@ -984,10 +984,10 @@ public class ApplicationDictAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Get 2 Delete.", action = ActionDeleteDataPath2.class) @GET - @Path("{applicationDictFlag}/application/{applicationFlag}/{path0}/{path1}/{path2}/data/mockget2delete") + @Path("{applicationDictFlag}/application/{applicationFlag}/{path0}/{path1}/{path2}/data/mockdeletetoget") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void deleteDataPath2MockGet2Delete(@Suspended final AsyncResponse asyncResponse, + public void deleteDataPath2MockDeleteToGet(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("数据字典标识") @PathParam("applicationDictFlag") String applicationDictFlag, @JaxrsParameterDescribe("应用标识") @PathParam("applicationFlag") String applicationFlag, @@ -1031,10 +1031,10 @@ public class ApplicationDictAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Get 2 Delete.", action = ActionDeleteDataPath3.class) @DELETE - @Path("{applicationDictFlag}/application/{applicationFlag}/{path0}/{path1}/{path2}/{path3}/data/mockget2delete") + @Path("{applicationDictFlag}/application/{applicationFlag}/{path0}/{path1}/{path2}/{path3}/data/mockdeletetoget") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void deleteDataPath3MockGet2Delete(@Suspended final AsyncResponse asyncResponse, + public void deleteDataPath3MockDeleteToGet(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("数据字典标识") @PathParam("applicationDictFlag") String applicationDictFlag, @JaxrsParameterDescribe("应用标识") @PathParam("applicationFlag") String applicationFlag, @@ -1081,10 +1081,10 @@ public class ApplicationDictAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Get 2 Delete.", action = ActionDeleteDataPath4.class) @GET - @Path("{applicationDictFlag}/application/{applicationFlag}/{path0}/{path1}/{path2}/{path3}/{path4}/data/mockget2delete") + @Path("{applicationDictFlag}/application/{applicationFlag}/{path0}/{path1}/{path2}/{path3}/{path4}/data/mockdeletetoget") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void deleteDataPath4MockGet2Delete(@Suspended final AsyncResponse asyncResponse, + public void deleteDataPath4MockDeleteToGet(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("数据字典标识") @PathParam("applicationDictFlag") String applicationDictFlag, @JaxrsParameterDescribe("应用标识") @PathParam("applicationFlag") String applicationFlag, @@ -1133,10 +1133,10 @@ public class ApplicationDictAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Get 2 Delete.", action = ActionDeleteDataPath5.class) @GET - @Path("{applicationDictFlag}/application/{applicationFlag}/{path0}/{path1}/{path2}/{path3}/{path4}/{path5}/data/mockget2delete") + @Path("{applicationDictFlag}/application/{applicationFlag}/{path0}/{path1}/{path2}/{path3}/{path4}/{path5}/data/mockdeletetoget") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void deleteDataPath5MockGet2Delete(@Suspended final AsyncResponse asyncResponse, + public void deleteDataPath5MockDeleteToGet(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("数据字典标识") @PathParam("applicationDictFlag") String applicationDictFlag, @JaxrsParameterDescribe("应用标识") @PathParam("applicationFlag") String applicationFlag, @@ -1187,10 +1187,10 @@ public class ApplicationDictAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Get 2 Delete.", action = ActionDeleteDataPath6.class) @GET - @Path("{applicationDictFlag}/application/{applicationFlag}/{path0}/{path1}/{path2}/{path3}/{path4}/{path5}/{path6}/data/mockget2delete") + @Path("{applicationDictFlag}/application/{applicationFlag}/{path0}/{path1}/{path2}/{path3}/{path4}/{path5}/{path6}/data/mockdeletetoget") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void deleteDataPath6MockGet2Delete(@Suspended final AsyncResponse asyncResponse, + public void deleteDataPath6MockDeleteToGet(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("数据字典标识") @PathParam("applicationDictFlag") String applicationDictFlag, @JaxrsParameterDescribe("应用标识") @PathParam("applicationFlag") String applicationFlag, @@ -1243,10 +1243,10 @@ public class ApplicationDictAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Get 2 Delete.", action = ActionDeleteDataPath7.class) @GET - @Path("{applicationDictFlag}/application/{applicationFlag}/{path0}/{path1}/{path2}/{path3}/{path4}/{path5}/{path6}/{path7}/data/mockget2delete") + @Path("{applicationDictFlag}/application/{applicationFlag}/{path0}/{path1}/{path2}/{path3}/{path4}/{path5}/{path6}/{path7}/data/mockdeletetoget") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void deleteDataPath7MockGet2Delete(@Suspended final AsyncResponse asyncResponse, + public void deleteDataPath7MockDeleteToGet(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("数据字典标识") @PathParam("applicationDictFlag") String applicationDictFlag, @JaxrsParameterDescribe("应用标识") @PathParam("applicationFlag") String applicationFlag, diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/AttachmentAction.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/AttachmentAction.java index 6b3de245c6cf6cfd81a1329b9f92e11ad917affd..4fc8f3db29563d9806edc3ce9ddbd69c5b4b7ed7 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/AttachmentAction.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/AttachmentAction.java @@ -194,10 +194,10 @@ public class AttachmentAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Get To Delete.", action = ActionDeleteWithWork.class) @GET - @Path("{id}/work/{workId}/mockget2delete") + @Path("{id}/work/{workId}/mockdeletetoget") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void deleteWithWorkMockGet2Delete(@Suspended final AsyncResponse asyncResponse, + public void deleteWithWorkMockDeleteToGet(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("附件标识") @PathParam("id") String id, @JaxrsParameterDescribe("工作标识") @PathParam("workId") String workId) { ActionResult result = new ActionResult<>(); @@ -232,10 +232,10 @@ public class AttachmentAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Get To Delete.", action = ActionDeleteWithWorkCompleted.class) @GET - @Path("{id}/workcompleted/{workCompletedId}/mockget2delete") + @Path("{id}/workcompleted/{workCompletedId}/mockdeletetoget") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void deleteWithWorkCompletedMockGet2Delete(@Suspended final AsyncResponse asyncResponse, + public void deleteWithWorkCompletedMockDeleteToGet(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("附件标识") @PathParam("id") String id, @JaxrsParameterDescribe("已完成工作标识") @PathParam("workCompletedId") String workCompletedId) { ActionResult result = new ActionResult<>(); @@ -541,10 +541,10 @@ public class AttachmentAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Get To Delete.", action = ActionUpdate.class) @POST - @Path("update/{id}/work/{workId}/mockpost2put") + @Path("update/{id}/work/{workId}/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.MULTIPART_FORM_DATA) - public void updateMockPost2Put(FormDataMultiPart form, @Suspended final AsyncResponse asyncResponse, + public void updateMockPutToPost(FormDataMultiPart form, @Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("附件标识") @PathParam("id") String id, @JaxrsParameterDescribe("工作标识") @PathParam("workId") String workId, @JaxrsParameterDescribe("附件名称") @FormDataParam(FILENAME_FIELD) String fileName, @@ -596,10 +596,10 @@ public class AttachmentAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Get To Delete.", action = ActionUpdateContent.class) @POST - @Path("update/content/{id}/work/{workId}/mockpost2put") + @Path("update/content/{id}/work/{workId}/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void updateContentMockPost2Put(@Suspended final AsyncResponse asyncResponse, + public void updateContentMockPutToPost(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("附件标识") @PathParam("id") String id, @JaxrsParameterDescribe("工作标识") @PathParam("workId") String workId, JsonElement jsonElement) { ActionResult result = new ActionResult<>(); @@ -752,10 +752,10 @@ public class AttachmentAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Get To Delete.", action = ActionEdit.class) @POST - @Path("edit/{id}/work/{workId}/mockpost2put") + @Path("edit/{id}/work/{workId}/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void editMockPost2Put(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, + public void editMockPutToPost(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("附件标识") @PathParam("id") String id, @JaxrsParameterDescribe("工作标识") @PathParam("workId") String workId, JsonElement jsonElement) { ActionResult result = new ActionResult<>(); @@ -810,10 +810,10 @@ public class AttachmentAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Get To Delete.", action = ActionEditText.class) @POST - @Path("edit/{id}/work/{workId}/text/mockpost2put") + @Path("edit/{id}/work/{workId}/text/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void exitTextMockPost2Put(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, + public void exitTextMockPutToPost(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("附件标识") @PathParam("id") String id, @JaxrsParameterDescribe("工作标识") @PathParam("workId") String workId, JsonElement jsonElement) { ActionResult result = new ActionResult<>(); @@ -1024,10 +1024,10 @@ public class AttachmentAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Get To Delete.", action = ActionUploadWorkInfo.class) @POST - @Path("upload/work/{workId}/save/as/{flag}/mockpost2put") + @Path("upload/work/{workId}/save/as/{flag}/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void uploadWorkInfoMockPost2Put(@Suspended final AsyncResponse asyncResponse, + public void uploadWorkInfoMockPutToPost(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("Work或WorkCompleted的工作标识") @PathParam("workId") String workId, @JaxrsParameterDescribe("另存为格式：(0)表示不转换|pdf表示转为pdf|word表示转为word") @PathParam("flag") String flag, diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/data/DataAction.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/data/DataAction.java index 1abaf2a8d2aa66dcdc4072aa869bc7b033763cc4..95635599ee54238a3436b0e4f08b67b50ca2e342 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/data/DataAction.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/data/DataAction.java @@ -690,6 +690,25 @@ public class DataAction extends StandardJaxrsAction { asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); } + @JaxrsMethodDescribe(value = "Mock PUT to POST.", action = ActionUpdateWithWork.class) + @POST + @Path("work/{id}/mockputtopost") + @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) + @Consumes(MediaType.APPLICATION_JSON) + public void updateWithWorkMockPutToPost(@Suspended final AsyncResponse asyncResponse, + @Context HttpServletRequest request, @JaxrsParameterDescribe("工作标识") @PathParam("id") String id, + JsonElement jsonElement) { + ActionResult result = new ActionResult<>(); + EffectivePerson effectivePerson = this.effectivePerson(request); + try { + result = new ActionUpdateWithWork().execute(effectivePerson, id, jsonElement); + } catch (Exception e) { + logger.error(e, effectivePerson, request, jsonElement); + result.error(e); + } + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + } + @JaxrsMethodDescribe(value = "更新指定Work的Data数据.", action = ActionUpdateWithWorkPath0.class) @PUT @Path("work/{id}/{path0}") @@ -709,6 +728,25 @@ public class DataAction extends StandardJaxrsAction { asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); } + @JaxrsMethodDescribe(value = "更新指定Work的Data数据.", action = ActionUpdateWithWorkPath0.class) + @POST + @Path("work/{id}/{path0}/mockputtopost") + @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) + @Consumes(MediaType.APPLICATION_JSON) + public void updateWithWorkPath0MockPutToPost(@Suspended final AsyncResponse asyncResponse, + @Context HttpServletRequest request, @JaxrsParameterDescribe("工作标识") @PathParam("id") String id, + @JaxrsParameterDescribe("0级路径") @PathParam("path0") String path0, JsonElement jsonElement) { + ActionResult result = new ActionResult<>(); + EffectivePerson effectivePerson = this.effectivePerson(request); + try { + result = new ActionUpdateWithWorkPath0().execute(effectivePerson, id, path0, jsonElement); + } catch (Exception e) { + logger.error(e, effectivePerson, request, jsonElement); + result.error(e); + } + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + } + @JaxrsMethodDescribe(value = "更新指定Work的Data数据.", action = ActionUpdateWithWorkPath1.class) @PUT @Path("work/{id}/{path0}/{path1}") @@ -729,6 +767,26 @@ public class DataAction extends StandardJaxrsAction { asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); } + @JaxrsMethodDescribe(value = "Mock PUT To POST.", action = ActionUpdateWithWorkPath1.class) + @PUT + @Path("work/{id}/{path0}/{path1}/mockputtopost") + @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) + @Consumes(MediaType.APPLICATION_JSON) + public void updateWithWorkPath1MockPutToPost(@Suspended final AsyncResponse asyncResponse, + @Context HttpServletRequest request, @JaxrsParameterDescribe("工作标识") @PathParam("id") String id, + @JaxrsParameterDescribe("0级路径") @PathParam("path0") String path0, + @JaxrsParameterDescribe("1级路径") @PathParam("path1") String path1, JsonElement jsonElement) { + ActionResult result = new ActionResult<>(); + EffectivePerson effectivePerson = this.effectivePerson(request); + try { + result = new ActionUpdateWithWorkPath1().execute(effectivePerson, id, path0, path1, jsonElement); + } catch (Exception e) { + logger.error(e, effectivePerson, request, jsonElement); + result.error(e); + } + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + } + @JaxrsMethodDescribe(value = "更新指定Work的Data数据.", action = ActionUpdateWithWorkPath2.class) @PUT @Path("work/{id}/{path0}/{path1}/{path2}") @@ -750,6 +808,27 @@ public class DataAction extends StandardJaxrsAction { asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); } + @JaxrsMethodDescribe(value = "Mock PUT to POST.", action = ActionUpdateWithWorkPath2.class) + @POST + @Path("work/{id}/{path0}/{path1}/{path2}/mockputtopost") + @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) + @Consumes(MediaType.APPLICATION_JSON) + public void updateWithWorkPath2MockPutToPost(@Suspended final AsyncResponse asyncResponse, + @Context HttpServletRequest request, @JaxrsParameterDescribe("工作标识") @PathParam("id") String id, + @JaxrsParameterDescribe("0级路径") @PathParam("path0") String path0, + @JaxrsParameterDescribe("1级路径") @PathParam("path1") String path1, + @JaxrsParameterDescribe("2级路径") @PathParam("path2") String path2, JsonElement jsonElement) { + ActionResult result = new ActionResult<>(); + EffectivePerson effectivePerson = this.effectivePerson(request); + try { + result = new ActionUpdateWithWorkPath2().execute(effectivePerson, id, path0, path1, path2, jsonElement); + } catch (Exception e) { + logger.error(e, effectivePerson, request, jsonElement); + result.error(e); + } + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + } + @JaxrsMethodDescribe(value = "更新指定Work的Data数据.", action = ActionUpdateWithWorkPath3.class) @PUT @Path("work/{id}/{path0}/{path1}/{path2}/{path3}") @@ -773,6 +852,29 @@ public class DataAction extends StandardJaxrsAction { asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); } + @JaxrsMethodDescribe(value = "Mock PUT to POST.", action = ActionUpdateWithWorkPath3.class) + @POST + @Path("work/{id}/{path0}/{path1}/{path2}/{path3}/mockputtopost") + @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) + @Consumes(MediaType.APPLICATION_JSON) + public void updateWithWorkPath3MockPutToPost(@Suspended final AsyncResponse asyncResponse, + @Context HttpServletRequest request, @JaxrsParameterDescribe("工作标识") @PathParam("id") String id, + @JaxrsParameterDescribe("0级路径") @PathParam("path0") String path0, + @JaxrsParameterDescribe("1级路径") @PathParam("path1") String path1, + @JaxrsParameterDescribe("2级路径") @PathParam("path2") String path2, + @JaxrsParameterDescribe("3级路径") @PathParam("path3") String path3, JsonElement jsonElement) { + ActionResult result = new ActionResult<>(); + EffectivePerson effectivePerson = this.effectivePerson(request); + try { + result = new ActionUpdateWithWorkPath3().execute(effectivePerson, id, path0, path1, path2, path3, + jsonElement); + } catch (Exception e) { + logger.error(e, effectivePerson, request, jsonElement); + result.error(e); + } + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + } + @JaxrsMethodDescribe(value = "更新指定Work的Data数据.", action = ActionUpdateWithWorkPath4.class) @PUT @Path("work/{id}/{path0}/{path1}/{path2}/{path3}/{path4}") @@ -797,6 +899,30 @@ public class DataAction extends StandardJaxrsAction { asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); } + @JaxrsMethodDescribe(value = "Mock PUT to POST.", action = ActionUpdateWithWorkPath4.class) + @POST + @Path("work/{id}/{path0}/{path1}/{path2}/{path3}/{path4}/mockputtopost") + @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) + @Consumes(MediaType.APPLICATION_JSON) + public void updateWithWorkPath4MockPutToPost(@Suspended final AsyncResponse asyncResponse, + @Context HttpServletRequest request, @JaxrsParameterDescribe("工作标识") @PathParam("id") String id, + @JaxrsParameterDescribe("0级路径") @PathParam("path0") String path0, + @JaxrsParameterDescribe("1级路径") @PathParam("path1") String path1, + @JaxrsParameterDescribe("2级路径") @PathParam("path2") String path2, + @JaxrsParameterDescribe("3级路径") @PathParam("path3") String path3, + @JaxrsParameterDescribe("4级路径") @PathParam("path4") String path4, JsonElement jsonElement) { + ActionResult result = new ActionResult<>(); + EffectivePerson effectivePerson = this.effectivePerson(request); + try { + result = new ActionUpdateWithWorkPath4().execute(effectivePerson, id, path0, path1, path2, path3, path4, + jsonElement); + } catch (Exception e) { + logger.error(e, effectivePerson, request, jsonElement); + result.error(e); + } + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + } + @JaxrsMethodDescribe(value = "更新指定Work的Data数据.", action = ActionUpdateWithWorkPath5.class) @PUT @Path("work/{id}/{path0}/{path1}/{path2}/{path3}/{path4}/{path5}") @@ -822,6 +948,31 @@ public class DataAction extends StandardJaxrsAction { asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); } + @JaxrsMethodDescribe(value = "更新指定Work的Data数据.", action = ActionUpdateWithWorkPath5.class) + @POST + @Path("work/{id}/{path0}/{path1}/{path2}/{path3}/{path4}/{path5}/mockputtopost") + @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) + @Consumes(MediaType.APPLICATION_JSON) + public void updateWithWorkPath5MockPutToPost(@Suspended final AsyncResponse asyncResponse, + @Context HttpServletRequest request, @JaxrsParameterDescribe("工作标识") @PathParam("id") String id, + @JaxrsParameterDescribe("0级路径") @PathParam("path0") String path0, + @JaxrsParameterDescribe("1级路径") @PathParam("path1") String path1, + @JaxrsParameterDescribe("2级路径") @PathParam("path2") String path2, + @JaxrsParameterDescribe("3级路径") @PathParam("path3") String path3, + @JaxrsParameterDescribe("4级路径") @PathParam("path4") String path4, + @JaxrsParameterDescribe("5级路径") @PathParam("path5") String path5, JsonElement jsonElement) { + ActionResult result = new ActionResult<>(); + EffectivePerson effectivePerson = this.effectivePerson(request); + try { + result = new ActionUpdateWithWorkPath5().execute(effectivePerson, id, path0, path1, path2, path3, path4, + path5, jsonElement); + } catch (Exception e) { + logger.error(e, effectivePerson, request, jsonElement); + result.error(e); + } + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + } + @JaxrsMethodDescribe(value = "更新指定Work的Data数据.", action = ActionUpdateWithWorkPath6.class) @PUT @Path("work/{id}/{path0}/{path1}/{path2}/{path3}/{path4}/{path5}/{path6}") @@ -848,6 +999,32 @@ public class DataAction extends StandardJaxrsAction { asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); } + @JaxrsMethodDescribe(value = "Mock PUT to POST.", action = ActionUpdateWithWorkPath6.class) + @POST + @Path("work/{id}/{path0}/{path1}/{path2}/{path3}/{path4}/{path5}/{path6}/mockputtopost") + @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) + @Consumes(MediaType.APPLICATION_JSON) + public void updateWithWorkPath6MockPutToPost(@Suspended final AsyncResponse asyncResponse, + @Context HttpServletRequest request, @JaxrsParameterDescribe("工作标识") @PathParam("id") String id, + @JaxrsParameterDescribe("0级路径") @PathParam("path0") String path0, + @JaxrsParameterDescribe("1级路径") @PathParam("path1") String path1, + @JaxrsParameterDescribe("2级路径") @PathParam("path2") String path2, + @JaxrsParameterDescribe("3级路径") @PathParam("path3") String path3, + @JaxrsParameterDescribe("4级路径") @PathParam("path4") String path4, + @JaxrsParameterDescribe("5级路径") @PathParam("path5") String path5, + @JaxrsParameterDescribe("6级路径") @PathParam("path6") String path6, JsonElement jsonElement) { + ActionResult result = new ActionResult<>(); + EffectivePerson effectivePerson = this.effectivePerson(request); + try { + result = new ActionUpdateWithWorkPath6().execute(effectivePerson, id, path0, path1, path2, path3, path4, + path5, path6, jsonElement); + } catch (Exception e) { + logger.error(e, effectivePerson, request, jsonElement); + result.error(e); + } + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + } + @JaxrsMethodDescribe(value = "更新指定Work的Data数据.", action = ActionUpdateWithWorkPath7.class) @PUT @Path("work/{id}/{path0}/{path1}/{path2}/{path3}/{path4}/{path5}/{path6}/{path7}") @@ -875,6 +1052,33 @@ public class DataAction extends StandardJaxrsAction { asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); } + @JaxrsMethodDescribe(value = "更新指定Work的Data数据.", action = ActionUpdateWithWorkPath7.class) + @POST + @Path("work/{id}/{path0}/{path1}/{path2}/{path3}/{path4}/{path5}/{path6}/{path7}/mockputtopost") + @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) + @Consumes(MediaType.APPLICATION_JSON) + public void updateWithWorkPath7MockPutToPost(@Suspended final AsyncResponse asyncResponse, + @Context HttpServletRequest request, @JaxrsParameterDescribe("工作标识") @PathParam("id") String id, + @JaxrsParameterDescribe("0级路径") @PathParam("path0") String path0, + @JaxrsParameterDescribe("1级路径") @PathParam("path1") String path1, + @JaxrsParameterDescribe("2级路径") @PathParam("path2") String path2, + @JaxrsParameterDescribe("3级路径") @PathParam("path3") String path3, + @JaxrsParameterDescribe("4级路径") @PathParam("path4") String path4, + @JaxrsParameterDescribe("5级路径") @PathParam("path5") String path5, + @JaxrsParameterDescribe("6级路径") @PathParam("path6") String path6, + @JaxrsParameterDescribe("7级路径") @PathParam("path7") String path7, JsonElement jsonElement) { + ActionResult result = new ActionResult<>(); + EffectivePerson effectivePerson = this.effectivePerson(request); + try { + result = new ActionUpdateWithWorkPath7().execute(effectivePerson, id, path0, path1, path2, path3, path4, + path5, path6, path7, jsonElement); + } catch (Exception e) { + logger.error(e, effectivePerson, request, jsonElement); + result.error(e); + } + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + } + @JaxrsMethodDescribe(value = "更新指定WorkCompleted的Data数据.", action = ActionUpdateWithWorkCompleted.class) @PUT @Path("workcompleted/{id}") @@ -894,6 +1098,25 @@ public class DataAction extends StandardJaxrsAction { asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); } + @JaxrsMethodDescribe(value = "更新指定WorkCompleted的Data数据.", action = ActionUpdateWithWorkCompleted.class) + @POST + @Path("workcompleted/{id}/mockputtopost") + @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) + @Consumes(MediaType.APPLICATION_JSON) + public void updateWithWorkCompletedMockPutToPost(@Suspended final AsyncResponse asyncResponse, + @Context HttpServletRequest request, @JaxrsParameterDescribe("完成工作标识") @PathParam("id") String id, + JsonElement jsonElement) { + ActionResult result = new ActionResult<>(); + EffectivePerson effectivePerson = this.effectivePerson(request); + try { + result = new ActionUpdateWithWorkCompleted().execute(effectivePerson, id, jsonElement); + } catch (Exception e) { + logger.error(e, effectivePerson, request, jsonElement); + result.error(e); + } + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + } + @JaxrsMethodDescribe(value = "更新指定WorkCompleted的Data数据.", action = ActionUpdateWithWorkCompletedPath0.class) @PUT @Path("workcompleted/{id}/{path0}") @@ -913,6 +1136,25 @@ public class DataAction extends StandardJaxrsAction { asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); } + @JaxrsMethodDescribe(value = "更新指定WorkCompleted的Data数据.", action = ActionUpdateWithWorkCompletedPath0.class) + @POST + @Path("workcompleted/{id}/{path0}/mockputtopost") + @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) + @Consumes(MediaType.APPLICATION_JSON) + public void updateWithWorkCompletedPath0MockPutToPost(@Suspended final AsyncResponse asyncResponse, + @Context HttpServletRequest request, @JaxrsParameterDescribe("完成工作标识") @PathParam("id") String id, + @JaxrsParameterDescribe("0级路径") @PathParam("path0") String path0, JsonElement jsonElement) { + ActionResult result = new ActionResult<>(); + EffectivePerson effectivePerson = this.effectivePerson(request); + try { + result = new ActionUpdateWithWorkCompletedPath0().execute(effectivePerson, id, path0, jsonElement); + } catch (Exception e) { + logger.error(e, effectivePerson, request, jsonElement); + result.error(e); + } + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + } + @JaxrsMethodDescribe(value = "更新指定WorkCompleted的Data数据.", action = ActionUpdateWithWorkCompletedPath1.class) @PUT @Path("workcompleted/{id}/{path0}/{path1}") @@ -933,6 +1175,26 @@ public class DataAction extends StandardJaxrsAction { asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); } + @JaxrsMethodDescribe(value = "更新指定WorkCompleted的Data数据.", action = ActionUpdateWithWorkCompletedPath1.class) + @POST + @Path("workcompleted/{id}/{path0}/{path1}/mockputtopost") + @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) + @Consumes(MediaType.APPLICATION_JSON) + public void updateWithWorkCompletedPath1MockPutToPost(@Suspended final AsyncResponse asyncResponse, + @Context HttpServletRequest request, @JaxrsParameterDescribe("完成工作标识") @PathParam("id") String id, + @JaxrsParameterDescribe("0级路径") @PathParam("path0") String path0, + @JaxrsParameterDescribe("1级路径") @PathParam("path1") String path1, JsonElement jsonElement) { + ActionResult result = new ActionResult<>(); + EffectivePerson effectivePerson = this.effectivePerson(request); + try { + result = new ActionUpdateWithWorkCompletedPath1().execute(effectivePerson, id, path0, path1, jsonElement); + } catch (Exception e) { + logger.error(e, effectivePerson, request, jsonElement); + result.error(e); + } + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + } + @JaxrsMethodDescribe(value = "更新指定WorkCompleted的Data数据.", action = ActionUpdateWithWorkCompletedPath2.class) @PUT @Path("workcompleted/{id}/{path0}/{path1}/{path2}") @@ -946,8 +1208,124 @@ public class DataAction extends StandardJaxrsAction { ActionResult result = new ActionResult<>(); EffectivePerson effectivePerson = this.effectivePerson(request); try { - result = new ActionUpdateWithWorkCompletedPath2().execute(effectivePerson, id, path0, path1, path2, - jsonElement); + result = new ActionUpdateWithWorkCompletedPath2().execute(effectivePerson, id, path0, path1, path2, + jsonElement); + } catch (Exception e) { + logger.error(e, effectivePerson, request, jsonElement); + result.error(e); + } + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + } + + @JaxrsMethodDescribe(value = "更新指定WorkCompleted的Data数据.", action = ActionUpdateWithWorkCompletedPath2.class) + @POST + @Path("workcompleted/{id}/{path0}/{path1}/{path2}/mockputtopost") + @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) + @Consumes(MediaType.APPLICATION_JSON) + public void updateWithWorkCompletedPath2MockPutToPost(@Suspended final AsyncResponse asyncResponse, + @Context HttpServletRequest request, @JaxrsParameterDescribe("完成工作标识") @PathParam("id") String id, + @JaxrsParameterDescribe("0级路径") @PathParam("path0") String path0, + @JaxrsParameterDescribe("1级路径") @PathParam("path1") String path1, + @JaxrsParameterDescribe("2级路径") @PathParam("path2") String path2, JsonElement jsonElement) { + ActionResult result = new ActionResult<>(); + EffectivePerson effectivePerson = this.effectivePerson(request); + try { + result = new ActionUpdateWithWorkCompletedPath2().execute(effectivePerson, id, path0, path1, path2, + jsonElement); + } catch (Exception e) { + logger.error(e, effectivePerson, request, jsonElement); + result.error(e); + } + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + } + + @JaxrsMethodDescribe(value = "更新指定WorkCompleted的Data数据.", action = ActionUpdateWithWorkCompletedPath3.class) + @PUT + @Path("workcompleted/{id}/{path0}/{path1}/{path2}/{path3}") + @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) + @Consumes(MediaType.APPLICATION_JSON) + public void updateWithWorkCompletedPath3(@Suspended final AsyncResponse asyncResponse, + @Context HttpServletRequest request, @JaxrsParameterDescribe("完成工作标识") @PathParam("id") String id, + @JaxrsParameterDescribe("0级路径") @PathParam("path0") String path0, + @JaxrsParameterDescribe("1级路径") @PathParam("path1") String path1, + @JaxrsParameterDescribe("2级路径") @PathParam("path2") String path2, + @JaxrsParameterDescribe("3级路径") @PathParam("path3") String path3, JsonElement jsonElement) { + ActionResult result = new ActionResult<>(); + EffectivePerson effectivePerson = this.effectivePerson(request); + try { + result = new ActionUpdateWithWorkCompletedPath3().execute(effectivePerson, id, path0, path1, path2, path3, + jsonElement); + } catch (Exception e) { + logger.error(e, effectivePerson, request, jsonElement); + result.error(e); + } + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + } + + @JaxrsMethodDescribe(value = "更新指定WorkCompleted的Data数据.", action = ActionUpdateWithWorkCompletedPath3.class) + @POST + @Path("workcompleted/{id}/{path0}/{path1}/{path2}/{path3}/mockputtopost") + @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) + @Consumes(MediaType.APPLICATION_JSON) + public void updateWithWorkCompletedPath3MockPutToPost(@Suspended final AsyncResponse asyncResponse, + @Context HttpServletRequest request, @JaxrsParameterDescribe("完成工作标识") @PathParam("id") String id, + @JaxrsParameterDescribe("0级路径") @PathParam("path0") String path0, + @JaxrsParameterDescribe("1级路径") @PathParam("path1") String path1, + @JaxrsParameterDescribe("2级路径") @PathParam("path2") String path2, + @JaxrsParameterDescribe("3级路径") @PathParam("path3") String path3, JsonElement jsonElement) { + ActionResult result = new ActionResult<>(); + EffectivePerson effectivePerson = this.effectivePerson(request); + try { + result = new ActionUpdateWithWorkCompletedPath3().execute(effectivePerson, id, path0, path1, path2, path3, + jsonElement); + } catch (Exception e) { + logger.error(e, effectivePerson, request, jsonElement); + result.error(e); + } + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + } + + @JaxrsMethodDescribe(value = "更新指定WorkCompleted的Data数据.", action = ActionUpdateWithWorkCompletedPath4.class) + @PUT + @Path("workcompleted/{id}/{path0}/{path1}/{path2}/{path3}/{path4}") + @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) + @Consumes(MediaType.APPLICATION_JSON) + public void updateWithWorkCompletedPath4(@Suspended final AsyncResponse asyncResponse, + @Context HttpServletRequest request, @JaxrsParameterDescribe("完成工作标识") @PathParam("id") String id, + @JaxrsParameterDescribe("0级路径") @PathParam("path0") String path0, + @JaxrsParameterDescribe("1级路径") @PathParam("path1") String path1, + @JaxrsParameterDescribe("2级路径") @PathParam("path2") String path2, + @JaxrsParameterDescribe("3级路径") @PathParam("path3") String path3, + @JaxrsParameterDescribe("4级路径") @PathParam("path4") String path4, JsonElement jsonElement) { + ActionResult result = new ActionResult<>(); + EffectivePerson effectivePerson = this.effectivePerson(request); + try { + result = new ActionUpdateWithWorkCompletedPath4().execute(effectivePerson, id, path0, path1, path2, path3, + path4, jsonElement); + } catch (Exception e) { + logger.error(e, effectivePerson, request, jsonElement); + result.error(e); + } + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + } + + @JaxrsMethodDescribe(value = "更新指定WorkCompleted的Data数据.", action = ActionUpdateWithWorkCompletedPath4.class) + @POST + @Path("workcompleted/{id}/{path0}/{path1}/{path2}/{path3}/{path4}/mockputtopost") + @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) + @Consumes(MediaType.APPLICATION_JSON) + public void updateWithWorkCompletedPath4MockPutToPost(@Suspended final AsyncResponse asyncResponse, + @Context HttpServletRequest request, @JaxrsParameterDescribe("完成工作标识") @PathParam("id") String id, + @JaxrsParameterDescribe("0级路径") @PathParam("path0") String path0, + @JaxrsParameterDescribe("1级路径") @PathParam("path1") String path1, + @JaxrsParameterDescribe("2级路径") @PathParam("path2") String path2, + @JaxrsParameterDescribe("3级路径") @PathParam("path3") String path3, + @JaxrsParameterDescribe("4级路径") @PathParam("path4") String path4, JsonElement jsonElement) { + ActionResult result = new ActionResult<>(); + EffectivePerson effectivePerson = this.effectivePerson(request); + try { + result = new ActionUpdateWithWorkCompletedPath4().execute(effectivePerson, id, path0, path1, path2, path3, + path4, jsonElement); } catch (Exception e) { logger.error(e, effectivePerson, request, jsonElement); result.error(e); @@ -955,22 +1333,24 @@ public class DataAction extends StandardJaxrsAction { asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); } - @JaxrsMethodDescribe(value = "更新指定WorkCompleted的Data数据.", action = ActionUpdateWithWorkCompletedPath3.class) + @JaxrsMethodDescribe(value = "更新指定WorkCompleted的Data数据.", action = ActionUpdateWithWorkCompletedPath5.class) @PUT - @Path("workcompleted/{id}/{path0}/{path1}/{path2}/{path3}") + @Path("workcompleted/{id}/{path0}/{path1}/{path2}/{path3}/{path4}/{path5}") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void updateWithWorkCompletedPath3(@Suspended final AsyncResponse asyncResponse, + public void updateWithWorkCompletedPath5(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("完成工作标识") @PathParam("id") String id, @JaxrsParameterDescribe("0级路径") @PathParam("path0") String path0, @JaxrsParameterDescribe("1级路径") @PathParam("path1") String path1, @JaxrsParameterDescribe("2级路径") @PathParam("path2") String path2, - @JaxrsParameterDescribe("3级路径") @PathParam("path3") String path3, JsonElement jsonElement) { - ActionResult result = new ActionResult<>(); + @JaxrsParameterDescribe("3级路径") @PathParam("path3") String path3, + @JaxrsParameterDescribe("4级路径") @PathParam("path4") String path4, + @JaxrsParameterDescribe("5级路径") @PathParam("path5") String path5, JsonElement jsonElement) { + ActionResult result = new ActionResult<>(); EffectivePerson effectivePerson = this.effectivePerson(request); try { - result = new ActionUpdateWithWorkCompletedPath3().execute(effectivePerson, id, path0, path1, path2, path3, - jsonElement); + result = new ActionUpdateWithWorkCompletedPath5().execute(effectivePerson, id, path0, path1, path2, path3, + path4, path5, jsonElement); } catch (Exception e) { logger.error(e, effectivePerson, request, jsonElement); result.error(e); @@ -978,23 +1358,24 @@ public class DataAction extends StandardJaxrsAction { asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); } - @JaxrsMethodDescribe(value = "更新指定WorkCompleted的Data数据.", action = ActionUpdateWithWorkCompletedPath4.class) - @PUT - @Path("workcompleted/{id}/{path0}/{path1}/{path2}/{path3}/{path4}") + @JaxrsMethodDescribe(value = "更新指定WorkCompleted的Data数据.", action = ActionUpdateWithWorkCompletedPath5.class) + @POST + @Path("workcompleted/{id}/{path0}/{path1}/{path2}/{path3}/{path4}/{path5}/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void updateWithWorkCompletedPath4(@Suspended final AsyncResponse asyncResponse, + public void updateWithWorkCompletedPath5MockPutToPost(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("完成工作标识") @PathParam("id") String id, @JaxrsParameterDescribe("0级路径") @PathParam("path0") String path0, @JaxrsParameterDescribe("1级路径") @PathParam("path1") String path1, @JaxrsParameterDescribe("2级路径") @PathParam("path2") String path2, @JaxrsParameterDescribe("3级路径") @PathParam("path3") String path3, - @JaxrsParameterDescribe("4级路径") @PathParam("path4") String path4, JsonElement jsonElement) { - ActionResult result = new ActionResult<>(); + @JaxrsParameterDescribe("4级路径") @PathParam("path4") String path4, + @JaxrsParameterDescribe("5级路径") @PathParam("path5") String path5, JsonElement jsonElement) { + ActionResult result = new ActionResult<>(); EffectivePerson effectivePerson = this.effectivePerson(request); try { - result = new ActionUpdateWithWorkCompletedPath4().execute(effectivePerson, id, path0, path1, path2, path3, - path4, jsonElement); + result = new ActionUpdateWithWorkCompletedPath5().execute(effectivePerson, id, path0, path1, path2, path3, + path4, path5, jsonElement); } catch (Exception e) { logger.error(e, effectivePerson, request, jsonElement); result.error(e); @@ -1002,24 +1383,25 @@ public class DataAction extends StandardJaxrsAction { asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); } - @JaxrsMethodDescribe(value = "更新指定WorkCompleted的Data数据.", action = ActionUpdateWithWorkCompletedPath5.class) + @JaxrsMethodDescribe(value = "更新指定WorkCompleted的Data数据.", action = ActionUpdateWithWorkCompletedPath6.class) @PUT - @Path("workcompleted/{id}/{path0}/{path1}/{path2}/{path3}/{path4}/{path5}") + @Path("workcompleted/{id}/{path0}/{path1}/{path2}/{path3}/{path4}/{path5}/{path6}") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void updateWithWorkCompletedPath5(@Suspended final AsyncResponse asyncResponse, + public void updateWithWorkCompletedPath6(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("完成工作标识") @PathParam("id") String id, @JaxrsParameterDescribe("0级路径") @PathParam("path0") String path0, @JaxrsParameterDescribe("1级路径") @PathParam("path1") String path1, @JaxrsParameterDescribe("2级路径") @PathParam("path2") String path2, @JaxrsParameterDescribe("3级路径") @PathParam("path3") String path3, @JaxrsParameterDescribe("4级路径") @PathParam("path4") String path4, - @JaxrsParameterDescribe("5级路径") @PathParam("path5") String path5, JsonElement jsonElement) { - ActionResult result = new ActionResult<>(); + @JaxrsParameterDescribe("5级路径") @PathParam("path5") String path5, + @JaxrsParameterDescribe("6级路径") @PathParam("path6") String path6, JsonElement jsonElement) { + ActionResult result = new ActionResult<>(); EffectivePerson effectivePerson = this.effectivePerson(request); try { - result = new ActionUpdateWithWorkCompletedPath5().execute(effectivePerson, id, path0, path1, path2, path3, - path4, path5, jsonElement); + result = new ActionUpdateWithWorkCompletedPath6().execute(effectivePerson, id, path0, path1, path2, path3, + path4, path5, path6, jsonElement); } catch (Exception e) { logger.error(e, effectivePerson, request, jsonElement); result.error(e); @@ -1028,11 +1410,11 @@ public class DataAction extends StandardJaxrsAction { } @JaxrsMethodDescribe(value = "更新指定WorkCompleted的Data数据.", action = ActionUpdateWithWorkCompletedPath6.class) - @PUT - @Path("workcompleted/{id}/{path0}/{path1}/{path2}/{path3}/{path4}/{path5}/{path6}") + @POST + @Path("workcompleted/{id}/{path0}/{path1}/{path2}/{path3}/{path4}/{path5}/{path6}/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void updateWithWorkCompletedPath6(@Suspended final AsyncResponse asyncResponse, + public void updateWithWorkCompletedPath6MockPutToPost(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("完成工作标识") @PathParam("id") String id, @JaxrsParameterDescribe("0级路径") @PathParam("path0") String path0, @JaxrsParameterDescribe("1级路径") @PathParam("path1") String path1, @@ -1080,6 +1462,33 @@ public class DataAction extends StandardJaxrsAction { asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); } + @JaxrsMethodDescribe(value = "更新指定WorkCompleted的Data数据.", action = ActionUpdateWithWorkCompletedPath7.class) + @POST + @Path("workcompleted/{id}/{path0}/{path1}/{path2}/{path3}/{path4}/{path5}/{path6}/{path7}/mockputtopost") + @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) + @Consumes(MediaType.APPLICATION_JSON) + public void updateWithWorkCompletedPath7MockPutToPost(@Suspended final AsyncResponse asyncResponse, + @Context HttpServletRequest request, @JaxrsParameterDescribe("完成工作标识") @PathParam("id") String id, + @JaxrsParameterDescribe("0级路径") @PathParam("path0") String path0, + @JaxrsParameterDescribe("1级路径") @PathParam("path1") String path1, + @JaxrsParameterDescribe("2级路径") @PathParam("path2") String path2, + @JaxrsParameterDescribe("3级路径") @PathParam("path3") String path3, + @JaxrsParameterDescribe("4级路径") @PathParam("path4") String path4, + @JaxrsParameterDescribe("5级路径") @PathParam("path5") String path5, + @JaxrsParameterDescribe("6级路径") @PathParam("path6") String path6, + @JaxrsParameterDescribe("7级路径") @PathParam("path7") String path7, JsonElement jsonElement) { + ActionResult result = new ActionResult<>(); + EffectivePerson effectivePerson = this.effectivePerson(request); + try { + result = new ActionUpdateWithWorkCompletedPath7().execute(effectivePerson, id, path0, path1, path2, path3, + path4, path5, path6, path7, jsonElement); + } catch (Exception e) { + logger.error(e, effectivePerson, request, jsonElement); + result.error(e); + } + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + } + @JaxrsMethodDescribe(value = "对指定的work添加局部data数据.", action = ActionCreateWithWork.class) @POST @Path("work/{id}") @@ -1301,6 +1710,24 @@ public class DataAction extends StandardJaxrsAction { asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); } + @JaxrsMethodDescribe(value = "对指定的work删除局部data数据.", action = ActionDeleteWithWork.class) + @GET + @Path("work/{id}/mockdeletetoget") + @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) + @Consumes(MediaType.APPLICATION_JSON) + public void deleteWithWorkMockDeleteToGet(@Suspended final AsyncResponse asyncResponse, + @Context HttpServletRequest request, @JaxrsParameterDescribe("工作标识") @PathParam("id") String id) { + ActionResult result = new ActionResult<>(); + EffectivePerson effectivePerson = this.effectivePerson(request); + try { + result = new ActionDeleteWithWork().execute(effectivePerson, id); + } catch (Exception e) { + logger.error(e, effectivePerson, request, null); + result.error(e); + } + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + } + @JaxrsMethodDescribe(value = "对指定的work删除局部data数据.", action = ActionDeleteWithWorkPath0.class) @DELETE @Path("work/{id}/{path0}") @@ -1320,6 +1747,25 @@ public class DataAction extends StandardJaxrsAction { asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); } + @JaxrsMethodDescribe(value = "对指定的work删除局部data数据.", action = ActionDeleteWithWorkPath0.class) + @GET + @Path("work/{id}/{path0}/mockdeletetoget") + @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) + @Consumes(MediaType.APPLICATION_JSON) + public void deleteWithWorkPath0MockDeleteToGet(@Suspended final AsyncResponse asyncResponse, + @Context HttpServletRequest request, @JaxrsParameterDescribe("工作标识") @PathParam("id") String id, + @JaxrsParameterDescribe("0级路径") @PathParam("path0") String path0) { + ActionResult result = new ActionResult<>(); + EffectivePerson effectivePerson = this.effectivePerson(request); + try { + result = new ActionDeleteWithWorkPath0().execute(effectivePerson, id, path0); + } catch (Exception e) { + logger.error(e, effectivePerson, request, null); + result.error(e); + } + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + } + @JaxrsMethodDescribe(value = "对指定的work删除局部data数据.", action = ActionDeleteWithWorkPath1.class) @DELETE @Path("work/{id}/{path0}/{path1}") @@ -1340,6 +1786,26 @@ public class DataAction extends StandardJaxrsAction { asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); } + @JaxrsMethodDescribe(value = "对指定的work删除局部data数据.", action = ActionDeleteWithWorkPath1.class) + @GET + @Path("work/{id}/{path0}/{path1}/mockdeletetoget") + @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) + @Consumes(MediaType.APPLICATION_JSON) + public void deleteWithWorkPath1MockDeleteToGet(@Suspended final AsyncResponse asyncResponse, + @Context HttpServletRequest request, @JaxrsParameterDescribe("工作标识") @PathParam("id") String id, + @JaxrsParameterDescribe("0级路径") @PathParam("path0") String path0, + @JaxrsParameterDescribe("1级路径") @PathParam("path1") String path1) { + ActionResult result = new ActionResult<>(); + EffectivePerson effectivePerson = this.effectivePerson(request); + try { + result = new ActionDeleteWithWorkPath1().execute(effectivePerson, id, path0, path1); + } catch (Exception e) { + logger.error(e, effectivePerson, request, null); + result.error(e); + } + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + } + @JaxrsMethodDescribe(value = "对指定的work删除局部data数据.", action = ActionDeleteWithWorkPath2.class) @DELETE @Path("work/{id}/{path0}/{path1}/{path2}") @@ -1361,6 +1827,27 @@ public class DataAction extends StandardJaxrsAction { asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); } + @JaxrsMethodDescribe(value = "对指定的work删除局部data数据.", action = ActionDeleteWithWorkPath2.class) + @GET + @Path("work/{id}/{path0}/{path1}/{path2}/mockdeletetoget") + @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) + @Consumes(MediaType.APPLICATION_JSON) + public void deleteWithWorkPath2MockDeleteToGet(@Suspended final AsyncResponse asyncResponse, + @Context HttpServletRequest request, @JaxrsParameterDescribe("工作标识") @PathParam("id") String id, + @JaxrsParameterDescribe("0级路径") @PathParam("path0") String path0, + @JaxrsParameterDescribe("1级路径") @PathParam("path1") String path1, + @JaxrsParameterDescribe("2级路径") @PathParam("path2") String path2) { + ActionResult result = new ActionResult<>(); + EffectivePerson effectivePerson = this.effectivePerson(request); + try { + result = new ActionDeleteWithWorkPath2().execute(effectivePerson, id, path0, path1, path2); + } catch (Exception e) { + logger.error(e, effectivePerson, request, null); + result.error(e); + } + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + } + @JaxrsMethodDescribe(value = "对指定的work删除局部data数据.", action = ActionDeleteWithWorkPath3.class) @DELETE @Path("work/{id}/{path0}/{path1}/{path2}/{path3}") @@ -1383,6 +1870,28 @@ public class DataAction extends StandardJaxrsAction { asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); } + @JaxrsMethodDescribe(value = "对指定的work删除局部data数据.", action = ActionDeleteWithWorkPath3.class) + @GET + @Path("work/{id}/{path0}/{path1}/{path2}/{path3}/mockdeletetoget") + @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) + @Consumes(MediaType.APPLICATION_JSON) + public void deleteWithWorkPath3MockDeleteToGet(@Suspended final AsyncResponse asyncResponse, + @Context HttpServletRequest request, @JaxrsParameterDescribe("工作标识") @PathParam("id") String id, + @JaxrsParameterDescribe("0级路径") @PathParam("path0") String path0, + @JaxrsParameterDescribe("1级路径") @PathParam("path1") String path1, + @JaxrsParameterDescribe("2级路径") @PathParam("path2") String path2, + @JaxrsParameterDescribe("3级路径") @PathParam("path3") String path3) { + ActionResult result = new ActionResult<>(); + EffectivePerson effectivePerson = this.effectivePerson(request); + try { + result = new ActionDeleteWithWorkPath3().execute(effectivePerson, id, path0, path1, path2, path3); + } catch (Exception e) { + logger.error(e, effectivePerson, request, null); + result.error(e); + } + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + } + @JaxrsMethodDescribe(value = "对指定的work删除局部data数据.", action = ActionDeleteWithWorkPath4.class) @DELETE @Path("work/{id}/{path0}/{path1}/{path2}/{path3}/{path4}") @@ -1406,6 +1915,29 @@ public class DataAction extends StandardJaxrsAction { asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); } + @JaxrsMethodDescribe(value = "对指定的work删除局部data数据.", action = ActionDeleteWithWorkPath4.class) + @GET + @Path("work/{id}/{path0}/{path1}/{path2}/{path3}/{path4}/mockdeletetoget") + @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) + @Consumes(MediaType.APPLICATION_JSON) + public void deleteWithWorkPath4MockDeleteToGet(@Suspended final AsyncResponse asyncResponse, + @Context HttpServletRequest request, @JaxrsParameterDescribe("工作标识") @PathParam("id") String id, + @JaxrsParameterDescribe("0级路径") @PathParam("path0") String path0, + @JaxrsParameterDescribe("1级路径") @PathParam("path1") String path1, + @JaxrsParameterDescribe("2级路径") @PathParam("path2") String path2, + @JaxrsParameterDescribe("3级路径") @PathParam("path3") String path3, + @JaxrsParameterDescribe("4级路径") @PathParam("path4") String path4) { + ActionResult result = new ActionResult<>(); + EffectivePerson effectivePerson = this.effectivePerson(request); + try { + result = new ActionDeleteWithWorkPath4().execute(effectivePerson, id, path0, path1, path2, path3, path4); + } catch (Exception e) { + logger.error(e, effectivePerson, request, null); + result.error(e); + } + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + } + @JaxrsMethodDescribe(value = "对指定的work删除局部data数据.", action = ActionDeleteWithWorkPath5.class) @DELETE @Path("work/{id}/{path0}/{path1}/{path2}/{path3}/{path4}/{path5}") @@ -1431,6 +1963,31 @@ public class DataAction extends StandardJaxrsAction { asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); } + @JaxrsMethodDescribe(value = "对指定的work删除局部data数据.", action = ActionDeleteWithWorkPath5.class) + @GET + @Path("work/{id}/{path0}/{path1}/{path2}/{path3}/{path4}/{path5}/mockdeletetoget") + @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) + @Consumes(MediaType.APPLICATION_JSON) + public void deleteWithWorkPath5MockDeleteToGet(@Suspended final AsyncResponse asyncResponse, + @Context HttpServletRequest request, @JaxrsParameterDescribe("工作标识") @PathParam("id") String id, + @JaxrsParameterDescribe("0级路径") @PathParam("path0") String path0, + @JaxrsParameterDescribe("1级路径") @PathParam("path1") String path1, + @JaxrsParameterDescribe("2级路径") @PathParam("path2") String path2, + @JaxrsParameterDescribe("3级路径") @PathParam("path3") String path3, + @JaxrsParameterDescribe("4级路径") @PathParam("path4") String path4, + @JaxrsParameterDescribe("5级路径") @PathParam("path5") String path5) { + ActionResult result = new ActionResult<>(); + EffectivePerson effectivePerson = this.effectivePerson(request); + try { + result = new ActionDeleteWithWorkPath5().execute(effectivePerson, id, path0, path1, path2, path3, path4, + path5); + } catch (Exception e) { + logger.error(e, effectivePerson, request, null); + result.error(e); + } + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + } + @JaxrsMethodDescribe(value = "对指定的work删除局部data数据.", action = ActionDeleteWithWorkPath6.class) @DELETE @Path("work/{id}/{path0}/{path1}/{path2}/{path3}/{path4}/{path5}/{path6}") @@ -1457,6 +2014,32 @@ public class DataAction extends StandardJaxrsAction { asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); } + @JaxrsMethodDescribe(value = "对指定的work删除局部data数据.", action = ActionDeleteWithWorkPath6.class) + @GET + @Path("work/{id}/{path0}/{path1}/{path2}/{path3}/{path4}/{path5}/{path6}/mockdeletetoget") + @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) + @Consumes(MediaType.APPLICATION_JSON) + public void deleteWithWorkPath6MockDeleteToGet(@Suspended final AsyncResponse asyncResponse, + @Context HttpServletRequest request, @JaxrsParameterDescribe("工作标识") @PathParam("id") String id, + @JaxrsParameterDescribe("0级路径") @PathParam("path0") String path0, + @JaxrsParameterDescribe("1级路径") @PathParam("path1") String path1, + @JaxrsParameterDescribe("2级路径") @PathParam("path2") String path2, + @JaxrsParameterDescribe("3级路径") @PathParam("path3") String path3, + @JaxrsParameterDescribe("4级路径") @PathParam("path4") String path4, + @JaxrsParameterDescribe("5级路径") @PathParam("path5") String path5, + @JaxrsParameterDescribe("6级路径") @PathParam("path6") String path6) { + ActionResult result = new ActionResult<>(); + EffectivePerson effectivePerson = this.effectivePerson(request); + try { + result = new ActionDeleteWithWorkPath6().execute(effectivePerson, id, path0, path1, path2, path3, path4, + path5, path6); + } catch (Exception e) { + logger.error(e, effectivePerson, request, null); + result.error(e); + } + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + } + @JaxrsMethodDescribe(value = "对指定的work删除局部data数据.", action = ActionDeleteWithWorkPath7.class) @DELETE @Path("work/{id}/{path0}/{path1}/{path2}/{path3}/{path4}/{path5}/{path6}/{path7}") @@ -1484,6 +2067,33 @@ public class DataAction extends StandardJaxrsAction { asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); } + @JaxrsMethodDescribe(value = "对指定的work删除局部data数据.", action = ActionDeleteWithWorkPath7.class) + @GET + @Path("work/{id}/{path0}/{path1}/{path2}/{path3}/{path4}/{path5}/{path6}/{path7}/mockdeletetoget") + @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) + @Consumes(MediaType.APPLICATION_JSON) + public void deleteWithWorkPath7MockDeleteToGet(@Suspended final AsyncResponse asyncResponse, + @Context HttpServletRequest request, @JaxrsParameterDescribe("工作标识") @PathParam("id") String id, + @JaxrsParameterDescribe("0级路径") @PathParam("path0") String path0, + @JaxrsParameterDescribe("1级路径") @PathParam("path1") String path1, + @JaxrsParameterDescribe("2级路径") @PathParam("path2") String path2, + @JaxrsParameterDescribe("3级路径") @PathParam("path3") String path3, + @JaxrsParameterDescribe("4级路径") @PathParam("path4") String path4, + @JaxrsParameterDescribe("5级路径") @PathParam("path5") String path5, + @JaxrsParameterDescribe("6级路径") @PathParam("path6") String path6, + @JaxrsParameterDescribe("7级路径") @PathParam("path7") String path7) { + ActionResult result = new ActionResult<>(); + EffectivePerson effectivePerson = this.effectivePerson(request); + try { + result = new ActionDeleteWithWorkPath7().execute(effectivePerson, id, path0, path1, path2, path3, path4, + path5, path6, path7); + } catch (Exception e) { + logger.error(e, effectivePerson, request, null); + result.error(e); + } + asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); + } + @JaxrsMethodDescribe(value = "根据job获取指定路径的部分data数据.", action = ActionFetchWithJob.class) @POST @Path("fetch/job/{job}") @@ -1502,21 +2112,4 @@ public class DataAction extends StandardJaxrsAction { asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); } -// @JaxrsMethodDescribe(value = "更新指定Work的Data数据合并区段数据.", action = ActionUpdateWithWorkSection.class) -// @PUT -// @Path("section/work/{id}") -// @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) -// @Consumes(MediaType.APPLICATION_JSON) -// public void updateWithWorkSection(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, -// @JaxrsParameterDescribe("工作标识") @PathParam("id") String id, JsonElement jsonElement) { -// ActionResult result = new ActionResult<>(); -// EffectivePerson effectivePerson = this.effectivePerson(request); -// try { -// result = new ActionUpdateWithWorkSection().execute(effectivePerson, id, jsonElement); -// } catch (Exception e) { -// logger.error(e, effectivePerson, request, jsonElement); -// result.error(e); -// } -// asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result)); -// } } \ No newline at end of file diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/draft/DraftAction.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/draft/DraftAction.java index c5a32ae39f7b1d0f816930c8f98a81b4c94062bd..edcf992802b6f95850277d3164e7875183194f92 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/draft/DraftAction.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/draft/DraftAction.java @@ -34,10 +34,10 @@ public class DraftAction extends StandardJaxrsAction { private static Logger logger = LoggerFactory.getLogger(DraftAction.class); - @POST @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) @Path("process/{processFlag}") + @POST @JaxrsMethodDescribe(value = "拟稿.", action = ActionDraw.class) public void draw(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("流程标识") @PathParam("processFlag") String processFlag, JsonElement jsonElement) { @@ -90,10 +90,10 @@ public class DraftAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Get To Delete", action = ActionDelete.class) @GET - @Path("{id}/mockget2delete") + @Path("{id}/mockdeletetoget") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void deleteMockGet2Delete(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, + public void deleteMockDeleteToGet(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("草稿标识") @PathParam("id") String id) { ActionResult result = new ActionResult<>(); EffectivePerson effectivePerson = this.effectivePerson(request); @@ -127,7 +127,8 @@ public class DraftAction extends StandardJaxrsAction { @Consumes(MediaType.APPLICATION_JSON) @JaxrsMethodDescribe(value = "Mock Post 2 Put.", action = ActionSave.class) @POST - public void saveMockPost2Put(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, + @Path("mockputtopost") + public void saveMockPutToPost(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, JsonElement jsonElement) { ActionResult result = new ActionResult<>(); EffectivePerson effectivePerson = this.effectivePerson(request); diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/V2LookupWorkOrWorkCompleted.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/V2LookupWorkOrWorkCompleted.java index e4ed45319e92fa4ad9826fe2d82f93623293d289..a417ca3a56da75949b6a7c687192dd0eb458b257 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/V2LookupWorkOrWorkCompleted.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/V2LookupWorkOrWorkCompleted.java @@ -1,25 +1,26 @@ package com.x.processplatform.assemble.surface.jaxrs.form; -import java.util.Map.Entry; +import java.util.concurrent.CompletableFuture; -import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.BooleanUtils; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; +import com.x.base.core.entity.JpaObject; import com.x.base.core.project.exception.ExceptionAccessDenied; import com.x.base.core.project.exception.ExceptionEntityNotExist; +import com.x.base.core.project.gson.XGsonBuilder; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.logger.Logger; import com.x.base.core.project.logger.LoggerFactory; +import com.x.base.core.project.tools.ListTools; import com.x.base.core.project.tools.PropertyTools; import com.x.processplatform.assemble.surface.Business; import com.x.processplatform.core.entity.content.Work; import com.x.processplatform.core.entity.content.WorkCompleted; -import com.x.processplatform.core.entity.content.WorkCompletedProperties; +import com.x.processplatform.core.entity.content.WorkCompletedProperties.AdaptForm; import com.x.processplatform.core.entity.element.Activity; -import com.x.processplatform.core.entity.element.Form; -import com.x.processplatform.core.entity.element.Script; class V2LookupWorkOrWorkCompleted extends BaseAction { @@ -33,94 +34,61 @@ class V2LookupWorkOrWorkCompleted extends BaseAction { new ExceptionEntityNotExist(workOrWorkCompleted))) { throw new ExceptionAccessDenied(effectivePerson); } - Wo wo = new Wo(); - Work work = emc.find(workOrWorkCompleted, Work.class); - if (null != work) { - this.work(business, work, wo); - } else { - this.workCompleted(business, emc.flag(workOrWorkCompleted, WorkCompleted.class), wo); + + CompletableFuture _wo = CompletableFuture.supplyAsync(() -> { + Wo wo = new Wo(); + try { + Work work = emc.fetch(workOrWorkCompleted, Work.class, ListTools.toList(JpaObject.id_FIELDNAME, + Work.form_FIELDNAME, Work.activity_FIELDNAME, Work.activityType_FIELDNAME)); + if (null != work) { + this.work(business, work, wo); + } else { + WorkCompleted workCompleted = emc.flag(workOrWorkCompleted, WorkCompleted.class); + if (null != workCompleted) { + this.workCompleted(business, workCompleted, wo); + } + } + } catch (Exception e) { + logger.error(e); + } + return wo; + }); + + CompletableFuture _control = CompletableFuture.supplyAsync(() -> { + Boolean value = false; + try { + value = business.readableWithWorkOrWorkCompleted(effectivePerson, workOrWorkCompleted, + new ExceptionEntityNotExist(workOrWorkCompleted)); + } catch (Exception e) { + logger.error(e); + } + return value; + }); + + if (BooleanUtils.isFalse(_control.get())) { + throw new ExceptionAccessDenied(effectivePerson, workOrWorkCompleted); } - result.setData(wo); + result.setData(_wo.get()); return result; } } private void work(Business business, Work work, Wo wo) throws Exception { - String id = work.getForm(); - if (!StringUtils.isEmpty(id)) { - wo.setId(id); + if (null != business.form().pick(work.getForm())) { + wo.setId(work.getForm()); } else { Activity activity = business.getActivity(work); - id = PropertyTools.getOrElse(activity, Activity.form_FIELDNAME, String.class, ""); + wo.setId(PropertyTools.getOrElse(activity, Activity.form_FIELDNAME, String.class, "")); } - wo.setId(id); } private void workCompleted(Business business, WorkCompleted workCompleted, Wo wo) throws Exception { // 先使用当前库的表单,如果不存在使用储存的表单. - if (StringUtils.isNotEmpty(workCompleted.getForm())) { - Form form = business.form().pick(workCompleted.getForm()); - if (null != form) { - wo.setForm(toWoFormDataOrMobileData(form)); - related(business, wo, form); - } + if (null != business.form().pick(workCompleted.getForm())) { + wo.setId(workCompleted.getForm()); } else if (null != workCompleted.getProperties().getForm()) { - wo.setForm(toWoFormDataOrMobileData(workCompleted.getProperties().getForm())); - if (StringUtils.isNotBlank(workCompleted.getProperties().getForm().getData())) { - workCompleted.getProperties().getRelatedFormList() - .forEach(o -> wo.getRelatedFormMap().put(o.getId(), toWoFormDataOrMobileData(o))); - } else { - workCompleted.getProperties().getMobileRelatedFormList() - .forEach(o -> wo.getRelatedFormMap().put(o.getId(), toWoFormMobileDataOrData(o))); - } - } - workCompleted.getProperties().getRelatedScriptList().stream() - .forEach(o -> wo.getRelatedScriptMap().put(o.getId(), toWoScript(o))); - } - - private void related(Business business, Wo wo, Form form) throws Exception { - if (StringUtils.isNotBlank(form.getData())) { - for (String relatedFormId : form.getProperties().getRelatedFormList()) { - Form relatedForm = business.form().pick(relatedFormId); - if (null != relatedForm) { - wo.getRelatedFormMap().put(relatedFormId, toWoFormDataOrMobileData(relatedForm)); - } - } - } else { - for (String mobileRelatedFormId : form.getProperties().getMobileRelatedFormList()) { - Form mobileRelatedForm = business.form().pick(mobileRelatedFormId); - if (null != mobileRelatedForm) { - wo.getRelatedFormMap().put(mobileRelatedFormId, toWoFormMobileDataOrData(mobileRelatedForm)); - } - } - } - relatedScript(business, wo, form); - } - - protected void relatedScript(Business business, AbstractWo wo, Form form) throws Exception { - for (Entry entry : form.getProperties().getRelatedScriptMap().entrySet()) { - switch (entry.getValue()) { - case WorkCompletedProperties.Script.TYPE_PROCESSPLATFORM: - Script relatedScript = business.script().pick(entry.getKey()); - if (null != relatedScript) { - wo.getRelatedScriptMap().put(entry.getKey(), toWoScript(relatedScript)); - } - break; - case WorkCompletedProperties.Script.TYPE_CMS: - com.x.cms.core.entity.element.Script relatedCmsScript = business.cms().script().pick(entry.getKey()); - if (null != relatedCmsScript) { - wo.getRelatedScriptMap().put(entry.getKey(), toWoScript(relatedCmsScript)); - } - break; - case WorkCompletedProperties.Script.TYPE_PORTAL: - com.x.portal.core.entity.Script relatedPortalScript = business.portal().script().pick(entry.getKey()); - if (null != relatedPortalScript) { - wo.getRelatedScriptMap().put(entry.getKey(), toWoScript(relatedPortalScript)); - } - break; - default: - break; - } + AdaptForm adapt = workCompleted.getProperties().adaptForm(false); + wo = XGsonBuilder.convert(adapt, Wo.class); } } diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/V2LookupWorkOrWorkCompletedMobile.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/V2LookupWorkOrWorkCompletedMobile.java new file mode 100644 index 0000000000000000000000000000000000000000..66830c64a155c32e967676c9d157eb5f129b19c9 --- /dev/null +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/V2LookupWorkOrWorkCompletedMobile.java @@ -0,0 +1,95 @@ +package com.x.processplatform.assemble.surface.jaxrs.form; + +import java.util.concurrent.CompletableFuture; + +import org.apache.commons.lang3.BooleanUtils; + +import com.x.base.core.container.EntityManagerContainer; +import com.x.base.core.container.factory.EntityManagerContainerFactory; +import com.x.base.core.entity.JpaObject; +import com.x.base.core.project.exception.ExceptionAccessDenied; +import com.x.base.core.project.exception.ExceptionEntityNotExist; +import com.x.base.core.project.gson.XGsonBuilder; +import com.x.base.core.project.http.ActionResult; +import com.x.base.core.project.http.EffectivePerson; +import com.x.base.core.project.logger.Logger; +import com.x.base.core.project.logger.LoggerFactory; +import com.x.base.core.project.tools.ListTools; +import com.x.base.core.project.tools.PropertyTools; +import com.x.processplatform.assemble.surface.Business; +import com.x.processplatform.core.entity.content.Work; +import com.x.processplatform.core.entity.content.WorkCompleted; +import com.x.processplatform.core.entity.content.WorkCompletedProperties.AdaptForm; +import com.x.processplatform.core.entity.element.Activity; + +class V2LookupWorkOrWorkCompletedMobile extends BaseAction { + + private static Logger logger = LoggerFactory.getLogger(V2LookupWorkOrWorkCompletedMobile.class); + + ActionResult execute(EffectivePerson effectivePerson, String workOrWorkCompleted) throws Exception { + try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { + ActionResult result = new ActionResult<>(); + Business business = new Business(emc); + + CompletableFuture _wo = CompletableFuture.supplyAsync(() -> { + Wo wo = new Wo(); + try { + Work work = emc.fetch(workOrWorkCompleted, Work.class, ListTools.toList(JpaObject.id_FIELDNAME, + Work.form_FIELDNAME, Work.activity_FIELDNAME, Work.activityType_FIELDNAME)); + if (null != work) { + this.work(business, work, wo); + } else { + WorkCompleted workCompleted = emc.flag(workOrWorkCompleted, WorkCompleted.class); + if (null != workCompleted) { + this.workCompleted(business, workCompleted, wo); + } + } + } catch (Exception e) { + logger.error(e); + } + return wo; + }); + + CompletableFuture _control = CompletableFuture.supplyAsync(() -> { + Boolean value = false; + try { + value = business.readableWithWorkOrWorkCompleted(effectivePerson, workOrWorkCompleted, + new ExceptionEntityNotExist(workOrWorkCompleted)); + } catch (Exception e) { + logger.error(e); + } + return value; + }); + + if (BooleanUtils.isFalse(_control.get())) { + throw new ExceptionAccessDenied(effectivePerson, workOrWorkCompleted); + } + result.setData(_wo.get()); + return result; + } + } + + private void work(Business business, Work work, Wo wo) throws Exception { + if (null != business.form().pick(work.getForm())) { + wo.setId(work.getForm()); + } else { + Activity activity = business.getActivity(work); + wo.setId(PropertyTools.getOrElse(activity, Activity.form_FIELDNAME, String.class, "")); + } + } + + private void workCompleted(Business business, WorkCompleted workCompleted, Wo wo) throws Exception { + // 先使用当前库的表单,如果不存在使用储存的表单. + if (null != business.form().pick(workCompleted.getForm())) { + wo.setId(workCompleted.getForm()); + } else if (null != workCompleted.getProperties().getForm()) { + AdaptForm adapt = workCompleted.getProperties().adaptForm(true); + wo = XGsonBuilder.convert(adapt, Wo.class); + } + } + + public static class Wo extends AbstractWo { + + } + +} \ No newline at end of file diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/keylock/KeyLockAction.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/keylock/KeyLockAction.java index 0f60f52fedacdd88a268c58e69b0b3a1779b4f82..3dc3a499846307d45e3b2c5fa2c1a39064ef5fcf 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/keylock/KeyLockAction.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/keylock/KeyLockAction.java @@ -47,10 +47,10 @@ public class KeyLockAction extends BaseAction { @JaxrsMethodDescribe(value = "Mock Post To Put.", action = ActionLock.class) @POST - @Path("lock/mockpost2put") + @Path("lock/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void lockMockPost2Put(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, + public void lockMockPutToPost(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, JsonElement jsonElement) { ActionResult result = new ActionResult<>(); EffectivePerson effectivePerson = this.effectivePerson(request); diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/read/ReadAction.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/read/ReadAction.java index 803e98fdc331bb130a1f7df5d5ed1c1b4ec145ca..f9caae66944c2c3a373d1a5e6efde11593c7b699 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/read/ReadAction.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/read/ReadAction.java @@ -319,10 +319,10 @@ public class ReadAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Post To Put.", action = ActionEdit.class) @POST - @Path("{id}/mockpost2put") + @Path("{id}/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void editMockPost2Put(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, + public void editMockPutToPost(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("待阅标识") @PathParam("id") String id, JsonElement jsonElement) { ActionResult result = new ActionResult<>(); EffectivePerson effectivePerson = this.effectivePerson(request); @@ -482,10 +482,10 @@ public class ReadAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "管理删除待阅.", action = ActionManageDelete.class) @GET - @Path("{id}/manage/mockget2delete") + @Path("{id}/manage/mockdeletetoget") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void manageDeleteMockGet2Delete(@Suspended final AsyncResponse asyncResponse, + public void manageDeleteMockDeleteToGet(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("待阅标识") @PathParam("id") String id) { ActionResult result = new ActionResult<>(); EffectivePerson effectivePerson = this.effectivePerson(request); @@ -518,10 +518,10 @@ public class ReadAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Post To Put.", action = ActionManageProcessing.class) @POST - @Path("{id}/processing/manage/mockpost2put") + @Path("{id}/processing/manage/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void manageProcessingMockPost2Put(@Suspended final AsyncResponse asyncResponse, + public void manageProcessingMockPostToPost(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("待阅标识") @PathParam("id") String id, JsonElement jsonElement) { ActionResult result = new ActionResult<>(); @@ -555,10 +555,10 @@ public class ReadAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Post To Put.", action = ActionManageReset.class) @POST - @Path("{id}/reset/manage/mockpost2put") + @Path("{id}/reset/manage/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void manageReadMockPost2Put(@Suspended final AsyncResponse asyncResponse, + public void manageReadMockPutToPost(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("待阅标识") @PathParam("id") String id, JsonElement jsonElement) { ActionResult result = new ActionResult<>(); @@ -592,10 +592,10 @@ public class ReadAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Post To Put.", action = ActionManageOpinion.class) @POST - @Path("{id}/opinion/manage/mockpost2put") + @Path("{id}/opinion/manage/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void manageOpinionMockPost2Put(@Suspended final AsyncResponse asyncResponse, + public void manageOpinionMockPutToPost(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("待阅标识") @PathParam("id") String id, JsonElement jsonElement) { ActionResult result = new ActionResult<>(); diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/ReadCompletedAction.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/ReadCompletedAction.java index 18078608a13ab15f2add5ebeb176c3a128f99f18..f5a9fdf6ed697df7b431ebbc57a5cba9a7c6fda6 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/ReadCompletedAction.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/ReadCompletedAction.java @@ -391,10 +391,10 @@ public class ReadCompletedAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Get To Delete", action = ActionManageDelete.class) @GET - @Path("{id}/manage/mockget2delete") + @Path("{id}/manage/mockdeletetoget") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void manageDeleteMockGet2Delete(@Suspended final AsyncResponse asyncResponse, + public void manageDeleteMockDeleteToGet(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("已阅标识") @PathParam("id") String id) { ActionResult result = new ActionResult<>(); EffectivePerson effectivePerson = this.effectivePerson(request); @@ -427,10 +427,10 @@ public class ReadCompletedAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Post To Put.", action = ActionManageOpinion.class) @POST - @Path("{id}/opinion/manage/mockpost2put") + @Path("{id}/opinion/manage/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void manageDeleteMockPost2Put(@Suspended final AsyncResponse asyncResponse, + public void manageDeleteMockPutToPost(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("已阅标识") @PathParam("id") String id, JsonElement jsonElement) { ActionResult result = new ActionResult<>(); diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/record/RecordAction.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/record/RecordAction.java index 0a3be2ce5ed12e38a0982482c8ba1db3cf6e6f2d..63a93169f831b1755457c2fa8b026947387da99a 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/record/RecordAction.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/record/RecordAction.java @@ -133,10 +133,10 @@ public class RecordAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Get To Delete.", action = ActionManageDelete.class) @GET - @Path("{id}/manage/mockget2delete") + @Path("{id}/manage/mockdeletetoget") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void manageDeleteMockGet2Delete(@Suspended final AsyncResponse asyncResponse, + public void manageDeleteMockDeleteToGet(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("标识") @PathParam("id") String id) { ActionResult result = new ActionResult<>(); EffectivePerson effectivePerson = this.effectivePerson(request); @@ -187,10 +187,10 @@ public class RecordAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Post To Put.", action = ActionManageEdit.class) @POST - @Path("{id}/manage/mockpost2put") + @Path("{id}/manage/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void manageEditMockPost2Put(@Suspended final AsyncResponse asyncResponse, + public void manageEditMockPutToPost(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("标识") @PathParam("id") String id, JsonElement jsonElement) { ActionResult result = new ActionResult<>(); diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/review/ReviewAction.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/review/ReviewAction.java index 1f623fdc8d6ee8a6ad9e51f8771e9b6e0675d637..bc4396b6ff375e68df9c593e3a52ff50233b3950 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/review/ReviewAction.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/review/ReviewAction.java @@ -181,10 +181,10 @@ public class ReviewAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Get To Delete.", action = ActionManageDelete.class) @GET - @Path("{id}/application/{applicationFlag}/manage/mockget2delete") + @Path("{id}/application/{applicationFlag}/manage/mockdeletetoget") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void manageDeleteMockGet2Delete(@Suspended final AsyncResponse asyncResponse, + public void manageDeleteMockDeleteToGet(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("参阅标识") @PathParam("id") String id, @JaxrsParameterDescribe("应用标识") @PathParam("applicationFlag") String applicationFlag) { ActionResult result = new ActionResult<>(); diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/route/RouteAction.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/route/RouteAction.java index ed9e38e3b96ee9dd9d4371b7846f329ef3bf6920..c1d4a2004eafecd329bad32c7c67983281c224cf 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/route/RouteAction.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/route/RouteAction.java @@ -71,10 +71,10 @@ public class RouteAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Post To Put.", action = ActionList.class) @POST - @Path("list/mockpost2put") + @Path("list/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void listMockPost2Put(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, + public void listMockPutToPost(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, JsonElement jsonElement) { ActionResult> result = new ActionResult<>(); EffectivePerson effectivePerson = this.effectivePerson(request); diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/serialnumber/SerialNumberAction.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/serialnumber/SerialNumberAction.java index fab9fe8ccd51c1d3383d97f0765f5a3e046c6e2d..d3f11241c87480fd710d8cae708cb1717b286992 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/serialnumber/SerialNumberAction.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/serialnumber/SerialNumberAction.java @@ -90,10 +90,10 @@ public class SerialNumberAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Post To Put.", action = ActionUpdate.class) @POST - @Path("{id}/mockpost2put") + @Path("{id}/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void updateMockPost2Put(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, + public void updateMockPutToPost(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("标识") @PathParam("id") String id, JsonElement jsonElement) { ActionResult result = new ActionResult<>(); EffectivePerson effectivePerson = this.effectivePerson(request); @@ -126,10 +126,10 @@ public class SerialNumberAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Get To Delete.", action = ActionRemove.class) @GET - @Path("{id}/mockget2delete") + @Path("{id}/mockdeletetoget") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void deleteMockGet2Delete(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, + public void deleteMockDeleteToGet(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("标识") @PathParam("id") String id) { ActionResult result = new ActionResult<>(); EffectivePerson effectivePerson = this.effectivePerson(request); diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/service/ServiceAction.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/service/ServiceAction.java index 4876edfa98a675f029b5236aa0e59cee320c4d10..419a16bb70ed87b864ba78e4081ef8ef721a7a8b 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/service/ServiceAction.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/service/ServiceAction.java @@ -50,10 +50,10 @@ public class ServiceAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Post To Put.", action = ActionTouch.class) @POST - @Path("work/{id}/touch/mockpost2put") + @Path("work/{id}/touch/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void touchMockPost2Put(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, + public void touchMockPutToPost(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("工作标识") @PathParam("id") String id, JsonElement jsonElement) { ActionResult result = new ActionResult<>(); EffectivePerson effectivePerson = this.effectivePerson(request); diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionListMyFilterPaging.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionListMyFilterPaging.java index cc1f47022f22480f22a5911136aa259cab8d27ca..f229d4e0e4ec7cf1acec363c653c71198fe3fcf8 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionListMyFilterPaging.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionListMyFilterPaging.java @@ -17,6 +17,7 @@ import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; +import com.x.base.core.project.tools.ListTools; import com.x.processplatform.assemble.surface.Business; import com.x.processplatform.core.entity.content.Snap; @@ -68,7 +69,7 @@ class ActionListMyFilterPaging extends BaseAction { private static final long serialVersionUID = 2279846765261247910L; static WrapCopier copier = WrapCopierFactory.wo(Snap.class, Wo.class, - JpaObject.singularAttributeField(Snap.class, true, true), null); + JpaObject.singularAttributeField(Snap.class, true, true), ListTools.toList(Snap.properties_FIELDNAME)); } diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionListMyPaging.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionListMyPaging.java index e526b609c5b2dbcc5dd995572d5ccadde0ec1862..840ebb0df033a2f8454573d0191e5bad1a8e53ab 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionListMyPaging.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionListMyPaging.java @@ -11,6 +11,7 @@ import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; +import com.x.base.core.project.tools.ListTools; import com.x.processplatform.assemble.surface.Business; import com.x.processplatform.assemble.surface.jaxrs.snap.ActionListMyFilterPaging.Wo; import com.x.processplatform.core.entity.content.Snap; @@ -33,7 +34,7 @@ class ActionListMyPaging extends BaseAction { private static final long serialVersionUID = 2279846765261247910L; static WrapCopier copier = WrapCopierFactory.wo(Snap.class, Wo.class, - JpaObject.singularAttributeField(Snap.class, true, true), null); + JpaObject.singularAttributeField(Snap.class, true, true), ListTools.toList(Snap.properties_FIELDNAME)); } diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionListNext.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionListNext.java index 93fb295ffe6f029c7b23b20f3706c87514df9ecf..8350caef1478bd474f4b5e83f3a9bf8c8eb02e9d 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionListNext.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionListNext.java @@ -11,6 +11,7 @@ import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; +import com.x.base.core.project.tools.ListTools; import com.x.processplatform.assemble.surface.Business; import com.x.processplatform.assemble.surface.jaxrs.snap.ActionListMyFilterPaging.Wo; import com.x.processplatform.core.entity.content.Snap; @@ -30,7 +31,7 @@ class ActionListNext extends BaseAction { private static final long serialVersionUID = 6502735971303449356L; static WrapCopier copier = WrapCopierFactory.wo(Snap.class, Wo.class, - JpaObject.singularAttributeField(Snap.class, true, true), null); + JpaObject.singularAttributeField(Snap.class, true, true), ListTools.toList(Snap.properties_FIELDNAME)); } } diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionListNextWithApplication.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionListNextWithApplication.java index 1bc838c96be4633695cf8fd9eafdc3290bc66c42..a196cb94fac3319c06944132de6cad17a3b1968f 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionListNextWithApplication.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionListNextWithApplication.java @@ -16,6 +16,7 @@ import com.x.base.core.project.bean.WrapCopierFactory; import com.x.base.core.project.exception.ExceptionEntityNotExist; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; +import com.x.base.core.project.tools.ListTools; import com.x.processplatform.assemble.surface.Business; import com.x.processplatform.assemble.surface.jaxrs.snap.ActionListMyFilterPaging.Wo; import com.x.processplatform.core.entity.content.Snap; @@ -44,7 +45,7 @@ class ActionListNextWithApplication extends BaseAction { private static final long serialVersionUID = 3075270584151179370L; static WrapCopier copier = WrapCopierFactory.wo(Snap.class, Wo.class, - JpaObject.singularAttributeField(Snap.class, true, true), null); + JpaObject.singularAttributeField(Snap.class, true, true), ListTools.toList(Snap.properties_FIELDNAME)); } } \ No newline at end of file diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionListNextWithProcess.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionListNextWithProcess.java index 2813876c0b2d071d8348f038404a145a4e28d3b3..68b43b00dab6349430d6579bf654bd873adaa996 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionListNextWithProcess.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionListNextWithProcess.java @@ -12,6 +12,7 @@ import com.x.base.core.project.bean.WrapCopierFactory; import com.x.base.core.project.exception.ExceptionEntityNotExist; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; +import com.x.base.core.project.tools.ListTools; import com.x.processplatform.assemble.surface.Business; import com.x.processplatform.assemble.surface.jaxrs.snap.ActionListMyFilterPaging.Wo; import com.x.processplatform.core.entity.content.Snap; @@ -38,7 +39,7 @@ class ActionListNextWithProcess extends BaseAction { private static final long serialVersionUID = 2988668146783909521L; static WrapCopier copier = WrapCopierFactory.wo(Snap.class, Wo.class, - JpaObject.singularAttributeField(Snap.class, true, true), null); + JpaObject.singularAttributeField(Snap.class, true, true), ListTools.toList(Snap.properties_FIELDNAME)); } } diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionListPrev.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionListPrev.java index 53a53afff1b3148b43bdd37a5c7ff9492b27c71b..dc29f206a0cbc74ee2fd1c286959992b9e5b9bc2 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionListPrev.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionListPrev.java @@ -11,6 +11,7 @@ import com.x.base.core.project.bean.WrapCopier; import com.x.base.core.project.bean.WrapCopierFactory; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; +import com.x.base.core.project.tools.ListTools; import com.x.processplatform.assemble.surface.Business; import com.x.processplatform.assemble.surface.jaxrs.snap.ActionListMyFilterPaging.Wo; import com.x.processplatform.core.entity.content.Snap; @@ -30,7 +31,7 @@ class ActionListPrev extends BaseAction { private static final long serialVersionUID = 6502735971303449356L; static WrapCopier copier = WrapCopierFactory.wo(Snap.class, Wo.class, - JpaObject.singularAttributeField(Snap.class, true, true), null); + JpaObject.singularAttributeField(Snap.class, true, true), ListTools.toList(Snap.properties_FIELDNAME)); } } diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionListPrevWithApplication.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionListPrevWithApplication.java index 8713af4cacecf9986a4e2dff32bdfdc6d1477793..e55f8e8d9b6956bce9b9162b7c493d82a2a4cb82 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionListPrevWithApplication.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionListPrevWithApplication.java @@ -12,6 +12,7 @@ import com.x.base.core.project.bean.WrapCopierFactory; import com.x.base.core.project.exception.ExceptionEntityNotExist; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; +import com.x.base.core.project.tools.ListTools; import com.x.processplatform.assemble.surface.Business; import com.x.processplatform.assemble.surface.jaxrs.snap.ActionListMyFilterPaging.Wo; import com.x.processplatform.core.entity.content.Snap; @@ -38,7 +39,7 @@ class ActionListPrevWithApplication extends BaseAction { private static final long serialVersionUID = 3075270584151179370L; static WrapCopier copier = WrapCopierFactory.wo(Snap.class, Wo.class, - JpaObject.singularAttributeField(Snap.class, true, true), null); + JpaObject.singularAttributeField(Snap.class, true, true), ListTools.toList(Snap.properties_FIELDNAME)); } diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionListPrevWithProcess.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionListPrevWithProcess.java index a00ec8f389e372948ea6d2bd729faf337282cc03..46b1638317c8a49a3097e1e743d92c5809134ee7 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionListPrevWithProcess.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionListPrevWithProcess.java @@ -12,6 +12,7 @@ import com.x.base.core.project.bean.WrapCopierFactory; import com.x.base.core.project.exception.ExceptionEntityNotExist; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; +import com.x.base.core.project.tools.ListTools; import com.x.processplatform.assemble.surface.Business; import com.x.processplatform.assemble.surface.jaxrs.snap.ActionListMyFilterPaging.Wo; import com.x.processplatform.core.entity.content.Snap; @@ -38,7 +39,7 @@ class ActionListPrevWithProcess extends BaseAction { private static final long serialVersionUID = 2988668146783909521L; static WrapCopier copier = WrapCopierFactory.wo(Snap.class, Wo.class, - JpaObject.singularAttributeField(Snap.class, true, true), null); + JpaObject.singularAttributeField(Snap.class, true, true), ListTools.toList(Snap.properties_FIELDNAME)); } diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/SnapAction.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/SnapAction.java index 2e94eae801d70ce1018f0d3c62bb10631e255b7c..96a417b3afae039a43c6f776fa0ead4b6d5784b0 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/SnapAction.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/SnapAction.java @@ -125,7 +125,7 @@ public class SnapAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "删除快照", action = ActionDelete.class) @GET - @Path("{id}/mockget2delete") + @Path("{id}/mockdeletetoget") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) public void deleteMockGet2Delete(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/TaskAction.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/TaskAction.java index a557cfc3e6cf124596d9e73b90cf21ca01282cde..3d8aa5cc3bacc9af042dae9b828df4f9d52ef3e5 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/TaskAction.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/TaskAction.java @@ -372,10 +372,10 @@ public class TaskAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Post To Put.", action = ActionEdit.class) @POST - @Path("{id}/mockpost2put") + @Path("{id}/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void editMockPost2Put(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, + public void editMockPutToPost(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("标识") @PathParam("id") String id, JsonElement jsonElement) { ActionResult result = new ActionResult<>(); EffectivePerson effectivePerson = this.effectivePerson(request); @@ -408,10 +408,10 @@ public class TaskAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "重置待办,将之前的待办转为已办,opinion:办理意见,routeName:选择路由,identityList:新的办理人.", action = ActionReset.class) @POST - @Path("{id}/reset/mockpost2put") + @Path("{id}/reset/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void resetMockPost2Put(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, + public void resetMockPutToPost(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("标识") @PathParam("id") String id, JsonElement jsonElement) { ActionResult result = new ActionResult<>(); EffectivePerson effectivePerson = this.effectivePerson(request); @@ -516,10 +516,10 @@ public class TaskAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Get To Delete.", action = ActionManageDelete.class) @GET - @Path("{id}/manage/mockget2delete") + @Path("{id}/manage/mockdeletetoget") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void manageDeleteMockGet2Delete(@Suspended final AsyncResponse asyncResponse, + public void manageDeleteMockDeleteToGet(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("标识") @PathParam("id") String id) { ActionResult result = new ActionResult<>(); EffectivePerson effectivePerson = this.effectivePerson(request); @@ -552,10 +552,10 @@ public class TaskAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Post To Put.", action = ActionManageProcessing.class) @POST - @Path("{id}/processing/manage/mockpost2put") + @Path("{id}/processing/manage/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void manageProcessingMockPost2Put(@Suspended final AsyncResponse asyncResponse, + public void manageProcessingMockPutToPost(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("待办标识") @PathParam("id") String id, JsonElement jsonElement) { ActionResult result = new ActionResult<>(); @@ -589,10 +589,10 @@ public class TaskAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Post To Put.", action = ActionManageOpinion.class) @POST - @Path("{id}/opinion/manage/mockpost2put") + @Path("{id}/opinion/manage/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void manageOpinionMockPost2Put(@Suspended final AsyncResponse asyncResponse, + public void manageOpinionMockPutToPost(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("待办标识") @PathParam("id") String id, JsonElement jsonElement) { ActionResult result = new ActionResult<>(); @@ -626,10 +626,10 @@ public class TaskAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "重置待办,将之前的待办转为已办,opinion:办理意见,routeName:选择路由,identityList:新的办理人.", action = ActionManageReset.class) @POST - @Path("{id}/reset/manage/mockpost2put") + @Path("{id}/reset/manage/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void manageResetMockPost2Put(@Suspended final AsyncResponse asyncResponse, + public void manageResetMockPutToPost(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("标识") @PathParam("id") String id, JsonElement jsonElement) { ActionResult result = new ActionResult<>(); @@ -946,10 +946,10 @@ public class TaskAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Post To Put.", action = V2Reset.class) @POST - @Path("v2/{id}/reset/mockpost2put") + @Path("v2/{id}/reset/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void V2ResetMockPost2Put(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, + public void V2ResetMockPutToPost(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("标识") @PathParam("id") String id, JsonElement jsonElement) { ActionResult result = new ActionResult<>(); EffectivePerson effectivePerson = this.effectivePerson(request); diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/taskcompleted/TaskCompletedAction.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/taskcompleted/TaskCompletedAction.java index 541349d7848a4e9b8848e2f139a63698bb356d24..427eac31c68c2f857f27a9149c59c726b5562dd2 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/taskcompleted/TaskCompletedAction.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/taskcompleted/TaskCompletedAction.java @@ -409,10 +409,10 @@ public class TaskCompletedAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Get To Delete.", action = ActionManageDelete.class) @GET - @Path("{id}/manage/mockget2delete") + @Path("{id}/manage/mockdeletetoget") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void manageDeleteMockGet2Delete(@Suspended final AsyncResponse asyncResponse, + public void manageDeleteMockDeleteToGet(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("标识") @PathParam("id") String id) { ActionResult result = new ActionResult<>(); EffectivePerson effectivePerson = this.effectivePerson(request); @@ -445,10 +445,10 @@ public class TaskCompletedAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Post To Put.", action = ActionManageOpinion.class) @POST - @Path("{id}/opinion/manage/mockpost2put") + @Path("{id}/opinion/manage/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void manageOpinionMockPost2Put(@Suspended final AsyncResponse asyncResponse, + public void manageOpinionMockPutToPost(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("已办标识") @PathParam("id") String id, JsonElement jsonElement) { ActionResult result = new ActionResult<>(); diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/V2GetWorkOrWorkCompleted.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/V2GetWorkOrWorkCompleted.java index 01b84927fdf89b513bbfe2b1008c82783bf70e3f..8e452d192c6e451d1a4929bffc39cacb3de53860 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/V2GetWorkOrWorkCompleted.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/V2GetWorkOrWorkCompleted.java @@ -579,7 +579,7 @@ class V2GetWorkOrWorkCompleted extends BaseAction { private static final long serialVersionUID = 5244996549744746585L; static WrapCopier copier = WrapCopierFactory.wo(Task.class, WoTask.class, null, - JpaObject.FieldsInvisibleIncludeProperites); + JpaObject.FieldsInvisible); } @@ -588,7 +588,7 @@ class V2GetWorkOrWorkCompleted extends BaseAction { private static final long serialVersionUID = 5244996549744746585L; static WrapCopier copier = WrapCopierFactory.wo(Read.class, WoRead.class, null, - JpaObject.FieldsInvisibleIncludeProperites); + JpaObject.FieldsInvisible); } diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/WorkAction.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/WorkAction.java index f632517d0bed2307d1712cb8fe0e415d1404ea71..b3e35bd7eb4393254e4c870be3b2226e5f4fbac3 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/WorkAction.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/WorkAction.java @@ -202,10 +202,10 @@ public class WorkAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Post To Put.", action = ActionProcessing.class) @POST - @Path("{id}/processing/mockpost2put") + @Path("{id}/processing/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void processingMockPost2Put(@Suspended final AsyncResponse asyncResponse, + public void processingMockPutToPost(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("工作标识") @PathParam("id") String id) { ActionResult result = new ActionResult<>(); EffectivePerson effectivePerson = this.effectivePerson(request); @@ -316,10 +316,10 @@ public class WorkAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Get To Delete.", action = ActionDelete.class) @GET - @Path("{id}/mockget2delete") + @Path("{id}/mockdeletetoget") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void deleteMockGet2Delete(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, + public void deleteMockDeleteToGet(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("工作标识") @PathParam("id") String id) { ActionResult result = new ActionResult<>(); EffectivePerson effectivePerson = this.effectivePerson(request); @@ -354,7 +354,7 @@ public class WorkAction extends StandardJaxrsAction { @POST @Path("{id}/close/check") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) - @Consumes(MediaType.APPLICATION_JSON) + // 不需要申明,这里使用的是chrome在onunload事件运行有特殊的限制@Consumes(MediaType.APPLICATION_JSON) public void closeCheckPost(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("工作标识") @PathParam("id") String id) { ActionResult result = new ActionResult<>(); @@ -637,10 +637,10 @@ public class WorkAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Post To Put.", action = ActionRetract.class) @POST - @Path("{id}/retract/mockPost2Put") + @Path("{id}/retract/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void retractMockPost2Put(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, + public void retractMockPutToPost(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("工作标识") @PathParam("id") String id) { ActionResult result = new ActionResult<>(); EffectivePerson effectivePerson = this.effectivePerson(request); @@ -676,7 +676,7 @@ public class WorkAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "将工作调度。", action = ActionReroute.class) @POST - @Path("{id}/reroute/activity/{activityId}/activitytype/{activityType}/mockpost2put") + @Path("{id}/reroute/activity/{activityId}/activitytype/{activityType}/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) public void rerouteMockPost2Put(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @@ -715,10 +715,10 @@ public class WorkAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Post To Put.", action = ActionAddSplit.class) @POST - @Path("{id}/add/split/mockpost2put") + @Path("{id}/add/split/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void addSplitMockPost2Put(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, + public void addSplitMockPutToPost(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("工作标识") @PathParam("id") String id, JsonElement jsonElement) { ActionResult> result = new ActionResult<>(); EffectivePerson effectivePerson = this.effectivePerson(request); @@ -751,10 +751,10 @@ public class WorkAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Post To Put.", action = ActionRollback.class) @POST - @Path("{id}/rollback/mockpost2put") + @Path("{id}/rollback/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void rollbackMockPost2Put(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, + public void rollbackMockPutToPost(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("工作标识") @PathParam("id") String id, JsonElement jsonElement) { ActionResult result = new ActionResult<>(); EffectivePerson effectivePerson = this.effectivePerson(request); @@ -937,10 +937,10 @@ public class WorkAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Get To Delete.", action = ActionManageDeleteSingleWork.class) @GET - @Path("{id}/single/manage/mockget2delete") + @Path("{id}/single/manage/mockdeletetoget") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void manageDeleteSingleWorkMockGet2Delete(@Suspended final AsyncResponse asyncResponse, + public void manageDeleteSingleWorkMockDeleteToGet(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("工作标识") @PathParam("id") String id) { ActionResult> result = new ActionResult<>(); EffectivePerson effectivePerson = this.effectivePerson(request); @@ -973,10 +973,10 @@ public class WorkAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Get To Delete.", action = ActionManageDeleteRelativeWork.class) @GET - @Path("{id}/relative/manage/mockget2delete") + @Path("{id}/relative/manage/mockdeletetoget") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void manageDeleteRelativeWorkMockGet2Delete(@Suspended final AsyncResponse asyncResponse, + public void manageDeleteRelativeWorkMockDeleteToGet(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("工作标识") @PathParam("id") String id) { ActionResult> result = new ActionResult<>(); EffectivePerson effectivePerson = this.effectivePerson(request); @@ -1090,11 +1090,12 @@ public class WorkAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Post To Put.", action = V2Reroute.class) @POST - @Path("v2/{id}/reroute/mockpost2put") + @Path("v2/{id}/reroute/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void V2RerouteMockPost2Put(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("工作标识") @PathParam("id") String id, JsonElement jsonElement) { + public void V2RerouteMockPutToPost(@Suspended final AsyncResponse asyncResponse, + @Context HttpServletRequest request, @JaxrsParameterDescribe("工作标识") @PathParam("id") String id, + JsonElement jsonElement) { ActionResult result = new ActionResult<>(); EffectivePerson effectivePerson = this.effectivePerson(request); try { @@ -1126,11 +1127,12 @@ public class WorkAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Post To Put.", action = V2Retract.class) @POST - @Path("v2/{id}/retract/mockpost2put") + @Path("v2/{id}/retract/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void V2RetractMockPost2Put(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, - @JaxrsParameterDescribe("工作标识") @PathParam("id") String id, JsonElement jsonElement) { + public void V2RetractMockPutToPost(@Suspended final AsyncResponse asyncResponse, + @Context HttpServletRequest request, @JaxrsParameterDescribe("工作标识") @PathParam("id") String id, + JsonElement jsonElement) { ActionResult result = new ActionResult<>(); EffectivePerson effectivePerson = this.effectivePerson(request); try { @@ -1162,10 +1164,10 @@ public class WorkAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Post To Put.", action = V2Rollback.class) @POST - @Path("v2/{id}/rollback/mockpost2put") + @Path("v2/{id}/rollback/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void V2RollbackMockPost2Put(@Suspended final AsyncResponse asyncResponse, + public void V2RollbackMockPutToPost(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("工作标识") @PathParam("id") String id, JsonElement jsonElement) { ActionResult result = new ActionResult<>(); @@ -1199,10 +1201,10 @@ public class WorkAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Post To Put.", action = ActionAddSplit.class) @POST - @Path("v2/{id}/add/split/mockpost2put") + @Path("v2/{id}/add/split/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void V2AddSplitMockPost2Put(@Suspended final AsyncResponse asyncResponse, + public void V2AddSplitMockPutToPost(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("工作标识") @PathParam("id") String id, JsonElement jsonElement) { ActionResult result = new ActionResult<>(); @@ -1237,10 +1239,10 @@ public class WorkAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Post To Put.", action = V2ManageRetract.class) @POST - @Path("v2/{id}/person/{person}/retract/manage/mockpost2put") + @Path("v2/{id}/person/{person}/retract/manage/mockputtopost") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void V2ManageRetractMockPost2Put(@Suspended final AsyncResponse asyncResponse, + public void V2ManageRetractMockPutToPost(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("工作标识") @PathParam("id") String id, @JaxrsParameterDescribe("召回工作已办人员（根据流转记录确认）") @PathParam("person") String person, JsonElement jsonElement) { ActionResult result = new ActionResult<>(); diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/workcompleted/WorkCompletedAction.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/workcompleted/WorkCompletedAction.java index 1e7eeeadb7d259f84311915a8ae9a2628de7a789..bdf7e658c0fab116596f7e68525eb6bd9277b663 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/workcompleted/WorkCompletedAction.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/workcompleted/WorkCompletedAction.java @@ -421,10 +421,10 @@ public class WorkCompletedAction extends StandardJaxrsAction { @JaxrsMethodDescribe(value = "Mock Get To Delete.", action = ActionManageDelete.class) @GET - @Path("{id}/delete/manage/mockget2delete") + @Path("{id}/delete/manage/mockdeletetoget") @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void manageDeleteMockGet2Delete(@Suspended final AsyncResponse asyncResponse, + public void manageDeleteMockDeleteToGet(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("标识") @PathParam("id") String id) { ActionResult> result = new ActionResult<>(); EffectivePerson effectivePerson = this.effectivePerson(request); @@ -534,11 +534,11 @@ public class WorkCompletedAction extends StandardJaxrsAction { } @JaxrsMethodDescribe(value = "Mock Post To Put.", action = ActionRollback.class) - @Path("{flag}/rollback/mockpost2put") + @Path("{flag}/rollback/mockputtopost") @POST @Produces(HttpMediaType.APPLICATION_JSON_UTF_8) @Consumes(MediaType.APPLICATION_JSON) - public void rollbackMockPost2Put(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, + public void rollbackMockPutToPost(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request, @JaxrsParameterDescribe("流程标识") @PathParam("flag") String flag, JsonElement jsonElement) { ActionResult result = new ActionResult<>(); EffectivePerson effectivePerson = this.effectivePerson(request); diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/WorkCompletedProperties.java b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/WorkCompletedProperties.java index 92f8a345f7638b7d4998fa9cfcf0d8cc583420c0..20b0364cff9195e1fc56a2c86be9fb08e7cfb29c 100644 --- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/WorkCompletedProperties.java +++ b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/WorkCompletedProperties.java @@ -1,10 +1,13 @@ package com.x.processplatform.core.entity.content; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import com.x.base.core.entity.JsonProperties; import com.x.base.core.project.annotation.FieldDescribe; +import com.x.base.core.project.gson.GsonPropertyObject; import com.x.processplatform.core.entity.element.Form; public class WorkCompletedProperties extends JsonProperties { @@ -39,7 +42,7 @@ public class WorkCompletedProperties extends JsonProperties { @FieldDescribe("合并工作mobileRelatedFormList") private List
mobileRelatedFormList = new ArrayList<>(); - @FieldDescribe("合并工作relatedScriptList") + @FieldDescribe("合并工作mobileRelatedFormList") private List