Merge branch 'fix/snap' into 'release'

snap服务载入

See merge request o2oa/o2oa!1732

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,

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",

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 {

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;
 

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;
 	}