Explorar o código

供方工作流添加log形式的日志

baichengfei %!s(int64=5) %!d(string=hai) anos
pai
achega
82c2ecd0d8
Modificáronse 47 ficheiros con 230 adicións e 66 borrados
  1. 16 13
      src/main/java/com/common/workflow/service/activiti/ActivitiService.java
  2. 4 1
      src/main/java/com/common/workflow/service/activiti/supplierAnnualListener/AnnualApprovalRefuseService.java
  3. 6 2
      src/main/java/com/common/workflow/service/activiti/supplierAnnualListener/AnnualApprovalRefuseTaskService.java
  4. 4 1
      src/main/java/com/common/workflow/service/activiti/supplierAnnualListener/AnnualCheckNeedPayService.java
  5. 4 1
      src/main/java/com/common/workflow/service/activiti/supplierAnnualListener/AnnualLawOfficeAuditService.java
  6. 4 1
      src/main/java/com/common/workflow/service/activiti/supplierAnnualListener/AnnualPreFenTrailService.java
  7. 4 1
      src/main/java/com/common/workflow/service/activiti/supplierAnnualListener/AnnualPreFirstTrailService.java
  8. 4 1
      src/main/java/com/common/workflow/service/activiti/supplierAnnualListener/AnnualPrePayerService.java
  9. 4 1
      src/main/java/com/common/workflow/service/activiti/supplierAnnualListener/AnnualPreSecondTrailService.java
  10. 4 1
      src/main/java/com/common/workflow/service/activiti/supplierAnnualListener/AnnualPreStorageAuditService.java
  11. 5 1
      src/main/java/com/common/workflow/service/activiti/supplierAnnualListener/AnnualWorkflowEndService.java
  12. 5 1
      src/main/java/com/common/workflow/service/activiti/supplierAppendListener/AppendApprovalRefuseService.java
  13. 6 1
      src/main/java/com/common/workflow/service/activiti/supplierAppendListener/AppendApprovalRefuseTaskService.java
  14. 5 1
      src/main/java/com/common/workflow/service/activiti/supplierAppendListener/AppendCheckNeedPayService.java
  15. 5 1
      src/main/java/com/common/workflow/service/activiti/supplierAppendListener/AppendPreFenTrailService.java
  16. 5 1
      src/main/java/com/common/workflow/service/activiti/supplierAppendListener/AppendPreFirstTrailService.java
  17. 5 1
      src/main/java/com/common/workflow/service/activiti/supplierAppendListener/AppendPrePayerService.java
  18. 5 1
      src/main/java/com/common/workflow/service/activiti/supplierAppendListener/AppendPreProfAuditService.java
  19. 5 1
      src/main/java/com/common/workflow/service/activiti/supplierAppendListener/AppendPreSecondTrailService.java
  20. 5 1
      src/main/java/com/common/workflow/service/activiti/supplierAppendListener/AppendPreStorageAuditService.java
  21. 5 1
      src/main/java/com/common/workflow/service/activiti/supplierAppendListener/AppendPreThirdTrialService.java
  22. 5 1
      src/main/java/com/common/workflow/service/activiti/supplierAppendListener/AppendWorkflowEndService.java
  23. 5 1
      src/main/java/com/common/workflow/service/activiti/supplierInfoChangeListener/ChangeApprovalRefuseService.java
  24. 7 1
      src/main/java/com/common/workflow/service/activiti/supplierInfoChangeListener/ChangeApprovalRefuseTaskService.java
  25. 5 1
      src/main/java/com/common/workflow/service/activiti/supplierInfoChangeListener/ChangeCheckNeedPayService.java
  26. 5 1
      src/main/java/com/common/workflow/service/activiti/supplierInfoChangeListener/ChangeLawOfficeAuditService.java
  27. 5 1
      src/main/java/com/common/workflow/service/activiti/supplierInfoChangeListener/ChangePreFenTrailService.java
  28. 5 1
      src/main/java/com/common/workflow/service/activiti/supplierInfoChangeListener/ChangePreFirstTrailService.java
  29. 5 1
      src/main/java/com/common/workflow/service/activiti/supplierInfoChangeListener/ChangePrePayerService.java
  30. 5 1
      src/main/java/com/common/workflow/service/activiti/supplierInfoChangeListener/ChangePreSecondTrailService.java
  31. 5 1
      src/main/java/com/common/workflow/service/activiti/supplierInfoChangeListener/ChangePreStorageAuditService.java
  32. 5 1
      src/main/java/com/common/workflow/service/activiti/supplierInfoChangeListener/ChangeWorkflowEndService.java
  33. 4 2
      src/main/java/com/common/workflow/service/activiti/supplierListener/ApprovalRefuseService.java
  34. 5 1
      src/main/java/com/common/workflow/service/activiti/supplierListener/ApprovalRefuseTaskService.java
  35. 4 1
      src/main/java/com/common/workflow/service/activiti/supplierListener/CheckNeedConcentrateAuditService.java
  36. 4 1
      src/main/java/com/common/workflow/service/activiti/supplierListener/CheckNeedPayService.java
  37. 4 1
      src/main/java/com/common/workflow/service/activiti/supplierListener/LawOfficeAuditService.java
  38. 4 1
      src/main/java/com/common/workflow/service/activiti/supplierListener/PreConcentrateAuditService.java
  39. 5 1
      src/main/java/com/common/workflow/service/activiti/supplierListener/PreFenTrailService.java
  40. 4 1
      src/main/java/com/common/workflow/service/activiti/supplierListener/PreFirstTrailService.java
  41. 4 1
      src/main/java/com/common/workflow/service/activiti/supplierListener/PrePayerService.java
  42. 4 1
      src/main/java/com/common/workflow/service/activiti/supplierListener/PreProfAuditService.java
  43. 4 1
      src/main/java/com/common/workflow/service/activiti/supplierListener/PreSecondTrailService.java
  44. 4 1
      src/main/java/com/common/workflow/service/activiti/supplierListener/PreStorageAuditService.java
  45. 6 4
      src/main/java/com/common/workflow/service/activiti/supplierListener/PreThirdTrialService.java
  46. 5 2
      src/main/java/com/common/workflow/service/activiti/supplierListener/WorkflowEndService.java
  47. 2 2
      src/main/resources/config/application-dev.yml

+ 16 - 13
src/main/java/com/common/workflow/service/activiti/ActivitiService.java

@@ -16,6 +16,7 @@ import javax.annotation.Resource;
 import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletResponse;
 
+import com.common.workflow.service.activiti.supplierAnnualListener.AnnualApprovalRefuseTaskService;
 import com.common.workflow.service.dto.ActiHistoricTaskDTO;
 import com.common.workflow.service.dto.ActiMyTaskDTO;
 import com.common.workflow.service.dto.ActiPageResultDTO;
