diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/AbstractFactory.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/AbstractFactory.java index c2f34ad525394d6e76950d97067ac48375dcda54..77263d37bdcb794b2e80ee8d61d7a613fb72e0ab 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/AbstractFactory.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/AbstractFactory.java @@ -4,7 +4,7 @@ import com.x.base.core.container.EntityManagerContainer; public abstract class AbstractFactory { - protected Business business; + private Business business; public AbstractFactory(Business business) throws Exception { try { diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/BindingPair.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/BindingPair.java deleted file mode 100644 index 7c4ce365b3603d12a44826d29916b37c45ef8ede..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/BindingPair.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.x.processplatform.service.processing; - -public class BindingPair { - - public BindingPair(String name, Object value) { - this.name = name; - this.value = value; - } - - private String name; - - private Object value; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Object getValue() { - return value; - } - - public void setValue(Object value) { - this.value = value; - } - -} diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/Processing.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/Processing.java index 21b3553014f34787f136ae3cde8be8c2cace0b72..356e4f30303bc8a2a89caa6d23305261dc683966 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/Processing.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/Processing.java @@ -18,7 +18,7 @@ public class Processing extends BaseProcessing { private EntityManagerContainer entityManagerContainer; - protected ProcessingAttributes processingAttributes; + private ProcessingAttributes processingAttributes; public EntityManagerContainer entityManagerContainer() { return this.entityManagerContainer; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/AttachmentFactory.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/AttachmentFactory.java index 8c3b965a3a710cc1ce259defb3cb30b01ea0d7c9..78affcaf6da3536bbbaf9fcb5fb0daa167301574 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/AttachmentFactory.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/AttachmentFactory.java @@ -29,13 +29,13 @@ public class AttachmentFactory extends AbstractFactory { return em.createQuery(cq).getResultList(); } - public List listWithJobObject(String job) throws Exception { - EntityManager em = this.entityManagerContainer().get(Attachment.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(Attachment.class); - Root root = cq.from(Attachment.class); - Predicate p = cb.equal(root.get(Attachment_.job), job); - cq.select(root).where(p); - return em.createQuery(cq).getResultList(); - } +// public List listWithJobObject(String job) throws Exception { +// EntityManager em = this.entityManagerContainer().get(Attachment.class); +// CriteriaBuilder cb = em.getCriteriaBuilder(); +// CriteriaQuery cq = cb.createQuery(Attachment.class); +// Root root = cq.from(Attachment.class); +// Predicate p = cb.equal(root.get(Attachment_.job), job); +// cq.select(root).where(p); +// return em.createQuery(cq).getResultList(); +// } } \ No newline at end of file diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/DocumentVersionFactory.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/DocumentVersionFactory.java index c81e16c896fab13acba67531d0f2ec42e3ca5a4c..d63100d00657c430ac10a32f829d92daec846f7f 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/DocumentVersionFactory.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/DocumentVersionFactory.java @@ -20,13 +20,13 @@ public class DocumentVersionFactory extends AbstractFactory { } - public List listWithJob(String job) throws Exception { - EntityManager em = this.entityManagerContainer().get(DocumentVersion.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(DocumentVersion.class); - Predicate p = cb.equal(root.get(DocumentVersion_.job), job); - cq.select(root.get(DocumentVersion_.id)).where(p); - return em.createQuery(cq).getResultList(); - } +// public List listWithJob(String job) throws Exception { +// EntityManager em = this.entityManagerContainer().get(DocumentVersion.class); +// CriteriaBuilder cb = em.getCriteriaBuilder(); +// CriteriaQuery cq = cb.createQuery(String.class); +// Root root = cq.from(DocumentVersion.class); +// Predicate p = cb.equal(root.get(DocumentVersion_.job), job); +// cq.select(root.get(DocumentVersion_.id)).where(p); +// return em.createQuery(cq).getResultList(); +// } } \ No newline at end of file diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/ReadCompletedFactory.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/ReadCompletedFactory.java index 1b455be06b48c5c17d57faff2b1bfd364e04bb5f..f1149f16816f1790b4ae039c679e06bbc9a94220 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/ReadCompletedFactory.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/ReadCompletedFactory.java @@ -29,24 +29,24 @@ public class ReadCompletedFactory extends AbstractFactory { return em.createQuery(cq).getResultList(); } - public List listWithJob(String job) throws Exception { - EntityManager em = this.entityManagerContainer().get(ReadCompleted.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(ReadCompleted.class); - Predicate p = cb.equal(root.get(ReadCompleted_.job), job); - cq.select(root.get(ReadCompleted_.id)).where(p); - return em.createQuery(cq).getResultList(); - } +// public List listWithJob(String job) throws Exception { +// EntityManager em = this.entityManagerContainer().get(ReadCompleted.class); +// CriteriaBuilder cb = em.getCriteriaBuilder(); +// CriteriaQuery cq = cb.createQuery(String.class); +// Root root = cq.from(ReadCompleted.class); +// Predicate p = cb.equal(root.get(ReadCompleted_.job), job); +// cq.select(root.get(ReadCompleted_.id)).where(p); +// return em.createQuery(cq).getResultList(); +// } - public List listWithActivityToken(String activityToken) throws Exception { - EntityManager em = this.entityManagerContainer().get(ReadCompleted.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(ReadCompleted.class); - Predicate p = cb.equal(root.get(ReadCompleted_.activityToken), activityToken); - cq.select(root.get(ReadCompleted_.id)).where(p); - return em.createQuery(cq).getResultList(); - } +// public List listWithActivityToken(String activityToken) throws Exception { +// EntityManager em = this.entityManagerContainer().get(ReadCompleted.class); +// CriteriaBuilder cb = em.getCriteriaBuilder(); +// CriteriaQuery cq = cb.createQuery(String.class); +// Root root = cq.from(ReadCompleted.class); +// Predicate p = cb.equal(root.get(ReadCompleted_.activityToken), activityToken); +// cq.select(root.get(ReadCompleted_.id)).where(p); +// return em.createQuery(cq).getResultList(); +// } } \ No newline at end of file diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/ReadFactory.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/ReadFactory.java index f9b03d783784da3d3145e7a35c62f62a6687bda9..ea7ef69b24d20126bd549bdb684a7f9a15a89648 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/ReadFactory.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/ReadFactory.java @@ -29,47 +29,47 @@ public class ReadFactory extends AbstractFactory { return em.createQuery(cq).getResultList(); } - public List listWithJob(String job) throws Exception { - EntityManager em = this.entityManagerContainer().get(Read.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(Read.class); - Predicate p = cb.equal(root.get(Read_.job), job); - cq.select(root.get(Read_.id)).where(p); - return em.createQuery(cq).getResultList(); - } +// public List listWithJob(String job) throws Exception { +// EntityManager em = this.entityManagerContainer().get(Read.class); +// CriteriaBuilder cb = em.getCriteriaBuilder(); +// CriteriaQuery cq = cb.createQuery(String.class); +// Root root = cq.from(Read.class); +// Predicate p = cb.equal(root.get(Read_.job), job); +// cq.select(root.get(Read_.id)).where(p); +// return em.createQuery(cq).getResultList(); +// } - public List listWithPersonWithWork(String person, String work) throws Exception { - EntityManager em = this.entityManagerContainer().get(Read.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(Read.class); - Predicate p = cb.equal(root.get(Read_.person), person); - p = cb.and(p, cb.equal(root.get(Read_.completed), false)); - p = cb.and(p, cb.equal(root.get(Read_.work), work)); - cq.select(root.get(Read_.id)).where(p); - return em.createQuery(cq).getResultList(); - } +// public List listWithPersonWithWork(String person, String work) throws Exception { +// EntityManager em = this.entityManagerContainer().get(Read.class); +// CriteriaBuilder cb = em.getCriteriaBuilder(); +// CriteriaQuery cq = cb.createQuery(String.class); +// Root root = cq.from(Read.class); +// Predicate p = cb.equal(root.get(Read_.person), person); +// p = cb.and(p, cb.equal(root.get(Read_.completed), false)); +// p = cb.and(p, cb.equal(root.get(Read_.work), work)); +// cq.select(root.get(Read_.id)).where(p); +// return em.createQuery(cq).getResultList(); +// } - public List listWithPersonWithWorkCompleted(String person, String workCompleted) throws Exception { - EntityManager em = this.entityManagerContainer().get(Read.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(Read.class); - Predicate p = cb.equal(root.get(Read_.person), person); - p = cb.and(p, cb.equal(root.get(Read_.completed), true)); - p = cb.and(p, cb.equal(root.get(Read_.workCompleted), workCompleted)); - cq.select(root.get(Read_.id)).where(p); - return em.createQuery(cq).getResultList(); - } +// public List listWithPersonWithWorkCompleted(String person, String workCompleted) throws Exception { +// EntityManager em = this.entityManagerContainer().get(Read.class); +// CriteriaBuilder cb = em.getCriteriaBuilder(); +// CriteriaQuery cq = cb.createQuery(String.class); +// Root root = cq.from(Read.class); +// Predicate p = cb.equal(root.get(Read_.person), person); +// p = cb.and(p, cb.equal(root.get(Read_.completed), true)); +// p = cb.and(p, cb.equal(root.get(Read_.workCompleted), workCompleted)); +// cq.select(root.get(Read_.id)).where(p); +// return em.createQuery(cq).getResultList(); +// } - public List listWithActivityToken(String activityToken) throws Exception { - EntityManager em = this.entityManagerContainer().get(Read.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(Read.class); - Predicate p = cb.equal(root.get(Read_.activityToken), activityToken); - cq.select(root.get(Read_.id)).where(p); - return em.createQuery(cq).getResultList(); - } +// public List listWithActivityToken(String activityToken) throws Exception { +// EntityManager em = this.entityManagerContainer().get(Read.class); +// CriteriaBuilder cb = em.getCriteriaBuilder(); +// CriteriaQuery cq = cb.createQuery(String.class); +// Root root = cq.from(Read.class); +// Predicate p = cb.equal(root.get(Read_.activityToken), activityToken); +// cq.select(root.get(Read_.id)).where(p); +// return em.createQuery(cq).getResultList(); +// } } \ No newline at end of file diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/ReviewFactory.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/ReviewFactory.java index c47add5e191d0bedf74f9a8583ac25e9d760b188..5bf32484663c57c5fb5116a6804457ae92ef06eb 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/ReviewFactory.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/ReviewFactory.java @@ -29,26 +29,26 @@ public class ReviewFactory extends AbstractFactory { return em.createQuery(cq).getResultList(); } - public List listWithJob(String job) throws Exception { - EntityManager em = this.entityManagerContainer().get(Review.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(Review.class); - Predicate p = cb.equal(root.get(Review_.job), job); - cq.select(root.get(Review_.id)).where(p); - return em.createQuery(cq).getResultList(); - } - - public String getWithPersonWithJob(String person, String job) throws Exception { - EntityManager em = this.entityManagerContainer().get(Review.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(Review.class); - Predicate p = cb.equal(root.get(Review_.person), person); - p = cb.and(p, cb.equal(root.get(Review_.job), job)); - cq.select(root.get(Review_.id)).where(p); - List list = em.createQuery(cq).setMaxResults(1).getResultList(); - return list.isEmpty() ? null : list.get(0); - } +// public List listWithJob(String job) throws Exception { +// EntityManager em = this.entityManagerContainer().get(Review.class); +// CriteriaBuilder cb = em.getCriteriaBuilder(); +// CriteriaQuery cq = cb.createQuery(String.class); +// Root root = cq.from(Review.class); +// Predicate p = cb.equal(root.get(Review_.job), job); +// cq.select(root.get(Review_.id)).where(p); +// return em.createQuery(cq).getResultList(); +// } + +// public String getWithPersonWithJob(String person, String job) throws Exception { +// EntityManager em = this.entityManagerContainer().get(Review.class); +// CriteriaBuilder cb = em.getCriteriaBuilder(); +// CriteriaQuery cq = cb.createQuery(String.class); +// Root root = cq.from(Review.class); +// Predicate p = cb.equal(root.get(Review_.person), person); +// p = cb.and(p, cb.equal(root.get(Review_.job), job)); +// cq.select(root.get(Review_.id)).where(p); +// List list = em.createQuery(cq).setMaxResults(1).getResultList(); +// return list.isEmpty() ? null : list.get(0); +// } } \ No newline at end of file diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/TaskCompletedFactory.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/TaskCompletedFactory.java index a96a3ba4166301c6711db0aaf96e2392c8dd014d..a4d9be85d571ec2476e26228df63a20720f9933c 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/TaskCompletedFactory.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/TaskCompletedFactory.java @@ -47,36 +47,36 @@ public class TaskCompletedFactory extends AbstractFactory { return em.createQuery(cq).getResultList(); } - public List listWithJob(String job) throws Exception { - EntityManager em = this.entityManagerContainer().get(TaskCompleted.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(TaskCompleted.class); - Predicate p = cb.equal(root.get(TaskCompleted_.job), job); - cq.select(root.get(TaskCompleted_.id)).where(p); - return em.createQuery(cq).getResultList(); - } +// public List listWithJob(String job) throws Exception { +// EntityManager em = this.entityManagerContainer().get(TaskCompleted.class); +// CriteriaBuilder cb = em.getCriteriaBuilder(); +// CriteriaQuery cq = cb.createQuery(String.class); +// Root root = cq.from(TaskCompleted.class); +// Predicate p = cb.equal(root.get(TaskCompleted_.job), job); +// cq.select(root.get(TaskCompleted_.id)).where(p); +// return em.createQuery(cq).getResultList(); +// } - public List listWithActivityTokenInIdentityList(String activityToken, List identites) - throws Exception { - EntityManager em = this.entityManagerContainer().get(TaskCompleted.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(TaskCompleted.class); - Predicate p = cb.equal(root.get(TaskCompleted_.activityToken), activityToken); - p = cb.and(p, root.get(TaskCompleted_.identity).in(identites)); - cq.select(root.get(TaskCompleted_.id)).where(p); - return em.createQuery(cq).getResultList(); - } +// public List listWithActivityTokenInIdentityList(String activityToken, List identites) +// throws Exception { +// EntityManager em = this.entityManagerContainer().get(TaskCompleted.class); +// CriteriaBuilder cb = em.getCriteriaBuilder(); +// CriteriaQuery cq = cb.createQuery(String.class); +// Root root = cq.from(TaskCompleted.class); +// Predicate p = cb.equal(root.get(TaskCompleted_.activityToken), activityToken); +// p = cb.and(p, root.get(TaskCompleted_.identity).in(identites)); +// cq.select(root.get(TaskCompleted_.id)).where(p); +// return em.createQuery(cq).getResultList(); +// } - public List listWithActivityToken(String activityToken) throws Exception { - EntityManager em = this.entityManagerContainer().get(TaskCompleted.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(TaskCompleted.class); - Predicate p = cb.equal(root.get(TaskCompleted_.activityToken), activityToken); - cq.select(root.get(TaskCompleted_.id)).where(p); - return em.createQuery(cq).getResultList(); - } +// public List listWithActivityToken(String activityToken) throws Exception { +// EntityManager em = this.entityManagerContainer().get(TaskCompleted.class); +// CriteriaBuilder cb = em.getCriteriaBuilder(); +// CriteriaQuery cq = cb.createQuery(String.class); +// Root root = cq.from(TaskCompleted.class); +// Predicate p = cb.equal(root.get(TaskCompleted_.activityToken), activityToken); +// cq.select(root.get(TaskCompleted_.id)).where(p); +// return em.createQuery(cq).getResultList(); +// } } \ No newline at end of file diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/TaskFactory.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/TaskFactory.java index 72325bc76964d68ca3935026779d7b90998c1c10..bdca956a172b130dc196c954d16e12c6f07c6b91 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/TaskFactory.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/TaskFactory.java @@ -29,44 +29,44 @@ public class TaskFactory extends AbstractFactory { return em.createQuery(cq).getResultList(); } - public List listWithWorkObject(String id) throws Exception { - EntityManager em = this.entityManagerContainer().get(Task.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(Task.class); - Root root = cq.from(Task.class); - Predicate p = cb.equal(root.get(Task_.work), id); - cq.select(root).where(p); - return em.createQuery(cq).getResultList(); - } +// public List listWithWorkObject(String id) throws Exception { +// EntityManager em = this.entityManagerContainer().get(Task.class); +// CriteriaBuilder cb = em.getCriteriaBuilder(); +// CriteriaQuery cq = cb.createQuery(Task.class); +// Root root = cq.from(Task.class); +// Predicate p = cb.equal(root.get(Task_.work), id); +// cq.select(root).where(p); +// return em.createQuery(cq).getResultList(); +// } - public List listWithJob(String job) throws Exception { - EntityManager em = this.entityManagerContainer().get(Task.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(Task.class); - Predicate p = cb.equal(root.get(Task_.job), job); - cq.select(root.get(Task_.id)).where(p); - return em.createQuery(cq).getResultList(); - } +// public List listWithJob(String job) throws Exception { +// EntityManager em = this.entityManagerContainer().get(Task.class); +// CriteriaBuilder cb = em.getCriteriaBuilder(); +// CriteriaQuery cq = cb.createQuery(String.class); +// Root root = cq.from(Task.class); +// Predicate p = cb.equal(root.get(Task_.job), job); +// cq.select(root.get(Task_.id)).where(p); +// return em.createQuery(cq).getResultList(); +// } - public Long countWithActivityToken(String activityToken) throws Exception { - EntityManager em = this.entityManagerContainer().get(Task.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(Long.class); - Root root = cq.from(Task.class); - Predicate p = cb.equal(root.get(Task_.activityToken), activityToken); - cq.select(cb.count(root)).where(p); - return em.createQuery(cq).getSingleResult(); - } +// public Long countWithActivityToken(String activityToken) throws Exception { +// EntityManager em = this.entityManagerContainer().get(Task.class); +// CriteriaBuilder cb = em.getCriteriaBuilder(); +// CriteriaQuery cq = cb.createQuery(Long.class); +// Root root = cq.from(Task.class); +// Predicate p = cb.equal(root.get(Task_.activityToken), activityToken); +// cq.select(cb.count(root)).where(p); +// return em.createQuery(cq).getSingleResult(); +// } - public List listWithActivityToken(String activityToken) throws Exception { - EntityManager em = this.entityManagerContainer().get(Task.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(Task.class); - Predicate p = cb.equal(root.get(Task_.activityToken), activityToken); - cq.select(root.get(Task_.id)).where(p); - return em.createQuery(cq).getResultList(); - } +// public List listWithActivityToken(String activityToken) throws Exception { +// EntityManager em = this.entityManagerContainer().get(Task.class); +// CriteriaBuilder cb = em.getCriteriaBuilder(); +// CriteriaQuery cq = cb.createQuery(String.class); +// Root root = cq.from(Task.class); +// Predicate p = cb.equal(root.get(Task_.activityToken), activityToken); +// cq.select(root.get(Task_.id)).where(p); +// return em.createQuery(cq).getResultList(); +// } } \ No newline at end of file diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/WorkCompletedFactory.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/WorkCompletedFactory.java index dc8d1a200bcb75de73837a943749f328482fb240..df86aa7ffc35c6b94bd5f8a21a0456229db3a88b 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/WorkCompletedFactory.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/WorkCompletedFactory.java @@ -19,15 +19,15 @@ public class WorkCompletedFactory extends AbstractFactory { super(business); } - public List listWithJob(String job) throws Exception { - EntityManager em = this.entityManagerContainer().get(WorkCompleted.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(WorkCompleted.class); - Predicate p = cb.equal(root.get(WorkCompleted_.job), job); - cq.select(root.get(WorkCompleted_.id)).where(p); - return em.createQuery(cq.where(p)).getResultList(); - } +// public List listWithJob(String job) throws Exception { +// EntityManager em = this.entityManagerContainer().get(WorkCompleted.class); +// CriteriaBuilder cb = em.getCriteriaBuilder(); +// CriteriaQuery cq = cb.createQuery(String.class); +// Root root = cq.from(WorkCompleted.class); +// Predicate p = cb.equal(root.get(WorkCompleted_.job), job); +// cq.select(root.get(WorkCompleted_.id)).where(p); +// return em.createQuery(cq.where(p)).getResultList(); +// } diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/WorkFactory.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/WorkFactory.java index 6f23fde647570ae405b873d6bebc21b464365269..2a27c15e5434aa6253853ea696b7bff293d1b268 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/WorkFactory.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/WorkFactory.java @@ -29,15 +29,15 @@ public class WorkFactory extends AbstractFactory { return em.createQuery(cq.where(p)).getResultList(); } - public List listContainSplitToken(String splitToken) throws Exception { - EntityManager em = this.entityManagerContainer().get(Work.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(Work.class); - Predicate p = cb.isMember(splitToken, root.get(Work_.splitTokenList)); - cq.select(root.get(Work_.id)).where(p); - return em.createQuery(cq.where(p)).getResultList(); - } +// public List listContainSplitToken(String splitToken) throws Exception { +// EntityManager em = this.entityManagerContainer().get(Work.class); +// CriteriaBuilder cb = em.getCriteriaBuilder(); +// CriteriaQuery cq = cb.createQuery(String.class); +// Root root = cq.from(Work.class); +// Predicate p = cb.isMember(splitToken, root.get(Work_.splitTokenList)); +// cq.select(root.get(Work_.id)).where(p); +// return em.createQuery(cq.where(p)).getResultList(); +// } // public Long countWithAttachment(String attachment) throws Exception { // EntityManager em = this.entityManagerContainer().get(Work.class); @@ -52,25 +52,25 @@ public class WorkFactory extends AbstractFactory { /* * 查找activityToken的Work，处于某一个ActivityToken的Work理论上只能有一个，但是在按值拆分的过程中可能临时产生多个 */ - public List listWithActivityToken(String activityToken) throws Exception { - EntityManager em = this.entityManagerContainer().get(Work.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(Work.class); - Predicate p = cb.equal(root.get(Work_.activityToken), activityToken); - cq.select(root.get(Work_.id)).where(p); - return em.createQuery(cq).getResultList(); - } +// public List listWithActivityToken(String activityToken) throws Exception { +// EntityManager em = this.entityManagerContainer().get(Work.class); +// CriteriaBuilder cb = em.getCriteriaBuilder(); +// CriteriaQuery cq = cb.createQuery(String.class); +// Root root = cq.from(Work.class); +// Predicate p = cb.equal(root.get(Work_.activityToken), activityToken); +// cq.select(root.get(Work_.id)).where(p); +// return em.createQuery(cq).getResultList(); +// } - public List listWithActivityToken(List activityTokens) throws Exception { - EntityManager em = this.entityManagerContainer().get(Work.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(Work.class); - Predicate p = root.get(Work_.activityToken).in(activityTokens); - cq.select(root.get(Work_.id)).where(p); - return em.createQuery(cq).getResultList(); - } +// public List listWithActivityToken(List activityTokens) throws Exception { +// EntityManager em = this.entityManagerContainer().get(Work.class); +// CriteriaBuilder cb = em.getCriteriaBuilder(); +// CriteriaQuery cq = cb.createQuery(String.class); +// Root root = cq.from(Work.class); +// Predicate p = root.get(Work_.activityToken).in(activityTokens); +// cq.select(root.get(Work_.id)).where(p); +// return em.createQuery(cq).getResultList(); +// } // /* 添加一个hint */ // public void addHint(Work work, String hint) { diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/WorkLogFactory.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/WorkLogFactory.java index d7b124d96462c20280f3b20151406b9aaae3382e..b98502749fce30b4ac5c00086f0f5268de2adc47 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/WorkLogFactory.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/factory/WorkLogFactory.java @@ -34,59 +34,59 @@ public class WorkLogFactory extends AbstractFactory { return em.createQuery(cq).getResultList(); } - public List listWithJob(String job) throws Exception { - EntityManager em = this.entityManagerContainer().get(WorkLog.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(WorkLog.class); - Predicate p = cb.equal(root.get(WorkLog_.job), job); - cq.select(root.get(WorkLog_.id)).where(p); - return em.createQuery(cq).getResultList(); - } +// public List listWithJob(String job) throws Exception { +// EntityManager em = this.entityManagerContainer().get(WorkLog.class); +// CriteriaBuilder cb = em.getCriteriaBuilder(); +// CriteriaQuery cq = cb.createQuery(String.class); +// Root root = cq.from(WorkLog.class); +// Predicate p = cb.equal(root.get(WorkLog_.job), job); +// cq.select(root.get(WorkLog_.id)).where(p); +// return em.createQuery(cq).getResultList(); +// } /* 从一个节点到另一个节点可能有多条 */ - public List listWithFromActivityTokenWithConnected(String fromActivityToken) throws Exception { - EntityManager em = this.entityManagerContainer().get(WorkLog.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(WorkLog.class); - Predicate p = cb.equal(root.get(WorkLog_.fromActivityToken), fromActivityToken); - p = cb.and(p, cb.equal(root.get(WorkLog_.connected), true)); - cq.select(root.get(WorkLog_.id)).where(p); - return em.createQuery(cq).getResultList(); - } - - public String getWithFromActivityTokenWithNotConnected(String fromActivityToken) throws Exception { - EntityManager em = this.entityManagerContainer().get(WorkLog.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(WorkLog.class); - Predicate p = cb.equal(root.get(WorkLog_.fromActivityToken), fromActivityToken); - p = cb.and(p, cb.equal(root.get(WorkLog_.connected), false)); - cq.select(root.get(WorkLog_.id)).where(p); - List list = em.createQuery(cq).setMaxResults(1).getResultList(); - if (!list.isEmpty()) { - return list.get(0); - } else { - return null; - } - } - - public String getWithArrivedActivityTokenWithConnected(String arrivedActivityToken) throws Exception { - EntityManager em = this.entityManagerContainer().get(WorkLog.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(WorkLog.class); - Predicate p = cb.equal(root.get(WorkLog_.arrivedActivityToken), arrivedActivityToken); - p = cb.and(p, cb.equal(root.get(WorkLog_.connected), true)); - cq.select(root.get(WorkLog_.id)).where(p); - List list = em.createQuery(cq).setMaxResults(1).getResultList(); - if (!list.isEmpty()) { - return list.get(0); - } else { - return null; - } - } +// public List listWithFromActivityTokenWithConnected(String fromActivityToken) throws Exception { +// EntityManager em = this.entityManagerContainer().get(WorkLog.class); +// CriteriaBuilder cb = em.getCriteriaBuilder(); +// CriteriaQuery cq = cb.createQuery(String.class); +// Root root = cq.from(WorkLog.class); +// Predicate p = cb.equal(root.get(WorkLog_.fromActivityToken), fromActivityToken); +// p = cb.and(p, cb.equal(root.get(WorkLog_.connected), true)); +// cq.select(root.get(WorkLog_.id)).where(p); +// return em.createQuery(cq).getResultList(); +// } + +// public String getWithFromActivityTokenWithNotConnected(String fromActivityToken) throws Exception { +// EntityManager em = this.entityManagerContainer().get(WorkLog.class); +// CriteriaBuilder cb = em.getCriteriaBuilder(); +// CriteriaQuery cq = cb.createQuery(String.class); +// Root root = cq.from(WorkLog.class); +// Predicate p = cb.equal(root.get(WorkLog_.fromActivityToken), fromActivityToken); +// p = cb.and(p, cb.equal(root.get(WorkLog_.connected), false)); +// cq.select(root.get(WorkLog_.id)).where(p); +// List list = em.createQuery(cq).setMaxResults(1).getResultList(); +// if (!list.isEmpty()) { +// return list.get(0); +// } else { +// return null; +// } +// } + +// public String getWithArrivedActivityTokenWithConnected(String arrivedActivityToken) throws Exception { +// EntityManager em = this.entityManagerContainer().get(WorkLog.class); +// CriteriaBuilder cb = em.getCriteriaBuilder(); +// CriteriaQuery cq = cb.createQuery(String.class); +// Root root = cq.from(WorkLog.class); +// Predicate p = cb.equal(root.get(WorkLog_.arrivedActivityToken), arrivedActivityToken); +// p = cb.and(p, cb.equal(root.get(WorkLog_.connected), true)); +// cq.select(root.get(WorkLog_.id)).where(p); +// List list = em.createQuery(cq).setMaxResults(1).getResultList(); +// if (!list.isEmpty()) { +// return list.get(0); +// } else { +// return null; +// } +// } public List listWithFromActivityToken(String fromActivityToken) throws Exception { EntityManager em = this.entityManagerContainer().get(WorkLog.class); @@ -98,71 +98,71 @@ public class WorkLogFactory extends AbstractFactory { return em.createQuery(cq).getResultList(); } - public List listWithArrivedActivityToken(String arrivedActivityToken) throws Exception { - EntityManager em = this.entityManagerContainer().get(WorkLog.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(WorkLog.class); - Predicate p = cb.equal(root.get(WorkLog_.arrivedActivityToken), arrivedActivityToken); - cq.select(root.get(WorkLog_.id)).where(p); - return em.createQuery(cq).getResultList(); - } - - public List listWithFromActivityTokenForwardNotConnected(String activityToken) throws Exception { - List results = SetUniqueList.setUniqueList(new ArrayList()); - this.listWithFromActivityTokenForwardNotConnected(activityToken, results); - return results; - } - - private void listWithFromActivityTokenForwardNotConnected(String activityToken, List results) - throws Exception { - List arrived = SetUniqueList.setUniqueList(new ArrayList()); - List ids = this.listWithFromActivityToken(activityToken); - if (!ids.isEmpty()) { - for (WorkLog o : this.entityManagerContainer().fetch(ids, WorkLog.class, - ListTools.toList(WorkLog.arrivedActivityToken_FIELDNAME, WorkLog.connected_FIELDNAME))) { - if (!results.contains(o.getId())) { - if (o.getConnected()) { - if (StringUtils.isNotEmpty(o.getArrivedActivityToken())) { - arrived.add(o.getArrivedActivityToken()); - } - } else { - results.add(o.getId()); - } - } - } - if (!arrived.isEmpty()) { - for (String str : arrived) { - this.listWithFromActivityTokenForwardNotConnected(str, results); - } - } - } - } - - public List listWithFromActivityTokenForward(String activityToken) throws Exception { - List results = SetUniqueList.setUniqueList(new ArrayList()); - this.listWithFromActivityTokenForward(activityToken, results); - return results; - } - - private void listWithFromActivityTokenForward(String activityToken, List results) throws Exception { - List arrived = SetUniqueList.setUniqueList(new ArrayList()); - List ids = this.listWithFromActivityToken(activityToken); - if (!ids.isEmpty()) { - for (WorkLog o : this.entityManagerContainer().fetch(ids, WorkLog.class, - ListTools.toList(WorkLog.arrivedActivityToken_FIELDNAME, WorkLog.connected_FIELDNAME))) { - if (!results.contains(o.getId())) { - results.add(o.getId()); - if ((o.getConnected()) && (StringUtils.isNotEmpty(o.getArrivedActivityToken()))) { - arrived.add(o.getArrivedActivityToken()); - } - } - } - if (!arrived.isEmpty()) { - for (String str : arrived) { - this.listWithFromActivityTokenForward(str, results); - } - } - } - } +// public List listWithArrivedActivityToken(String arrivedActivityToken) throws Exception { +// EntityManager em = this.entityManagerContainer().get(WorkLog.class); +// CriteriaBuilder cb = em.getCriteriaBuilder(); +// CriteriaQuery cq = cb.createQuery(String.class); +// Root root = cq.from(WorkLog.class); +// Predicate p = cb.equal(root.get(WorkLog_.arrivedActivityToken), arrivedActivityToken); +// cq.select(root.get(WorkLog_.id)).where(p); +// return em.createQuery(cq).getResultList(); +// } + +// public List listWithFromActivityTokenForwardNotConnected(String activityToken) throws Exception { +// List results = SetUniqueList.setUniqueList(new ArrayList()); +// this.listWithFromActivityTokenForwardNotConnected(activityToken, results); +// return results; +// } + +// private void listWithFromActivityTokenForwardNotConnected(String activityToken, List results) +// throws Exception { +// List arrived = SetUniqueList.setUniqueList(new ArrayList()); +// List ids = this.listWithFromActivityToken(activityToken); +// if (!ids.isEmpty()) { +// for (WorkLog o : this.entityManagerContainer().fetch(ids, WorkLog.class, +// ListTools.toList(WorkLog.arrivedActivityToken_FIELDNAME, WorkLog.connected_FIELDNAME))) { +// if (!results.contains(o.getId())) { +// if (o.getConnected()) { +// if (StringUtils.isNotEmpty(o.getArrivedActivityToken())) { +// arrived.add(o.getArrivedActivityToken()); +// } +// } else { +// results.add(o.getId()); +// } +// } +// } +// if (!arrived.isEmpty()) { +// for (String str : arrived) { +// this.listWithFromActivityTokenForwardNotConnected(str, results); +// } +// } +// } +// } + +// public List listWithFromActivityTokenForward(String activityToken) throws Exception { +// List results = SetUniqueList.setUniqueList(new ArrayList()); +// this.listWithFromActivityTokenForward(activityToken, results); +// return results; +// } + +// private void listWithFromActivityTokenForward(String activityToken, List results) throws Exception { +// List arrived = SetUniqueList.setUniqueList(new ArrayList()); +// List ids = this.listWithFromActivityToken(activityToken); +// if (!ids.isEmpty()) { +// for (WorkLog o : this.entityManagerContainer().fetch(ids, WorkLog.class, +// ListTools.toList(WorkLog.arrivedActivityToken_FIELDNAME, WorkLog.connected_FIELDNAME))) { +// if (!results.contains(o.getId())) { +// results.add(o.getId()); +// if ((o.getConnected()) && (StringUtils.isNotEmpty(o.getArrivedActivityToken()))) { +// arrived.add(o.getArrivedActivityToken()); +// } +// } +// } +// if (!arrived.isEmpty()) { +// for (String str : arrived) { +// this.listWithFromActivityTokenForward(str, results); +// } +// } +// } +// } } \ No newline at end of file diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ExceptionEmptyData.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ExceptionEmptyData.java deleted file mode 100644 index 4eb07e7805b1c16ac01a1a596d9d0f4a6e519dcb..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ExceptionEmptyData.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.processplatform.service.processing.jaxrs.data; - -import com.x.base.core.project.exception.PromptException; - -class ExceptionEmptyData extends PromptException { - - private static final long serialVersionUID = -665095222445791960L; - - ExceptionEmptyData() { - super("更新的数据不能为空."); - } -} diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ExceptionNotExistItem.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ExceptionNotExistItem.java deleted file mode 100644 index 1caf594ece626270f99cfe529a0214a90b0eabcd..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/data/ExceptionNotExistItem.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.x.processplatform.service.processing.jaxrs.data; - -import com.x.base.core.project.exception.PromptException; - -class ExceptionNotExistItem extends PromptException { - private static final long serialVersionUID = 4865231321642600303L; - - ExceptionNotExistItem(String itemName) { - super("path路径无法找到,itemName：{}.", itemName); - } -} diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/service/ExceptionService.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/service/ExceptionService.java deleted file mode 100644 index fe23fba381697ae343b509dd977e39b3af61dc2f..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/service/ExceptionService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.processplatform.service.processing.jaxrs.service; - -import com.x.base.core.project.exception.PromptException; - -class ExceptionService extends PromptException { - - private static final long serialVersionUID = 1040883405179987063L; - - ExceptionService(String workId) { - super("服务执行失败,工作:{}.", workId); - } -} diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/service/ExceptionWorkLogWithActivityTokenNotExist.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/service/ExceptionWorkLogWithActivityTokenNotExist.java deleted file mode 100644 index 2c36d5a0dff99350ce35bafda16c5c016120d237..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/service/ExceptionWorkLogWithActivityTokenNotExist.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.processplatform.service.processing.jaxrs.service; - -import com.x.base.core.project.exception.PromptException; - -class ExceptionWorkLogWithActivityTokenNotExist extends PromptException { - - private static final long serialVersionUID = -9089355008820123519L; - - ExceptionWorkLogWithActivityTokenNotExist(String str) { - super("无法根据活动令牌获取工作日志:{}.", str); - } -} diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ExceptionEmptyFilter.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ExceptionEmptyFilter.java deleted file mode 100644 index b26f337ceb1661acb732533a640bcc836a1908d7..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ExceptionEmptyFilter.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.processplatform.service.processing.jaxrs.task; - -import com.x.base.core.project.exception.PromptException; - -class ExceptionEmptyFilter extends PromptException { - - private static final long serialVersionUID = -3439770681867963457L; - - ExceptionEmptyFilter() { - super("过滤条件为空."); - } -} diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ExceptionInvalidCount.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ExceptionInvalidCount.java deleted file mode 100644 index ffd7f7838996c61a15ec92afb92d8bceb56b7ea3..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ExceptionInvalidCount.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.processplatform.service.processing.jaxrs.task; - -import com.x.base.core.project.exception.PromptException; - -class ExceptionInvalidCount extends PromptException { - - private static final long serialVersionUID = -3439770681867963457L; - - ExceptionInvalidCount(Integer count) { - super("返回数量不正确: {}.", count); - } -} diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ExceptionResetEmpty.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ExceptionResetEmpty.java deleted file mode 100644 index 4a07f2ae9a6236ff84d72af276f9d6829f7b702b..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ExceptionResetEmpty.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.processplatform.service.processing.jaxrs.task; - -import com.x.base.core.project.exception.PromptException; - -class ExceptionResetEmpty extends PromptException { - - private static final long serialVersionUID = -3439770681867963457L; - - ExceptionResetEmpty() { - super("重置处理人为空."); - } -} diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ExceptionSplittingCannotCallback.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ExceptionSplittingCannotCallback.java deleted file mode 100644 index 83f823303d5b1386d1525e8c4864ddc15d4c8c21..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ExceptionSplittingCannotCallback.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.processplatform.service.processing.jaxrs.work; - -import com.x.base.core.project.exception.PromptException; - -class ExceptionSplittingCannotCallback extends PromptException { - - private static final long serialVersionUID = -3439770681867963457L; - - ExceptionSplittingCannotCallback(String workId, String workLogId) { - super("工作无法回滚到处于拆分的状态,work:{}, workLog:{}.", workId, workLogId); - } -} diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ExceptionSplittingNotRollback.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ExceptionSplittingNotRollback.java deleted file mode 100644 index 7a600547ac10c4add83b9532f62a0c18fa7433bc..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ExceptionSplittingNotRollback.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.x.processplatform.service.processing.jaxrs.work; - -import com.x.base.core.project.exception.PromptException; - -class ExceptionSplittingNotRollback extends PromptException { - - private static final long serialVersionUID = -3439770681867963457L; - - ExceptionSplittingNotRollback(String workId, String workLogId) { - super("工作无法回滚到处于拆分的状态,work:{}, workLog:{}.", workId, workLogId); - } -} diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ExceptionWorkLogNotExist.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ExceptionWorkLogNotExist.java deleted file mode 100644 index cef12bc91f1ce37d0474b2c7f4ae4e8afdaee2a4..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ExceptionWorkLogNotExist.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.x.processplatform.service.processing.jaxrs.work; - -import com.x.base.core.project.exception.PromptException; - -class ExceptionWorkLogNotExist extends PromptException { - - private static final long serialVersionUID = -7038279889683420366L; - - ExceptionWorkLogNotExist(String workId) { - super("workLog id:{}, not existed.", workId); - } - -} diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ExceptionWorkNotMatchWithWorkLog.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ExceptionWorkNotMatchWithWorkLog.java deleted file mode 100644 index 26d075bcaf28d35795f6756d50d9ad23687ed741..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ExceptionWorkNotMatchWithWorkLog.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.x.processplatform.service.processing.jaxrs.work; - -import com.x.base.core.project.exception.PromptException; - -class ExceptionWorkNotMatchWithWorkLog extends PromptException { - - private static final long serialVersionUID = -7038279889683420366L; - - ExceptionWorkNotMatchWithWorkLog(String workTitle, String workId, String workJob, String workLogId, - String workLogJob) { - super("work title: {} id: {} job: {}, not match job with workLog: id: {}, job: {}."); - } - -} diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/neural/NeuralAnalyzer.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/neural/NeuralAnalyzer.java deleted file mode 100644 index 4ba0ba15bd05e4e10530d46dbf075cd15962dee7..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/neural/NeuralAnalyzer.java +++ /dev/null @@ -1,186 +0,0 @@ -package com.x.processplatform.service.processing.neural; - -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; - -import org.apache.commons.lang3.ArrayUtils; -import org.apache.commons.lang3.StringUtils; -import org.neuroph.core.data.DataSet; -import org.neuroph.core.data.DataSetRow; -import org.neuroph.nnet.MultiLayerPerceptron; -import org.neuroph.util.TransferFunctionType; - -import com.google.gson.JsonElement; -import com.x.base.core.entity.dataitem.DataItemConverter; -import com.x.base.core.project.gson.XGsonBuilder; -import com.x.base.core.project.tools.ListTools; -import com.x.processplatform.core.entity.content.Data; -import com.x.processplatform.core.entity.content.Task; -import com.x.processplatform.core.entity.content.TaskCompleted; -import com.x.processplatform.core.entity.content.TaskCompleted_; -import com.x.processplatform.core.entity.element.FormField; -import com.x.processplatform.core.entity.element.FormField_; -import com.x.processplatform.core.entity.element.Process; -import com.x.processplatform.core.entity.element.Route; -import com.x.processplatform.service.processing.Business; -import com.x.query.core.entity.Item; -import com.x.query.core.entity.Item_; - -public class NeuralAnalyzer { - - private DataItemConverter itemConverter = new DataItemConverter<>(Item.class); - - public Route analysis(Business business, Task task) throws Exception { - List routes = business.element().listRouteWithManual(task.getActivity()); - if (routes.size() == 0) { - return null; - } - if (routes.size() == 1) { - /** 如果只有一条路由就不用判断了 */ - return routes.get(0); - } - Process process = business.element().get(task.getProcess(), Process.class); - List taskCompleteds = listTaskCompleted(business, task.getActivity(), task.getPerson()); - if (null == process || ListTools.isEmpty(taskCompleteds)) { - /** 如果流程不存在或者已办为空直接返回 */ - return routes.get(0); - } - List fields = this.listNumberFormField(business, process); - if (fields.isEmpty()) { - String value = this.maxFromTaskCompleted(taskCompleteds); - if (task.getRouteNameList().contains(value)) { - for (Route route : routes) { - if (StringUtils.equals(route.getName(), value)) { - return route; - } - } - } - /** 如果没有可以用于分析的数据,那么返回第一条路由 */ - return routes.get(0); - } - List routeNames = ListTools.extractField(routes, Route.name_FIELDNAME, String.class, false, false); - DataSet trainingSet = new DataSet(fields.size(), routeNames.size()); - for (TaskCompleted o : taskCompleteds) { - if (ListTools.contains(routeNames, o.getRouteName())) { - /** 包含有需要的决策 */ - Data data = this.load_data(business, o.getJob()); - double[] input = new double[fields.size()]; - for (int i = 0; i < fields.size(); i++) { - Number n = data.find(fields.get(i), Number.class, 0); - input[i] = n.doubleValue(); - } - double[] desiredOutput = new double[routeNames.size()]; - Arrays.fill(desiredOutput, 0); - int index = routeNames.indexOf(o.getRouteName()); - if (index > -1) { - desiredOutput[index] = 1.0; - } - DataSetRow row = new DataSetRow(); - row.setInput(input); - row.setDesiredOutput(desiredOutput); - trainingSet.add(row); - } - } - if (trainingSet.isEmpty()) { - /* 没有产生可用的训练集 */ - return routes.get(0); - } - MultiLayerPerceptron perceptron = new MultiLayerPerceptron(TransferFunctionType.SIGMOID, fields.size(), - fields.size() * 2, routeNames.size()); - perceptron.getLearningRule().setMaxIterations(100); - perceptron.learn(trainingSet); - /* 输入当前值 */ - Data data = this.load_data(business, task.getJob()); - double[] input = new double[fields.size()]; - for (int i = 0; i < fields.size(); i++) { - Number n = data.find(fields.get(i), Number.class, 0); - input[i] = n.doubleValue(); - } - perceptron.setInput(input); - perceptron.calculate(); - double[] networkOutput = perceptron.getOutput(); - networkOutput = this.competition(networkOutput); - int index = ArrayUtils.indexOf(networkOutput, 1.0); - if (index < 0) { - index = 0; - } - Route selected = ListTools.parallel(routeNames, routeNames.get(index), routes); - return selected; - } - - private double[] competition(double[] d) { - double[] output = d; - double[] re = new double[output.length]; - int maxIndex = 0; - double maxValue = Double.MIN_VALUE; - for (int i = 0; i < output.length; i++) { - if (output[i] > maxValue) { - maxIndex = i; - maxValue = output[i]; - } - } - for (int i = 0; i < re.length; i++) { - if (i == maxIndex) { - re[i] = 1; - } else { - re[i] = 0; - } - } - return re; - } - - private List listNumberFormField(Business business, Process process) throws Exception { - List formIds = business.element().listFormWithProcess(process); - EntityManager em = business.entityManagerContainer().get(FormField.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(String.class); - Root root = cq.from(FormField.class); - Predicate p = root.get(FormField_.form).in(formIds); - p = cb.and(p, cb.equal(root.get(FormField_.dataType), "number")); - cq.select(root.get(FormField_.name)).where(p); - return em.createQuery(cq).getResultList().stream().distinct().collect(Collectors.toList()); - } - - private List listTaskCompleted(Business business, String activity, String person) throws Exception { - EntityManager em = business.entityManagerContainer().get(TaskCompleted.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(TaskCompleted.class); - Root root = cq.from(TaskCompleted.class); - Predicate p = cb.equal(root.get(TaskCompleted_.activity), activity); - p = cb.and(p, cb.equal(root.get(TaskCompleted_.person), person)); - cq.select(root).where(p); - return em.createQuery(cq).getResultList(); - } - - private Data load_data(Business business, String job) throws Exception { - EntityManager em = business.entityManagerContainer().get(Item.class); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery cq = cb.createQuery(Item.class); - Root root = cq.from(Item.class); - Predicate p = cb.equal(root.get(Item_.bundle), job); - List list = em.createQuery(cq.where(p)).getResultList(); - if (list.isEmpty()) { - return new Data(); - } else { - JsonElement jsonElement = itemConverter.assemble(list); - if (jsonElement.isJsonObject()) { - return XGsonBuilder.instance().fromJson(jsonElement, Data.class); - } else { - return new Data(); - } - } - } - - private String maxFromTaskCompleted(List list) throws Exception { - List values = ListTools.extractField(list, "routeName", String.class, true, true); - return ListTools.maxCountElement(values); - } - -} diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/AbstractBaseProcessor.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/AbstractBaseProcessor.java index 2629664815a1208e6348efafa35e1c83da8362e5..76b9381698a2c528eb94b8a652491677dd36bba6 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/AbstractBaseProcessor.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/AbstractBaseProcessor.java @@ -26,7 +26,7 @@ import com.x.processplatform.service.processing.Business; /*** * 基础的Processor类,属性以及WorkLog处理 */ -public abstract class AbstractBaseProcessor { +abstract class AbstractBaseProcessor { private EntityManagerContainer entityManagerContainer; diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/ExceptionProcessNotExist.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/ExceptionProcessNotExist.java deleted file mode 100644 index 54526639992b0e4dafba424cce7a51cd8ce3e5aa..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/ExceptionProcessNotExist.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.x.processplatform.service.processing.processor; - -import com.x.base.core.project.exception.RunningException; - -class ExceptionProcessNotExist extends RunningException { - - private static final long serialVersionUID = 9085364457175859374L; - - ExceptionProcessNotExist(String id) { - super("process:{} not exist.", id); - } - -} diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/agent/AbstractAgentProcessor.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/agent/AbstractAgentProcessor.java index a252cb72046d22c3723ecde0d1a81c11a702c5e0..ba75b97c5f266176fc8d82f4a2cc48343b4941c5 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/agent/AbstractAgentProcessor.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/agent/AbstractAgentProcessor.java @@ -16,7 +16,7 @@ import com.x.processplatform.service.processing.Business; import com.x.processplatform.service.processing.processor.AbstractProcessor; import com.x.processplatform.service.processing.processor.AeiObjects; -public abstract class AbstractAgentProcessor extends AbstractProcessor { +abstract class AbstractAgentProcessor extends AbstractProcessor { protected AbstractAgentProcessor(EntityManagerContainer entityManagerContainer) throws Exception { super(entityManagerContainer); diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/agent/ExceptionInterrupt.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/agent/ExceptionInterrupt.java deleted file mode 100644 index 1ae96bb390f531a9d8a9a916453b9903fbab8d75..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/agent/ExceptionInterrupt.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.x.processplatform.service.processing.processor.agent; - -import com.x.base.core.project.exception.RunningException; - -class ExceptionInterrupt extends RunningException { - - private static final long serialVersionUID = 9085364457175859374L; - - ExceptionInterrupt(Exception e, String title, String workId, String agentName, String agentId, String processName, - String processId) { - super(e, "工作:{}, id:{}, 在Agent节点:{}, id:{}, 流程:{}, id:{},运行中断.", title, workId, agentName, agentId, processName, - processId); - } - -} diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/begin/AbstractBeginProcessor.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/begin/AbstractBeginProcessor.java index dcf7c736e15539847aee8b6d101902abf280a246..4d0352898eb9c36604ae52b77e22dc0397354681 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/begin/AbstractBeginProcessor.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/begin/AbstractBeginProcessor.java @@ -9,7 +9,7 @@ import com.x.processplatform.core.entity.element.Route; import com.x.processplatform.service.processing.processor.AbstractProcessor; import com.x.processplatform.service.processing.processor.AeiObjects; -public abstract class AbstractBeginProcessor extends AbstractProcessor { +abstract class AbstractBeginProcessor extends AbstractProcessor { protected AbstractBeginProcessor(EntityManagerContainer entityManagerContainer) throws Exception { super(entityManagerContainer); diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/cancel/AbstractCancelProcessor.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/cancel/AbstractCancelProcessor.java index febe8da6e49d0c5a0a46e8fcb04d997226cedb0a..24eedc13cdcf1b9d87e95a642c43453a634e00b8 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/cancel/AbstractCancelProcessor.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/cancel/AbstractCancelProcessor.java @@ -9,7 +9,7 @@ import com.x.processplatform.core.entity.element.Route; import com.x.processplatform.service.processing.processor.AbstractProcessor; import com.x.processplatform.service.processing.processor.AeiObjects; -public abstract class AbstractCancelProcessor extends AbstractProcessor { +abstract class AbstractCancelProcessor extends AbstractProcessor { protected AbstractCancelProcessor(EntityManagerContainer entityManagerContainer) throws Exception { super(entityManagerContainer); diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/choice/AbstractChoiceProcessor.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/choice/AbstractChoiceProcessor.java index 0c2607644d8aedda39d31281888e4beee9a1c13d..744704a48ddfb3c8711557b57be202f1eb6e0473 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/choice/AbstractChoiceProcessor.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/choice/AbstractChoiceProcessor.java @@ -9,7 +9,7 @@ import com.x.processplatform.core.entity.element.Route; import com.x.processplatform.service.processing.processor.AbstractProcessor; import com.x.processplatform.service.processing.processor.AeiObjects; -public abstract class AbstractChoiceProcessor extends AbstractProcessor { +abstract class AbstractChoiceProcessor extends AbstractProcessor { protected AbstractChoiceProcessor(EntityManagerContainer entityManagerContainer) throws Exception { super(entityManagerContainer); diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/delay/AbstractDelayProcessor.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/delay/AbstractDelayProcessor.java index 736325bf650c22d44e73699363329f79dca5c665..db94b9190579708e97a48ca8fbfeb9efa3cd6c1a 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/delay/AbstractDelayProcessor.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/delay/AbstractDelayProcessor.java @@ -9,7 +9,7 @@ import com.x.processplatform.core.entity.element.Route; import com.x.processplatform.service.processing.processor.AbstractProcessor; import com.x.processplatform.service.processing.processor.AeiObjects; -public abstract class AbstractDelayProcessor extends AbstractProcessor { +abstract class AbstractDelayProcessor extends AbstractProcessor { protected AbstractDelayProcessor(EntityManagerContainer entityManagerContainer) throws Exception { super(entityManagerContainer); diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/embed/AbstractEmbedProcessor.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/embed/AbstractEmbedProcessor.java index b6d5ab180f1b24f51fcda5ce33a8688c3ac20d3b..da5dafbd3f20bf06a73246159fda614eb13e221b 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/embed/AbstractEmbedProcessor.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/embed/AbstractEmbedProcessor.java @@ -9,7 +9,7 @@ import com.x.processplatform.core.entity.element.Route; import com.x.processplatform.service.processing.processor.AbstractProcessor; import com.x.processplatform.service.processing.processor.AeiObjects; -public abstract class AbstractEmbedProcessor extends AbstractProcessor { +abstract class AbstractEmbedProcessor extends AbstractProcessor { protected AbstractEmbedProcessor(EntityManagerContainer entityManagerContainer) throws Exception { super(entityManagerContainer); diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/end/AbstractEndProcessor.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/end/AbstractEndProcessor.java index da663e2456ff7e9c7c1f2aa372ad0ce183196809..330719871610c1905447a8a7934307e0c8192d43 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/end/AbstractEndProcessor.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/end/AbstractEndProcessor.java @@ -13,7 +13,7 @@ import com.x.processplatform.core.entity.element.Route; import com.x.processplatform.service.processing.processor.AbstractProcessor; import com.x.processplatform.service.processing.processor.AeiObjects; -public abstract class AbstractEndProcessor extends AbstractProcessor { +abstract class AbstractEndProcessor extends AbstractProcessor { private static Logger logger = LoggerFactory.getLogger(AbstractEndProcessor.class); diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/invoke/AbstractInvokeProcessor.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/invoke/AbstractInvokeProcessor.java index 1d60f58a3f629692374331d3034826b626f449dd..d05499f85f6985367e629aa30f261218b44eb57e 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/invoke/AbstractInvokeProcessor.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/invoke/AbstractInvokeProcessor.java @@ -9,7 +9,7 @@ import com.x.processplatform.core.entity.element.Route; import com.x.processplatform.service.processing.processor.AbstractProcessor; import com.x.processplatform.service.processing.processor.AeiObjects; -public abstract class AbstractInvokeProcessor extends AbstractProcessor { +abstract class AbstractInvokeProcessor extends AbstractProcessor { protected AbstractInvokeProcessor(EntityManagerContainer entityManagerContainer) throws Exception { super(entityManagerContainer); diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/manual/AbstractManualProcessor.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/manual/AbstractManualProcessor.java index 8954db1dfb76cd0b1eefbddf8e2704d1b6ce4ca4..3df77931b515b11691f28ef0776cbe9b60d796ac 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/manual/AbstractManualProcessor.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/manual/AbstractManualProcessor.java @@ -19,7 +19,7 @@ import com.x.processplatform.service.processing.processor.AeiObjects; /*** * Manual活动基础功能 */ -public abstract class AbstractManualProcessor extends AbstractProcessor { +abstract class AbstractManualProcessor extends AbstractProcessor { private static final Logger LOGGER = LoggerFactory.getLogger(AbstractManualProcessor.class); diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/manual/ExceptionManualModeError.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/manual/ExceptionManualModeError.java deleted file mode 100644 index 0576801fe9866323390ee959ff033b16bfd6140d..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/manual/ExceptionManualModeError.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.x.processplatform.service.processing.processor.manual; - -import com.x.base.core.project.exception.RunningException; - -class ExceptionManualModeError extends RunningException { - - private static final long serialVersionUID = 9085364457175859374L; - - ExceptionManualModeError(String activityId) { - super("unknown manualMode, id:{}.", activityId); - } - -} diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/manual/ManualProcessor2.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/manual/ManualProcessor2.java deleted file mode 100644 index 2b9c0d8a0d71549c6641237c34cb5ef5e6bba92f..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/manual/ManualProcessor2.java +++ /dev/null @@ -1,822 +0,0 @@ -//package com.x.processplatform.service.processing.processor.manual; -// -//import java.util.ArrayList; -//import java.util.Calendar; -//import java.util.Comparator; -//import java.util.Date; -//import java.util.LinkedHashMap; -//import java.util.List; -//import java.util.Map; -//import java.util.Map.Entry; -//import java.util.Objects; -//import java.util.Optional; -//import java.util.stream.Collectors; -// -//import javax.script.Bindings; -//import javax.script.CompiledScript; -//import javax.script.ScriptContext; -// -//import org.apache.commons.collections4.ListUtils; -//import org.apache.commons.lang3.BooleanUtils; -//import org.apache.commons.lang3.ObjectUtils; -//import org.apache.commons.lang3.StringUtils; -//import org.apache.commons.lang3.time.DateUtils; -// -//import com.x.base.core.container.EntityManagerContainer; -//import com.x.base.core.entity.JpaObject; -//import com.x.base.core.project.config.Config; -//import com.x.base.core.project.logger.Logger; -//import com.x.base.core.project.logger.LoggerFactory; -//import com.x.base.core.project.organization.EmpowerLog; -//import com.x.base.core.project.scripting.JsonScriptingExecutor; -//import com.x.base.core.project.scripting.ScriptingFactory; -//import com.x.base.core.project.tools.DateTools; -//import com.x.base.core.project.tools.ListTools; -//import com.x.base.core.project.tools.NumberTools; -//import com.x.base.core.project.utils.time.WorkTime; -//import com.x.processplatform.core.entity.content.Read; -//import com.x.processplatform.core.entity.content.Task; -//import com.x.processplatform.core.entity.content.TaskCompleted; -//import com.x.processplatform.core.entity.content.Work; -//import com.x.processplatform.core.entity.content.WorkLog; -//import com.x.processplatform.core.entity.element.ActivityType; -//import com.x.processplatform.core.entity.element.Manual; -//import com.x.processplatform.core.entity.element.Route; -//import com.x.processplatform.core.entity.element.util.WorkLogTree; -//import com.x.processplatform.core.entity.element.util.WorkLogTree.Node; -//import com.x.processplatform.core.entity.log.Signal; -//import com.x.processplatform.service.processing.Business; -//import com.x.processplatform.service.processing.WorkContext; -//import com.x.processplatform.service.processing.processor.AeiObjects; -// -///** -// * @author Zhou Rui -// */ -//public class ManualProcessor2 extends AbstractManualProcessor { -// -// private static final Logger LOGGER = LoggerFactory.getLogger(ManualProcessor2.class); -// -// public ManualProcessor2(EntityManagerContainer entityManagerContainer) throws Exception { -// super(entityManagerContainer); -// } -// -// -// -// @Override -// protected Work arriving(AeiObjects aeiObjects, Manual manual) throws Exception { -// // 发送ProcessingSignal -// aeiObjects.getProcessingAttributes().push(Signal.manualArrive(aeiObjects.getWork().getActivityToken(), manual)); -// // 根据manual计算出来的活动处理人 -// List identities = calculateTaskIdentities(aeiObjects, manual); -// // 启用同类工作相同活动节点合并,如果有合并的工作,那么直接返回这个工作. -// Work merge = this.arrivingMergeSameJob(aeiObjects, manual, identities); -// if (null != merge) { -// return merge; -// } -// this.arrivingPassSame(aeiObjects, identities); -// aeiObjects.getWork().setManualTaskIdentityList(new ArrayList<>(identities)); -// return aeiObjects.getWork(); -// } -// -// private Work arrivingMergeSameJob(AeiObjects aeiObjects, Manual manual, List identities) throws Exception { -// if (!BooleanUtils.isTrue(manual.getManualMergeSameJobActivity())) { -// return null; -// } -// List exists = this.arrivingSameJobActivityExistIdentities(aeiObjects, manual); -// if (ListTools.isNotEmpty(exists)) { -// Work other = aeiObjects.getWorks().stream() -// .filter(o -> StringUtils.equals(aeiObjects.getWork().getJob(), o.getJob()) -// && StringUtils.equals(aeiObjects.getWork().getActivity(), o.getActivity()) -// && (!Objects.equals(aeiObjects.getWork(), o))) -// .findFirst().orElse(null); -// if (null != other) { -// identities.removeAll(exists); -// if (ListTools.isEmpty(identities)) { -// this.mergeTaskCompleted(aeiObjects, aeiObjects.getWork(), other); -// this.mergeRead(aeiObjects, aeiObjects.getWork(), other); -// this.mergeReadCompleted(aeiObjects, aeiObjects.getWork(), other); -// this.mergeReview(aeiObjects, aeiObjects.getWork(), other); -// this.mergeAttachment(aeiObjects, aeiObjects.getWork(), other); -// this.mergeWorkLog(aeiObjects, aeiObjects.getWork(), other); -// if (ListTools.size(aeiObjects.getWork().getSplitTokenList()) > ListTools -// .size(other.getSplitTokenList())) { -// other.setSplitTokenList(aeiObjects.getWork().getSplitTokenList()); -// other.setSplitToken(aeiObjects.getWork().getSplitToken()); -// other.setSplitValue(aeiObjects.getWork().getSplitValue()); -// other.setSplitting(true); -// } -// aeiObjects.getUpdateWorks().add(other); -// aeiObjects.getDeleteWorks().add(aeiObjects.getWork()); -// return other; -// } -// } -// } -// return null; -// } -// -// private void arrivingPassSame(AeiObjects aeiObjects, List identities) throws Exception { -// // 查找是否有passSameTarget设置 -// Route route = aeiObjects.getRoutes().stream().filter(o -> BooleanUtils.isTrue(o.getPassSameTarget())) -// .findFirst().orElse(null); -// // 如果有passSameTarget,有到达ArriveWorkLog,不是调度到这个节点的 -// if ((null != route) && (null != aeiObjects.getArriveWorkLog(aeiObjects.getWork())) -// && (!aeiObjects.getProcessingAttributes().ifForceJoinAtArrive())) { -// WorkLog workLog = findPassSameTargetWorkLog(aeiObjects); -// if (null == workLog) { -// return; -// } -// LOGGER.debug("pass same target work:{}, workLog:{}.", aeiObjects::getWork, workLog::toString); -// for (TaskCompleted o : aeiObjects.getJoinInquireTaskCompleteds()) { -// if (StringUtils.equals(o.getActivityToken(), workLog.getArrivedActivityToken())) { -// List values = ListUtils.intersection(identities, -// aeiObjects.business().organization().identity().listWithPerson(o.getPerson())); -// if (!values.isEmpty()) { -// TaskCompleted obj = new TaskCompleted(aeiObjects.getWork(), route, o); -// obj.setIdentity(values.get(0)); -// obj.setUnit(aeiObjects.business().organization().unit().getWithIdentity(obj.getIdentity())); -// obj.setProcessingType(TaskCompleted.PROCESSINGTYPE_SAMETARGET); -// obj.setRouteName(route.getName()); -// obj.setOpinion(route.getOpinion()); -// Date now = new Date(); -// obj.setStartTime(now); -// obj.setStartTimeMonth(DateTools.format(now, DateTools.format_yyyyMM)); -// obj.setCompletedTime(now); -// obj.setCompletedTimeMonth(DateTools.format(now, DateTools.format_yyyyMM)); -// obj.setDuration(0L); -// obj.setExpired(false); -// obj.setExpireTime(null); -// obj.setTask(null); -// obj.setLatest(true); -// aeiObjects.getCreateTaskCompleteds().add(obj); -// } -// } -// } -// } -// } -// -// // 计算处理人 -// private List calculateTaskIdentities(AeiObjects aeiObjects, Manual manual) throws Exception { -// TaskIdentities taskIdentities = new TaskIdentities(); -// // 先计算强制处理人 -// if (!aeiObjects.getWork().getProperties().getManualForceTaskIdentityList().isEmpty()) { -// List identities = new ArrayList<>(); -// identities.addAll(aeiObjects.getWork().getProperties().getManualForceTaskIdentityList()); -// identities = aeiObjects.business().organization().identity().list(identities); -// if (ListTools.isNotEmpty(identities)) { -// taskIdentities.addIdentities(identities); -// } -// } -// // 计算退回的结果 -// if (taskIdentities.isEmpty()) { -// Route route = aeiObjects.business().element().get(aeiObjects.getWork().getDestinationRoute(), Route.class); -// if ((null != route) && (StringUtils.equals(route.getType(), Route.TYPE_BACK))) { -// calculateRouteTypeBack(aeiObjects, manual, taskIdentities); -// } -// } -// if (taskIdentities.isEmpty()) { -// taskIdentities = TranslateTaskIdentityTools.translate(aeiObjects, manual); -// this.ifTaskIdentitiesEmptyForceToCreatorOrMaintenance(aeiObjects, manual, taskIdentities); -// this.writeToEmpowerMap(aeiObjects, taskIdentities); -// } -// return taskIdentities.identities(); -// } -// -// private void calculateRouteTypeBack(AeiObjects aeiObjects, Manual manual, TaskIdentities taskIdentities) -// throws Exception { -// List identities = new ArrayList<>(); -// List workLogs = new ArrayList<>(); -// workLogs.addAll(aeiObjects.getUpdateWorkLogs()); -// workLogs.addAll(aeiObjects.getCreateWorkLogs()); -// for (WorkLog o : aeiObjects.getWorkLogs()) { -// if (!workLogs.contains(o)) { -// workLogs.add(o); -// } -// } -// WorkLogTree tree = new WorkLogTree(workLogs); -// Node node = tree.location(aeiObjects.getWork()); -// if (null != node) { -// calculateRouteTypeBackIdentityByTaskCompleted(aeiObjects, manual, taskIdentities, identities, tree, node); -// } -// } -// -// private void calculateRouteTypeBackIdentityByTaskCompleted(AeiObjects aeiObjects, Manual manual, -// TaskIdentities taskIdentities, List identities, WorkLogTree tree, Node node) throws Exception { -// for (Node n : tree.up(node)) { -// if (StringUtils.equals(manual.getId(), n.getWorkLog().getFromActivity())) { -// for (TaskCompleted t : aeiObjects.getTaskCompleteds()) { -// if (StringUtils.equals(n.getWorkLog().getFromActivityToken(), t.getActivityToken()) -// && BooleanUtils.isTrue(t.getJoinInquire())) { -// identities.add(t.getIdentity()); -// } -// } -// break; -// } -// } -// identities = aeiObjects.business().organization().identity().list(identities); -// if (ListTools.isNotEmpty(identities)) { -// taskIdentities.addIdentities(identities); -// } -// } -// -// // 如果活动没有找到任何可用的处理人,那么强制设置处理人为文档创建者,或者配置的 maintenanceIdentity -// private void ifTaskIdentitiesEmptyForceToCreatorOrMaintenance(AeiObjects aeiObjects, Manual manual, -// TaskIdentities taskIdentities) throws Exception { -// if (taskIdentities.isEmpty()) { -// String identity = aeiObjects.business().organization().identity() -// .get(aeiObjects.getWork().getCreatorIdentity()); -// if (StringUtils.isNotEmpty(identity)) { -// LOGGER.info("{}[{}]未能找到指定的处理人, 标题:{}, id:{}, 强制指定处理人为活动的创建身份:{}.", aeiObjects.getProcess()::getName, -// manual::getName, aeiObjects.getWork()::getTitle, aeiObjects.getWork()::getId, -// identity::toString); -// taskIdentities.addIdentity(identity); -// } else { -// identity = aeiObjects.business().organization().identity() -// .get(Config.processPlatform().getMaintenanceIdentity()); -// if (StringUtils.isNotEmpty(identity)) { -// LOGGER.info("{}[{}]未能找到指定的处理人, 也没有能找到工作创建人, 标题:{}, id:{}, 强制指定处理人为系统维护身份:{}.", -// aeiObjects.getProcess()::getName, manual::getName, aeiObjects.getWork()::getTitle, -// aeiObjects.getWork()::getId, identity::toString); -// taskIdentities.addIdentity(identity); -// } else { -// throw new ExceptionExpectedEmpty(aeiObjects.getWork().getTitle(), aeiObjects.getWork().getId(), -// aeiObjects.getActivity().getName(), aeiObjects.getActivity().getId()); -// } -// } -// } -// } -// -// // 更新授权,通过surface创建且workThroughManual=false 代表是草稿,那么不需要授权. -// -// private void writeToEmpowerMap(AeiObjects aeiObjects, TaskIdentities taskIdentities) throws Exception { -// // 先清空EmpowerMap -// aeiObjects.getWork().getProperties().setManualEmpowerMap(new LinkedHashMap<>()); -// if (!(StringUtils.equals(aeiObjects.getWork().getWorkCreateType(), Work.WORKCREATETYPE_SURFACE) -// && BooleanUtils.isFalse(aeiObjects.getWork().getWorkThroughManual()))) { -// List values = taskIdentities.identities(); -// values = ListUtils.subtract(values, aeiObjects.getProcessingAttributes().getIgnoreEmpowerIdentityList()); -// taskIdentities.empower(aeiObjects.business().organization().empower().listWithIdentityObject( -// aeiObjects.getWork().getApplication(), aeiObjects.getProcess().getEdition(), -// aeiObjects.getWork().getProcess(), aeiObjects.getWork().getId(), values)); -// for (TaskIdentity taskIdentity : taskIdentities) { -// if (StringUtils.isNotEmpty(taskIdentity.getFromIdentity())) { -// aeiObjects.getWork().getProperties().getManualEmpowerMap().put(taskIdentity.getIdentity(), -// taskIdentity.getFromIdentity()); -// } -// } -// } -// } -// -// private WorkLog findPassSameTargetWorkLog(AeiObjects aeiObjects) throws Exception { -// WorkLogTree tree = new WorkLogTree(aeiObjects.getWorkLogs()); -// List parents = tree.parents(aeiObjects.getArriveWorkLog(aeiObjects.getWork())); -// LOGGER.debug("pass same target rollback parents:{}.", parents::toString); -// WorkLog workLog = null; -// for (WorkLog o : parents) { -// // choice, agent, invoke, service, delay, embed 继续向上查找manual -// ActivityType arrivedActivityType = o.getArrivedActivityType(); -// if (Objects.equals(ActivityType.manual, arrivedActivityType) -// || Objects.equals(ActivityType.begin, arrivedActivityType) -// || Objects.equals(ActivityType.cancel, arrivedActivityType) -// // || Objects.equals(ActivityType.embed, arrivedActivityType) -// || Objects.equals(ActivityType.end, arrivedActivityType) -// || Objects.equals(ActivityType.merge, arrivedActivityType) -// || Objects.equals(ActivityType.parallel, arrivedActivityType) -// || Objects.equals(ActivityType.split, arrivedActivityType)) { -// if (Objects.equals(ActivityType.manual, arrivedActivityType)) { -// workLog = o; -// } -// break; -// } -// } -// return workLog; -// } -// -// @Override -// protected void arrivingCommitted(AeiObjects aeiObjects, Manual manual) throws Exception { -// // nothing -// } -// -// @Override -// protected List executing(AeiObjects aeiObjects, Manual manual) throws Exception { -// List results = new ArrayList<>(); -// boolean passThrough = false; -// List identities = aeiObjects.business().organization().identity() -// .list(aeiObjects.getWork().getManualTaskIdentityList()); -// if (identities.isEmpty()) { -// identities = calculateTaskIdentities(aeiObjects, manual); -// LOGGER.info("工作设置的处理人已经全部无效,重新计算当前环节所有处理人进行处理,标题:{}, id:{}, 设置的处理人:{}.", aeiObjects.getWork()::getTitle, -// aeiObjects.getWork()::getId, identities::toString); -// // 后面进行了identitis.remove()这里必须用一个新对象包装 -// aeiObjects.getWork().setManualTaskIdentityList(new ArrayList<>(identities)); -// } -// // 发送ProcessingSignal -// aeiObjects.getProcessingAttributes().push(Signal.manualExecute(aeiObjects.getWork().getActivityToken(), manual, -// Objects.toString(manual.getManualMode(), ""), identities)); -// switch (manual.getManualMode()) { -// case single: -// passThrough = this.single(aeiObjects, manual, identities); -// break; -// case parallel: -// passThrough = this.parallel(aeiObjects, manual, identities); -// break; -// case queue: -// passThrough = this.queue(aeiObjects, manual, identities); -// break; -// case grab: -// passThrough = this.single(aeiObjects, manual, identities); -// break; -// default: -// throw new ExceptionManualModeError(manual.getId()); -// } -// -// if (passThrough) { -// results.add(aeiObjects.getWork()); -// } -// return results; -// } -// -// @Override -// protected void executingCommitted(AeiObjects aeiObjects, Manual manual, List works) throws Exception { -// // Manual Work 还没有处理完 发生了停留,出发了停留事件 -// if ((ListTools.isEmpty(works)) && (!aeiObjects.getCreateTasks().isEmpty())) { -// boolean hasManualStayScript = this.hasManualStayScript(manual); -// boolean processHasManualStayScript = this.hasManualStayScript(aeiObjects.getProcess()); -// if (hasManualStayScript || processHasManualStayScript) { -// ScriptContext scriptContext = aeiObjects.scriptContext(); -// Bindings bindings = scriptContext.getBindings(ScriptContext.ENGINE_SCOPE); -// WorkContext workContext = (WorkContext) bindings.get(ScriptingFactory.BINDING_NAME_WORKCONTEXT); -// // 只有一条待办绑定到task -// if (aeiObjects.getCreateTasks().size() == 1) { -// workContext.bindTask(aeiObjects.getCreateTasks().get(0)); -// } -// if (processHasManualStayScript) { -// JsonScriptingExecutor -// .eval(aeiObjects.business().element().getCompiledScript(aeiObjects.getApplication().getId(), -// aeiObjects.getProcess(), Business.EVENT_MANUALSTAY), scriptContext); -// } -// if (hasManualStayScript) { -// JsonScriptingExecutor -// .eval(aeiObjects.business().element().getCompiledScript(aeiObjects.getApplication().getId(), -// aeiObjects.getActivity(), Business.EVENT_MANUALSTAY), scriptContext); -// } -// // 解除绑定 -// workContext.bindTask(null); -// } -// } -// } -// -// @Override -// protected List inquiring(AeiObjects aeiObjects, Manual manual) throws Exception { -// // 发送ProcessingSignal -// aeiObjects.getProcessingAttributes() -// .push(Signal.manualInquire(aeiObjects.getWork().getActivityToken(), manual)); -// List results = new ArrayList<>(); -// // 仅有单条路由 -// if (aeiObjects.getRoutes().size() == 1) { -// results.add(aeiObjects.getRoutes().get(0)); -// } else if (aeiObjects.getRoutes().size() > 1) { -// // 存在多条路由 -// List taskCompletedList = aeiObjects.getJoinInquireTaskCompleteds().stream() -// .filter(o -> StringUtils.equals(o.getActivityToken(), aeiObjects.getWork().getActivityToken()) -// && aeiObjects.getWork().getManualTaskIdentityList().contains(o.getIdentity())) -// .collect(Collectors.toList()); -// -// String name = this.choiceRouteName(taskCompletedList, aeiObjects.getRoutes()); -// for (Route o : aeiObjects.getRoutes()) { -// if (o.getName().equalsIgnoreCase(name)) { -// results.add(o); -// break; -// } -// } -// } -// -// if (!results.isEmpty()) { -// // 清理掉强制的指定的处理人 -// aeiObjects.getWork().getProperties().setManualForceTaskIdentityList(new ArrayList<>()); -// } -// -// return results; -// } -// -// // 通过已办存根选择某条路由 -// private String choiceRouteName(List list, List routes) throws Exception { -// String result = ""; -// List names = new ArrayList<>(); -// ListTools.trim(list, false, false).stream().forEach(o -> names.add(o.getRouteName())); -// // 进行优先路由的判断 -// // 已经开始选择路由,如果选择了soleDirect那么就直接返回了,如果没有选择这个路由在进行sole的判断,顺序是 soleDirct -> sole -// // -> max. -// Route soleRoute = routes.stream().filter(o -> BooleanUtils.isTrue(o.getSoleDirect())).findFirst().orElse(null); -// if ((null != soleRoute) && names.contains(soleRoute.getName())) { -// result = soleRoute.getName(); -// } else { -// soleRoute = routes.stream().filter(o -> BooleanUtils.isTrue(o.getSole())).findFirst().orElse(null); -// if ((null != soleRoute) && names.contains(soleRoute.getName())) { -// result = soleRoute.getName(); -// } else { -// // 进行默认的策略,选择占比多的 -// result = maxCountOrLatest(list); -// } -// } -// if (StringUtils.isEmpty(result)) { -// throw new ExceptionChoiceRouteNameError( -// ListTools.extractProperty(list, JpaObject.id_FIELDNAME, String.class, false, false)); -// } -// return result; -// } -// -// private String maxCountOrLatest(List list) { -// Map> map = list.stream() -// .collect(Collectors.groupingBy(TaskCompleted::getRouteName)); -// Optional>> optional = map.entrySet().stream().min((o1, o2) -> { -// int c = o2.getValue().size() - o1.getValue().size(); -// if (c == 0) { -// Date d1 = o1.getValue().stream().sorted(Comparator.comparing(TaskCompleted::getCreateTime).reversed()) -// .findFirst().get().getCreateTime(); -// Date d2 = o2.getValue().stream().sorted(Comparator.comparing(TaskCompleted::getCreateTime).reversed()) -// .findFirst().get().getCreateTime(); -// return ObjectUtils.compare(d2, d1); -// } else { -// return c; -// } -// }); -// return optional.isPresent() ? optional.get().getKey() : null; -// } -// -// private boolean single(AeiObjects aeiObjects, Manual manual, List identities) throws Exception { -// boolean passThrough = false; -// Long count = aeiObjects.getJoinInquireTaskCompleteds().stream() -// .filter(o -> (StringUtils.equals(aeiObjects.getWork().getActivityToken(), o.getActivityToken()) -// && (identities.contains(o.getIdentity())))) -// .count(); -// if (count > 0) { -// // 已经确定要通过此节点,清除可能是多余的待办 -// aeiObjects.getTasks().stream().filter(o -> StringUtils.equals(aeiObjects.getWork().getId(), o.getWork())) -// .forEach(o -> { -// // 如果启用了将未处理待办转待阅,那么进行转换 -// if (BooleanUtils.isTrue(manual.getManualUncompletedTaskToRead())) { -// aeiObjects.getCreateReads() -// .add(new Read(aeiObjects.getWork(), o.getIdentity(), o.getUnit(), o.getPerson())); -// } -// aeiObjects.deleteTask(o); -// }); -// // 所有预计的处理人中已经有已办,这个环节已经产生了已办，可以离开换个环节。 -// passThrough = true; -// } else { -// // 取到期望的待办人员，由于要进行处理需要转换成可读写List -// if (ListTools.isEmpty(identities)) { -// throw new ExceptionExpectedEmpty(aeiObjects.getWork().getTitle(), aeiObjects.getWork().getId(), -// manual.getName(), manual.getId()); -// } -// // 删除多余的待办 -// aeiObjects.getTasks().stream() -// .filter(o -> StringUtils.equals(aeiObjects.getWork().getActivityToken(), o.getActivityToken()) -// && (!ListTools.contains(identities, o.getIdentity()))) -// .forEach(aeiObjects::deleteTask); -// // 将待办已经产生的人从预期值中删除 -// aeiObjects.getTasks().stream() -// .filter(o -> StringUtils.equals(aeiObjects.getWork().getActivityToken(), o.getActivityToken()) -// && (ListTools.contains(identities, o.getIdentity()))) -// .forEach(o -> identities.remove(o.getIdentity())); -// // 这里剩余的应该是没有生成待办的人员 -// if (!identities.isEmpty()) { -// for (String identity : identities) { -// aeiObjects.createTask(this.createTask(aeiObjects, manual, identity)); -// } -// } -// } -// return passThrough; -// } -// -// private boolean parallel(AeiObjects aeiObjects, Manual manual, List identities) throws Exception { -// boolean passThrough = false; -// // 取得本环节已经处理的已办 -// List taskCompleteds = this.listJoinInquireTaskCompleted(aeiObjects, identities); -// // 存在优先路由,如果有人选择了优先路由那么直接流转.需要判断是否启用了soleDirect -// Route soleRoute = aeiObjects.getRoutes().stream().filter(r -> BooleanUtils.isTrue(r.getSoleDirect())) -// .findFirst().orElse(null); -// if (null != soleRoute) { -// TaskCompleted soleTaskCompleted = taskCompleteds.stream() -// .filter(t -> BooleanUtils.isTrue(t.getJoinInquire()) -// && StringUtils.equals(t.getRouteName(), soleRoute.getName())) -// .findFirst().orElse(null); -// if (null != soleTaskCompleted) { -// this.parallelSoleTaskCompleted(aeiObjects); -// return true; -// } -// } -// // 将已经处理的人从期望值中移除 -// aeiObjects.getJoinInquireTaskCompleteds().stream() -// .filter(o -> StringUtils.equals(aeiObjects.getWork().getActivityToken(), o.getActivityToken())) -// .forEach(o -> identities.remove(o.getIdentity())); -// // 清空可能的多余的待办 -// aeiObjects.getTasks().stream() -// .filter(o -> StringUtils.equals(aeiObjects.getWork().getActivityToken(), o.getActivityToken()) -// && (!ListTools.contains(identities, o.getIdentity()))) -// .forEach(aeiObjects::deleteTask); -// if (identities.isEmpty()) { -// // 所有人已经处理完成。 -// passThrough = true; -// } else { -// passThrough = false; -// // 先清空已经有待办的身份 -// aeiObjects.getTasks().stream() -// .filter(o -> StringUtils.equals(aeiObjects.getWork().getActivityToken(), o.getActivityToken())) -// .forEach(o -> identities.remove(o.getIdentity())); -// // 这里剩余的应该是没有生成待办的人员 -// if (!identities.isEmpty()) { -// for (String identity : identities) { -// aeiObjects.createTask(this.createTask(aeiObjects, manual, identity)); -// } -// } -// } -// return passThrough; -// } -// -// // 并行环节下如果有优先路由,那么直接走优先路由,处理的时候需要晴空所有代办 -// private void parallelSoleTaskCompleted(AeiObjects aeiObjects) throws Exception { -// // 清空可能的多余的待办 -// aeiObjects.getTasks().stream() -// .filter(o -> StringUtils.equals(aeiObjects.getWork().getActivityToken(), o.getActivityToken())) -// .forEach(aeiObjects::deleteTask); -// } -// -// private boolean queue(AeiObjects aeiObjects, Manual manual, List identities) throws Exception { -// boolean passThrough = false; -// List taskCompleteds = this.listJoinInquireTaskCompleted(aeiObjects, identities); -// // 存在优先路由 -// if (queueHasSole(aeiObjects, taskCompleteds)) { -// return true; -// } -// // 存在优先路由结束,将已经处理的人从期望值中移除 -// queueRemoveTaskCompletedFromIdentities(identities, taskCompleteds); -// if (identities.isEmpty()) { -// // 所有人已经处理完成。 -// passThrough = true; -// } else { -// passThrough = false; -// String identity = identities.get(0); -// // 还有人没有处理，开始判断待办,取到本环节的所有待办,理论上只能有一条待办 -// boolean find = false; -// for (Task t : aeiObjects.getTasks()) { -// if (StringUtils.equals(aeiObjects.getWork().getActivityToken(), t.getActivityToken())) { -// if (!StringUtils.equals(t.getIdentity(), identity)) { -// aeiObjects.deleteTask(t); -// } else { -// find = true; -// } -// } -// } -// // 当前处理人没有待办 -// if (!find) { -// aeiObjects.createTask(this.createTask(aeiObjects, manual, identity)); -// } -// } -// return passThrough; -// -// } -// -// private boolean queueHasSole(AeiObjects aeiObjects, List taskCompleteds) throws Exception { -// Route soleRoute = aeiObjects.getRoutes().stream().filter(r -> BooleanUtils.isTrue(r.getSoleDirect())) -// .findFirst().orElse(null); -// if (null != soleRoute) { -// TaskCompleted soleTaskCompleted = taskCompleteds.stream() -// .filter(t -> BooleanUtils.isTrue(t.getJoinInquire()) -// && StringUtils.equals(t.getRouteName(), soleRoute.getName())) -// .findFirst().orElse(null); -// if (null != soleTaskCompleted) { -// return true; -// } -// } -// return false; -// } -// -// private void queueRemoveTaskCompletedFromIdentities(List identities, List taskCompleteds) { -// for (TaskCompleted o : taskCompleteds) { -// identities.remove(o.getIdentity()); -// } -// } -// -// // 所有有效的已办,去除 reset,retract,appendTask -// private List listJoinInquireTaskCompleted(AeiObjects aeiObjects, List identities) -// throws Exception { -// return aeiObjects.getJoinInquireTaskCompleteds().stream() -// .filter(o -> StringUtils.equals(aeiObjects.getWork().getActivityToken(), o.getActivityToken()) -// && identities.contains(o.getIdentity()) && BooleanUtils.isTrue(o.getJoinInquire())) -// .collect(Collectors.toList()); -// } -// -// @Override -// protected void inquiringCommitted(AeiObjects aeiObjects, Manual manual) throws Exception { -// // nothing -// } -// -// private void calculateExpire(AeiObjects aeiObjects, Manual manual, Task task) throws Exception { -// if (null != manual.getTaskExpireType()) { -// switch (manual.getTaskExpireType()) { -// case never: -// this.expireNever(task); -// break; -// case appoint: -// this.expireAppoint(manual, task); -// break; -// case script: -// this.expireScript(aeiObjects, manual, task); -// break; -// default: -// break; -// } -// } -// // 如果work有截至时间 -// if (null != aeiObjects.getWork().getExpireTime()) { -// if (null == task.getExpireTime()) { -// task.setExpireTime(aeiObjects.getWork().getExpireTime()); -// } else { -// if (task.getExpireTime().after(aeiObjects.getWork().getExpireTime())) { -// task.setExpireTime(aeiObjects.getWork().getExpireTime()); -// } -// } -// } -// // 已经有过期时间了,那么设置催办时间 -// if (null != task.getExpireTime()) { -// task.setUrgeTime(DateUtils.addHours(task.getExpireTime(), -2)); -// } else { -// task.setExpired(false); -// task.setUrgeTime(null); -// task.setUrged(false); -// } -// } -// -// // 从不过期 -// private void expireNever(Task task) { -// task.setExpireTime(null); -// } -// -// private void expireAppoint(Manual manual, Task task) throws Exception { -// if (BooleanUtils.isTrue(manual.getTaskExpireWorkTime())) { -// this.expireAppointWorkTime(task, manual); -// } else { -// this.expireAppointNaturalDay(task, manual); -// } -// } -// -// private void expireAppointWorkTime(Task task, Manual manual) throws Exception { -// Integer m = 0; -// WorkTime wt = Config.workTime(); -// if (BooleanUtils.isTrue(NumberTools.greaterThan(manual.getTaskExpireDay(), 0))) { -// m += manual.getTaskExpireDay() * wt.minutesOfWorkDay(); -// } -// if (BooleanUtils.isTrue(NumberTools.greaterThan(manual.getTaskExpireHour(), 0))) { -// m += manual.getTaskExpireHour() * 60; -// } -// if (m > 0) { -// Date expire = wt.forwardMinutes(new Date(), m); -// task.setExpireTime(expire); -// } else { -// task.setExpireTime(null); -// } -// } -// -// private void expireAppointNaturalDay(Task task, Manual manual) { -// Integer m = 0; -// if (BooleanUtils.isTrue(NumberTools.greaterThan(manual.getTaskExpireDay(), 0))) { -// m += manual.getTaskExpireDay() * 60 * 24; -// } -// if (BooleanUtils.isTrue(NumberTools.greaterThan(manual.getTaskExpireHour(), 0))) { -// m += manual.getTaskExpireHour() * 60; -// } -// if (m > 0) { -// Calendar cl = Calendar.getInstance(); -// cl.add(Calendar.MINUTE, m); -// task.setExpireTime(cl.getTime()); -// } else { -// task.setExpireTime(null); -// } -// } -// -// private void expireScript(AeiObjects aeiObjects, Manual manual, Task task) throws Exception { -// ExpireScriptResult expire = new ExpireScriptResult(); -// ScriptContext scriptContext = aeiObjects.scriptContext(); -// CompiledScript cs = aeiObjects.business().element().getCompiledScript(aeiObjects.getWork().getApplication(), -// manual, Business.EVENT_MANUALTASKEXPIRE); -// scriptContext.getBindings(ScriptContext.ENGINE_SCOPE).put(ScriptingFactory.BINDING_NAME_EXPIRE, expire); -// JsonScriptingExecutor.eval(cs, scriptContext, ExpireScriptResult.class, o -> { -// if (null != o) { -// expire.setDate(o.getDate()); -// expire.setHour(o.getHour()); -// expire.setWorkHour(o.getWorkHour()); -// } -// }); -// if (BooleanUtils.isTrue(NumberTools.greaterThan(expire.getWorkHour(), 0))) { -// Integer m = 0; -// m += expire.getWorkHour() * 60; -// if (m > 0) { -// task.setExpireTime(Config.workTime().forwardMinutes(new Date(), m)); -// } else { -// task.setExpireTime(null); -// } -// } else if (BooleanUtils.isTrue(NumberTools.greaterThan(expire.getHour(), 0))) { -// Integer m = 0; -// m += expire.getHour() * 60; -// if (m > 0) { -// Calendar cl = Calendar.getInstance(); -// cl.add(Calendar.MINUTE, m); -// task.setExpireTime(cl.getTime()); -// } else { -// task.setExpireTime(null); -// } -// } else if (null != expire.getDate()) { -// task.setExpireTime(expire.getDate()); -// } else { -// task.setExpireTime(null); -// } -// } -// -// private Task createTask(AeiObjects aeiObjects, Manual manual, String identity) throws Exception { -// String fromIdentity = aeiObjects.getWork().getProperties().getManualEmpowerMap().get(identity); -// String person = aeiObjects.business().organization().person().getWithIdentity(identity); -// String unit = aeiObjects.business().organization().unit().getWithIdentity(identity); -// Task task = new Task(aeiObjects.getWork(), identity, person, unit, fromIdentity, new Date(), null, -// aeiObjects.getRoutes(), manual.getAllowRapid()); -// // 是第一条待办,进行标记，调度过的待办都标记为非第一个待办 -// if (BooleanUtils.isTrue(aeiObjects.getProcessingAttributes().getForceJoinAtArrive())) { -// task.setFirst(false); -// } else { -// task.setFirst(ListTools.isEmpty(aeiObjects.getJoinInquireTaskCompleteds())); -// } -// this.calculateExpire(aeiObjects, manual, task); -// if (StringUtils.isNotEmpty(fromIdentity)) { -// aeiObjects.business().organization().empowerLog() -// .log(this.createEmpowerLog(aeiObjects.getWork(), fromIdentity, identity)); -// String fromPerson = aeiObjects.business().organization().person().getWithIdentity(fromIdentity); -// String fromUnit = aeiObjects.business().organization().unit().getWithIdentity(fromIdentity); -// TaskCompleted empowerTaskCompleted = new TaskCompleted(aeiObjects.getWork()); -// empowerTaskCompleted.setProcessingType(TaskCompleted.PROCESSINGTYPE_EMPOWER); -// empowerTaskCompleted.setIdentity(fromIdentity); -// empowerTaskCompleted.setUnit(fromUnit); -// empowerTaskCompleted.setPerson(fromPerson); -// empowerTaskCompleted.setEmpowerToIdentity(identity); -// aeiObjects.createTaskCompleted(empowerTaskCompleted); -// Read empowerRead = new Read(aeiObjects.getWork(), fromIdentity, fromUnit, fromPerson); -// aeiObjects.createRead(empowerRead); -// } -// return task; -// } -// -// private EmpowerLog createEmpowerLog(Work work, String fromIdentity, String toIdentity) { -// return new EmpowerLog().setApplication(work.getApplication()).setApplicationAlias(work.getApplicationAlias()) -// .setApplicationName(work.getApplicationName()).setProcess(work.getProcess()) -// .setProcessAlias(work.getProcessAlias()).setProcessName(work.getProcessName()).setTitle(work.getTitle()) -// .setWork(work.getId()).setJob(work.getJob()).setFromIdentity(fromIdentity).setToIdentity(toIdentity) -// .setActivity(work.getActivity()).setActivityAlias(work.getActivityAlias()) -// .setActivityName(work.getActivityName()).setEmpowerTime(new Date()); -// } -// -// private List arrivingSameJobActivityExistIdentities(AeiObjects aeiObjects, Manual manual) throws Exception { -// List exists = new ArrayList<>(); -// aeiObjects.getTasks().stream() -// .filter(o -> StringUtils.equals(o.getActivity(), manual.getId()) -// && StringUtils.equals(o.getJob(), aeiObjects.getWork().getJob())) -// .forEach(o -> exists.add(o.getIdentity())); -// return exists; -// } -// -// public class ExpireScriptResult { -// Integer hour; -// Integer workHour; -// Date date; -// -// public Integer getHour() { -// return hour; -// } -// -// public void setHour(Integer hour) { -// this.hour = hour; -// } -// -// public Integer getWorkHour() { -// return workHour; -// } -// -// public void setWorkHour(Integer workHour) { -// this.workHour = workHour; -// } -// -// public Date getDate() { -// return date; -// } -// -// public void setDate(Date date) { -// this.date = date; -// } -// -// public void setDate(String str) { -// try { -// this.date = DateTools.parse(str); -// } catch (Exception e) { -// LOGGER.error(e); -// } -// } -// -// } -//} diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/merge/AbstractMergeProcessor.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/merge/AbstractMergeProcessor.java index 0d0fa5633b76eab06a8bb8fe08d936193ad5dae5..0a5d46e2a2f5dcf2ca2e97c8726f13560766ac39 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/merge/AbstractMergeProcessor.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/merge/AbstractMergeProcessor.java @@ -9,7 +9,7 @@ import com.x.processplatform.core.entity.element.Route; import com.x.processplatform.service.processing.processor.AbstractProcessor; import com.x.processplatform.service.processing.processor.AeiObjects; -public abstract class AbstractMergeProcessor extends AbstractProcessor { +abstract class AbstractMergeProcessor extends AbstractProcessor { protected AbstractMergeProcessor(EntityManagerContainer entityManagerContainer) throws Exception { super(entityManagerContainer); diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/parallel/AbstractParallelProcessor.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/parallel/AbstractParallelProcessor.java index 87ba8631cdf51ea0beeae7db513dc1bac5fff506..7e577298d43d1ea4a93a64cbc92e7c380a4ec1b3 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/parallel/AbstractParallelProcessor.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/parallel/AbstractParallelProcessor.java @@ -9,7 +9,7 @@ import com.x.processplatform.core.entity.element.Route; import com.x.processplatform.service.processing.processor.AbstractProcessor; import com.x.processplatform.service.processing.processor.AeiObjects; -public abstract class AbstractParallelProcessor extends AbstractProcessor { +abstract class AbstractParallelProcessor extends AbstractProcessor { protected AbstractParallelProcessor(EntityManagerContainer entityManagerContainer) throws Exception { super(entityManagerContainer); diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/parallel/ExceptionParallelNotFoundRoute.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/parallel/ExceptionParallelNotFoundRoute.java deleted file mode 100644 index b0a4f426d2aa4bd778bc5d806a12bb5634750e84..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/parallel/ExceptionParallelNotFoundRoute.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.x.processplatform.service.processing.processor.parallel; - -import com.x.base.core.project.exception.RunningException; - -class ExceptionParallelNotFoundRoute extends RunningException { - - private static final long serialVersionUID = 6143035361950594561L; - - ExceptionParallelNotFoundRoute(String name, String title, String id, String job) { - super("parallel:{} not found route, work:{}, id:{}, job:{}.", name, title, id, job); - } - -} diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/service/AbstractServiceProcessor.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/service/AbstractServiceProcessor.java index 51d08948d6feac0af925e8afa7cc5eb2443fdfca..092dae2f87964cf06cbcabb1f31654b6931b4f9a 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/service/AbstractServiceProcessor.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/service/AbstractServiceProcessor.java @@ -9,7 +9,7 @@ import com.x.processplatform.core.entity.element.Service; import com.x.processplatform.service.processing.processor.AbstractProcessor; import com.x.processplatform.service.processing.processor.AeiObjects; -public abstract class AbstractServiceProcessor extends AbstractProcessor { +abstract class AbstractServiceProcessor extends AbstractProcessor { protected AbstractServiceProcessor(EntityManagerContainer entityManagerContainer) throws Exception { super(entityManagerContainer); diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/split/AbstractSplitProcessor.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/split/AbstractSplitProcessor.java index d3fedc15994dc49547c593033584ad882779f866..286a963d3a17c206a88012d1cecd36ad83e53305 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/split/AbstractSplitProcessor.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/split/AbstractSplitProcessor.java @@ -9,7 +9,7 @@ import com.x.processplatform.core.entity.element.Split; import com.x.processplatform.service.processing.processor.AbstractProcessor; import com.x.processplatform.service.processing.processor.AeiObjects; -public abstract class AbstractSplitProcessor extends AbstractProcessor { +abstract class AbstractSplitProcessor extends AbstractProcessor { protected AbstractSplitProcessor(EntityManagerContainer entityManagerContainer) throws Exception { super(entityManagerContainer); diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/schedule/ExceptionTouchEmbedWaitUntilCompleted.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/schedule/ExceptionTouchEmbedWaitUntilCompleted.java deleted file mode 100644 index 5b4039e39af255c3eca9e9ee34845c6bf9e81a24..0000000000000000000000000000000000000000 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/schedule/ExceptionTouchEmbedWaitUntilCompleted.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.x.processplatform.service.processing.schedule; - -import com.x.base.core.project.exception.PromptException; - -class ExceptionTouchEmbedWaitUntilCompleted extends PromptException { - - private static final long serialVersionUID = -7038279889683420366L; - - ExceptionTouchEmbedWaitUntilCompleted(Exception e, String id, String job) { - super(e, "子流程结束工作触发失败, id:{}, job:{}.", id, job); - } - -}