From 0c25a406bd188caddad289dd549ce461bfbb3588 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Sun, 23 Oct 2022 10:13:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8E=82=E5=AE=B6=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E4=BB=A5=E5=8F=8A=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=BE=85?=
 =?UTF-8?q?=E5=8A=9E=E6=B7=BB=E5=8A=A0orgPath?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusVehicleApplyService.java               | 47 +++++++++++++++----
 .../portal/biz/flow/FlowableService.java      |  8 ++++
 2 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
index 2b2a501adb..53832766a3 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
@@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufactorSubscriptionDto;
 import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
@@ -60,11 +61,14 @@ import com.yxt.messagecenter.api.message.MessageFlowableQuery;
 import com.yxt.messagecenter.api.messagelist.MessageListFeign;
 import com.yxt.messagecenter.api.messagetype.MessageTypeFeign;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.tomcat.util.threads.ThreadPoolExecutor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 /**
@@ -348,8 +352,8 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         }
         //用户的组织全路径
         String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
-        BusVehicleApply busVehicleApply = fetchBySid(dto.getSid());
-        int r = submitBusinessData(dto, busVehicleApply);
+        AtomicReference<BusVehicleApply> busVehicleApply = new AtomicReference<>(fetchBySid(dto.getSid()));
+        int r = submitBusinessData(dto, busVehicleApply.get());
         if (r == 3) {
             return rb.setMsg("该申请不存在");
         }
@@ -395,8 +399,35 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             }
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
-            //极光推送
-            busVehicleApply = fetchBySid(businessSid);
+            //==================================添加线程
+            try {
+                ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                        .setNameFormat("demo-pool-%d").build();
+                ExecutorService pool = new ThreadPoolExecutor(2, 100,
+                        0L, TimeUnit.MILLISECONDS,
+                        new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+                Future future1 = pool.submit(() -> {
+                    //极光推送
+                    busVehicleApply.set(fetchBySid(businessSid));
+                    MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+                    MessageFlowVo messageFlowVo = new MessageFlowVo();
+                    BeanUtil.copyProperties(ufVo, messageFlowVo);
+                    messageFlowableQuery.setUfVo(messageFlowVo);
+                    messageFlowableQuery.setAppMap(appMap);
+                    messageFlowableQuery.setBusinessSid(businessSid);
+                    messageFlowableQuery.setModuleName("厂家采购申请");
+                    messageFlowableQuery.setMsgContent(busVehicleApply.get().getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+                    messageFlowableQuery.setMsgTitle("厂家采购");
+                    ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+                });
+
+
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            //==================================添加线程
+            /*//极光推送
+            busVehicleApply.set(fetchBySid(businessSid));
             MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
             MessageFlowVo messageFlowVo = new MessageFlowVo();
             BeanUtil.copyProperties(ufVo, messageFlowVo);
@@ -404,9 +435,9 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             messageFlowableQuery.setAppMap(appMap);
             messageFlowableQuery.setBusinessSid(businessSid);
             messageFlowableQuery.setModuleName("厂家采购申请");
-            messageFlowableQuery.setMsgContent(busVehicleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+            messageFlowableQuery.setMsgContent(busVehicleApply.get().getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
             messageFlowableQuery.setMsgTitle("厂家采购");
-            ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+            ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);*/
             return voResultBean;
         }
         if (r == 2) {
@@ -414,8 +445,8 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             if (StringUtils.isBlank(dto.getInstanceId())) {
                 return rb.setMsg("参数错误：instanceId");
             }
-            bv.setTaskId(busVehicleApply.getTaskId());
-            bv.setTaskDefKey(busVehicleApply.getNodeId());
+            bv.setTaskId(busVehicleApply.get().getTaskId());
+            bv.setTaskDefKey(busVehicleApply.get().getNodeId());
             bv.setComment("重新提交");
             bv.setInstanceId(dto.getInstanceId());
             return complete(bv);
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java
index d6f5cc5744..01d9ef02bf 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java
@@ -461,6 +461,7 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
         FlowTaskDoQuery params = pagerQuery.getParams();
         String names = params.getNames();
         String userSid = params.getUserSid();
+        String orgPath = params.getOrgPath();
         BusinessTaskQuery taskQuery = new BusinessTaskQuery();
         List<BusinessTaskParam> taskParamList = new ArrayList<>();
         if (StringUtils.isNotBlank(names)) {
@@ -470,6 +471,13 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
             taskParam.setSqlOperationSymbol(SQLOperationSymbol.LIKE);
             taskParamList.add(taskParam);
         }
+        if (StringUtils.isNotBlank(orgPath)) {//切换机构
+            BusinessTaskParam taskParam = new BusinessTaskParam();
+            taskParam.setField(BusinessVariables.ORGPATH);
+            taskParam.setSqlOperationSymbol(SQLOperationSymbol.NONE);
+            taskParam.setValue(orgPath);
+            taskParamList.add(taskParam);
+        }
         taskQuery.setFields(taskParamList);
         taskQueryPagerQuery.setParams(taskQuery);
         ResultBean<Page<FlowTaskDto>> resultBean = flowTaskFeign.businessTodoListForApp(userSid, taskQueryPagerQuery);