@@ -39,12 +40,14 @@ import org.activiti.engine.task.TaskQuery;
 import org.activiti.image.ProcessDiagramGenerator;
 
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
 public class ActivitiService {
-
+    private static final Logger logger = LoggerFactory.getLogger(AnnualApprovalRefuseTaskService.class);
     @Autowired
     private RuntimeService runtimeService;
     @Autowired
@@ -70,7 +73,7 @@ public class ActivitiService {
         variables.put("result", result);
 
         ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(processKey, variables);
-        System.out.println("流程启动成功,流程id:"+processInstance.getId());
+        logger.info("流程启动成功,流程id:" + processInstance.getId() + " 业务ID: " + businessKey);
         return processInstance.getProcessInstanceId();
     }
 
@@ -88,7 +91,7 @@ public class ActivitiService {
         variables.put("supplierName", supplierName);
 
         ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(processKey, variables);
-        System.out.println("流程启动成功,流程id:"+processInstance.getId());
+        logger.info("流程启动成功,流程id:" + processInstance.getId() + " 业务ID: " + businessKey);
         return processInstance.getProcessInstanceId();
     }
 
@@ -120,12 +123,12 @@ public class ActivitiService {
             .list();*/
 
         //获取流程实例
-        System.out.println("创建的myTask: " + myTask.toString());
-        System.out.println("工作流参数 processKey:" + processKey);
-        System.out.println("工作流参数 businessKey:" + businessKey);
-        System.out.println("工作流参数 userId:" + userId);
-        System.out.println("工作流参数 result:" + result);
-        System.out.println("工作流参数 callbackUrl:" + callbackUrl);
+        logger.info("创建的myTask: " + myTask.toString());
+        logger.info("工作流参数 processKey:" + processKey);
+        logger.info("工作流参数 businessKey:" + businessKey);
+        logger.info("工作流参数 userId:" + userId);
+        logger.info("工作流参数 result:" + result);
+        logger.info("工作流参数 callbackUrl:" + callbackUrl);
         taskService.claim(myTask.getId(), userId);
 
         Map<String,Object> vars = new HashMap<String,Object>();
@@ -586,7 +589,7 @@ public class ActivitiService {
     /*public void updateBizStatus(DelegateExecution execution,String status) {
         String bizId = execution.getProcessBusinessKey();
         //根据业务id自行处理业务表
-        System.out.println("业务表["+bizId+"]状态更改成功,状态更改为:"+status);
+        logger.info("业务表["+bizId+"]状态更改成功,状态更改为:"+status);
     }*/
 
 
@@ -622,11 +625,11 @@ public class ActivitiService {
         ImageIO.write(bi, "png", fos);
         fos.close();
         is.close();
-        System.out.println("图片生成成功");
+        logger.info("图片生成成功");
 
         List<Task> tasks = taskService.createTaskQuery().taskCandidateUser("userId").list();
         for(Task t : tasks) {
-            System.out.println(t.getName());
+            logger.info(t.getName());
         }
     }*/
 
@@ -694,7 +697,7 @@ public class ActivitiService {
             }
             //logger.info("[完成]-获取流程图图像");
         } catch (Exception e) {
-            System.out.println(e.getMessage());
+            logger.info(e.getMessage());
             //logger.error("【异常】-获取流程图失败!" + e.getMessage());
             //throw new BusinessException("获取流程图失败!" + e.getMessage());
         }

+ 4 - 1
src/main/java/com/common/workflow/service/activiti/supplierAnnualListener/AnnualApprovalRefuseService.java

@@ -5,10 +5,13 @@ import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.ExecutionListener;
 import org.activiti.engine.delegate.Expression;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 @Component("annualApprovalRefuseService")
 public class AnnualApprovalRefuseService implements ExecutionListener {
+    private static final Logger logger = LoggerFactory.getLogger(AnnualApprovalRefuseService.class);
 
     private Expression stepCode;
     // 审批驳回
@@ -47,7 +50,7 @@ public class AnnualApprovalRefuseService implements ExecutionListener {
         } else if (nowStepCode.equals("-10")) {
             delegateExecution.setVariableLocal("refuseName", "二级单位分办未通过");
         }
-        System.out.println("年审工作流 线 驳回: " + nowStepCode);
+        logger.info("年审工作流流业务ID:" + businessKey + " 线 驳回: " + nowStepCode);
         delegateExecution.setVariable("backUsers", createUserId);
         delegateExecution.setVariableLocal("backUsers", createUserId);
     }

+ 6 - 2
src/main/java/com/common/workflow/service/activiti/supplierAnnualListener/AnnualApprovalRefuseTaskService.java

@@ -2,21 +2,25 @@ package com.common.workflow.service.activiti.supplierAnnualListener;
 
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
 @Component("annualApprovalRefuseTaskService")
 public class AnnualApprovalRefuseTaskService implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(AnnualApprovalRefuseTaskService.class);
     // 二级单位初审
     @Override
     public void notify(DelegateTask delegateTask) {
+        String backUsers = delegateTask.getVariable("backUsers").toString();
         if (delegateTask.getVariable("backUsers") != null) {
-            String backUsers = delegateTask.getVariable("backUsers").toString();
+            String businessKey = delegateTask.getVariable("businessKey").toString();
             delegateTask.setVariable("users", backUsers);
             delegateTask.setVariableLocal("users", backUsers);
             delegateTask.addCandidateUsers(Arrays.asList(backUsers.split(",")));
-            System.out.println("年审工作流 节点 驳回: " + delegateTask.getVariable("backUsers").toString());
+            logger.info("年审工作流流业务ID:" + businessKey + " 节点 驳回: " + delegateTask.getVariable("backUsers").toString());
         }
     }
 }

+ 4 - 1
src/main/java/com/common/workflow/service/activiti/supplierAnnualListener/AnnualCheckNeedPayService.java

@@ -4,6 +4,8 @@ import com.common.workflow.service.util.HttpRequest;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.ExecutionListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 /**
@@ -11,6 +13,7 @@ import org.springframework.stereotype.Component;
  */
 @Component("annualCheckNeedPayService")
 public class AnnualCheckNeedPayService implements ExecutionListener {
+    private static final Logger logger = LoggerFactory.getLogger(AnnualCheckNeedPayService.class);
     // 检查是否需要交费
     @Override
     public void notify(DelegateExecution delegateExecution) {
@@ -33,7 +36,7 @@ public class AnnualCheckNeedPayService implements ExecutionListener {
             }
             delegateExecution.setVariable("result", isPay);
             delegateExecution.setVariableLocal("result", isPay);
-            System.out.println("年审工作流 是否交费: " + isPay);
+            logger.info("年审工作流流业务ID:" + businessKey + " 是否交费: " + isPay);
         }
     }
 }

+ 4 - 1
src/main/java/com/common/workflow/service/activiti/supplierAnnualListener/AnnualLawOfficeAuditService.java

