Merge branch 'fix/流程审计日志补充' into 'develop'

Merge of fix/[流程平台]流程审计日志补充 to develop

See merge request o2oa/o2oa!750

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/ActionProcessing.java

@@ -9,6 +9,7 @@ import com.x.base.core.container.EntityManagerContainer;
 import com.x.base.core.container.factory.EntityManagerContainerFactory;
 import com.x.base.core.entity.JpaObject;
 import com.x.base.core.project.Applications;
+import com.x.base.core.project.logger.Audit;
 import com.x.base.core.project.x_processplatform_service_processing;
 import com.x.base.core.project.annotation.FieldDescribe;
 import com.x.base.core.project.bean.WrapCopier;
@@ -66,6 +67,7 @@ class ActionProcessing extends BaseAction {
 	private final String TYPE_TASK = "task";
 
 	ActionResult<Wo> execute(EffectivePerson effectivePerson, String id, JsonElement jsonElement) throws Exception {
+		Audit audit = logger.audit(effectivePerson);
 		this.effectivePerson = effectivePerson;
 		wi = this.convertToWrapIn(jsonElement, Wi.class);
 		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
@@ -96,6 +98,7 @@ class ActionProcessing extends BaseAction {
 			this.type = this.type(business, task, wi);
 		}
 		this.processing();
+		audit.log(null, "任务处理");
 		Wo wo = Wo.copier.copy(record);
 		result.setData(wo);
 		return result;

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/ActionProcessingNeural.java

@@ -90,7 +90,7 @@ class ActionProcessingNeural extends BaseAction {
 			wo.setWorkLogList(this.referenceWorkLog(business, task));
 			wo.setRouteName(routeName);
 			result.setData(wo);
-			audit.log(null, "审批");
+			audit.log(null, "任务处理");
 			return result;
 		}
 	}

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/V2Reset.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import com.x.base.core.project.logger.Audit;
 import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -58,6 +59,7 @@ public class V2Reset extends BaseAction {
 	private EffectivePerson effectivePerson;
 
 	ActionResult<Wo> execute(EffectivePerson effectivePerson, String id, JsonElement jsonElement) throws Exception {
+		Audit audit = logger.audit(effectivePerson);
 		ActionResult<Wo> result = new ActionResult<>();
 		this.wi = this.convertToWrapIn(jsonElement, Wi.class);
 		this.effectivePerson = effectivePerson;
@@ -130,7 +132,7 @@ public class V2Reset extends BaseAction {
 		}
 
 		this.updateTask();
-
+		audit.log(null, "重置处理人");
 		Wo wo = Wo.copier.copy(record);
 		result.setData(wo);
 		return result;

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionDelete.java

@@ -1,5 +1,8 @@
 package com.x.processplatform.assemble.surface.jaxrs.work;
 
+import com.x.base.core.project.logger.Audit;
+import com.x.base.core.project.logger.Logger;
+import com.x.base.core.project.logger.LoggerFactory;
 import org.apache.commons.lang3.BooleanUtils;
 
 import com.x.base.core.container.EntityManagerContainer;
@@ -13,10 +16,14 @@ import com.x.processplatform.assemble.surface.Business;
 import com.x.processplatform.assemble.surface.ThisApplication;
 import com.x.processplatform.assemble.surface.WorkControl;
 import com.x.processplatform.core.entity.content.Work;
+import org.apache.commons.lang3.StringUtils;
 
 class ActionDelete extends BaseAction {
 
+	private static Logger logger = LoggerFactory.getLogger(ActionDelete.class);
+
 	ActionResult<Wo> execute(EffectivePerson effectivePerson, String id) throws Exception {
+		Audit audit = logger.audit(effectivePerson);
 		ActionResult<Wo> result = new ActionResult<>();
 		Work work = null;
 		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
@@ -33,6 +40,9 @@ class ActionDelete extends BaseAction {
 		}
 		Wo wo = ThisApplication.context().applications().deleteQuery(x_processplatform_service_processing.class,
 				Applications.joinQueryUri("work", work.getId()), work.getJob()).getData(Wo.class);
+		if(wo!=null && StringUtils.isNotEmpty(wo.getId())){
+			audit.log(null, "废弃工单");
+		}
 		result.setData(wo);
 		return result;
 	}

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/V2Reroute.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import com.x.base.core.project.logger.Audit;
 import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -55,6 +56,7 @@ class V2Reroute extends BaseAction {
 	private Wi wi;
 
 	ActionResult<Wo> execute(EffectivePerson effectivePerson, String id, JsonElement jsonElement) throws Exception {
+		Audit audit = logger.audit(effectivePerson);
 		this.effectivePerson = effectivePerson;
 		wi = this.convertToWrapIn(jsonElement, Wi.class);
 		ActionResult<Wo> result = new ActionResult<>();
@@ -85,6 +87,7 @@ class V2Reroute extends BaseAction {
 		reroute();
 		processing();
 		record();
+		audit.log(null, "工作调度");
 		Wo wo = Wo.copier.copy(record);
 		result.setData(wo);
 		return result;

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/V2Retract.java

@@ -5,6 +5,7 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import com.x.base.core.project.logger.Audit;
 import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -59,7 +60,7 @@ class V2Retract extends BaseAction {
 	private EffectivePerson effectivePerson;
 
 	ActionResult<Wo> execute(EffectivePerson effectivePerson, String id) throws Exception {
-
+		Audit audit = logger.audit(effectivePerson);
 		ActionResult<Wo> result = new ActionResult<>();
 
 		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
@@ -121,6 +122,8 @@ class V2Retract extends BaseAction {
 
 		this.record();
 
+		audit.log(null, "工作召回");
+
 		result.setData(Wo.copier.copy(record));
 
 		return result;

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/V2Rollback.java

@@ -4,6 +4,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import com.x.base.core.project.logger.Audit;
+import com.x.base.core.project.logger.Logger;
+import com.x.base.core.project.logger.LoggerFactory;
 import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.lang3.StringUtils;
 
@@ -36,6 +39,8 @@ import com.x.processplatform.core.express.service.processing.jaxrs.work.V2Rollba
 
 class V2Rollback extends BaseAction {
 
+	private static Logger logger = LoggerFactory.getLogger(V2Rollback.class);
+
 	private Work work;
 	private WorkLog workLog;
 	private Wi wi;
@@ -44,7 +49,7 @@ class V2Rollback extends BaseAction {
 	private String series = StringTools.uniqueToken();
 
 	ActionResult<Wo> execute(EffectivePerson effectivePerson, String id, JsonElement jsonElement) throws Exception {
-
+		Audit audit = logger.audit(effectivePerson);
 		wi = this.convertToWrapIn(jsonElement, Wi.class);
 		ActionResult<Wo> result = new ActionResult<>();
 		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
@@ -74,6 +79,7 @@ class V2Rollback extends BaseAction {
 		}
 
 		this.record();
+		audit.log(null, "回滚工作");
 
 		Wo wo = Wo.copier.copy(record);
 		result.setData(wo);