Skip to content

o2oa
o2oa

ghsby / o2oa
落后 Fork 源项目 2880 个版本

Fork自 浙江兰德纵横网络技术股份有限公司 / o2oa

通知 1
Star 1
Fork 0
o2oa
o2oa

体验新版 GitCode，发现更多精彩内容 >>

提交 8eed76b3 编写于 作者: Z zhourui
浏览文件
操作

完成web.json

上级 e38335c6
展开全部 隐藏空白更改
内联 并排
Showing with 1038 addition and 282 deletion
o2server/x_base_core_project/src/main/java/com/x/base/core/entity/JpaObject.java
浏览文件 @ 8eed76b3
......@@ -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());
}
......
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ApplicationServer.java
浏览文件 @ 8eed76b3
......@@ -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;
......
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/CenterServer.java
浏览文件 @ 8eed76b3
......@@ -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();
......
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Web.java
浏览文件 @ 8eed76b3
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<String> mocks = new ArrayList<>();
private Mock mock = new Mock();
public static class Mock extends TreeMap<String, MockItem> {
public List<String> getMocks() {
return mocks;
}
public void setMocks(List<String> mocks) {
this.mocks = mocks;
public static class MockItem {
private MockItemObject put;
private MockItemObject delete;
}
public static class MockItemObject {
private String to;
private String append;
}
}
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/WebServer.java
浏览文件 @ 8eed76b3
......@@ -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;
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/applicationdict/ApplicationDictAction.java
浏览文件 @ 8eed76b3
......@@ -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,
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/AttachmentAction.java
浏览文件 @ 8eed76b3
......@@ -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<ActionDeleteWithWork.Wo> 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<ActionDeleteWithWorkCompleted.Wo> 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<ActionUpdateContent.Wo> 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<ActionEdit.Wo> 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<ActionEditText.Wo> 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,
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/draft/DraftAction.java
浏览文件 @ 8eed76b3
......@@ -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<ActionDelete.Wo> 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<ActionSave.Wo> result = new ActionResult<>();
EffectivePerson effectivePerson = this.effectivePerson(request);
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/V2LookupWorkOrWorkCompleted.java
浏览文件 @ 8eed76b3
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> _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<Boolean> _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<String, String> 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);
}
}
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/V2LookupWorkOrWorkCompletedMobile.java 0 → 100644
浏览文件 @ 8eed76b3
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<Wo> execute(EffectivePerson effectivePerson, String workOrWorkCompleted) throws Exception {
try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
ActionResult<Wo> result = new ActionResult<>();
Business business = new Business(emc);
CompletableFuture<Wo> _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<Boolean> _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
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/keylock/KeyLockAction.java
浏览文件 @ 8eed76b3
......@@ -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<ActionLock.Wo> result = new ActionResult<>();
EffectivePerson effectivePerson = this.effectivePerson(request);
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/read/ReadAction.java
浏览文件 @ 8eed76b3
......@@ -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<ActionEdit.Wo> 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<ActionManageDelete.Wo> 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<ActionManageProcessing.Wo> 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<ActionManageReset.Wo> 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<ActionManageOpinion.Wo> result = new ActionResult<>();
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/ReadCompletedAction.java
浏览文件 @ 8eed76b3
......@@ -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<ActionManageDelete.Wo> 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<ActionManageOpinion.Wo> result = new ActionResult<>();
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/record/RecordAction.java
浏览文件 @ 8eed76b3
......@@ -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<ActionManageDelete.Wo> 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<ActionManageEdit.Wo> result = new ActionResult<>();
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/review/ReviewAction.java
浏览文件 @ 8eed76b3
......@@ -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<ActionManageDelete.Wo> result = new ActionResult<>();
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/route/RouteAction.java
浏览文件 @ 8eed76b3
......@@ -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<List<ActionList.Wo>> result = new ActionResult<>();
EffectivePerson effectivePerson = this.effectivePerson(request);
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/serialnumber/SerialNumberAction.java
浏览文件 @ 8eed76b3
......@@ -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<ActionUpdate.Wo> 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<ActionRemove.Wo> result = new ActionResult<>();
EffectivePerson effectivePerson = this.effectivePerson(request);
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/service/ServiceAction.java
浏览文件 @ 8eed76b3
......@@ -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<ActionTouch.Wo> result = new ActionResult<>();
EffectivePerson effectivePerson = this.effectivePerson(request);
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionListMyFilterPaging.java
浏览文件 @ 8eed76b3
......@@ -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<Snap, Wo> 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));
}
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionListMyPaging.java
浏览文件 @ 8eed76b3
......@@ -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<Snap, Wo> 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));
}
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionListNext.java
浏览文件 @ 8eed76b3
......@@ -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<Snap, Wo> 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));
}
}
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionListNextWithApplication.java
浏览文件 @ 8eed76b3
......@@ -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<Snap, Wo> 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
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionListNextWithProcess.java
浏览文件 @ 8eed76b3
......@@ -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<Snap, Wo> 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));
}
}
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionListPrev.java
浏览文件 @ 8eed76b3
......@@ -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<Snap, Wo> 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));
}
}
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionListPrevWithApplication.java
浏览文件 @ 8eed76b3
......@@ -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<Snap, Wo> 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));
}
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/ActionListPrevWithProcess.java
浏览文件 @ 8eed76b3
......@@ -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<Snap, Wo> 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));
}
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/SnapAction.java
浏览文件 @ 8eed76b3
......@@ -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,
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/TaskAction.java
浏览文件 @ 8eed76b3
......@@ -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<ActionEdit.Wo> 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<ActionReset.Wo> 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<ActionManageDelete.Wo> 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<ActionManageProcessing.Wo> 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<ActionManageOpinion.Wo> 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<ActionManageReset.Wo> 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<V2Reset.Wo> result = new ActionResult<>();
EffectivePerson effectivePerson = this.effectivePerson(request);
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/taskcompleted/TaskCompletedAction.java
浏览文件 @ 8eed76b3
......@@ -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<ActionManageDelete.Wo> 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<ActionManageOpinion.Wo> result = new ActionResult<>();
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/V2GetWorkOrWorkCompleted.java
浏览文件 @ 8eed76b3
......@@ -579,7 +579,7 @@ class V2GetWorkOrWorkCompleted extends BaseAction {
private static final long serialVersionUID = 5244996549744746585L;
static WrapCopier<Task, WoTask> 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<Read, WoRead> copier = WrapCopierFactory.wo(Read.class, WoRead.class, null,
JpaObject.FieldsInvisibleIncludeProperites);
JpaObject.FieldsInvisible);
}
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/WorkAction.java
浏览文件 @ 8eed76b3
......@@ -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<ActionProcessing.Wo> 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<ActionDelete.Wo> 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<ActionCloseCheck.Wo> 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<ActionRetract.Wo> 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<List<ActionAddSplit.Wo>> 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<ActionRollback.Wo> 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<List<ActionManageDeleteSingleWork.Wo>> 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<List<ActionManageDeleteRelativeWork.Wo>> 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<V2Reroute.Wo> 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<V2Retract.Wo> 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<V2Rollback.Wo> 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<V2AddSplit.Wo> 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<V2ManageRetract.Wo> result = new ActionResult<>();
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/workcompleted/WorkCompletedAction.java
浏览文件 @ 8eed76b3
......@@ -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<List<ActionManageDelete.Wo>> 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<ActionRollback.Wo> result = new ActionResult<>();
EffectivePerson effectivePerson = this.effectivePerson(request);
......
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/WorkCompletedProperties.java
浏览文件 @ 8eed76b3
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<Form> mobileRelatedFormList = new ArrayList<>();
@FieldDescribe("合并工作relatedScriptList")
@FieldDescribe("合并工作mobileRelatedFormList")
private List<Script> mobileRelatedScriptList = new ArrayList<>();
@FieldDescribe("标题")
......@@ -141,7 +144,81 @@ public class WorkCompletedProperties extends JsonProperties {
this.reviewList = reviewList;
}
public static class Script {
public AdaptForm adaptForm(boolean mobile) throws Exception {
AdaptForm adapt = new AdaptForm();
if (null != this.form) {
if (mobile) {
Form f = new Form();
this.form.copyTo(f, Form.data_FIELDNAME, Form.mobileData_FIELDNAME);
f.setData(form.getMobileDataOrData());
adapt.setForm(f);
for (Form o : this.getMobileRelatedFormList()) {
Form m = new Form();
o.copyTo(m, true, Form.data_FIELDNAME, Form.mobileData_FIELDNAME);
m.setData(o.getMobileDataOrData());
adapt.getRelatedFormMap().put(o.getId(), m);
}
for (Script o : this.getMobileRelatedScriptList()) {
Script s = new Script();
o.copyTo(s, true);
adapt.getRelatedScriptMap().put(o.getId(), s);
}
} else {
Form f = new Form();
this.form.copyTo(f, Form.data_FIELDNAME, Form.mobileData_FIELDNAME);
f.setData(form.getDataOrMobileData());
adapt.setForm(f);
for (Form o : this.getRelatedFormList()) {
Form m = new Form();
o.copyTo(m, true, Form.data_FIELDNAME, Form.mobileData_FIELDNAME);
m.setData(o.getDataOrMobileData());
adapt.getRelatedFormMap().put(o.getId(), m);
}
for (Script o : this.getRelatedScriptList()) {
Script s = new Script();
o.copyTo(s, true);
adapt.getRelatedScriptMap().put(o.getId(), s);
}
}
}
return adapt;
}
public static class AdaptForm {
private Form form;
private Map<String, Form> relatedFormMap = new HashMap<>();
private Map<String, Script> relatedScriptMap = new HashMap<>();
public Form getForm() {
return form;
}
public void setForm(Form form) {
this.form = form;
}
public Map<String, Form> getRelatedFormMap() {
return relatedFormMap;
}
public void setRelatedFormMap(Map<String, Form> relatedFormMap) {
this.relatedFormMap = relatedFormMap;
}
public Map<String, Script> getRelatedScriptMap() {
return relatedScriptMap;
}
public void setRelatedScriptMap(Map<String, Script> relatedScriptMap) {
this.relatedScriptMap = relatedScriptMap;
}
}
public static class Script extends GsonPropertyObject {
public static final String TYPE_PROCESSPLATFORM = "processPlatform";
public static final String TYPE_CMS = "cms";
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或