diff --git a/o2server/configSample/processPlatform.json b/o2server/configSample/processPlatform.json index c30b4fee335f27c8166cc7cf8529260b09ddcf12..62167e0553e6f0188462dd971945a84a355893b8 100644 --- a/o2server/configSample/processPlatform.json +++ b/o2server/configSample/processPlatform.json @@ -30,9 +30,11 @@ "enable": false, "cron": "30 30 6 * * ?", "thresholdDays": 730.0, + "batchSize": 100.0, "###enable": "是否启用###", "###cron": "定时cron表达式###", - "###thresholdDays": "期限,已完成工作结束间隔指定时间进行combine,默认两年后进行combine###" + "###thresholdDays": "期限,已完成工作结束间隔指定时间进行merge,默认两年后进行merge###", + "###batchSize": "批量大小.###" }, "deleteDraft": { "enable": false, diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_processplatform_service_processing.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_processplatform_service_processing.java index a15f8d774dba4d44da884a4a2d2c132060771c0a..26b23861657506546f25cf8a19a3c6363959d5ac 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_processplatform_service_processing.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_processplatform_service_processing.java @@ -6,7 +6,7 @@ import com.x.base.core.project.annotation.ModuleCategory; import com.x.base.core.project.annotation.ModuleType; @Module(type = ModuleType.SERVICE, category = ModuleCategory.OFFICIAL, name = "流程服务", packageName = "com.x.processplatform.service.processing", containerEntities = { - "com.x.processplatform.core.entity.content.Draft", "com.x.processplatform.core.entity.content.Snap", + "com.x.processplatform.core.entity.content.Snap", "com.x.processplatform.core.entity.content.Draft", "com.x.processplatform.core.entity.content.Attachment", "com.x.processplatform.core.entity.content.TaskCompleted", "com.x.processplatform.core.entity.content.ReadCompleted", "com.x.processplatform.core.entity.content.Review", 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 969d155b378552aa83aeb7687da309da269bbaaf..5ba69e3acef67bcd8879ad4d2ad1181f1956a937 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 @@ -18,7 +18,7 @@ import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.processplatform.assemble.surface.Business; import com.x.processplatform.core.entity.content.Snap; -import com.x.processplatform.core.entity.content.Snap_; +import com.x.processplatform.core.entity.content.Snap; import com.x.processplatform.core.entity.element.Application; class ActionListNextWithApplication extends BaseAction { diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/BaseAction.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/BaseAction.java index 64b4e970d4bfdc00688c860d4d4fc44944a1f27f..1020dc13149aa2cec904b0906459cee7fb018d5c 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/BaseAction.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/snap/BaseAction.java @@ -18,7 +18,7 @@ import com.x.base.core.project.tools.ListTools; import com.x.base.core.project.tools.StringTools; import com.x.processplatform.assemble.surface.Business; import com.x.processplatform.core.entity.content.Snap; -import com.x.processplatform.core.entity.content.Snap_; +import com.x.processplatform.core.entity.content.Snap; import com.x.processplatform.core.entity.element.Application; import com.x.processplatform.core.entity.element.Process; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/ActionApplication.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/ActionApplication.java index 49d1a5f254046f9ed1ba0a701aec8273d1708c33..14cf3650a72f561288031743112b717922bbd15d 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/ActionApplication.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/ActionApplication.java @@ -5,7 +5,6 @@ import java.util.Set; import javax.ws.rs.ApplicationPath; import com.x.base.core.project.jaxrs.AbstractActionApplication; -import com.x.processplatform.core.entity.content.Snap; import com.x.processplatform.service.processing.jaxrs.applicationdict.ApplicationDictAction; import com.x.processplatform.service.processing.jaxrs.attachment.AttachmentAction; import com.x.processplatform.service.processing.jaxrs.data.DataAction; @@ -16,6 +15,7 @@ import com.x.processplatform.service.processing.jaxrs.readcompleted.ReadComplete import com.x.processplatform.service.processing.jaxrs.record.RecordAction; import com.x.processplatform.service.processing.jaxrs.review.ReviewAction; import com.x.processplatform.service.processing.jaxrs.service.ServiceAction; +import com.x.processplatform.service.processing.jaxrs.snap.SnapAction; import com.x.processplatform.service.processing.jaxrs.task.TaskAction; import com.x.processplatform.service.processing.jaxrs.taskcompleted.TaskCompletedAction; import com.x.processplatform.service.processing.jaxrs.test.TestAction; @@ -41,7 +41,7 @@ public class ActionApplication extends AbstractActionApplication { classes.add(TestAction.class); classes.add(RecordAction.class); classes.add(ServiceAction.class); - classes.add(Snap.class); + classes.add(SnapAction.class); return classes; }