diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/container/factory/PersistenceXmlHelper.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/container/factory/PersistenceXmlHelper.java index cae34a96a8bb8dfeee8f3f2f7b39eaf1baca8e47..32d5e05d704334a7c7c9503c6211e6a0565e2833 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/container/factory/PersistenceXmlHelper.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/container/factory/PersistenceXmlHelper.java @@ -282,7 +282,7 @@ public class PersistenceXmlHelper { properties.put("openjpa.QueryCompilationCache", "false"); properties.put("openjpa.LockManager", "none"); properties.put("openjpa.jdbc.ResultSetType", "scroll-insensitive"); - properties.put("openjpa.Multithreaded", "true"); + properties.put("openjpa.Multithreaded", "false"); /* 如果启用本地初始化会导致classLoad的问题 */ properties.put("openjpa.DynamicEnhancementAgent", "false"); properties.put("openjpa.jdbc.SynchronizeMappings", "buildSchema(ForeignKeys=false)"); diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionCloseCheck.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionCloseCheck.java index 38b79a49324cd16e84ebaf4a5bcf0c496bd7ff19..1794a7d7bc993f2b27329ea657ed147a5667996d 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionCloseCheck.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionCloseCheck.java @@ -35,7 +35,7 @@ class ActionCloseCheck extends BaseAction { process = business.process().pick(work.getProcess()); } } - if (null != work && null != process) { + if ((null != work) && (null != process)) { wo.setDraft(this.draft(effectivePerson, work, process)); } else { WoDraft woDraft = new WoDraft(); 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 4635fb3b514619e30d503bbb40833a7eb85b2ab7..929b18ecd57597f9d689261660baf7d1eea14dc0 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 @@ -119,6 +119,12 @@ class V2GetWorkOrWorkCompleted extends BaseAction { private WoRecord taskToRecord(WoTask woTask) { WoRecord o = new WoRecord(); + // id必须设置为空,否则会影响每次输出的内容都不同,那么会导致etag每次不同. + o.setId(""); + // order设置为task的最后修改时间,否则会影响每次输出的内容都不同,那么会导致etag每次不同. + o.setOrder(woTask.getUpdateTime().getTime()); + // recordTime设置为task的最后修改时间,否则会影响每次输出的内容都不同,那么会导致etag每次不同. + o.setRecordTime(woTask.getUpdateTime()); o.setType(Record.TYPE_CURRENTTASK); o.setFromActivity(woTask.getActivity()); o.setFromActivityAlias(woTask.getActivityAlias()); diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionCreateDataPath0.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionCreateDataPath0.java index 60a8ffaaa5549de9e34621c0c0d8d0ca5ab566be..30948aace41ce93a269dfed5a86be8318cca6aac 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionCreateDataPath0.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionCreateDataPath0.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.applicationdict; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -35,7 +36,7 @@ class ActionCreateDataPath0 extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(id).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(id).submit(callable).get(300, TimeUnit.SECONDS); } public static class Wo extends WoId { diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionCreateDataPath1.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionCreateDataPath1.java index bf71a819a1e9b679fdd5fb74af662ea2e43575e5..759eb2b23d1c140c0227098e226ac492ac42ebc0 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionCreateDataPath1.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionCreateDataPath1.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.applicationdict; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -35,7 +36,7 @@ class ActionCreateDataPath1 extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(id).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(id).submit(callable).get(300, TimeUnit.SECONDS); } public static class Wo extends WoId { diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionCreateDataPath2.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionCreateDataPath2.java index e377e40da86c0b0d3769e00c1234250a970c0605..726eec86aff40c689a7d953d6a155e5101bb4dc5 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionCreateDataPath2.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionCreateDataPath2.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.applicationdict; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -36,7 +37,7 @@ class ActionCreateDataPath2 extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(id).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(id).submit(callable).get(300, TimeUnit.SECONDS); } public static class Wo extends WoId { diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionCreateDataPath3.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionCreateDataPath3.java index 4c02b7714dd04278449c388ca7b28531403a2d93..8e2415b63c87df20c5cfa830307d3af0d5e670aa 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionCreateDataPath3.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionCreateDataPath3.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.applicationdict; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -36,7 +37,7 @@ class ActionCreateDataPath3 extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(id).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(id).submit(callable).get(300, TimeUnit.SECONDS); } public static class Wo extends WoId { diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionCreateDataPath4.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionCreateDataPath4.java index 62263f23fffc4856af3cc49eb741bf1397447ff7..61a3f4c092ddfe16c5fd2c21a7fe0618e6e27220 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionCreateDataPath4.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionCreateDataPath4.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.applicationdict; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -36,7 +37,7 @@ class ActionCreateDataPath4 extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(id).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(id).submit(callable).get(300, TimeUnit.SECONDS); } public static class Wo extends WoId { diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionCreateDataPath5.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionCreateDataPath5.java index 7d20330fd1d9e4ea70922c312338ecccf0162f3b..a37b06995eb7cbb124e4548ec2eb415b9deb9ffe 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionCreateDataPath5.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionCreateDataPath5.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.applicationdict; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -36,7 +37,7 @@ class ActionCreateDataPath5 extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(id).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(id).submit(callable).get(300, TimeUnit.SECONDS); } public static class Wo extends WoId { diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionCreateDataPath6.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionCreateDataPath6.java index 72f957df6a38c636c82bb1bc21f2f2a8f7c3c2d7..2d8df04c9be00053f6f3d16f9f43d9aa0eef091d 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionCreateDataPath6.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionCreateDataPath6.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.applicationdict; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -36,7 +37,7 @@ class ActionCreateDataPath6 extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(id).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(id).submit(callable).get(300, TimeUnit.SECONDS); } public static class Wo extends WoId { diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionCreateDataPath7.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionCreateDataPath7.java index 705bec653937b74a0d934c0d02361c2714bf9e3b..81a425d7edd8ceab5e3ab0a1e3fe18026785c336 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionCreateDataPath7.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionCreateDataPath7.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.applicationdict; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -36,7 +37,7 @@ class ActionCreateDataPath7 extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(id).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(id).submit(callable).get(300, TimeUnit.SECONDS); } public static class Wo extends WoId { diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionDeleteDataPath0.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionDeleteDataPath0.java index aa9d2fd5cc2cbc4d21724ab5eaa09ac5e3ca69c4..3fdd4ba423fb293a44575216371992c716264f8b 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionDeleteDataPath0.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionDeleteDataPath0.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.applicationdict; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -34,7 +35,7 @@ class ActionDeleteDataPath0 extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(id).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(id).submit(callable).get(300, TimeUnit.SECONDS); } public static class Wo extends WoId { diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionDeleteDataPath1.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionDeleteDataPath1.java index d023fa0fdf1207ed8f132635a2754a4a5ffcd0d0..1c51b2645199da6cc9a3dcae3fc0b77b86c5ad6f 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionDeleteDataPath1.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionDeleteDataPath1.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.applicationdict; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -34,7 +35,7 @@ class ActionDeleteDataPath1 extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(id).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(id).submit(callable).get(300, TimeUnit.SECONDS); } public static class Wo extends WoId { diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionDeleteDataPath2.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionDeleteDataPath2.java index 5e421436aa046c21e48945e950d13c7db8bc2ad7..b98775f487b96806334abce9b77d5472effca522 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionDeleteDataPath2.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionDeleteDataPath2.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.applicationdict; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -34,7 +35,7 @@ class ActionDeleteDataPath2 extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(id).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(id).submit(callable).get(300, TimeUnit.SECONDS); } public static class Wo extends WoId { diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionDeleteDataPath3.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionDeleteDataPath3.java index d3f175adf06019f7cb5010b5d74ac500f8a08dce..516822133f0d89be890ae677d31ade522108501a 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionDeleteDataPath3.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionDeleteDataPath3.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.applicationdict; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -34,7 +35,7 @@ class ActionDeleteDataPath3 extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(id).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(id).submit(callable).get(300, TimeUnit.SECONDS); } public static class Wo extends WoId { diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionDeleteDataPath4.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionDeleteDataPath4.java index 09af2fa2d9ecde0492ed787012a4d331921b15c5..a2323be2633e8d654859587b530136756cc72ba9 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionDeleteDataPath4.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionDeleteDataPath4.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.applicationdict; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -35,7 +36,7 @@ class ActionDeleteDataPath4 extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(id).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(id).submit(callable).get(300, TimeUnit.SECONDS); } public static class Wo extends WoId { diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionDeleteDataPath5.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionDeleteDataPath5.java index 772186046f2efb39eee62710c0b4cd1f14c692f0..3489d30913ae274a9a1c350e9789cb80186651a5 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionDeleteDataPath5.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionDeleteDataPath5.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.applicationdict; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -35,7 +36,7 @@ class ActionDeleteDataPath5 extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(id).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(id).submit(callable).get(300, TimeUnit.SECONDS); } public static class Wo extends WoId { diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionDeleteDataPath6.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionDeleteDataPath6.java index 85b9e18352369a1e5fff4572c28e9dd16881d565..7298ed9f7f4a3cc2e261ffdaca6d507c80e36b18 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionDeleteDataPath6.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionDeleteDataPath6.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.applicationdict; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -35,7 +36,7 @@ class ActionDeleteDataPath6 extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(id).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(id).submit(callable).get(300, TimeUnit.SECONDS); } public static class Wo extends WoId { diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionDeleteDataPath7.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionDeleteDataPath7.java index 49657bbc9daf354a208d79396641ac084227c5ae..d02b69ac6bcab6de1a08f7ed8044de09435fb9a0 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionDeleteDataPath7.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionDeleteDataPath7.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.applicationdict; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -35,7 +36,7 @@ class ActionDeleteDataPath7 extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(id).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(id).submit(callable).get(300, TimeUnit.SECONDS); } public static class Wo extends WoId { diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionUpdate.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionUpdate.java index 1036ddb6dee9b7e66134f1937b65da87f84903b4..23420b1e9af10ffdb561d077f0d954176e81f352 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionUpdate.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionUpdate.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.applicationdict; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -48,7 +49,7 @@ class ActionUpdate extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(id).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(id).submit(callable).get(300, TimeUnit.SECONDS); } diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionUpdateDataPath0.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionUpdateDataPath0.java index 87d2f4ce94621ceeac5bb41a37c8f597272a48e9..da4b2079dfa533584de60605faddb6132a57066d 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionUpdateDataPath0.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionUpdateDataPath0.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.applicationdict; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -35,7 +36,7 @@ class ActionUpdateDataPath0 extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(id).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(id).submit(callable).get(300, TimeUnit.SECONDS); } diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionUpdateDataPath1.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionUpdateDataPath1.java index 8bb6acc726fb4794bd72dd362074074795b56123..9fc10dc359b133e808916ade04064674b86eb8c0 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionUpdateDataPath1.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionUpdateDataPath1.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.applicationdict; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -35,7 +36,7 @@ class ActionUpdateDataPath1 extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(id).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(id).submit(callable).get(300, TimeUnit.SECONDS); } diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionUpdateDataPath2.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionUpdateDataPath2.java index 1670d9008e1d191aa7e91e31c6b0f8332fe823f4..21d501dbd7c0bea9bdcd8afa64f33d1ae9b573d1 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionUpdateDataPath2.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionUpdateDataPath2.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.applicationdict; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -36,7 +37,7 @@ class ActionUpdateDataPath2 extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(id).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(id).submit(callable).get(300, TimeUnit.SECONDS); } diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionUpdateDataPath3.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionUpdateDataPath3.java index 5c6892c90a0e8e8bae11bcffd901945d9230df75..81753e9db14f812f9342572d298b0e67a50dacab 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionUpdateDataPath3.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionUpdateDataPath3.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.applicationdict; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -36,7 +37,7 @@ class ActionUpdateDataPath3 extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(id).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(id).submit(callable).get(300, TimeUnit.SECONDS); } diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionUpdateDataPath4.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionUpdateDataPath4.java index a836145fd12d72b221c27bcc18f5cc439b006ab5..abbd32eb383e0faf1cb2215d05986d5b795cc4f5 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionUpdateDataPath4.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionUpdateDataPath4.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.applicationdict; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -36,7 +37,7 @@ class ActionUpdateDataPath4 extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(id).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(id).submit(callable).get(300, TimeUnit.SECONDS); } diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionUpdateDataPath5.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionUpdateDataPath5.java index 96545110e7db86acd23de99a045b84dba0a7b437..dd03d2a3dfb7b6843b128c2482b809be89591b18 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionUpdateDataPath5.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionUpdateDataPath5.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.applicationdict; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -36,7 +37,7 @@ class ActionUpdateDataPath5 extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(id).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(id).submit(callable).get(300, TimeUnit.SECONDS); } diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionUpdateDataPath6.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionUpdateDataPath6.java index 0bb1c7bc4f865b24a57f3b9b3fa8ac82bc980c2c..13e7eebb0e8cab12c43057eab73e811e5d719952 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionUpdateDataPath6.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionUpdateDataPath6.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.applicationdict; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -36,7 +37,7 @@ class ActionUpdateDataPath6 extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(id).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(id).submit(callable).get(300, TimeUnit.SECONDS); } diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionUpdateDataPath7.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionUpdateDataPath7.java index 961cf5332471a1c93d7e083ab12eb59bc4a94c75..c74516f2426d612088df0e838e2d71afa120e34b 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionUpdateDataPath7.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/applicationdict/ActionUpdateDataPath7.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.applicationdict; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -36,7 +37,7 @@ class ActionUpdateDataPath7 extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(id).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(id).submit(callable).get(300, TimeUnit.SECONDS); } diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/attachment/ActionCopyToWork.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/attachment/ActionCopyToWork.java index 60985fee3d03d53ca5d579dcafe813c1bc1a1360..059b1c85f469312edef8851deb73b4ba44d79f39 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/attachment/ActionCopyToWork.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/attachment/ActionCopyToWork.java @@ -3,6 +3,7 @@ package com.x.processplatform.service.processing.jaxrs.attachment; import java.util.ArrayList; import java.util.List; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -88,7 +89,7 @@ class ActionCopyToWork extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); } diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/attachment/ActionCopyToWorkCompleted.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/attachment/ActionCopyToWorkCompleted.java index c706fc26316a7c73f19eb0b71024f499dc00d166..068eac2bfdb0a230df4c937649d47ca75db1130b 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/attachment/ActionCopyToWorkCompleted.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/attachment/ActionCopyToWorkCompleted.java @@ -3,6 +3,7 @@ package com.x.processplatform.service.processing.jaxrs.attachment; import java.util.ArrayList; import java.util.List; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -89,7 +90,7 @@ class ActionCopyToWorkCompleted extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); } diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/attachment/ActionDelete.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/attachment/ActionDelete.java index 2d2aae0d1589621e1b41246d1a1fec1caa6ee8da..72b20b904bedc8e5dc1717ac9addf7c94fd0b75a 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/attachment/ActionDelete.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/attachment/ActionDelete.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.attachment; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -64,7 +65,7 @@ class ActionDelete extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/attachment/ActionDeleteWithWork.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/attachment/ActionDeleteWithWork.java index 7b07a9d6999884e3be3f3a6159fc51c233fce82d..55a1756f8da4e4a9b7f52a4e48a1a82053f49a3f 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/attachment/ActionDeleteWithWork.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/attachment/ActionDeleteWithWork.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.attachment; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -69,7 +70,7 @@ class ActionDeleteWithWork extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/attachment/ActionDeleteWithWorkCompleted.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/attachment/ActionDeleteWithWorkCompleted.java index b827731734b83171df116fe23fb69725ae4ce11f..1b8b81bcf73c698fe7acadc881011bd92b8874e9 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/attachment/ActionDeleteWithWorkCompleted.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/attachment/ActionDeleteWithWorkCompleted.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.attachment; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -68,7 +69,7 @@ class ActionDeleteWithWorkCompleted extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/attachment/ActionEdit.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/attachment/ActionEdit.java index 821281ddc331c78bd6e0eff8e2b96dcde6e2624b..3c49b04366360d81348aef52d4030e64f35bd452 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/attachment/ActionEdit.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/attachment/ActionEdit.java @@ -2,6 +2,7 @@ package com.x.processplatform.service.processing.jaxrs.attachment; import java.util.Arrays; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -56,7 +57,7 @@ class ActionEdit extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); } diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/attachment/ActionEditText.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/attachment/ActionEditText.java index 74654ca8649bbc0272ef08f8c1a6e4d04b77780d..b5ba953a606df687169d663963f26907fa524ee2 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/attachment/ActionEditText.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/attachment/ActionEditText.java @@ -2,6 +2,7 @@ package com.x.processplatform.service.processing.jaxrs.attachment; import java.util.Arrays; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -59,7 +60,7 @@ class ActionEditText extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); } diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionCreateWithWork.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionCreateWithWork.java index 0d95a3e1f3cb0b5314d4c395d40ec0234075ea51..1cc13be6d8729502adca3642738d87275812f67c 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionCreateWithWork.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionCreateWithWork.java @@ -2,6 +2,7 @@ package com.x.processplatform.service.processing.jaxrs.data; import java.util.List; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -68,7 +69,7 @@ class ActionCreateWithWork extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionCreateWithWorkPath0.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionCreateWithWorkPath0.java index 67b862c7e187db0d785760d09a39cb21b7753b65..3d6c1bb1b9f79dad14b47825ffb13325ff7ace1c 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionCreateWithWorkPath0.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionCreateWithWorkPath0.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.data; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -53,7 +54,7 @@ class ActionCreateWithWorkPath0 extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionCreateWithWorkPath1.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionCreateWithWorkPath1.java index 9bbfe61206b9dc30a4db4e2dd51581f49a199434..372e5c9bffd5aa89027694ebdda6438cd42f5714 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionCreateWithWorkPath1.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionCreateWithWorkPath1.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.data; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -52,7 +53,7 @@ class ActionCreateWithWorkPath1 extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionCreateWithWorkPath2.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionCreateWithWorkPath2.java index adafc10d81ed53596e00d56770255a0b4ba685e4..46f25266d9c88fa5dec53ad826218a94d1e788e4 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionCreateWithWorkPath2.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionCreateWithWorkPath2.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.data; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -52,7 +53,7 @@ class ActionCreateWithWorkPath2 extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionCreateWithWorkPath3.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionCreateWithWorkPath3.java index 0bc8081f69fa1cf57346ba86b588e5014ae8ec7c..e43c4e7eb7284d36c789c762b2677f27f80c22db 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionCreateWithWorkPath3.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionCreateWithWorkPath3.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.data; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -52,7 +53,7 @@ class ActionCreateWithWorkPath3 extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionCreateWithWorkPath4.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionCreateWithWorkPath4.java index 1af27fd88103c25139d85efca6dd89f9396630ac..92039490acf12612142734126b3be91962bb1ca0 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionCreateWithWorkPath4.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionCreateWithWorkPath4.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.data; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -52,7 +53,7 @@ class ActionCreateWithWorkPath4 extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionCreateWithWorkPath5.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionCreateWithWorkPath5.java index ba63a318bfc5acae2dea7a098953a4c9790d9ff0..462de2f159daa97153710a8c888db354b0822359 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionCreateWithWorkPath5.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionCreateWithWorkPath5.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.data; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -52,7 +53,7 @@ class ActionCreateWithWorkPath5 extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionCreateWithWorkPath6.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionCreateWithWorkPath6.java index b728cffbdeb848533420e172ed4f10649f394406..7d0b23efdeb703e7daf3dfdef9bd6db524258cb4 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionCreateWithWorkPath6.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionCreateWithWorkPath6.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.data; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -52,7 +53,7 @@ class ActionCreateWithWorkPath6 extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionCreateWithWorkPath7.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionCreateWithWorkPath7.java index fc7510ad5717e56a056ad523c47c2f212ef49a7b..b21c23789e604063ba9ccc8a33abd4ee48b0fa13 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionCreateWithWorkPath7.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionCreateWithWorkPath7.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.data; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -54,7 +55,7 @@ class ActionCreateWithWorkPath7 extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionDeleteWithWork.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionDeleteWithWork.java index 576818c2184474d6db4d8a2df7620287fd68b5c8..6c5391644a5481893aae710db1171fceaa5a742f 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionDeleteWithWork.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionDeleteWithWork.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.data; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -51,7 +52,7 @@ class ActionDeleteWithWork extends BaseAction { } } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; } diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionDeleteWithWorkPath0.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionDeleteWithWorkPath0.java index 1a70724a0404bd0a75736aa6595baf6dc1c48321..0b8bb510f69cb1e1ed09e834bde5fb5a8f14d3e9 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionDeleteWithWorkPath0.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionDeleteWithWorkPath0.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.data; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -49,7 +50,7 @@ class ActionDeleteWithWorkPath0 extends BaseAction { return ""; } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionDeleteWithWorkPath1.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionDeleteWithWorkPath1.java index 26e136068b8c45cd4fa1810c74e0611744f9a072..08adca8bd2c4616688b2d808e19ea64ee26646b5 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionDeleteWithWorkPath1.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionDeleteWithWorkPath1.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.data; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -48,7 +49,7 @@ class ActionDeleteWithWorkPath1 extends BaseAction { return ""; } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionDeleteWithWorkPath2.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionDeleteWithWorkPath2.java index 738ab1105b5308b9bfef629eaa12aac12c93fe06..fcf694c757cd665db5e99ad0db19f8229dbf61fd 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionDeleteWithWorkPath2.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionDeleteWithWorkPath2.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.data; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -49,7 +50,7 @@ class ActionDeleteWithWorkPath2 extends BaseAction { return ""; } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionDeleteWithWorkPath3.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionDeleteWithWorkPath3.java index 181677b4d8b9cc200d21366b0cb554a92d598239..5d0665eb9dda39282d0053a4dac036ccbb12ff8b 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionDeleteWithWorkPath3.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionDeleteWithWorkPath3.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.data; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -49,7 +50,7 @@ class ActionDeleteWithWorkPath3 extends BaseAction { return ""; } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionDeleteWithWorkPath4.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionDeleteWithWorkPath4.java index b5fb5994934cc8260d17af9c42b733d80fe86989..f912ceeebb0756f41016b47ad63a0e67fdc38b51 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionDeleteWithWorkPath4.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionDeleteWithWorkPath4.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.data; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -49,7 +50,7 @@ class ActionDeleteWithWorkPath4 extends BaseAction { return ""; } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionDeleteWithWorkPath5.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionDeleteWithWorkPath5.java index ae3c26528bece88963c0250c337466bb8d8ff96a..fc996f5e0f0946bcfe635ae33bd3c1fe45e080bd 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionDeleteWithWorkPath5.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionDeleteWithWorkPath5.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.data; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -49,7 +50,7 @@ class ActionDeleteWithWorkPath5 extends BaseAction { return ""; } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionDeleteWithWorkPath6.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionDeleteWithWorkPath6.java index 6d6ed27faf0d4beb95c066a5b73edd1fcd8f53fe..200ed04586c697da5f50e49b2672700e366b1a87 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionDeleteWithWorkPath6.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionDeleteWithWorkPath6.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.data; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -49,7 +50,7 @@ class ActionDeleteWithWorkPath6 extends BaseAction { return ""; } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionDeleteWithWorkPath7.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionDeleteWithWorkPath7.java index 978cf7646715a73e0e6f9be8e7e225a1aff08840..c585a0d558145791218e93e1d76c8c0a6eba22ad 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionDeleteWithWorkPath7.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionDeleteWithWorkPath7.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.data; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -49,7 +50,7 @@ class ActionDeleteWithWorkPath7 extends BaseAction { return ""; } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWork.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWork.java index 7407ad658522861ce3209aab1f3241d94ad64efa..63e0625e3046d5333e0c6a6eb00781f0eceb822d 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWork.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWork.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.data; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -68,7 +69,7 @@ class ActionUpdateWithWork extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkCompleted.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkCompleted.java index dea2b71ca834e0da45163b5ed2886aea4577beec..632ca2990e2b842ebb60e3c51ac41c32e6da8ce3 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkCompleted.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkCompleted.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.data; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import org.apache.commons.lang3.BooleanUtils; @@ -65,7 +66,7 @@ class ActionUpdateWithWorkCompleted extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkCompletedPath0.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkCompletedPath0.java index 10a56213517bde5eb3dedb5e4b77037ffc4f98d4..c5075b6a5dab6e709586cefbee3cfd195b80d47f 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkCompletedPath0.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkCompletedPath0.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.data; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import org.apache.commons.lang3.BooleanUtils; @@ -60,7 +61,7 @@ class ActionUpdateWithWorkCompletedPath0 extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkCompletedPath1.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkCompletedPath1.java index 6579029486235f8d31c9e3eafa84560003e1c5c8..a3bbe23a97a95d39c4c513392e9e07d799599dc1 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkCompletedPath1.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkCompletedPath1.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.data; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import org.apache.commons.lang3.BooleanUtils; @@ -59,7 +60,7 @@ class ActionUpdateWithWorkCompletedPath1 extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkCompletedPath2.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkCompletedPath2.java index bd177c5559435a5eae31a0037288c881ff304690..9965bcdc71061acc8f6c11ce517cc286eabb9cf2 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkCompletedPath2.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkCompletedPath2.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.data; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import org.apache.commons.lang3.BooleanUtils; @@ -59,7 +60,7 @@ class ActionUpdateWithWorkCompletedPath2 extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkCompletedPath3.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkCompletedPath3.java index e27daf09b9bd8dd86a0c5302464c7ed5599a42a6..b52e94549de701288dd7f4ece59eac853c96ec1e 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkCompletedPath3.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkCompletedPath3.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.data; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import org.apache.commons.lang3.BooleanUtils; @@ -59,7 +60,7 @@ class ActionUpdateWithWorkCompletedPath3 extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkCompletedPath4.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkCompletedPath4.java index 7af9d07f9689ee7445bf3d10c951e0b2ff781350..ef4c151b101b13bfeaaedbf4f7764604024fc33a 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkCompletedPath4.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkCompletedPath4.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.data; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import org.apache.commons.lang3.BooleanUtils; @@ -59,7 +60,7 @@ class ActionUpdateWithWorkCompletedPath4 extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkCompletedPath5.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkCompletedPath5.java index dd7f3081c774330a64edc125a1aff7807fb8cb51..9b5f6358f4499b094026c6e706f9712503fc6c6d 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkCompletedPath5.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkCompletedPath5.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.data; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import org.apache.commons.lang3.BooleanUtils; @@ -59,7 +60,7 @@ class ActionUpdateWithWorkCompletedPath5 extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkCompletedPath6.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkCompletedPath6.java index 878e97ec6d5d501fe6ebf5313e095ad9befa2035..3676eb472e531fe99259ebde61d3cd6a92b40266 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkCompletedPath6.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkCompletedPath6.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.data; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import org.apache.commons.lang3.BooleanUtils; @@ -59,7 +60,7 @@ class ActionUpdateWithWorkCompletedPath6 extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkCompletedPath7.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkCompletedPath7.java index 6c3ec27a8d8124f05f6e463c799fb0a807ce97fb..0c494cb8c68b297770514b0b91ecb1d00082ff8e 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkCompletedPath7.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkCompletedPath7.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.data; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import org.apache.commons.lang3.BooleanUtils; @@ -61,7 +62,7 @@ class ActionUpdateWithWorkCompletedPath7 extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkCompletedPrimitivePath0.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkCompletedPrimitivePath0.java index 19ff641d3602d80f123e937cf049842729e9d6b3..0ca846260f5da0437093eec1a0f71db3d645b95a 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkCompletedPrimitivePath0.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkCompletedPrimitivePath0.java @@ -2,6 +2,7 @@ package com.x.processplatform.service.processing.jaxrs.data; import java.util.List; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import org.apache.commons.lang3.BooleanUtils; @@ -98,7 +99,7 @@ class ActionUpdateWithWorkCompletedPrimitivePath0 extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkPath0.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkPath0.java index 00eb66b89d4c6ce6e2d04abcaf9b33e4093b7a8e..e86cc89dd160deefdae496e900f1731cbab3e0d6 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkPath0.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkPath0.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.data; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -55,7 +56,7 @@ class ActionUpdateWithWorkPath0 extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkPath1.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkPath1.java index 00fd18073f827598cfa5d4709c577f37396d9ec7..e75560682006ed83427f79b542ba1ec8fb44f2db 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkPath1.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkPath1.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.data; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -55,7 +56,7 @@ class ActionUpdateWithWorkPath1 extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkPath2.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkPath2.java index 0affa8b12483f62c6a08a4458837421b2074d4b2..2d6daebef64abee06bfe1df7ea35e5d8d7a7b04f 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkPath2.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkPath2.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.data; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -55,7 +56,7 @@ class ActionUpdateWithWorkPath2 extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkPath3.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkPath3.java index 93a3e6866b9ed16edd5ac59d4563edcc9fbcd54f..597c6daa5273833296095b279146319a7c59ab4a 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkPath3.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkPath3.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.data; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -55,7 +56,7 @@ class ActionUpdateWithWorkPath3 extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkPath4.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkPath4.java index 9727f3c9c13631e7c7670dcdedd246e567f1a0e3..4b150c75c74c02058cce13dd2a01f37907c82721 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkPath4.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkPath4.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.data; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -55,7 +56,7 @@ class ActionUpdateWithWorkPath4 extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkPath5.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkPath5.java index 3133884aa9e1d14063a4c544b448fe4ca1a93e53..18e9ffda583a5757ffcaee6994edad244b688c8d 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkPath5.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkPath5.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.data; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -55,7 +56,7 @@ class ActionUpdateWithWorkPath5 extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkPath6.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkPath6.java index dbf828823263fa9deea6acc98fc73fdecab1c7e4..d532fac51f0daca21fadb73d1f05428343108c37 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkPath6.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkPath6.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.data; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -55,7 +56,7 @@ class ActionUpdateWithWorkPath6 extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkPath7.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkPath7.java index d9543e7b42f92181e045edc7123af3ad3a9e55dc..26043fae15d67e6282b1024dd0d250edf8f5fc6c 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkPath7.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkPath7.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.data; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -56,7 +57,7 @@ class ActionUpdateWithWorkPath7 extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkSection.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkSection.java deleted file mode 100644 index 2a5404bcfa6ac16c0d12eff5730b650e55eaf1dc..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ActionUpdateWithWorkSection.java +++ /dev/null @@ -1,185 +0,0 @@ -//package com.x.processplatform.service.processing.jaxrs.data; -// -//import java.util.ArrayList; -//import java.util.List; -//import java.util.Map.Entry; -//import java.util.concurrent.Callable; -// -//import org.apache.commons.lang3.ArrayUtils; -//import org.apache.commons.lang3.StringUtils; -//import org.apache.commons.lang3.math.NumberUtils; -// -//import com.google.gson.JsonElement; -//import com.google.gson.JsonObject; -//import com.x.base.core.container.EntityManagerContainer; -//import com.x.base.core.container.factory.EntityManagerContainerFactory; -//import com.x.base.core.project.annotation.ActionLogger; -//import com.x.base.core.project.exception.ExceptionEntityNotExist; -//import com.x.base.core.project.executor.ProcessPlatformExecutorFactory; -//import com.x.base.core.project.http.ActionResult; -//import com.x.base.core.project.http.EffectivePerson; -//import com.x.base.core.project.jaxrs.WoId; -//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.processplatform.core.entity.content.Work; -//import com.x.processplatform.service.processing.Business; -//import com.x.processplatform.service.processing.jaxrs.data.ActionUpdateWithWorkPath7.Wo; -// -//class ActionUpdateWithWorkSection extends BaseAction { -// -// @ActionLogger -// private static Logger logger = LoggerFactory.getLogger(ActionUpdateWithWorkSection.class); -// -// ActionResult execute(EffectivePerson effectivePerson, String id, JsonElement jsonElement) throws Exception { -// -// ActionResult result = new ActionResult<>(); -// Wo wo = new Wo(); -// String executorSeed = null; -// -// try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { -// Work work = emc.fetch(id, Work.class, ListTools.toList(Work.job_FIELDNAME)); -// if (null == work) { -// throw new ExceptionEntityNotExist(id, Work.class); -// } -// executorSeed = work.getJob(); -// } -// Callable callable = new Callable() { -// public String call() throws Exception { -// try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { -// /* 防止提交空数据清空data */ -// if (null == jsonElement || (!jsonElement.isJsonObject())) { -// throw new ExceptionNotJsonObject(); -// } -// if (jsonElement.getAsJsonObject().entrySet().isEmpty()) { -// throw new ExceptionEmptyData(); -// } -// Business business = new Business(emc); -// Work work = emc.find(id, Work.class); -// if (null == work) { -// throw new ExceptionEntityNotExist(id, Work.class); -// } -// wo.setId(work.getId()); -// /* 进行区段数据合并 */ -// SectionData sectionData = gson.fromJson(jsonElement, SectionData.class); -// JsonElement merged; -// if (sectionData.hasSection()) { -// JsonElement data = sectionData.getData(); -// JsonElement source = getData(business, work.getJob()); -// for (Section section : sectionData.getSectionList()) { -// if (StringUtils.isNotEmpty(section.getPath())) { -// data = mergeSection(data, section.paths(), section.getKey(), source); -// } -// } -// merged = data; -// } else { -// merged = sectionData.getData(); -// } -// /** 先更新title和serial,再更新DataItem,因为旧的DataItem中也有title和serial数据. */ -// updateTitleSerial(business, work, merged); -// updateData(business, work, merged); -// /* updateTitleSerial 和 updateData 方法内进行了提交 */ -// } -// return ""; -// } -// }; -// ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); -// -// result.setData(wo); -// return result; -// } -// -// private JsonElement mergeSection(JsonElement data, String[] paths, String key, JsonElement source) -// throws Exception { -// JsonObject data_part_object = this.navigateElseEmptyObject(data, paths).getAsJsonObject(); -// JsonObject source_part_object = this.navigateElseEmptyObject(source, paths).getAsJsonObject(); -// for (Entry entry : source_part_object.entrySet()) { -// if (!StringUtils.equals(key, entry.getKey())) { -// data_part_object.add(entry.getKey(), entry.getValue()); -// } -// } -// return data; -// } -// -// private JsonElement navigateElseEmptyObject(JsonElement jsonElement, String[] paths) throws Exception { -// /* 判断在前 */ -// if (null == jsonElement || jsonElement.isJsonPrimitive() || jsonElement.isJsonNull()) { -// return new JsonObject(); -// } -// if (paths.length == 0) { -// return jsonElement; -// } -// -// if (jsonElement.isJsonArray()) { -// return navigateElseEmptyObject(jsonElement.getAsJsonArray().get(NumberUtils.toInt(paths[0])), -// ArrayUtils.remove(paths, 0)); -// } -// return navigateElseEmptyObject(jsonElement.getAsJsonObject().get(paths[0]), ArrayUtils.remove(paths, 0)); -// } -// -// public static class SectionData { -// -// private JsonElement data; -// -// private List
sectionList = new ArrayList<>(); -// -// public boolean hasSection() { -// if (ListTools.isNotEmpty(this.sectionList)) { -// for (Section section : this.sectionList) { -// if (StringUtils.isNotEmpty(section.getPath())) { -// return true; -// } -// } -// } -// return false; -// } -// -// public JsonElement getData() { -// return data; -// } -// -// public void setData(JsonElement data) { -// this.data = data; -// } -// -// public List
getSectionList() { -// return sectionList; -// } -// -// public void setSectionList(List
sectionList) { -// this.sectionList = sectionList; -// } -// } -// -// public static class Section { -// -// public String[] paths() { -// return StringUtils.split(path, "."); -// } -// -// private String path; -// -// private String key; -// -// public String getPath() { -// return path; -// } -// -// public void setPath(String path) { -// this.path = path; -// } -// -// public String getKey() { -// return key; -// } -// -// public void setKey(String key) { -// this.key = key; -// } -// } -// -// public static class Wo extends WoId { -// -// } -// -//} diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/documentversion/ActionCreate.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/documentversion/ActionCreate.java index 7f69d6c39439a387a8c5d25d135a63a167f5352b..821349f6f2949429ce0ab4e8fd205aeb70a57514 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/documentversion/ActionCreate.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/documentversion/ActionCreate.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.documentversion; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -67,7 +68,7 @@ class ActionCreate extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); } public static class Wi extends DocumentVersion { diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/job/ActionDelete.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/job/ActionDelete.java index 22aafe6a3a0931ad042866495fc81fdfc154e6ee..299ee3e6a617137cdab3a584db8014e6b03a75f1 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/job/ActionDelete.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/job/ActionDelete.java @@ -3,6 +3,7 @@ package com.x.processplatform.service.processing.jaxrs.job; import java.util.ArrayList; import java.util.List; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -108,7 +109,7 @@ public class ActionDelete extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(job).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(job).submit(callable).get(300, TimeUnit.SECONDS); } diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/read/ActionCreateWithWork.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/read/ActionCreateWithWork.java index 52719be99198ae54512f73c611b8a064f2dc50b3..830e771ab009228c5b89775f197feb24f3520110 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/read/ActionCreateWithWork.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/read/ActionCreateWithWork.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import org.apache.commons.lang3.BooleanUtils; @@ -137,7 +138,7 @@ class ActionCreateWithWork extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wos); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/read/ActionCreateWithWorkCompleted.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/read/ActionCreateWithWorkCompleted.java index 942071ec891fbe41cb0e4a221145240e005d15a2..ffd57a53e1ea794d860b6ab5980865c1cb576df3 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/read/ActionCreateWithWorkCompleted.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/read/ActionCreateWithWorkCompleted.java @@ -6,6 +6,7 @@ import java.util.Date; import java.util.List; import java.util.UUID; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import org.apache.commons.lang3.BooleanUtils; @@ -149,7 +150,7 @@ class ActionCreateWithWorkCompleted extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wos); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/read/ActionDelete.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/read/ActionDelete.java index ffa6d90d76462596904c65d66865d3f444444dff..07e5b0e3e310db6e97b381510d8fb4e263cdc391 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/read/ActionDelete.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/read/ActionDelete.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.read; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -54,7 +55,7 @@ class ActionDelete extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/read/ActionProcessing.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/read/ActionProcessing.java index 664354563fdcc376d5ae992b3b9112c7862de9c9..9b242dbe27847dd8924c4fff4a4524a65bf39268 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/read/ActionProcessing.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/read/ActionProcessing.java @@ -3,6 +3,7 @@ package com.x.processplatform.service.processing.jaxrs.read; import java.util.Date; import java.util.List; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -77,7 +78,7 @@ class ActionProcessing extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/readcompleted/ActionDelete.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/readcompleted/ActionDelete.java index e4670d1ace13df512dc4e4f54c9c0899159d6643..ad4c4eb20e09e9f3fa332d2cbf9db99bc1fb1762 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/readcompleted/ActionDelete.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/readcompleted/ActionDelete.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.readcompleted; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -54,7 +55,7 @@ class ActionDelete extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/record/ActionCreateWithJob.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/record/ActionCreateWithJob.java index 59ccaca3c7611fce27c2ca297f917dae5c7159b3..92b8021d06c0f1ea6ce86f996fafeda1a904de4f 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/record/ActionCreateWithJob.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/record/ActionCreateWithJob.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.record; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -46,7 +47,7 @@ class ActionCreateWithJob extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(job).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(job).submit(callable).get(300, TimeUnit.SECONDS); } diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/record/ActionDelete.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/record/ActionDelete.java index 443d59f68b1ff7eb269211e99b3656568727f47c..f10804af95863f5e052725fb1faf393937980f21 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/record/ActionDelete.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/record/ActionDelete.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.record; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -49,7 +50,7 @@ class ActionDelete extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(bag.job).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(bag.job).submit(callable).get(300, TimeUnit.SECONDS); } diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/record/ActionEdit.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/record/ActionEdit.java index a8e9b0d73b0dcb309629aa31694648b00850126f..3711df81078476abf8482270c08cf1750b43d8b4 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/record/ActionEdit.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/record/ActionEdit.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.record; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -69,7 +70,7 @@ class ActionEdit extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(bag.job).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(bag.job).submit(callable).get(300, TimeUnit.SECONDS); } diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/review/ActionCreateWithWork.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/review/ActionCreateWithWork.java index 13ec3e70eade3b4cc1f03c18db3f344457dd14b7..d9e4020aed6dcbea8848bdc59a03e078540a2b9c 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/review/ActionCreateWithWork.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/review/ActionCreateWithWork.java @@ -3,6 +3,7 @@ package com.x.processplatform.service.processing.jaxrs.review; import java.util.ArrayList; import java.util.List; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -75,7 +76,7 @@ class ActionCreateWithWork extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wos); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/review/ActionCreateWithWorkCompleted.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/review/ActionCreateWithWorkCompleted.java index d45290c4009db9fd8fa15af8603d3ac2b4d48bea..8f976190b1a6f294aa09b0850cc1eef7dbc0a576 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/review/ActionCreateWithWorkCompleted.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/review/ActionCreateWithWorkCompleted.java @@ -3,6 +3,7 @@ package com.x.processplatform.service.processing.jaxrs.review; import java.util.ArrayList; import java.util.List; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -70,7 +71,7 @@ class ActionCreateWithWorkCompleted extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wos); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/review/ActionDelete.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/review/ActionDelete.java index 02850ceb2a7a91f0a4f4a201110d94b495921e69..3a4d1a2b1534d606726ccba66476a14f984e5ed5 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/review/ActionDelete.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/review/ActionDelete.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.review; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -49,7 +50,7 @@ class ActionDelete extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/service/ActionTouch.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/service/ActionTouch.java index f7488cc6bb07a6484a4df39762c5393580e06707..3f4fd4afac38afff4d2d80d978ed38183728b2ae 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/service/ActionTouch.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/service/ActionTouch.java @@ -4,6 +4,7 @@ import java.lang.reflect.Type; import java.util.LinkedHashMap; import java.util.Objects; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.google.gson.reflect.TypeToken; @@ -35,7 +36,7 @@ class ActionTouch extends BaseAction{ } job = work.getJob(); } - return ProcessPlatformExecutorFactory.get(job).submit(new CallableAction(id, jsonElement)).get(); + return ProcessPlatformExecutorFactory.get(job).submit(new CallableAction(id, jsonElement)).get(300, TimeUnit.SECONDS); } public class CallableAction implements Callable> { diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/snap/ActionDelete.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/snap/ActionDelete.java index 28aaa55c62c0932f5d13f3a62a328425d411816b..3b0b5f57eb2a9b568cdb57ac178cba53ee96d36b 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/snap/ActionDelete.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/snap/ActionDelete.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.snap; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -34,7 +35,7 @@ class ActionDelete extends BaseAction { } job = snap.getJob(); } - return ProcessPlatformExecutorFactory.get(job).submit(new CallableImpl(id)).get(); + return ProcessPlatformExecutorFactory.get(job).submit(new CallableImpl(id)).get(300, TimeUnit.SECONDS); } public class CallableImpl implements Callable> { diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/snap/ActionRestore.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/snap/ActionRestore.java index 34ff080c54f438ad9a99e7a822ed74f8648ab0be..2956a897476e5a7a8744b4ebc175c808ac8999cd 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/snap/ActionRestore.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/snap/ActionRestore.java @@ -3,6 +3,7 @@ package com.x.processplatform.service.processing.jaxrs.snap; import java.util.List; import java.util.concurrent.Callable; import java.util.concurrent.CompletableFuture; +import java.util.concurrent.TimeUnit; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -46,7 +47,7 @@ class ActionRestore extends BaseAction { } job = snap.getJob(); } - return ProcessPlatformExecutorFactory.get(job).submit(new CallableImpl(id)).get(); + return ProcessPlatformExecutorFactory.get(job).submit(new CallableImpl(id)).get(300, TimeUnit.SECONDS); } public class CallableImpl implements Callable> { diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/snap/ActionTypeAbandoned.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/snap/ActionTypeAbandoned.java index f9cc9ec00dc9aad58a1520cb918f252710a7ed41..c92c29b87c5495c0520088c018e205c3454e2189 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/snap/ActionTypeAbandoned.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/snap/ActionTypeAbandoned.java @@ -3,6 +3,7 @@ package com.x.processplatform.service.processing.jaxrs.snap; import java.util.ArrayList; import java.util.List; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -43,7 +44,7 @@ class ActionTypeAbandoned extends BaseAction { } job = work.getJob(); } - return ProcessPlatformExecutorFactory.get(job).submit(new CallableImpl(workId)).get(); + return ProcessPlatformExecutorFactory.get(job).submit(new CallableImpl(workId)).get(300, TimeUnit.SECONDS); } public class CallableImpl implements Callable> { diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/snap/ActionTypeSnap.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/snap/ActionTypeSnap.java index b1b5f97359affa22a61b518ec08ca0df7ff4d72a..773c791876e8d44a05ecc6b28c9d398683288b71 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/snap/ActionTypeSnap.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/snap/ActionTypeSnap.java @@ -3,6 +3,7 @@ package com.x.processplatform.service.processing.jaxrs.snap; import java.util.ArrayList; import java.util.List; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -42,7 +43,7 @@ class ActionTypeSnap extends BaseAction { } job = work.getJob(); } - return ProcessPlatformExecutorFactory.get(job).submit(new CallableImpl(workId)).get(); + return ProcessPlatformExecutorFactory.get(job).submit(new CallableImpl(workId)).get(300, TimeUnit.SECONDS); } public class CallableImpl implements Callable> { diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/snap/ActionTypeSuspend.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/snap/ActionTypeSuspend.java index a026bd44486d7d4f6763dbc9ff06d26cddee7812..e728c5c47fbbc037f6f7a052d09fffc01107803e 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/snap/ActionTypeSuspend.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/snap/ActionTypeSuspend.java @@ -3,6 +3,7 @@ package com.x.processplatform.service.processing.jaxrs.snap; import java.util.ArrayList; import java.util.List; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -43,7 +44,7 @@ class ActionTypeSuspend extends BaseAction { } job = work.getJob(); } - return ProcessPlatformExecutorFactory.get(job).submit(new CallableImpl(workId)).get(); + return ProcessPlatformExecutorFactory.get(job).submit(new CallableImpl(workId)).get(300, TimeUnit.SECONDS); } public class CallableImpl implements Callable> { diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionAppend.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionAppend.java index e8844b67cf59bd6192a30b06138c9dbcd7dc0f58..334a329ab71bf0a9e03b06e185cf4ccc4c075c5e 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionAppend.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionAppend.java @@ -3,6 +3,7 @@ package com.x.processplatform.service.processing.jaxrs.task; import java.util.ArrayList; import java.util.List; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import javax.script.Bindings; import javax.script.CompiledScript; @@ -140,7 +141,7 @@ class ActionAppend extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); } public static ScriptContext scriptContext(Business business, Work work, Data data, Activity activity, Task task) diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionDelete.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionDelete.java index 2afdc7bec206e31a67845c0695ac1aaca6b85d6f..0997bf31b2e468475a05691e5cc6665e8f876bc5 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionDelete.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionDelete.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.task; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -54,7 +55,7 @@ class ActionDelete extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); } diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionExpire.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionExpire.java index f852f0a9ba2cb8a450d475ce73be8499675fb430..1f50fbb1e7fc50244312bcc0c35de616fe2dda97 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionExpire.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionExpire.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.task; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -73,7 +74,7 @@ class ActionExpire extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionGrab.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionGrab.java index a3efc28e0ac692ed319c9f2c5a93875ff70b647c..9df19d3f2c08703c397880b7af60c5b3363e28d3 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionGrab.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionGrab.java @@ -3,6 +3,7 @@ package com.x.processplatform.service.processing.jaxrs.task; import java.util.List; import java.util.Objects; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -73,7 +74,7 @@ class ActionGrab extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); return result; } diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionPassExpired.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionPassExpired.java index ea6d72cdc33622b4e0df83491b111604f14f00a2..ddb60cca14f82f3b3a4df4b2759a5df2c2db7187 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionPassExpired.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionPassExpired.java @@ -2,6 +2,7 @@ package com.x.processplatform.service.processing.jaxrs.task; import java.util.List; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -79,7 +80,7 @@ class ActionPassExpired extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); } diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionProcessing.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionProcessing.java index 52e240a910fcb76fb6e34d382d62b91983f0f456..cae713485364a096f9d108fc528a9cb91ef9d59f 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionProcessing.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionProcessing.java @@ -3,6 +3,7 @@ package com.x.processplatform.service.processing.jaxrs.task; import java.util.Date; import java.util.Objects; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import javax.script.CompiledScript; import javax.script.ScriptContext; @@ -60,7 +61,7 @@ class ActionProcessing extends BaseAction { job = task.getJob(); } - return ProcessPlatformExecutorFactory.get(job).submit(new CallableExecute(wi, id)).get(); + return ProcessPlatformExecutorFactory.get(job).submit(new CallableExecute(wi, id)).get(300, TimeUnit.SECONDS); } diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionReset.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionReset.java index 1904a13424ad2bf2d1eacf9e2ad08857b1c0065d..1fff73181a7363bf40aac37d4143e9431714a94a 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionReset.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionReset.java @@ -3,6 +3,7 @@ package com.x.processplatform.service.processing.jaxrs.task; import java.util.Date; import java.util.List; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang3.BooleanUtils; @@ -105,7 +106,7 @@ class ActionReset extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); return result; } diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionUpdatePrevTaskIdentity.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionUpdatePrevTaskIdentity.java index 76aa2977799ed5be953c5fd88eb3ff95025d61e7..4fa3f98f3c112d5ab1a500cb4d3450b58b84c2cc 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionUpdatePrevTaskIdentity.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionUpdatePrevTaskIdentity.java @@ -2,6 +2,7 @@ package com.x.processplatform.service.processing.jaxrs.task; import java.util.List; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -84,7 +85,7 @@ class ActionUpdatePrevTaskIdentity extends BaseAction { return result; }; - return ProcessPlatformExecutorFactory.get(bag.job).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(bag.job).submit(callable).get(300, TimeUnit.SECONDS); } diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionUrge.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionUrge.java index c00fffe9d39c745c6c2f555ca3871122ae848761..36d44e42eb10917e4a07330a768fc90aacfbca4d 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionUrge.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionUrge.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.task; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -74,7 +75,7 @@ class ActionUrge extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionWill.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionWill.java index 5b94fef12077c6b6054928bb7a295c1e301ea25f..0ee3ef3b004a7261c4240ff825c112c69005d214 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionWill.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionWill.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.Objects; import java.util.Optional; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import org.apache.commons.lang3.BooleanUtils; @@ -44,7 +45,7 @@ class ActionWill extends BaseAction { executorSeed = task.getJob(); } - return ProcessPlatformExecutorFactory.get(executorSeed).submit(new CallableImpl(id)).get(); + return ProcessPlatformExecutorFactory.get(executorSeed).submit(new CallableImpl(id)).get(300, TimeUnit.SECONDS); } private class CallableImpl implements Callable> { diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/V2Reset.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/V2Reset.java index 8f1144bcf4088d4d563d5bbbb766bd2ef6e53b63..9e2d8626b1464f05581eed185672eb58293bb405 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/V2Reset.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/V2Reset.java @@ -2,6 +2,7 @@ package com.x.processplatform.service.processing.jaxrs.task; import java.util.List; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang3.BooleanUtils; @@ -85,7 +86,7 @@ class V2Reset extends BaseAction { return result; }; - return ProcessPlatformExecutorFactory.get(job).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(job).submit(callable).get(300, TimeUnit.SECONDS); } diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/taskcompleted/ActionDelete.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/taskcompleted/ActionDelete.java index 4aaa1ed9380094083fe492a7c42b1f083faea95f..d5d4e461bf54829f8bd4f1190db228c6f86a6d59 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/taskcompleted/ActionDelete.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/taskcompleted/ActionDelete.java @@ -4,6 +4,7 @@ import java.util.Comparator; import java.util.Date; import java.util.List; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import org.apache.commons.lang3.StringUtils; @@ -69,7 +70,7 @@ class ActionDelete extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/taskcompleted/ActionPress.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/taskcompleted/ActionPress.java index 35a0e7bf99b35273ff9a70ed99236021b00a296b..d65af4be533f83c0b31a1102ef490bd5acac5617 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/taskcompleted/ActionPress.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/taskcompleted/ActionPress.java @@ -3,6 +3,7 @@ package com.x.processplatform.service.processing.jaxrs.taskcompleted; import java.util.Date; import java.util.List; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import org.apache.commons.lang3.StringUtils; @@ -83,7 +84,7 @@ class ActionPress extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/taskcompleted/ActionUpdateNextTaskIdentity.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/taskcompleted/ActionUpdateNextTaskIdentity.java index 5a5c824485082bf4053680ba746bf8281c51d8f3..6d1b1c30ae30bf462d1bec157f7eddc3c9980bb8 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/taskcompleted/ActionUpdateNextTaskIdentity.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/taskcompleted/ActionUpdateNextTaskIdentity.java @@ -2,6 +2,7 @@ package com.x.processplatform.service.processing.jaxrs.taskcompleted; import java.util.List; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -59,7 +60,7 @@ class ActionUpdateNextTaskIdentity extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(bag.job).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(bag.job).submit(callable).get(300, TimeUnit.SECONDS); } diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionAddSplit.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionAddSplit.java index b768cca0f949770e9dc8716034dff2551204e5bb..fdaf8a7e602e53ff98d6c903404ee2974ae5f973 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionAddSplit.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionAddSplit.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import org.apache.commons.lang3.StringUtils; @@ -157,7 +158,7 @@ class ActionAddSplit extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); } diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionDelete.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionDelete.java index 76d9e71b2469c75de406d6db5c3b6b6416611b45..c2c10bc5195e111d63d0a999c709ce6a4b23a6e4 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionDelete.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionDelete.java @@ -2,6 +2,7 @@ package com.x.processplatform.service.processing.jaxrs.work; import java.util.List; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -88,7 +89,7 @@ class ActionDelete extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); } diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionDeleteDraft.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionDeleteDraft.java index 1f76766838921d2bef4273246352d009995ca01f..f5b8464fbfb507d534c1421eedea5d30e536b2a2 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionDeleteDraft.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionDeleteDraft.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.work; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.x.base.core.container.EntityManagerContainer; import com.x.base.core.container.factory.EntityManagerContainerFactory; @@ -95,7 +96,7 @@ class ActionDeleteDraft extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); } public static class Wo extends WoId { diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionEdit.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionEdit.java index e255615d75cbb5b47bf31c3a631d4d62eee12a67..26116459b9f2f48b12ec5bca681b283abad30adf 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionEdit.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionEdit.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.work; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -49,7 +50,7 @@ class ActionEdit extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); } diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionManualAppendIdentity.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionManualAppendIdentity.java index 492f93ad8bf69ab65f39d4c9434cf43cc3050d41..b26bd0893e360f054106b8a5009fa6b90b96f0e9 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionManualAppendIdentity.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionManualAppendIdentity.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang3.StringUtils; @@ -105,7 +106,7 @@ class ActionManualAppendIdentity extends BaseAction { return ""; } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionProcessing.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionProcessing.java index ca597c7388355810bf3008aad012f11ee8e1c71a..cd44f732e1aacf3e955b4b5594d9daa65177b9f1 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionProcessing.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionProcessing.java @@ -1,6 +1,7 @@ package com.x.processplatform.service.processing.jaxrs.work; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import org.apache.commons.lang3.BooleanUtils; @@ -50,7 +51,7 @@ class ActionProcessing extends BaseAction { try { open(id, wi); - Wo wo = ProcessPlatformExecutorFactory.get(job).submit(new CallableExecute(wi, id)).get(); + Wo wo = ProcessPlatformExecutorFactory.get(job).submit(new CallableExecute(wi, id)).get(300, TimeUnit.SECONDS); persistSignalStack(id, job, wi); result.setData(wo); return result; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionProjection.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionProjection.java index 66399cb224999ea4a9f6425c50c3d9abb25f15bb..a9e2d51ec26f7f2f4d0f7680279d1aac59a10908 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionProjection.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionProjection.java @@ -3,6 +3,7 @@ package com.x.processplatform.service.processing.jaxrs.work; import java.util.ArrayList; import java.util.List; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.reflect.TypeToken; import com.x.base.core.container.EntityManagerContainer; @@ -71,7 +72,7 @@ class ActionProjection extends BaseAction { return result; }; - return ProcessPlatformExecutorFactory.get(job).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(job).submit(callable).get(300, TimeUnit.SECONDS); } diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionReroute.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionReroute.java index fb30f971225ae3cec4ecd690e22a38f7eec494a6..05e6ebb93b04e27eee63dc8b10006f3581a4bd29 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionReroute.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionReroute.java @@ -2,6 +2,7 @@ package com.x.processplatform.service.processing.jaxrs.work; import java.util.List; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import org.apache.commons.lang3.StringUtils; @@ -82,7 +83,7 @@ class ActionReroute extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(job).submit(callable).get(); + ProcessPlatformExecutorFactory.get(job).submit(callable).get(300, TimeUnit.SECONDS); wo = ThisApplication.context().applications() .putQuery(x_processplatform_service_processing.class, diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionRollback.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionRollback.java index 99d4baa5c609e9c9f29ca7160a0b00ec7638492f..7b901951c42e19eb36e3864c093360b078d005dd 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionRollback.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionRollback.java @@ -3,6 +3,7 @@ package com.x.processplatform.service.processing.jaxrs.work; import java.util.Date; import java.util.List; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; @@ -134,7 +135,7 @@ class ActionRollback extends BaseAction { } }; - ActionResult result = ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ActionResult result = ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); ThisApplication.context().applications().putQuery(x_processplatform_service_processing.class, Applications.joinQueryUri("work", workId, "processing"), null, job); diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/V2AddSplit.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/V2AddSplit.java index 09926ae7ed40e76a8717417aebbe54a864d9b145..44c2982b01fe273de83a9b49d5df9377a6605e61 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/V2AddSplit.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/V2AddSplit.java @@ -3,6 +3,7 @@ package com.x.processplatform.service.processing.jaxrs.work; import java.util.Date; import java.util.List; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -145,7 +146,7 @@ class V2AddSplit extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(job).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(job).submit(callable).get(300, TimeUnit.SECONDS); } diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/V2Reroute.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/V2Reroute.java index 55c10fdbaec62c2c68ac22ed5032c70d03830732..8fc6fc7847b2e421989050d749a1a1f754a68a39 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/V2Reroute.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/V2Reroute.java @@ -3,6 +3,7 @@ package com.x.processplatform.service.processing.jaxrs.work; import java.util.ArrayList; import java.util.List; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -100,7 +101,7 @@ class V2Reroute extends BaseAction { result.setData(wo); return result; }; - return ProcessPlatformExecutorFactory.get(job).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(job).submit(callable).get(300, TimeUnit.SECONDS); } diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/V2Retract.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/V2Retract.java index b694b42424dc13182f655f8eb5d5f823187e8786..a31ef857927d411a8c933a842ff06c7d2bfb41e6 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/V2Retract.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/V2Retract.java @@ -3,6 +3,7 @@ package com.x.processplatform.service.processing.jaxrs.work; import java.util.ArrayList; import java.util.List; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import com.google.gson.JsonElement; import com.x.base.core.container.EntityManagerContainer; @@ -121,7 +122,7 @@ class V2Retract extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(job).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(job).submit(callable).get(300, TimeUnit.SECONDS); } diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/V2Rollback.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/V2Rollback.java index 4a005f0f7d2409577608515b13562ce7a5c5428d..2f873ce169900af0583e04100c4e6a63acc361f7 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/V2Rollback.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/V2Rollback.java @@ -3,6 +3,7 @@ package com.x.processplatform.service.processing.jaxrs.work; import java.util.ArrayList; import java.util.List; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang3.BooleanUtils; @@ -120,7 +121,7 @@ class V2Rollback extends BaseAction { } }; - return ProcessPlatformExecutorFactory.get(job).submit(callable).get(); + return ProcessPlatformExecutorFactory.get(job).submit(callable).get(300, TimeUnit.SECONDS); } diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/workcompleted/ActionCreate.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/workcompleted/ActionCreate.java index daae60360dd262d922f090d08b1388aa40a37a77..ced660abc5c9af32c82e43ce4cf82798930a6959 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/workcompleted/ActionCreate.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/workcompleted/ActionCreate.java @@ -3,6 +3,7 @@ package com.x.processplatform.service.processing.jaxrs.workcompleted; import java.util.Date; import java.util.List; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import org.apache.commons.lang3.StringUtils; @@ -102,7 +103,7 @@ class ActionCreate extends BaseAction { } } }; - ActionResult result = ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ActionResult result = ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); return result; } diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/workcompleted/ActionMerge.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/workcompleted/ActionMerge.java index 052dbe6db479fbba2607bfefe496a4b7abacc31b..587e1707e15f4120274e1796bb34e0236a406b18 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/workcompleted/ActionMerge.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/workcompleted/ActionMerge.java @@ -9,6 +9,7 @@ import java.util.Map.Entry; import java.util.TreeMap; import java.util.concurrent.Callable; import java.util.concurrent.CompletableFuture; +import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import com.google.gson.JsonElement; @@ -60,7 +61,7 @@ class ActionMerge extends BaseAction { executorSeed = workCompleted.getJob(); } - return ProcessPlatformExecutorFactory.get(executorSeed).submit(new CallableAction(id)).get(); + return ProcessPlatformExecutorFactory.get(executorSeed).submit(new CallableAction(id)).get(300, TimeUnit.SECONDS); } public static class Wo extends WoId { diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/workcompleted/ActionRollback.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/workcompleted/ActionRollback.java index 00c982d390f6aff8960abe18ea926d9040018dbe..fe37121beb76682f50c68a66775eca1607f2d4cf 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/workcompleted/ActionRollback.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/workcompleted/ActionRollback.java @@ -3,6 +3,7 @@ package com.x.processplatform.service.processing.jaxrs.workcompleted; import java.util.Date; import java.util.List; import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; @@ -140,7 +141,7 @@ class ActionRollback extends BaseAction { } }; - ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(); + ProcessPlatformExecutorFactory.get(executorSeed).submit(callable).get(300, TimeUnit.SECONDS); ThisApplication.context().applications().putQuery(x_processplatform_service_processing.class, Applications.joinQueryUri("work", wo.getId(), "processing"), null, executorSeed);