feat: There is no way the

src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java

@@ -404,6 +404,7 @@ public class TodoTaskController extends BaseAction {
             NotifyTodoAppResult notifyTodoAppResult = webServiceOAService.setTodoDone(notifyTodoSendContext);
             if(notifyTodoAppResult != null){
                 if(notifyTodoAppResult.getSIGN().equals("0") && notifyTodoAppResult.getMASSAGE().equals("操作成功")){
+                    logger.info("--------------------------成功发送 ESP 已办 模块ID"+list.get(0).getId()+"----------------------------");
                     logger.info("--------------------------成功发送 ESP 已办任务----------------------------");
                 }else {
                     logger.error("ESP 发送待办任务异常 :" + "SIGN: "+notifyTodoAppResult.getSIGN()+",MASSAGE: "+notifyTodoAppResult.getMASSAGE());

src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/BusProcessNew.java

@@ -88,4 +88,8 @@ public class BusProcessNew implements Serializable {
     @ApiModelProperty(value = "流程名称")
     @TableField("PRC_NAME")
     private String prcName;
+
+    @TableField( exist = false)
+    @ApiModelProperty(value = "OA link")
+    private String link;
 }

src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java

@@ -1,10 +1,13 @@
 package com.ydw.bat.wkflow.business_oa.webService.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
 import com.ydw.bat.wkflow.business_main.datas.entity.ResponseMessage;
 import com.ydw.bat.wkflow.business_main.datas.entity.UserVO;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
 import com.ydw.bat.wkflow.business_oa.common.WebServiceConf;
 import com.ydw.bat.wkflow.business_oa.utils.OkHttpUtil;
 import com.ydw.bat.wkflow.business_oa.webService.service.WebServiceOAService;
@@ -17,6 +20,7 @@ import okhttp3.Credentials;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -43,6 +47,9 @@ public class WebServiceOAServiceImpl  implements WebServiceOAService {
 
     private String api_key = "OA";
     private String api_secret = "TEST_oa201611241710";
+
+    @Value("${webUrl}")
+    private String webUrl;
     //认证信息
     private String[] baseAuth = {api_key,api_secret};
     private String credentials = "";
@@ -53,6 +60,9 @@ public class WebServiceOAServiceImpl  implements WebServiceOAService {
     @Autowired
     private LawsUserInfoService lawsUserInfoService;
 
+    @Autowired
+    private IBusProcessNameService iBusProcessNameService;
+
     public WebServiceOAServiceImpl(){
         credentials =  Credentials.basic(api_key,api_secret);
     }
@@ -68,7 +78,7 @@ public class WebServiceOAServiceImpl  implements WebServiceOAService {
             HEAD head = new HEAD();
             head.setACCOUNT("OA");
             head.setBIZTRANSACTIONID("SYC_161320210206133219");
-            head.setCONSUMER("PCMS");
+            head.setCONSUMER("FOTON");
             head.setCOUNT("1");
             head.setPASSWORD("TEST_oa201611241710");
             head.setSRVLEVEL("1");
@@ -84,9 +94,10 @@ public class WebServiceOAServiceImpl  implements WebServiceOAService {
             log.info("请求发送已办接口完毕，返回响应状态：【"+sdf.format(new Date())+"】");
             notifyTodoAppResult = (NotifyTodoAppResult) net.sf.json.JSONObject.toBean(net.sf.json.JSONObject.fromObject(result), NotifyTodoAppResult.class);
 //            JSONObject jsonObject = JSONObject.parseObject(result);
-            if(!result.contains("请求成功")){
+            if(!result.contains("操作成功")){
                 log.error("请求发送已办接口出现异常："+result);
             }else {
+                log.info("--------------------------成功发送 ESP 已办 模块ID"+notifyTodoSendContext.getModelId()+"----------------------------");
                 log.info("okHttp请求发送已办接口成功结果："+result);
             }
 
@@ -108,7 +119,7 @@ public class WebServiceOAServiceImpl  implements WebServiceOAService {
             HEAD head = new HEAD();
             head.setACCOUNT("OA");
             head.setBIZTRANSACTIONID("SYC_161320210206133219");
-            head.setCONSUMER("PCMS");
+            head.setCONSUMER("FOTON");
             head.setCOUNT("1");
             head.setPASSWORD("TEST_oa201611241710");
             head.setSRVLEVEL("1");
@@ -125,7 +136,11 @@ public class WebServiceOAServiceImpl  implements WebServiceOAService {
             //标题
             notifyTodoSendContext.setSubject(busProcessNew.getPrcName());
             //地址
-            notifyTodoSendContext.setLink("http://");
+            QueryWrapper queryWrapper = new QueryWrapper();
+            queryWrapper.eq("PRC_ID", busProcessNew.getPId());
+            BusProcessName busProcessName = iBusProcessNameService.getOne(queryWrapper);
+            String linkParam = "&taskIds="+busProcessNew.getTaskId()+"&prcId="+busProcessNew.getPId()+"&prcNum="+busProcessName.getPrcNum()+"&prcName="+busProcessNew.getPrcName();
+            notifyTodoSendContext.setLink(webUrl+busProcessNew.getLink()+linkParam);
             //待办类型
             notifyTodoSendContext.setType("1");
 
@@ -145,9 +160,10 @@ public class WebServiceOAServiceImpl  implements WebServiceOAService {
             log.info("请求发送待办接口完毕，返回响应状态：【"+sdf.format(new Date())+"】");
             notifyTodoAppResult = (NotifyTodoAppResult) net.sf.json.JSONObject.toBean(net.sf.json.JSONObject.fromObject(result), NotifyTodoAppResult.class);
 //            JSONObject jsonObject = JSONObject.parseObject(result);
-            if(!result.contains("请求成功")){
+            if(!result.contains("操作成功")){
                 log.error("请求发送待办接口出现异常："+result);
             }else {
+                log.info("--------------------------成功发送 ESP 待办 模块ID"+notifyTodoSendContext.getModelId()+"----------------------------");
                 log.info("okHttp请求发送待办接口成功结果："+result);
             }
 

src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ApplyApplicantAfter.java

@@ -28,7 +28,6 @@ public class ApplyApplicantAfter implements TaskListener{
     @Override
     public void notify(DelegateTask delegateTask) {
         IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
-        WebServiceOAService oaService = SpringContextUtil.getBean(WebServiceOAService.class);
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
 
@@ -103,9 +102,6 @@ public class ApplyApplicantAfter implements TaskListener{
                 busProcessNew.setUserId(nextUser);
                 busProcessNew.setPrcName(prcName);
                 busBean.save(busProcessNew);
-
-                // 发送 oa 待办
-                oaService.sendTodo(busProcessNew);
             }
         }
     }

src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ApplyApplicantBefore.java

@@ -6,6 +6,7 @@ import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
 import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
+import com.ydw.bat.wkflow.business_oa.webService.service.WebServiceOAService;
 import com.ydw.bat.wkflow.util.SpringContextUtil;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
@@ -19,6 +20,8 @@ public class ApplyApplicantBefore implements TaskListener{
     @Override
     public void notify(DelegateTask delegateTask) {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        WebServiceOAService oaService = SpringContextUtil.getBean(WebServiceOAService.class);
+
         QueryWrapper queryWrapper1 = new QueryWrapper();
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
@@ -28,6 +31,10 @@ public class ApplyApplicantBefore implements TaskListener{
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
+
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzrkStep4?prcType=1");
+            oaService.sendTodo(one1);
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/CountersignAfter.java

@@ -27,7 +27,6 @@ public class CountersignAfter implements TaskListener{
     @Override
     public void notify(DelegateTask delegateTask) {
         IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
-        WebServiceOAService oaService = SpringContextUtil.getBean(WebServiceOAService.class);
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
 
@@ -102,9 +101,6 @@ public class CountersignAfter implements TaskListener{
                 busProcessNew.setUserId(nextUser);
                 busProcessNew.setPrcName(prcName);
                 busBean.save(busProcessNew);
-
-                // 发送 oa 待办
-                oaService.sendTodo(busProcessNew);
             }
         }
     }

src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/CountersignBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.standardLibrary;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
+import com.ydw.bat.wkflow.business_oa.webService.service.WebServiceOAService;
 import com.ydw.bat.wkflow.util.SpringContextUtil;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
@@ -16,6 +17,7 @@ public class CountersignBefore implements TaskListener{
     @Override
     public void notify(DelegateTask delegateTask) {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        WebServiceOAService oaService = SpringContextUtil.getBean(WebServiceOAService.class);
         QueryWrapper queryWrapper1 = new QueryWrapper();
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
@@ -25,6 +27,10 @@ public class CountersignBefore implements TaskListener{
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
+
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzrkStep3?prcType=1");
+            oaService.sendTodo(one1);
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ManagerApproveBefore.java

@@ -6,9 +6,12 @@ import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
 import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
+import com.ydw.bat.wkflow.business_oa.webService.service.WebServiceOAService;
 import com.ydw.bat.wkflow.util.SpringContextUtil;
+import org.activiti.engine.TaskService;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.activiti.engine.task.Task;
 
 import java.util.List;
 
@@ -19,6 +22,8 @@ public class ManagerApproveBefore implements TaskListener{
     @Override
     public void notify(DelegateTask delegateTask) {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        WebServiceOAService oaService = SpringContextUtil.getBean(WebServiceOAService.class);
+
         QueryWrapper queryWrapper1 = new QueryWrapper();
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
@@ -27,7 +32,11 @@ public class ManagerApproveBefore implements TaskListener{
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
+            one1.setTaskInfo(delegateTask.getName());
             busBean.saveOrUpdate(one1);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzrkStep2?prcType=1");
+            oaService.sendTodo(one1);
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/SLApplicantAfter.java

@@ -30,7 +30,6 @@ public class SLApplicantAfter implements TaskListener{
     public void notify(DelegateTask delegateTask) {
         IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
-        WebServiceOAService oaService = SpringContextUtil.getBean(WebServiceOAService.class);
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
 
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
@@ -127,11 +126,10 @@ public class SLApplicantAfter implements TaskListener{
                 busProcessNewNext.setUserId(nextUser);
                 busProcessNewNext.setPrcName(prcName);
                 busBean.save(busProcessNewNext);
-                // 发送 oa 待办
-                oaService.sendTodo(busProcessNewNext);
             }
         }
     }
+
     private String verifyObj(String str){
         return (str == null || str.equals("")) ? "" : str;
     }

src/main/resources/application.yml

@@ -15,10 +15,10 @@ logging:
 eureka:
   client:
     serviceUrl:
-      defaultZone: http://192.168.10.47:8761/eureka/
+      defaultZone: http://127.0.0.1:8761/eureka/
 spring:
   application:
-    name: shan3
+    name: bat-wkflow
   http:
     encoding:
       charset: UTF-8
@@ -31,7 +31,7 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.10.47:3306/foton-bat-wkflow?nullCatalogMeansCurrent=true&serverTimezone=Asia/Shanghai&useSSL=false&characterEncoding=utf-8
+    url: jdbc:mysql://127.0.0.1:3306/foton-bat-wkflow?nullCatalogMeansCurrent=true&serverTimezone=Asia/Shanghai&useSSL=false&characterEncoding=utf-8
     username: root
     password: root
   activiti:
@@ -47,3 +47,6 @@ mybatis-plus:
 ribbon:
   ReadTimeout: 60000
   ConnectTimeout: 60000
+
+# 配置前端服务全路径地址 如下 /#/
+webUrl: http://127.0.0.1:10088/#/