m

youxiw2000
1 parent 4aaa29fb
Showing 10 changed files with 85 additions and 69 deletions
trash-activiti/src/main/java/com/trash/activiti/mapper/ActReDeploymentMapper.java
trash-activiti/src/main/java/com/trash/activiti/service/impl/ActTaskServiceImpl.java
trash-activiti/src/main/java/com/trash/activiti/service/impl/myTaskServiceImpl.java
trash-activiti/src/main/resources/mapper/activiti/ActReDeploymentMapper.xml
trash-admin/src/main/resources/application-dev.yml
trash-ui/src/layout/index.vue
trash-ui/src/layout/index5.vue → trash-ui/src/layout/index6.vue
trash-ui/src/permission.js
trash-ui/src/views/activiti/task/taskCard.vue
trash-ui/vue.config.js
@@ -20,9 +20,9 @@ public interface ActReDeploymentMapper {
         public List<ActReDeploymentVO> selectActReDeploymentByIds(@Param("ids") Set<String> ids);
-        public Map<String,String> selectWorkById(@Param("id") String id);
+        public  List<Map<String, String>> selectWorkByIds(@Param("ids") Set<String> idString);
-        public Map<String,String> selectHistoryWorkById(@Param("id") String id);
+        public List<Map<String, String>> selectHistoryWorkByPIds(@Param("ids") Set<String> id);
@@ -3,6 +3,7 @@ package com.trash.activiti.service.impl;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -86,32 +87,40 @@ public class ActTaskServiceImpl implements IActTaskService {
         Page<ActTaskDTO> list = new Page<ActTaskDTO>();
-        if (ServletUtils.getParameter("role") != null) {
-            List<String> posts = new ArrayList<>();
-            posts.add(ServletUtils.getParameter("role"));
-            SecurityUtils.getLoginUser().getUser().setPostIds(posts);
-        }
-        if (ServletUtils.getParameter("dept") != null) {
-            List<String> roles = new ArrayList<>();
-            roles.add(ServletUtils.getParameter("dept"));
-            SecurityUtils.getLoginUser().getUser().setRoleIds(roles);
-        }
-        if (SecurityUtils.getLoginUser().getUser().getPostIds().size() == 0 || SecurityUtils.getLoginUser().getUser().getRoleIds().size() == 0) {
-            return list;
-        }
-
+//        if (ServletUtils.getParameter("role") != null) {
+//            List<String> posts = new ArrayList<>();
+//            posts.add(ServletUtils.getParameter("role"));
+//            SecurityUtils.getLoginUser().getUser().setPostIds(posts);
+//        }
+//        if (ServletUtils.getParameter("dept") != null) {
+//            List<String> roles = new ArrayList<>();
+//            roles.add(ServletUtils.getParameter("dept"));
+//            SecurityUtils.getLoginUser().getUser().setRoleIds(roles);
+//        }
+//        if (SecurityUtils.getLoginUser().getUser().getPostIds().size() == 0 || SecurityUtils.getLoginUser().getUser().getRoleIds().size() == 0) {
+//            return list;
+//        }
+        
+        
         org.activiti.api.runtime.shared.query.Page<Task> pageTasks = taskRuntime.tasks(Pageable.of((pageDomain.getPageNum() - 1) * pageDomain.getPageSize(), pageDomain.getPageSize()));
-
+        
         List<Task> tasks = pageTasks.getContent();
         int totalItems = pageTasks.getTotalItems();
         list.setTotal(totalItems);
         if (totalItems != 0) {
             Set<String> processInstanceIdIds = tasks.parallelStream().map(t -> t.getProcessInstanceId()).collect(Collectors.toSet());
-
+            
             List<ProcessInstance> processInstanceList = runtimeService.createProcessInstanceQuery().processInstanceIds(processInstanceIdIds).list();
+            Set<String> idString = new HashSet<String>();
+            for(ProcessInstance pi:processInstanceList){
+            	idString.add(pi.getBusinessKey());
+            }
+            
+            List<Map<String, String>>  maps = actMapper.selectWorkByIds(idString);
-            List<ActTaskDTO> actTaskDTOS = tasks.stream().map(t -> new ActTaskDTO(t, processInstanceList.parallelStream().filter(pi -> t.getProcessInstanceId().equals(pi.getId())).findAny().get(),
-                    getData(processInstanceList.parallelStream().filter(pi -> t.getProcessInstanceId().equals(pi.getId())).findAny().get()))).collect(Collectors.toList());
+            List<ActTaskDTO> actTaskDTOS = tasks.stream().map(t -> new ActTaskDTO(t, 
+            		processInstanceList.parallelStream().filter(pi -> t.getProcessInstanceId().equals(pi.getId())).findAny().get(),
+                    maps.parallelStream().filter(pi -> t.getProcessInstanceId().equals(pi.get("instance_id"))).findAny().get())).collect(Collectors.toList());
             list.addAll(actTaskDTOS);
         }
@@ -133,12 +142,19 @@ public class ActTaskServiceImpl implements IActTaskService {
             Set<String> set = new HashSet(collect);
             List<HistoricProcessInstance> processInstanceList = historyService.createHistoricProcessInstanceQuery().involvedUser(username).processInstanceIds(set).list();
-
+            
+            Set<String> idString = new HashSet<String>();
+            for(HistoricProcessInstance pi:processInstanceList){
+            	idString.add(pi.getId());
+            }
+            
+            List<Map<String, String>>  maps = actMapper.selectHistoryWorkByPIds(idString);
+            
             list.setTotal(processInstanceList.size());
             if (processInstanceList.size() > 0) {
                 for (HistoricProcessInstance p : processInstanceList) {
-                    ActTaskDTO actTaskDTOS = new ActTaskDTO(p, getHistoryData(p));
+                    ActTaskDTO actTaskDTOS = new ActTaskDTO(p,  maps.parallelStream().filter(pi -> p.getId().equals(pi.get("instance_id"))).findAny().get());
                     getCheckData(actTaskDTOS);
@@ -169,9 +185,17 @@ public class ActTaskServiceImpl implements IActTaskService {
             list.setTotal(processInstanceList.size());
+            Set<String> idString = new HashSet<String>();
+            for(ProcessInstance pi:processInstanceList){
+            	idString.add(pi.getBusinessKey());
+            }
+            
+            List<Map<String, String>>  maps = actMapper.selectWorkByIds(idString);
+            
+            
             if (processInstanceList.size() > 0) {
                 for (ProcessInstance p : processInstanceList) {
-                    ActTaskDTO actTaskDTOS = new ActTaskDTO(p, getData(p));
+                    ActTaskDTO actTaskDTOS = new ActTaskDTO(p, maps.parallelStream().filter(pi -> p.getProcessInstanceId().equals(pi.get("instance_id"))).findAny().get());
                     getCheckData(actTaskDTOS);
@@ -200,22 +224,6 @@ public class ActTaskServiceImpl implements IActTaskService {
     SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:SS");
-    public Map<String, String> getData(HistoricProcessInstance processInstance) {
-        Map<String, String> map = actMapper.selectWorkById(processInstance.getBusinessKey());
-        return map;
-    }
-
-    public Map<String, String> getHistoryData(HistoricProcessInstance processInstance) {
-        Map<String, String> map = actMapper.selectHistoryWorkByPId(processInstance.getId());
-        return map;
-
-    }
-
-    public Map<String, String> getData(ProcessInstance processInstance) {
-        Map<String, String> map = actMapper.selectWorkById(processInstance.getBusinessKey());
-        return map;
-    }
-
     @Override
     public List<String> formDataShow(String taskID) {
         Task task = taskRuntime.task(taskID);
@@ -42,6 +42,7 @@ import com.trash.activiti.service.myTaskService;
 import com.trash.common.utils.SecurityUtils;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
@@ -105,7 +106,8 @@ public class myTaskServiceImpl implements myTaskService {
     @Override
     public Page<Task> tasks(Pageable pageable,GetTasksPayload getTasksPayload) {
-    	
+
+        long time = new Date().getTime();
         TaskQuery crossQuery = taskService.createTaskQuery();
@@ -139,28 +141,26 @@ public class myTaskServiceImpl implements myTaskService {
             	continue;
             }
     	}
+
+        System.out.println(new Date().getTime() - time);
         for(org.activiti.engine.task.Task t1:list1){
-            if(taskService.getIdentityLinksForTask(t1.getId()).size() == 1){
-            	pid.add(t1.getProcessInstanceId());
-            	continue;
-            }
-        	
+                    	
         	for(org.activiti.engine.task.Task t2:list2){
-        		if(taskService.getIdentityLinksForTask(t2.getId()).size() == 1){
-                	pid.add(t2.getProcessInstanceId());
-                	continue;
-                }
-        		
+        		        		
         		if(t1.getId().equals(t2.getId())){
         			pid.add(t1.getProcessInstanceId());
         		}
         	}
         }
+
+        System.out.println(new Date().getTime() - time);
         for(org.activiti.engine.task.Task tasks : userQuery.list()){
         	pid.add(tasks.getProcessInstanceId());
         }
+
+        System.out.println(new Date().getTime() - time);
         if(pid.size() > 0){
     		taskQuery.processInstanceIdIn(pid);
@@ -172,6 +172,8 @@ public class myTaskServiceImpl implements myTaskService {
         List<Task> tasks = taskConverter.from(taskQuery.listPage(pageable.getStartIndex(),
                 pageable.getMaxItems()));
+
+        System.out.println(new Date().getTime() - time);
         return new PageImpl<>(tasks,Math.toIntExact(taskQuery.count()));
     }
@@ -23,12 +23,18 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 		</foreach>
 	</select>
-	<select id="selectWorkById"  parameterType="String" resultType="java.util.Map">
-	   	select start_time as startTime,end_time as endTime, reason,type from workflow where id = #{id}
+	<select id="selectWorkByIds"  parameterType="String" resultType="java.util.Map">
+	   	select start_time as startTime,end_time as endTime, reason,type,instance_id from workflow where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
 	</select>
-	<select id="selectHistoryWorkByPId"  parameterType="String" resultType="java.util.Map">
-	   	select start_time as startTime,end_time as endTime, reason,type from workflow_hi where instance_id = #{id}
+	<select id="selectHistoryWorkByPIds"  parameterType="String" resultType="java.util.Map">
+	   	select start_time as startTime,end_time as endTime, reason,type,instance_id from workflow_hi where instance_id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
 	</select>
@@ -16,10 +16,10 @@ trash:
     # 验证码类型 math 数组计算 char 字符验证
     captchaType: math
     # 远程服务器地址
-    remotePath: http://175.6.47.84:8008
-    token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0MzI3NzQ1ODkyfQ.4BrpgD9i_1TwjLRGqa3wo4Ikx8t8Gcl3FzHfjL_uolPnNMm2rd7fCvrUoBBN4Qp4cMGzg9h2Nt4NNx8PYThTaQ
-    #remotePath: http://183.66.242.6:14601
-    #token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0NDU5MjEzNzQ2fQ.85oIrOnU7cz7L_-IGt4Bt1LXDTkFtyrdqNt05K0v9-4nsrrzzpbjbemK-yMlbnUpe4Fx2FFES-Wbw8Yr8ML69w
+    #remotePath: http://175.6.47.84:8008
+    #token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0MzI3NzQ1ODkyfQ.4BrpgD9i_1TwjLRGqa3wo4Ikx8t8Gcl3FzHfjL_uolPnNMm2rd7fCvrUoBBN4Qp4cMGzg9h2Nt4NNx8PYThTaQ
+    remotePath: http://183.66.242.6:14601
+    token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0NDU5MjEzNzQ2fQ.85oIrOnU7cz7L_-IGt4Bt1LXDTkFtyrdqNt05K0v9-4nsrrzzpbjbemK-yMlbnUpe4Fx2FFES-Wbw8Yr8ML69w
 # 数据源配置
 spring:
 <template>
+  <div :class="classObj" class="app-wrapper">
+    <sidebar class="sidebar-container" />
+    <div :class="{hasTagsView:needTagsView}" class="main-container">
+        <tags-view v-if="needTagsView" />
       <app-main />
+      
+      </div>
+  </div>
 </template>
 <script>
 <template>
-  <div :class="classObj" class="app-wrapper">
-    <sidebar class="sidebar-container" />
-    <div :class="{hasTagsView:needTagsView}" class="main-container">
-        <tags-view v-if="needTagsView" />
       <app-main />
-      
-      </div>
-  </div>
 </template>
 <script>
@@ -17,7 +17,7 @@ router.beforeEach((to, from, next) =&gt; {
   NProgress.start()
   var token = getToken();
-  if(token && to.query.token.indexOf(token) == -1){
+  if(to.query.token && token && to.query.token.indexOf(token) == -1){
       removeToken();
       token = null;
   }
@@ -7,7 +7,7 @@
       <a @click="sendToParent(task)">详情>></a>
     </div>
     <el-row class="card_row">
-      <el-col :span="2" class="card_grid">{{task.name}}</el-col>
+      <!-- <el-col :span="2" class="card_grid">{{task.name}}</el-col> -->
       <div class="card_title">{{task.instanceName}}</div>
     </el-row>
@@ -41,8 +41,8 @@ module.exports = {
         }
       },
         ['/api']: {
-          // target: `http://183.66.242.6:14601`,
-          target: `http://183.66.242.6:6001`,
+          target: `http://183.66.242.6:14601`,
+          // target: `http://183.66.242.6:6001`,
           changeOrigin: true,
         },