@@ -9,12 +9,15 @@ import feign.jackson.JacksonEncoder;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
 @Component("annualLawOfficeAuditService")
 public class AnnualLawOfficeAuditService implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(AnnualLawOfficeAuditService.class);
     // 企业法规处审核, 非入库
     @Override
     public void notify(DelegateTask delegateTask) {
@@ -38,7 +41,7 @@ public class AnnualLawOfficeAuditService implements TaskListener {
         if (approveInfo.getUsers().length() <= 0) {
             throw new ActivitiException("未找到审核用户,请联系管理员!");
         }
-        System.out.println("年审工作流 获取企业法规处审核审核人: " + approveInfo.getUsers());
+        logger.info("年审工作流流业务ID:" + businessKey + " 获取企业法规处审核审核人: " + approveInfo.getUsers());
         delegateTask.setVariable("users", approveInfo.getUsers());
         delegateTask.setVariableLocal("users", approveInfo.getUsers());
         delegateTask.addCandidateUsers(Arrays.asList(approveInfo.getUsers().split(",")));

+ 4 - 1
src/main/java/com/common/workflow/service/activiti/supplierAnnualListener/AnnualPreFenTrailService.java

@@ -9,12 +9,15 @@ import feign.jackson.JacksonEncoder;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
 @Component("annualPreFenTrailService")
 public class AnnualPreFenTrailService implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(AnnualPreFenTrailService.class);
     // 二级单位分办
     @Override
     public void notify(DelegateTask delegateTask) {
@@ -36,7 +39,7 @@ public class AnnualPreFenTrailService implements TaskListener {
         if (approveInfo.getUsers().length() <= 0) {
             throw new ActivitiException("未找到审核用户,请联系管理员!");
         }
-        System.out.println("年审工作流 获取分办人: " + approveInfo.getUsers());
+        logger.info("年审工作流流业务ID:" + businessKey + " 获取分办人: " + approveInfo.getUsers());
         delegateTask.setVariable("users", approveInfo.getUsers());
         delegateTask.setVariableLocal("users", approveInfo.getUsers());
         delegateTask.addCandidateUsers(Arrays.asList(approveInfo.getUsers().split(",")));

+ 4 - 1
src/main/java/com/common/workflow/service/activiti/supplierAnnualListener/AnnualPreFirstTrailService.java

@@ -4,12 +4,15 @@ import com.common.workflow.service.util.HttpRequest;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
 @Component("annualPreFirstTrailService")
 public class AnnualPreFirstTrailService implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(AnnualPreFirstTrailService.class);
     // 二级单位初审
     @Override
     public void notify(DelegateTask delegateTask) {
@@ -28,7 +31,7 @@ public class AnnualPreFirstTrailService implements TaskListener {
         if (approveIds.length() <= 0) {
             throw new ActivitiException("未找到审核用户,请联系管理员!");
         }
-        System.out.println("年审工作流 获取初审人: " + approveIds);
+        logger.info("年审工作流流业务ID:" + businessKey + " 获取初审人: " + approveIds);
         delegateTask.setVariable("users", approveIds);
         delegateTask.setVariableLocal("users", approveIds);
         delegateTask.addCandidateUsers(Arrays.asList(approveIds.split(",")));

+ 4 - 1
src/main/java/com/common/workflow/service/activiti/supplierAnnualListener/AnnualPrePayerService.java

@@ -4,12 +4,15 @@ import com.common.workflow.service.util.HttpRequest;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
 @Component("annualPrePayerService")
 public class AnnualPrePayerService implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(AnnualPrePayerService.class);
     // 获取交费人
     @Override
     public void notify(DelegateTask delegateTask) {
@@ -28,7 +31,7 @@ public class AnnualPrePayerService implements TaskListener {
         if (approveIds.length() <= 0) {
             throw new ActivitiException("未找到审核用户,请联系管理员!");
         }
-        System.out.println("年审工作流 获取交费人: " + approveIds);
+        logger.info("年审工作流流业务ID:" + businessKey + " 获取交费人: " + approveIds);
         delegateTask.setVariable("users", approveIds);
         delegateTask.setVariableLocal("users", approveIds);
         delegateTask.addCandidateUsers(Arrays.asList(approveIds.split(",")));

+ 4 - 1
src/main/java/com/common/workflow/service/activiti/supplierAnnualListener/AnnualPreSecondTrailService.java

@@ -4,12 +4,15 @@ import com.common.workflow.service.util.HttpRequest;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
 @Component("annualPreSecondTrailService")
 public class AnnualPreSecondTrailService implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(AnnualPreSecondTrailService.class);
     // 二级单位复审
     @Override
     public void notify(DelegateTask delegateTask) {
@@ -31,6 +34,6 @@ public class AnnualPreSecondTrailService implements TaskListener {
         delegateTask.setVariable("users", approveIds);
         delegateTask.setVariableLocal("users", approveIds);
         delegateTask.addCandidateUsers(Arrays.asList(approveIds.split(",")));
-        System.out.println("年审工作流 获取二级单位复审审核人: " + approveIds);
+        logger.info("年审工作流流业务ID:" + businessKey + " 获取二级单位复审审核人: " + approveIds);
     }
 }

+ 4 - 1
src/main/java/com/common/workflow/service/activiti/supplierAnnualListener/AnnualPreStorageAuditService.java

@@ -9,12 +9,15 @@ import feign.jackson.JacksonEncoder;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
 @Component("annualPreStorageAuditService")
 public class AnnualPreStorageAuditService implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(AnnualPreStorageAuditService.class);
     // 企业法规处入库审核
     @Override
     public void notify(DelegateTask delegateTask) {
@@ -38,7 +41,7 @@ public class AnnualPreStorageAuditService implements TaskListener {
         if (approveInfo.getUsers().length() <= 0) {
             throw new ActivitiException("未找到审核用户,请联系管理员!");
         }
-        System.out.println("年审工作流 获取入库审核人: " + approveInfo.getUsers());
+        logger.info("年审工作流流业务ID:" + businessKey + " 获取入库审核人: " + approveInfo.getUsers());
         delegateTask.setVariable("users", approveInfo.getUsers());
         delegateTask.setVariableLocal("users", approveInfo.getUsers());
         delegateTask.addCandidateUsers(Arrays.asList(approveInfo.getUsers().split(",")));

+ 5 - 1
src/main/java/com/common/workflow/service/activiti/supplierAnnualListener/AnnualWorkflowEndService.java

@@ -1,15 +1,19 @@
 package com.common.workflow.service.activiti.supplierAnnualListener;
 
+import com.common.workflow.service.activiti.supplierInfoChangeListener.ChangeApprovalRefuseService;
 import com.common.workflow.service.util.HttpRequest;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.ExecutionListener;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 @Component("annualWorkflowEndService")
 public class AnnualWorkflowEndService implements ExecutionListener {
+    private static final Logger logger = LoggerFactory.getLogger(AnnualWorkflowEndService.class);
     // 企业法规处审批入库完成
     @Override
     public void notify(DelegateExecution delegateExecution) {
@@ -28,6 +32,6 @@ public class AnnualWorkflowEndService implements ExecutionListener {
         if (res.equals("0")) {
             throw new ActivitiException("审核入库失败!请联系管理员!");
         }
-        System.out.println("年审工作流 结束");
+        logger.info("年审工作流流业务ID:" + businessKey + " 结束");
     }
 }

+ 5 - 1
src/main/java/com/common/workflow/service/activiti/supplierAppendListener/AppendApprovalRefuseService.java

@@ -1,14 +1,18 @@
 package com.common.workflow.service.activiti.supplierAppendListener;
 
+import com.common.workflow.service.activiti.supplierInfoChangeListener.ChangeApprovalRefuseService;
 import com.common.workflow.service.util.HttpRequest;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.ExecutionListener;
 import org.activiti.engine.delegate.Expression;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 @Component("appendApprovalRefuseService")
 public class AppendApprovalRefuseService implements ExecutionListener {
+    private static final Logger logger = LoggerFactory.getLogger(AppendApprovalRefuseService.class);
 
     private Expression stepCode;
     // 审批驳回
@@ -47,7 +51,7 @@ public class AppendApprovalRefuseService implements ExecutionListener {
         } else if (nowStepCode.equals("-10")) {
             delegateExecution.setVariableLocal("refuseName", "二级单位分办未通过");
         }
-        System.out.println("增项工作流 线 驳回: " + nowStepCode);
+        logger.info("增项工作流业务ID:" + businessKey + " 线 驳回: " + nowStepCode);
         delegateExecution.setVariable("backUsers", createUserId);
         delegateExecution.setVariableLocal("backUsers", createUserId);
     }

+ 6 - 1
src/main/java/com/common/workflow/service/activiti/supplierAppendListener/AppendApprovalRefuseTaskService.java

@@ -1,22 +1,27 @@
 package com.common.workflow.service.activiti.supplierAppendListener;
 
+import com.common.workflow.service.activiti.supplierInfoChangeListener.ChangeApprovalRefuseService;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
 @Component("appendApprovalRefuseTaskService")
 public class AppendApprovalRefuseTaskService implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(AppendApprovalRefuseTaskService.class);
     // 二级单位初审
     @Override
     public void notify(DelegateTask delegateTask) {
+        String businessKey = delegateTask.getVariable("businessKey").toString();
         if (delegateTask.getVariable("backUsers") != null) {
             String backUsers = delegateTask.getVariable("backUsers").toString();
             delegateTask.setVariable("users", backUsers);
             delegateTask.setVariableLocal("users", backUsers);
             delegateTask.addCandidateUsers(Arrays.asList(backUsers.split(",")));
-            System.out.println("增项工作流 节点 驳回: " + delegateTask.getVariable("backUsers").toString());
+            logger.info("增项工作流业务ID:" + businessKey + " 节点 驳回: " + delegateTask.getVariable("backUsers").toString());
         }
     }
 }

+ 5 - 1
src/main/java/com/common/workflow/service/activiti/supplierAppendListener/AppendCheckNeedPayService.java

@@ -1,9 +1,12 @@
 package com.common.workflow.service.activiti.supplierAppendListener;
 
+import com.common.workflow.service.activiti.supplierInfoChangeListener.ChangeApprovalRefuseService;
 import com.common.workflow.service.util.HttpRequest;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.ExecutionListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 /**
@@ -11,6 +14,7 @@ import org.springframework.stereotype.Component;
  */
 @Component("appendCheckNeedPayService")
 public class AppendCheckNeedPayService implements ExecutionListener {
+    private static final Logger logger = LoggerFactory.getLogger(AppendCheckNeedPayService.class);
 
     @Override
     public void notify(DelegateExecution delegateExecution) {
@@ -33,7 +37,7 @@ public class AppendCheckNeedPayService implements ExecutionListener {
             }
             delegateExecution.setVariable("result", isPay);
             delegateExecution.setVariableLocal("result", isPay);
-            System.out.println("增项工作流 是否交费: " + isPay);
+            logger.info("增项工作流业务ID:" + businessKey + " 是否交费: " + isPay);
         }
     }
 }

+ 5 - 1
src/main/java/com/common/workflow/service/activiti/supplierAppendListener/AppendPreFenTrailService.java

@@ -1,5 +1,6 @@
 package com.common.workflow.service.activiti.supplierAppendListener;
 
+import com.common.workflow.service.activiti.supplierInfoChangeListener.ChangeApprovalRefuseService;
 import com.common.workflow.service.client.FeignClient;
 import com.common.workflow.service.dto.ApproveInfoDTO;
 import com.common.workflow.service.dto.ApproveParamsDTO;
@@ -9,12 +10,15 @@ import feign.jackson.JacksonEncoder;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
 @Component("appendPreFenTrailService")
 public class AppendPreFenTrailService implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(AppendPreFenTrailService.class);
     // 二级单位分办
     @Override
     public void notify(DelegateTask delegateTask) {
@@ -36,7 +40,7 @@ public class AppendPreFenTrailService implements TaskListener {
         if (approveInfo.getUsers().length() <= 0) {
             throw new ActivitiException("未找到审核用户,请联系管理员!");
         }
-        System.out.println("增项工作流 获取分办人: " + approveInfo.getUsers());
+        logger.info("增项工作流业务ID:" + businessKey + " 获取分办人: " + approveInfo.getUsers());
         delegateTask.setVariable("users", approveInfo.getUsers());
         delegateTask.setVariableLocal("users", approveInfo.getUsers());
         delegateTask.addCandidateUsers(Arrays.asList(approveInfo.getUsers().split(",")));

+ 5 - 1
src/main/java/com/common/workflow/service/activiti/supplierAppendListener/AppendPreFirstTrailService.java

@@ -1,15 +1,19 @@
 package com.common.workflow.service.activiti.supplierAppendListener;
 
+import com.common.workflow.service.activiti.supplierInfoChangeListener.ChangeApprovalRefuseService;
 import com.common.workflow.service.util.HttpRequest;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
 @Component("appendPreFirstTrailService")
 public class AppendPreFirstTrailService implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(AppendPreFirstTrailService.class);
     // 二级单位初审
     @Override
     public void notify(DelegateTask delegateTask) {
@@ -28,7 +32,7 @@ public class AppendPreFirstTrailService implements TaskListener {
         if (approveIds.length() <= 0) {
             throw new ActivitiException("未找到审核用户,请联系管理员!");
         }
-        System.out.println("增项工作流 获取初审人: " + approveIds);
+        logger.info("增项工作流业务ID:" + businessKey + " 获取初审人: " + approveIds);
         delegateTask.setVariable("users", approveIds);
         delegateTask.setVariableLocal("users", approveIds);
         delegateTask.addCandidateUsers(Arrays.asList(approveIds.split(",")));

+ 5 - 1
src/main/java/com/common/workflow/service/activiti/supplierAppendListener/AppendPrePayerService.java

@@ -1,15 +1,19 @@
 package com.common.workflow.service.activiti.supplierAppendListener;
 
+import com.common.workflow.service.activiti.supplierInfoChangeListener.ChangeApprovalRefuseService;
 import com.common.workflow.service.util.HttpRequest;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
 @Component("appendPrePayerService")
 public class AppendPrePayerService implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(AppendPrePayerService.class);
     // 获取交费人
     @Override
     public void notify(DelegateTask delegateTask) {
@@ -28,7 +32,7 @@ public class AppendPrePayerService implements TaskListener {
         if (approveIds.length() <= 0) {
             throw new ActivitiException("未找到审核用户,请联系管理员!");
         }
-        System.out.println("增项工作流 获取交费人: " + approveIds);
+        logger.info("增项工作流业务ID:" + businessKey + " 获取交费人: " + approveIds);
         delegateTask.setVariable("users", approveIds);
         delegateTask.setVariableLocal("users", approveIds);
         delegateTask.addCandidateUsers(Arrays.asList(approveIds.split(",")));

+ 5 - 1
src/main/java/com/common/workflow/service/activiti/supplierAppendListener/AppendPreProfAuditService.java

@@ -1,13 +1,17 @@
 package com.common.workflow.service.activiti.supplierAppendListener;
 
+import com.common.workflow.service.activiti.supplierInfoChangeListener.ChangeApprovalRefuseService;
 import com.common.workflow.service.util.HttpRequest;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 @Component("appendPreProfAuditService")
 public class AppendPreProfAuditService implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(AppendPreProfAuditService.class);
     // 业务处室专业审批 仅用于回调更新状态
     @Override
     public void notify(DelegateTask delegateTask) {
@@ -26,6 +30,6 @@ public class AppendPreProfAuditService implements TaskListener {
         if (!res.equals("1")) {
             throw new ActivitiException("工作流异常,请联系管理员!");
         }
-        System.out.println("增项工作流 专业审核");
+        logger.info("增项工作流业务ID:" + businessKey + " 专业审核");
     }
 }

+ 5 - 1
src/main/java/com/common/workflow/service/activiti/supplierAppendListener/AppendPreSecondTrailService.java

@@ -1,15 +1,19 @@
 package com.common.workflow.service.activiti.supplierAppendListener;
 
+import com.common.workflow.service.activiti.supplierInfoChangeListener.ChangeApprovalRefuseService;
 import com.common.workflow.service.util.HttpRequest;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
 @Component("appendPreSecondTrailService")
 public class AppendPreSecondTrailService implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(AppendPreSecondTrailService.class);
     // 二级单位复审
     @Override
     public void notify(DelegateTask delegateTask) {
@@ -31,6 +35,6 @@ public class AppendPreSecondTrailService implements TaskListener {
         delegateTask.setVariable("users", approveIds);
         delegateTask.setVariableLocal("users", approveIds);
         delegateTask.addCandidateUsers(Arrays.asList(approveIds.split(",")));
-        System.out.println("增项工作流 获取二级单位复审审核人: " + approveIds);
+        logger.info("增项工作流业务ID:" + businessKey + " 获取二级单位复审审核人: " + approveIds);
     }
 }

+ 5 - 1
src/main/java/com/common/workflow/service/activiti/supplierAppendListener/AppendPreStorageAuditService.java

@@ -1,5 +1,6 @@
 package com.common.workflow.service.activiti.supplierAppendListener;
 
+import com.common.workflow.service.activiti.supplierInfoChangeListener.ChangeApprovalRefuseService;
 import com.common.workflow.service.client.FeignClient;
 import com.common.workflow.service.dto.ApproveInfoDTO;
 import com.common.workflow.service.dto.ApproveParamsDTO;
@@ -9,12 +10,15 @@ import feign.jackson.JacksonEncoder;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
 @Component("appendPreStorageAuditService")
 public class AppendPreStorageAuditService implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(AppendPreStorageAuditService.class);
     // 企业法规处入库审核
     @Override
     public void notify(DelegateTask delegateTask) {
@@ -38,7 +42,7 @@ public class AppendPreStorageAuditService implements TaskListener {
         if (approveInfo.getUsers().length() <= 0) {
             throw new ActivitiException("未找到审核用户,请联系管理员!");
         }
-        System.out.println("增项工作流 获取入库审核人: " + approveInfo.getUsers());
+        logger.info("增项工作流业务ID:" + businessKey + " 获取入库审核人: " + approveInfo.getUsers());
         delegateTask.setVariable("users", approveInfo.getUsers());
         delegateTask.setVariableLocal("users", approveInfo.getUsers());
         delegateTask.addCandidateUsers(Arrays.asList(approveInfo.getUsers().split(",")));

+ 5 - 1
src/main/java/com/common/workflow/service/activiti/supplierAppendListener/AppendPreThirdTrialService.java

@@ -1,5 +1,6 @@
 package com.common.workflow.service.activiti.supplierAppendListener;
 
+import com.common.workflow.service.activiti.supplierInfoChangeListener.ChangeApprovalRefuseService;
 import com.common.workflow.service.client.FeignClient;
 import com.common.workflow.service.dto.ApproveInfoDTO;
 import com.common.workflow.service.dto.ApproveParamsDTO;
@@ -9,12 +10,15 @@ import feign.jackson.JacksonEncoder;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
 @Component("appendPreThirdTrialService")
 public class AppendPreThirdTrialService implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(AppendPreThirdTrialService.class);
     // 业务处室接收分办
     @Override
     public void notify(DelegateTask delegateTask) {
@@ -36,7 +40,7 @@ public class AppendPreThirdTrialService implements TaskListener {
         if (approveInfo.getUsers().length() <= 0) {
             throw new ActivitiException("未找到审核用户,请联系管理员!");
         }
-        System.out.println("增项工作流 获取业务处室接收分办审批人: " + approveInfo.getUsers());
+        logger.info("增项工作流业务ID:" + businessKey + " 获取业务处室接收分办审批人: " + approveInfo.getUsers());
         delegateTask.setVariable("users", approveInfo.getUsers());
         delegateTask.setVariableLocal("users", approveInfo.getUsers());
         delegateTask.addCandidateUsers(Arrays.asList(approveInfo.getUsers().split(",")));

+ 5 - 1
src/main/java/com/common/workflow/service/activiti/supplierAppendListener/AppendWorkflowEndService.java

@@ -1,15 +1,19 @@
 package com.common.workflow.service.activiti.supplierAppendListener;
 
+import com.common.workflow.service.activiti.supplierInfoChangeListener.ChangeApprovalRefuseService;
 import com.common.workflow.service.util.HttpRequest;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.ExecutionListener;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 @Component("appendWorkflowEndService")
 public class AppendWorkflowEndService implements ExecutionListener {
+    private static final Logger logger = LoggerFactory.getLogger(AppendWorkflowEndService.class);
     // 企业法规处审批入库完成
     @Override
     public void notify(DelegateExecution delegateExecution) {
@@ -28,6 +32,6 @@ public class AppendWorkflowEndService implements ExecutionListener {
         if (res.equals("0")) {
             throw new ActivitiException("审核入库失败!请联系管理员!");
         }
-        System.out.println("增项工作流 结束");
+        logger.info("增项工作流业务ID:" + businessKey + " 结束");
     }
 }

+ 5 - 1
src/main/java/com/common/workflow/service/activiti/supplierInfoChangeListener/ChangeApprovalRefuseService.java

@@ -1,14 +1,18 @@
 package com.common.workflow.service.activiti.supplierInfoChangeListener;
 
+import com.common.workflow.service.activiti.supplierListener.LawOfficeAuditService;
 import com.common.workflow.service.util.HttpRequest;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.ExecutionListener;
 import org.activiti.engine.delegate.Expression;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 @Component("changeApprovalRefuseService")
 public class ChangeApprovalRefuseService implements ExecutionListener {
+    private static final Logger logger = LoggerFactory.getLogger(ChangeApprovalRefuseService.class);
 
     private Expression stepCode;
     // 审批驳回
@@ -47,7 +51,7 @@ public class ChangeApprovalRefuseService implements ExecutionListener {
         } else if (nowStepCode.equals("-10")) {
             delegateExecution.setVariableLocal("refuseName", "二级单位分办未通过");
         }
-        System.out.println("信息变更工作流 线 驳回: " + nowStepCode);
+        logger.info("信息变更工作流业务ID:" + businessKey + " 线 驳回: " + nowStepCode);
         delegateExecution.setVariable("backUsers", createUserId);
         delegateExecution.setVariableLocal("backUsers", createUserId);
     }

+ 7 - 1
src/main/java/com/common/workflow/service/activiti/supplierInfoChangeListener/ChangeApprovalRefuseTaskService.java

@@ -1,22 +1,28 @@
 package com.common.workflow.service.activiti.supplierInfoChangeListener;
 
+import com.common.workflow.service.activiti.supplierListener.LawOfficeAuditService;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
 @Component("changeApprovalRefuseTaskService")
 public class ChangeApprovalRefuseTaskService implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(ChangeApprovalRefuseTaskService.class);
     // 二级单位初审
     @Override
     public void notify(DelegateTask delegateTask) {
+        String businessKey = delegateTask.getVariable("businessKey").toString();
+
         if (delegateTask.getVariable("backUsers") != null) {
             String backUsers = delegateTask.getVariable("backUsers").toString();
             delegateTask.setVariable("users", backUsers);
             delegateTask.setVariableLocal("users", backUsers);
             delegateTask.addCandidateUsers(Arrays.asList(backUsers.split(",")));
-            System.out.println("信息变更工作流 节点 驳回: " + delegateTask.getVariable("backUsers").toString());
+            logger.info("信息变更工作流业务ID:" + businessKey + " 节点 驳回: " + delegateTask.getVariable("backUsers").toString());
         }
     }
 }

+ 5 - 1
src/main/java/com/common/workflow/service/activiti/supplierInfoChangeListener/ChangeCheckNeedPayService.java

@@ -1,9 +1,12 @@
 package com.common.workflow.service.activiti.supplierInfoChangeListener;
 
+import com.common.workflow.service.activiti.supplierListener.LawOfficeAuditService;
 import com.common.workflow.service.util.HttpRequest;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.ExecutionListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 /**
@@ -11,6 +14,7 @@ import org.springframework.stereotype.Component;
  */
 @Component("changeCheckNeedPayService")
 public class ChangeCheckNeedPayService implements ExecutionListener {
+    private static final Logger logger = LoggerFactory.getLogger(ChangeCheckNeedPayService.class);
     // 检查是否需要交费
     @Override
     public void notify(DelegateExecution delegateExecution) {
@@ -31,7 +35,7 @@ public class ChangeCheckNeedPayService implements ExecutionListener {
             }
             delegateExecution.setVariable("result", isPay);
             delegateExecution.setVariableLocal("result", isPay);
-            System.out.println("信息变更工作流 是否交费: " + isPay);
+            logger.info("信息变更工作流业务ID:" + businessKey + " 是否交费: " + isPay);
         }
     }
 }

+ 5 - 1
src/main/java/com/common/workflow/service/activiti/supplierInfoChangeListener/ChangeLawOfficeAuditService.java

@@ -1,5 +1,6 @@
 package com.common.workflow.service.activiti.supplierInfoChangeListener;
 
+import com.common.workflow.service.activiti.supplierListener.LawOfficeAuditService;
 import com.common.workflow.service.client.FeignClient;
 import com.common.workflow.service.dto.ApproveInfoDTO;
 import com.common.workflow.service.dto.ApproveParamsDTO;
@@ -9,12 +10,15 @@ import feign.jackson.JacksonEncoder;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
 @Component("changeLawOfficeAuditService")
 public class ChangeLawOfficeAuditService implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(ChangeLawOfficeAuditService.class);
     // 企业法规处审核, 非入库
     @Override
     public void notify(DelegateTask delegateTask) {
@@ -36,7 +40,7 @@ public class ChangeLawOfficeAuditService implements TaskListener {
         if (approveInfo.getUsers().length() <= 0) {
             throw new ActivitiException("未找到审核用户,请联系管理员!");
         }
-        System.out.println("信息变更工作流 获取企业法规处审核审核人: " + approveInfo.getUsers());
+        logger.info("信息变更工作流业务ID:" + businessKey + " 获取企业法规处审核审核人: " + approveInfo.getUsers());
         delegateTask.setVariable("users", approveInfo.getUsers());
         delegateTask.setVariableLocal("users", approveInfo.getUsers());
         delegateTask.addCandidateUsers(Arrays.asList(approveInfo.getUsers().split(",")));

+ 5 - 1
src/main/java/com/common/workflow/service/activiti/supplierInfoChangeListener/ChangePreFenTrailService.java

@@ -1,5 +1,6 @@
 package com.common.workflow.service.activiti.supplierInfoChangeListener;
 
+import com.common.workflow.service.activiti.supplierListener.LawOfficeAuditService;
 import com.common.workflow.service.client.FeignClient;
 import com.common.workflow.service.dto.ApproveInfoDTO;
 import com.common.workflow.service.dto.ApproveParamsDTO;
@@ -9,12 +10,15 @@ import feign.jackson.JacksonEncoder;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
 @Component("changePreFenTrailService")
 public class ChangePreFenTrailService implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(ChangePreFenTrailService.class);
     // 二级单位分办
     @Override
     public void notify(DelegateTask delegateTask) {
@@ -36,7 +40,7 @@ public class ChangePreFenTrailService implements TaskListener {
         if (approveInfo.getUsers().length() <= 0) {
             throw new ActivitiException("未找到审核用户,请联系管理员!");
         }
-        System.out.println("信息变更工作流 获取分办人: " + approveInfo.getUsers());
+        logger.info("信息变更工作流业务ID:" + businessKey + " 获取分办人: " + approveInfo.getUsers());
         delegateTask.setVariable("users", approveInfo.getUsers());
         delegateTask.setVariableLocal("users", approveInfo.getUsers());
         delegateTask.addCandidateUsers(Arrays.asList(approveInfo.getUsers().split(",")));

+ 5 - 1
src/main/java/com/common/workflow/service/activiti/supplierInfoChangeListener/ChangePreFirstTrailService.java

@@ -1,15 +1,19 @@
 package com.common.workflow.service.activiti.supplierInfoChangeListener;
 
+import com.common.workflow.service.activiti.supplierListener.LawOfficeAuditService;
 import com.common.workflow.service.util.HttpRequest;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
 @Component("changePreFirstTrailService")
 public class ChangePreFirstTrailService implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(ChangePreFirstTrailService.class);
     // 二级单位初审
     @Override
     public void notify(DelegateTask delegateTask) {
@@ -28,7 +32,7 @@ public class ChangePreFirstTrailService implements TaskListener {
         if (approveIds.length() <= 0) {
             throw new ActivitiException("未找到审核用户,请联系管理员!");
         }
-        System.out.println("信息变更工作流 获取初审人: " + approveIds);
+        logger.info("信息变更工作流业务ID:" + businessKey + " 获取初审人: " + approveIds);
         delegateTask.setVariable("users", approveIds);
         delegateTask.setVariableLocal("users", approveIds);
         delegateTask.addCandidateUsers(Arrays.asList(approveIds.split(",")));

+ 5 - 1
src/main/java/com/common/workflow/service/activiti/supplierInfoChangeListener/ChangePrePayerService.java

@@ -1,15 +1,19 @@
 package com.common.workflow.service.activiti.supplierInfoChangeListener;
 
+import com.common.workflow.service.activiti.supplierListener.LawOfficeAuditService;
 import com.common.workflow.service.util.HttpRequest;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
 @Component("changePrePayerService")
 public class ChangePrePayerService implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(ChangePrePayerService.class);
     // 获取交费人
     @Override
     public void notify(DelegateTask delegateTask) {
@@ -28,7 +32,7 @@ public class ChangePrePayerService implements TaskListener {
         if (approveIds.length() <= 0) {
             throw new ActivitiException("未找到审核用户,请联系管理员!");
         }
-        System.out.println("信息变更工作流 获取交费人: " + approveIds);
+        logger.info("信息变更工作流业务ID:" + businessKey + " 获取交费人: " + approveIds);
         delegateTask.setVariable("users", approveIds);
         delegateTask.setVariableLocal("users", approveIds);
         delegateTask.addCandidateUsers(Arrays.asList(approveIds.split(",")));

+ 5 - 1
src/main/java/com/common/workflow/service/activiti/supplierInfoChangeListener/ChangePreSecondTrailService.java

@@ -1,15 +1,19 @@
 package com.common.workflow.service.activiti.supplierInfoChangeListener;
 
+import com.common.workflow.service.activiti.supplierListener.LawOfficeAuditService;
 import com.common.workflow.service.util.HttpRequest;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
 @Component("changePreSecondTrailService")
 public class ChangePreSecondTrailService implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(ChangePreSecondTrailService.class);
     // 二级单位复审
     @Override
     public void notify(DelegateTask delegateTask) {
@@ -28,7 +32,7 @@ public class ChangePreSecondTrailService implements TaskListener {
         if (approveIds.length() <= 0) {
             throw new ActivitiException("未找到审核用户,请联系管理员!");
         }
-        System.out.println("信息变更工作流 获取二级单位复审审核人: " + approveIds);
+        logger.info("信息变更工作流业务ID:" + businessKey + " 获取二级单位复审审核人: " + approveIds);
         delegateTask.setVariable("users", approveIds);
         delegateTask.setVariableLocal("users", approveIds);
         delegateTask.addCandidateUsers(Arrays.asList(approveIds.split(",")));

+ 5 - 1
src/main/java/com/common/workflow/service/activiti/supplierInfoChangeListener/ChangePreStorageAuditService.java

@@ -1,5 +1,6 @@
 package com.common.workflow.service.activiti.supplierInfoChangeListener;
 
+import com.common.workflow.service.activiti.supplierListener.LawOfficeAuditService;
 import com.common.workflow.service.client.FeignClient;
 import com.common.workflow.service.dto.ApproveInfoDTO;
 import com.common.workflow.service.dto.ApproveParamsDTO;
@@ -9,12 +10,15 @@ import feign.jackson.JacksonEncoder;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
 @Component("changePreStorageAuditService")
 public class ChangePreStorageAuditService implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(ChangePreStorageAuditService.class);
     // 企业法规处入库审核
     @Override
     public void notify(DelegateTask delegateTask) {
@@ -38,7 +42,7 @@ public class ChangePreStorageAuditService implements TaskListener {
         if (approveInfo.getUsers().length() <= 0) {
             throw new ActivitiException("未找到审核用户,请联系管理员!");
         }
-        System.out.println("信息变更工作流 获取入库审核人: " + approveInfo.getUsers());
+        logger.info("信息变更工作流业务ID:" + businessKey + " 获取入库审核人: " + approveInfo.getUsers());
         delegateTask.setVariable("users", approveInfo.getUsers());
         delegateTask.setVariableLocal("users", approveInfo.getUsers());
         delegateTask.addCandidateUsers(Arrays.asList(approveInfo.getUsers().split(",")));

+ 5 - 1
src/main/java/com/common/workflow/service/activiti/supplierInfoChangeListener/ChangeWorkflowEndService.java

@@ -1,15 +1,19 @@
 package com.common.workflow.service.activiti.supplierInfoChangeListener;
 
+import com.common.workflow.service.activiti.supplierListener.LawOfficeAuditService;
 import com.common.workflow.service.util.HttpRequest;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.ExecutionListener;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 @Component("changeWorkflowEndService")
 public class ChangeWorkflowEndService implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(ChangeWorkflowEndService.class);
     // 企业法规处审批入库完成
     @Override
     public void notify(DelegateTask delegateTask) {
@@ -28,6 +32,6 @@ public class ChangeWorkflowEndService implements TaskListener {
         if (res.equals("0")) {
             throw new ActivitiException("审核入库失败!请联系管理员!");
         }
-        System.out.println("信息变更工作流 结束 ");
+        logger.info("信息变更工作流业务ID:" + businessKey + " 结束 ");
     }
 }

+ 4 - 2
src/main/java/com/common/workflow/service/activiti/supplierListener/ApprovalRefuseService.java

@@ -3,13 +3,15 @@ package com.common.workflow.service.activiti.supplierListener;
 import com.common.workflow.service.util.HttpRequest;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
 @Component("approvalRefuseService")
 public class ApprovalRefuseService implements ExecutionListener {
-
+    private static final Logger logger = LoggerFactory.getLogger(ApprovalRefuseService.class);
     private Expression stepCode;
     // 审批驳回
     @Override
@@ -54,6 +56,6 @@ public class ApprovalRefuseService implements ExecutionListener {
         delegateExecution.setVariable("remarks", businessKey);
         delegateExecution.setVariableLocal("remarks", businessKey);*/
 
-        System.out.println("准入工作流 线 审批驳回: " + nowStepCode);
+        logger.info("准入工作流业务ID:" + businessKey + " 线 审批驳回: " + nowStepCode);
     }
 }

+ 5 - 1
src/main/java/com/common/workflow/service/activiti/supplierListener/ApprovalRefuseTaskService.java

@@ -4,22 +4,26 @@ import com.common.workflow.service.util.HttpRequest;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
 @Component("approvalRefuseTaskService")
 public class ApprovalRefuseTaskService  implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(ApprovalRefuseService.class);
     // 审批驳回
     @Override
     public void notify(DelegateTask delegateTask) {
+        String businessKey = delegateTask.getVariable("businessKey").toString();
         if (delegateTask.getVariable("backUsers") != null) {
             String backUsers = delegateTask.getVariable("backUsers").toString();
             delegateTask.setVariable("users", backUsers);
             delegateTask.setVariableLocal("users", backUsers);
             delegateTask.addCandidateUsers(Arrays.asList(backUsers.split(",")));
 
-            System.out.println("准入工作流 节点 审批驳回: " + delegateTask.getVariable("backUsers").toString());
+            logger.info("准入工作流业务ID:" + businessKey + "准入工作流 节点 审批驳回: " + delegateTask.getVariable("backUsers").toString());
         }
     }
 }

+ 4 - 1
src/main/java/com/common/workflow/service/activiti/supplierListener/CheckNeedConcentrateAuditService.java

@@ -9,11 +9,14 @@ import feign.jackson.JacksonEncoder;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.ExecutionListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 
 @Component("checkNeedConcentrateAuditService")
 public class CheckNeedConcentrateAuditService implements ExecutionListener {
+    private static final Logger logger = LoggerFactory.getLogger(CheckNeedConcentrateAuditService.class);
     // 业务处室专业审批————检查是否需要集中审批
     @Override
     public void notify(DelegateExecution delegateExecution) {
@@ -31,7 +34,7 @@ public class CheckNeedConcentrateAuditService implements ExecutionListener {
             if (isConcentrateAudit.equals("0")) {
                 throw new ActivitiException("准入类型评审方式错误!请联系管理员");
             }
-            System.out.println("准入工作流 检查是否集中评审: " + isConcentrateAudit);
+            logger.info("准入工作流业务ID:" + businessKey + " 检查是否集中评审: " + isConcentrateAudit);
             delegateExecution.setVariable("isConcentrateAudit", isConcentrateAudit);
             delegateExecution.setVariableLocal("isConcentrateAudit", isConcentrateAudit);
             delegateExecution.setVariable("result", isConcentrateAudit);

+ 4 - 1
src/main/java/com/common/workflow/service/activiti/supplierListener/CheckNeedPayService.java

@@ -10,6 +10,8 @@ import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.ExecutionListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
@@ -19,6 +21,7 @@ import java.util.Arrays;
  */
 @Component("checkNeedPayService")
 public class CheckNeedPayService implements ExecutionListener {
+    private static final Logger logger = LoggerFactory.getLogger(CheckNeedPayService.class);
 
     @Override
     public void notify(DelegateExecution delegateExecution) {
@@ -45,7 +48,7 @@ public class CheckNeedPayService implements ExecutionListener {
             // if (isConcentrateAudit.equals("2") && isPay.equals("1")) {
             //     isPay = "3"; // 不集中评审但交费,需经企管法规处审批后再交费。
             // }
-            System.out.println("准入工作流 检查是否交费: " + isPay);
+            logger.info("准入工作流业务ID:" + businessKey + " 检查是否交费: " + isPay);
             delegateExecution.setVariable("result", isPay);
             delegateExecution.setVariableLocal("result", isPay);
         }

+ 4 - 1
src/main/java/com/common/workflow/service/activiti/supplierListener/LawOfficeAuditService.java

@@ -9,12 +9,15 @@ import feign.jackson.JacksonEncoder;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
 @Component("lawOfficeAuditService")
 public class LawOfficeAuditService implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(LawOfficeAuditService.class);
     // 企业法规处审核, 非入库
     @Override
     public void notify(DelegateTask delegateTask) {
@@ -36,7 +39,7 @@ public class LawOfficeAuditService implements TaskListener {
         if (approveInfo.getUsers().length() <= 0) {
             throw new ActivitiException("未找到审核用户,请联系管理员!");
         }
-        System.out.println("准入申请工作流 获取企业法规处审核审核人: " + approveInfo.getUsers());
+        logger.info("准入工作流业务ID:" + businessKey + " 获取企业法规处审核审核人: " + approveInfo.getUsers());
         delegateTask.setVariable("users", approveInfo.getUsers());
         delegateTask.setVariableLocal("users", approveInfo.getUsers());
         delegateTask.addCandidateUsers(Arrays.asList(approveInfo.getUsers().split(",")));

+ 4 - 1
src/main/java/com/common/workflow/service/activiti/supplierListener/PreConcentrateAuditService.java

@@ -9,12 +9,15 @@ import feign.jackson.JacksonEncoder;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
 @Component("preConcentrateAuditService")
 public class PreConcentrateAuditService implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(PreConcentrateAuditService.class);
     // 集中评审
     @Override
     public void notify(DelegateTask delegateTask) {
@@ -38,7 +41,7 @@ public class PreConcentrateAuditService implements TaskListener {
         if (approveInfo.getUsers().length() <= 0) {
             throw new ActivitiException("未找到审核用户,请联系管理员!");
         }
-        System.out.println("准入工作流 获取集中评审审批人: " + approveInfo.getUsers());
+        logger.info("准入工作流业务ID:" + businessKey + " 获取集中评审审批人: " + approveInfo.getUsers());
         delegateTask.setVariable("users", approveInfo.getUsers());
         delegateTask.setVariableLocal("users", approveInfo.getUsers());
         delegateTask.addCandidateUsers(Arrays.asList(approveInfo.getUsers().split(",")));

+ 5 - 1
src/main/java/com/common/workflow/service/activiti/supplierListener/PreFenTrailService.java

@@ -10,12 +10,15 @@ import feign.jackson.JacksonEncoder;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
 @Component("preFenTrailService")
 public class PreFenTrailService  implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(PreFenTrailService.class);
     // 二级单位分办
     @Override
     public void notify(DelegateTask delegateTask) {
@@ -37,7 +40,8 @@ public class PreFenTrailService  implements TaskListener {
         if (approveInfo.getUsers().length() <= 0) {
             throw new ActivitiException("未找到审核用户,请联系管理员!");
         }
-        System.out.println("准入工作流 获取分办人: " + approveInfo.getUsers());
+        logger.info("准入工作流业务ID:" + businessKey + " 获取分办人: " + approveInfo.getUsers());
+        logger.info("准入工作流业务ID:" + businessKey + " 获取分办人: " + approveInfo.getUsers());
         delegateTask.setVariable("users", approveInfo.getUsers());
         delegateTask.setVariableLocal("users", approveInfo.getUsers());
         delegateTask.addCandidateUsers(Arrays.asList(approveInfo.getUsers().split(",")));

+ 4 - 1
src/main/java/com/common/workflow/service/activiti/supplierListener/PreFirstTrailService.java

@@ -4,12 +4,15 @@ import com.common.workflow.service.util.HttpRequest;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
 @Component("preFirstTrailService")
 public class PreFirstTrailService implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(PreFirstTrailService.class);
     // 二级单位初审
     @Override
     public void notify(DelegateTask delegateTask) {
@@ -28,7 +31,7 @@ public class PreFirstTrailService implements TaskListener {
         if (approveIds.length() <= 0) {
             throw new ActivitiException("未找到审核用户,请联系管理员!");
         }
-        System.out.println("准入工作流 获取初审人: " + approveIds);
+        logger.info("准入工作流业务ID:" + businessKey + " 获取初审人: " + approveIds);
         delegateTask.setVariable("users", approveIds);
         delegateTask.setVariableLocal("users", approveIds);
         delegateTask.addCandidateUsers(Arrays.asList(approveIds.split(",")));

+ 4 - 1
src/main/java/com/common/workflow/service/activiti/supplierListener/PrePayerService.java

@@ -4,12 +4,15 @@ import com.common.workflow.service.util.HttpRequest;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
 @Component("prePayerService")
 public class PrePayerService implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(PrePayerService.class);
     // 获取交费人
     @Override
     public void notify(DelegateTask delegateTask) {
@@ -28,7 +31,7 @@ public class PrePayerService implements TaskListener {
         if (approveIds.length() <= 0) {
             throw new ActivitiException("未找到审核用户,请联系管理员!");
         }
-        System.out.println("准入工作流 获取交费人: " + approveIds);
+        logger.info("准入工作流业务ID:" + businessKey + " 获取交费人: " + approveIds);
         delegateTask.setVariable("users", approveIds);
         delegateTask.setVariableLocal("users", approveIds);
         delegateTask.addCandidateUsers(Arrays.asList(approveIds.split(",")));

+ 4 - 1
src/main/java/com/common/workflow/service/activiti/supplierListener/PreProfAuditService.java

@@ -4,12 +4,15 @@ import com.common.workflow.service.util.HttpRequest;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
 @Component("preProfAuditService")
 public class PreProfAuditService  implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(PreProfAuditService.class);
     // 业务处室专业审批 仅用于回调更新状态
     @Override
     public void notify(DelegateTask delegateTask) {
@@ -28,6 +31,6 @@ public class PreProfAuditService  implements TaskListener {
         if (!res.equals("1")) {
             throw new ActivitiException("工作流异常,请联系管理员!");
         }
-        System.out.println("准入工作流 专业审核");
+        logger.info("准入工作流业务ID:" + businessKey + " 专业审核");
     }
 }

+ 4 - 1
src/main/java/com/common/workflow/service/activiti/supplierListener/PreSecondTrailService.java

@@ -4,12 +4,15 @@ import com.common.workflow.service.util.HttpRequest;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
 @Component("preSecondTrailService")
 public class PreSecondTrailService implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(PreSecondTrailService.class);
     // 二级单位复审
     @Override
     public void notify(DelegateTask delegateTask) {
@@ -28,7 +31,7 @@ public class PreSecondTrailService implements TaskListener {
         if (approveIds.length() <= 0) {
             throw new ActivitiException("未找到审核用户,请联系管理员!");
         }
-        System.out.println("准入工作流 获取复审人: " + approveIds);
+        logger.info("准入工作流业务ID:" + businessKey + " 获取复审人: " + approveIds);
         delegateTask.setVariable("users", approveIds);
         delegateTask.setVariableLocal("users", approveIds);
         delegateTask.addCandidateUsers(Arrays.asList(approveIds.split(",")));

+ 4 - 1
src/main/java/com/common/workflow/service/activiti/supplierListener/PreStorageAuditService.java

@@ -9,12 +9,15 @@ import feign.jackson.JacksonEncoder;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
 @Component("preStorageAuditService")
 public class PreStorageAuditService implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(PreStorageAuditService.class);
     // 企业法规处入库审核
     @Override
     public void notify(DelegateTask delegateTask) {
@@ -38,7 +41,7 @@ public class PreStorageAuditService implements TaskListener {
         if (approveInfo.getUsers().length() <= 0) {
             throw new ActivitiException("未找到审核用户,请联系管理员!");
         }
-        System.out.println("准入工作流 获取入库审批人: " + approveInfo.getUsers());
+        logger.info("准入工作流业务ID:" + businessKey + " 获取入库审批人: " + approveInfo.getUsers());
         delegateTask.setVariable("users", approveInfo.getUsers());
         delegateTask.setVariableLocal("users", approveInfo.getUsers());
         delegateTask.addCandidateUsers(Arrays.asList(approveInfo.getUsers().split(",")));

+ 6 - 4
src/main/java/com/common/workflow/service/activiti/supplierListener/PreThirdTrialService.java

@@ -1,23 +1,24 @@
 package com.common.workflow.service.activiti.supplierListener;
 
-import com.alibaba.fastjson.JSONObject;
 import com.common.workflow.service.client.FeignClient;
 import com.common.workflow.service.dto.ApproveInfoDTO;
 import com.common.workflow.service.dto.ApproveParamsDTO;
-import com.common.workflow.service.util.HttpRequest;
-import com.fasterxml.jackson.databind.util.JSONPObject;
+import com.mysql.jdbc.log.Slf4JLogger;
 import feign.Feign;
 import feign.jackson.JacksonDecoder;
 import feign.jackson.JacksonEncoder;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
 @Component("preThirdTrialService")
 public class PreThirdTrialService  implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(PreThirdTrialService.class);
     // 业务处室接收分办
     @Override
     public void notify(DelegateTask delegateTask) {
@@ -44,7 +45,8 @@ public class PreThirdTrialService  implements TaskListener {
         if (approveInfo.getUsers().length() <= 0) {
             throw new ActivitiException("未找到审核用户,请联系管理员!");
         }
-        System.out.println("准入工作流 获取业务处室接收分办审批人: " + approveInfo.getUsers());
+
+        logger.info("准入工作流业务ID:" + businessKey + " 获取业务处室接收分办审批人: " + approveInfo.getUsers());
         delegateTask.setVariable("users", approveInfo.getUsers());
         delegateTask.setVariableLocal("users", approveInfo.getUsers());
         delegateTask.addCandidateUsers(Arrays.asList(approveInfo.getUsers().split(",")));

+ 5 - 2
src/main/java/com/common/workflow/service/activiti/supplierListener/WorkflowEndService.java

@@ -6,12 +6,15 @@ import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.ExecutionListener;
 import org.activiti.engine.delegate.TaskListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 
 @Component("workflowEndService")
 public class WorkflowEndService implements TaskListener {
+    private static final Logger logger = LoggerFactory.getLogger(WorkflowEndService.class);
     // 企业法规处审批入库完成
     @Override
     public void notify(DelegateTask delegateTask) {
@@ -20,7 +23,7 @@ public class WorkflowEndService implements TaskListener {
         String businessKey = delegateTask.getVariable("businessKey").toString();
         String result = delegateTask.getVariable("result").toString();
 
-        System.out.println("准入申请 工作流结束结果:" + result);
+        logger.info("准入工作流业务ID:" + businessKey + "工作流结束结果:" + result);
         String approveUrl = callbackUrl + "/suppliercert-listener/workflow-end";
 
         String res = "0";
@@ -32,6 +35,6 @@ public class WorkflowEndService implements TaskListener {
         if (res.equals("0")) {
             throw new ActivitiException("审核入库失败!请联系管理员!");
         }
-        System.out.println("准入工作流 结束");
+        logger.info("准入工作流业务ID:" + businessKey + " 结束");
     }
 }

+ 2 - 2
src/main/resources/config/application-dev.yml

@@ -37,12 +37,12 @@ spring:
     datasource:
         type: com.zaxxer.hikari.HikariDataSource
         # url: jdbc:mysql://60.30.245.229:3306/activiti?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC
-        url: jdbc:mysql://47.92.212.59:3306/activiti?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC
+        url: jdbc:mysql://139.9.119.182:3306/activiti_20210107?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC
         # url: jdbc:mysql://39.98.34.197:3306/activiti_dqm?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC
         # username: dqmnt_user
         # password: Y6Ba64w1Hezo
         username: root
-        password: zks123456
+        password: newsys*123
         hikari:
             auto-commit: false
             minimum-idle: 5