Merge remote-tracking branch 'origin/develop' into develop

src/main/java/com/bbd/bpm/BpmBackendApplication.java

 package com.bbd.bpm;
 
+import com.bbd.bpm.util.ContextUtils;
 import org.activiti.spring.boot.SecurityAutoConfiguration;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ConfigurableApplicationContext;
 
 @SpringBootApplication(exclude = SecurityAutoConfiguration.class)
 @MapperScan(basePackages = "com.bbd.bpm.dao")
 public class BpmBackendApplication {
        //这个是启动方法。
 	public static void main(String[] args) {
-		SpringApplication.run(BpmBackendApplication.class, args);
+
+		ConfigurableApplicationContext context = SpringApplication.run(BpmBackendApplication.class, args);
+		ContextUtils.setApplicationContext(context);
+
 	}
 
 }

src/main/java/com/bbd/bpm/listener/NormalServiceTask.java

+package com.bbd.bpm.listener;
+
+import org.activiti.engine.ProcessEngine;
+import org.activiti.engine.ProcessEngines;
+import org.activiti.engine.TaskService;
+import org.activiti.engine.delegate.DelegateExecution;
+import org.activiti.engine.delegate.JavaDelegate;
+import org.activiti.engine.delegate.Expression;
+import org.activiti.engine.task.Task;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class NormalServiceTask implements JavaDelegate {
+
+    private static final Logger Log = LoggerFactory.getLogger(NormalServiceTask.class);
+
+    private Expression paramOne;
+
+    private Expression paramTwo;
+
+    @Override
+    public void execute(DelegateExecution execution)  {
+        Log.info("NormalServiceTask 开始执行");
+        String value1 = (String) paramOne.getValue(execution);
+        System.out.println(value1);
+
+//        ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+//
+//        Task task = processEngine.getTaskService().createTaskQuery().processInstanceId(execution.getProcessInstanceId()).active().singleResult();
+//
+//        TaskService taskService = processEngine.getTaskService();
+//        taskService.complete(task.getId());
+
+        Log.info("NormalServiceTask 执行结束");
+
+
+    }
+
+
+}

src/main/java/com/bbd/bpm/listener/PutAssigneeListener.java

 package com.bbd.bpm.listener;
 
+import com.bbd.bpm.domain.BpmEmployee;
+import com.bbd.bpm.repository.UserRepository;
+import com.bbd.bpm.result.Result;
+import com.bbd.bpm.serviceImpl.UserInfoServiceImpl;
+import com.bbd.bpm.util.ContextUtils;
 import org.activiti.engine.ProcessEngine;
 import org.activiti.engine.ProcessEngines;
 import org.activiti.engine.TaskService;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
 import org.activiti.engine.impl.el.FixedValue;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 import java.io.Serializable;
 
@@ -15,9 +22,27 @@ import java.io.Serializable;
 public class PutAssigneeListener   implements Serializable, TaskListener {
     private FixedValue job;
 
+    private FixedValue userId;
+
+    private FixedValue department;
+
+    private FixedValue company;
+
+
+
     @Override
     public void notify(DelegateTask delegateTask) {
 
+        Object obj_userID = delegateTask.getVariable("userId");
+        String userId = null;
+        if(obj_userID != null ){
+            userId = String.valueOf(obj_userID);
+        }
+
+        UserInfoServiceImpl userService =  ContextUtils.getBean(UserInfoServiceImpl.class);
+
+
+
         ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
         TaskService taskService = processEngine.getTaskService();
         if(job!=null){

src/main/java/com/bbd/bpm/service/NormalServiceTaskServiceImpl.java

+package com.bbd.bpm.service;
+
+
+import org.springframework.stereotype.Service;
+
+@Service("normalServiceTaskServiceImpl")
+public class NormalServiceTaskServiceImpl {
+
+
+
+
+    public void testST(){
+        System.out.println("开始执行 表达式方法");
+    }
+}

src/main/java/com/bbd/bpm/serviceImpl/UserInfoServiceImpl.java

@@ -6,6 +6,7 @@ import com.bbd.bpm.dao.UserInfoMapper;
 import com.bbd.bpm.domain.BpmCompany;
 import com.bbd.bpm.domain.BpmEmployee;
 import com.bbd.bpm.domain.User;
+import com.bbd.bpm.repository.BpmEmployeeRepository;
 import com.bbd.bpm.result.RespCode;
 import com.bbd.bpm.result.Result;
 import com.bbd.bpm.result.ResultUtil;
@@ -31,6 +32,8 @@ public class UserInfoServiceImpl implements UserInfoService{
 
     @Autowired
     private MemberMapper memberMapper;
+
+
     /**
      * 获取组织列表
      * @Author:cwd
@@ -405,4 +408,6 @@ public class UserInfoServiceImpl implements UserInfoService{
         parent.setChild(child);
         return parent;
     }
+
+
 }

src/main/java/com/bbd/bpm/util/ContextUtils.java

+package com.bbd.bpm.util;
+
+import org.springframework.context.ApplicationContext;
+
+public class ContextUtils {
+
+    public static ApplicationContext context;
+
+    private ContextUtils() {
+    }
+
+    public static void setApplicationContext(ApplicationContext applicationContext) {
+        context = applicationContext;
+    }
+
+    public static Object getBean(String beanName) {
+        return context.getBean(beanName);
+    }
+
+    public static <T> T getBean(Class<T> t) {
+        return context.getBean(t);
+    }
+}
\ No newline at end of file

src/main/resources/application.properties

 #端口
 server.port=8081
 #这个是数据库配置
-spring.datasource-url=jdbc:mysql://106.75.97.50:3306/test?characterEncoding=UTF-8
+spring.datasource-url=jdbc:mysql://106.75.97.50:3306/test?characterEncoding=UTF-8&autoReconnect=true
 spring.datasource-username=airuser
 spring.datasource-password=!@JD@2016
 spring.datasource-type=com.alibaba.druid.pool.DruidDataSource