youxiw2000 / trash · Commits

Commit bcf7be752795f720866ad7558ecc7fb77996bbb9

Authored by youxiw2000
1 parent 4aaa29fb
build: skipped

m

Inline Side-by-side
Showing 10 changed files with 85 additions and 69 deletions
trash-activiti/src/main/java/com/trash/activiti/mapper/ActReDeploymentMapper.java
  View file @bcf7be7
... ... @@ -20,9 +20,9 @@ public interface ActReDeploymentMapper {
20 20 public List<ActReDeploymentVO> selectActReDeploymentByIds(@Param("ids") Set<String> ids);
21 21  
22 22  
23   - public Map<String,String> selectWorkById(@Param("id") String id);
  23 + public List<Map<String, String>> selectWorkByIds(@Param("ids") Set<String> idString);
24 24  
25   - public Map<String,String> selectHistoryWorkById(@Param("id") String id);
  25 + public List<Map<String, String>> selectHistoryWorkByPIds(@Param("ids") Set<String> id);
26 26  
27 27  
28 28  
... ...
trash-activiti/src/main/java/com/trash/activiti/service/impl/ActTaskServiceImpl.java
  View file @bcf7be7
... ... @@ -3,6 +3,7 @@ package com.trash.activiti.service.impl;
3 3 import java.text.ParseException;
4 4 import java.text.SimpleDateFormat;
5 5 import java.util.ArrayList;
  6 +import java.util.Date;
6 7 import java.util.HashMap;
7 8 import java.util.HashSet;
8 9 import java.util.List;
... ... @@ -86,32 +87,40 @@ public class ActTaskServiceImpl implements IActTaskService {
86 87 Page<ActTaskDTO> list = new Page<ActTaskDTO>();
87 88  
88 89  
89   - if (ServletUtils.getParameter("role") != null) {
90   - List<String> posts = new ArrayList<>();
91   - posts.add(ServletUtils.getParameter("role"));
92   - SecurityUtils.getLoginUser().getUser().setPostIds(posts);
93   - }
94   - if (ServletUtils.getParameter("dept") != null) {
95   - List<String> roles = new ArrayList<>();
96   - roles.add(ServletUtils.getParameter("dept"));
97   - SecurityUtils.getLoginUser().getUser().setRoleIds(roles);
98   - }
99   - if (SecurityUtils.getLoginUser().getUser().getPostIds().size() == 0 || SecurityUtils.getLoginUser().getUser().getRoleIds().size() == 0) {
100   - return list;
101   - }
102   -
  90 +// if (ServletUtils.getParameter("role") != null) {
  91 +// List<String> posts = new ArrayList<>();
  92 +// posts.add(ServletUtils.getParameter("role"));
  93 +// SecurityUtils.getLoginUser().getUser().setPostIds(posts);
  94 +// }
  95 +// if (ServletUtils.getParameter("dept") != null) {
  96 +// List<String> roles = new ArrayList<>();
  97 +// roles.add(ServletUtils.getParameter("dept"));
  98 +// SecurityUtils.getLoginUser().getUser().setRoleIds(roles);
  99 +// }
  100 +// if (SecurityUtils.getLoginUser().getUser().getPostIds().size() == 0 || SecurityUtils.getLoginUser().getUser().getRoleIds().size() == 0) {
  101 +// return list;
  102 +// }
  103 +
  104 +
103 105 org.activiti.api.runtime.shared.query.Page<Task> pageTasks = taskRuntime.tasks(Pageable.of((pageDomain.getPageNum() - 1) * pageDomain.getPageSize(), pageDomain.getPageSize()));
104   -
  106 +
105 107 List<Task> tasks = pageTasks.getContent();
106 108 int totalItems = pageTasks.getTotalItems();
107 109 list.setTotal(totalItems);
108 110 if (totalItems != 0) {
109 111 Set<String> processInstanceIdIds = tasks.parallelStream().map(t -> t.getProcessInstanceId()).collect(Collectors.toSet());
110   -
  112 +
111 113 List<ProcessInstance> processInstanceList = runtimeService.createProcessInstanceQuery().processInstanceIds(processInstanceIdIds).list();
  114 + Set<String> idString = new HashSet<String>();
  115 + for(ProcessInstance pi:processInstanceList){
  116 + idString.add(pi.getBusinessKey());
  117 + }
  118 +
  119 + List<Map<String, String>> maps = actMapper.selectWorkByIds(idString);
112 120  
113   - List<ActTaskDTO> actTaskDTOS = tasks.stream().map(t -> new ActTaskDTO(t, processInstanceList.parallelStream().filter(pi -> t.getProcessInstanceId().equals(pi.getId())).findAny().get(),
114   - getData(processInstanceList.parallelStream().filter(pi -> t.getProcessInstanceId().equals(pi.getId())).findAny().get()))).collect(Collectors.toList());
  121 + List<ActTaskDTO> actTaskDTOS = tasks.stream().map(t -> new ActTaskDTO(t,
  122 + processInstanceList.parallelStream().filter(pi -> t.getProcessInstanceId().equals(pi.getId())).findAny().get(),
  123 + maps.parallelStream().filter(pi -> t.getProcessInstanceId().equals(pi.get("instance_id"))).findAny().get())).collect(Collectors.toList());
115 124  
116 125 list.addAll(actTaskDTOS);
117 126 }
... ... @@ -133,12 +142,19 @@ public class ActTaskServiceImpl implements IActTaskService {
133 142 Set<String> set = new HashSet(collect);
134 143  
135 144 List<HistoricProcessInstance> processInstanceList = historyService.createHistoricProcessInstanceQuery().involvedUser(username).processInstanceIds(set).list();
136   -
  145 +
  146 + Set<String> idString = new HashSet<String>();
  147 + for(HistoricProcessInstance pi:processInstanceList){
  148 + idString.add(pi.getId());
  149 + }
  150 +
  151 + List<Map<String, String>> maps = actMapper.selectHistoryWorkByPIds(idString);
  152 +
137 153 list.setTotal(processInstanceList.size());
138 154  
139 155 if (processInstanceList.size() > 0) {
140 156 for (HistoricProcessInstance p : processInstanceList) {
141   - ActTaskDTO actTaskDTOS = new ActTaskDTO(p, getHistoryData(p));
  157 + ActTaskDTO actTaskDTOS = new ActTaskDTO(p, maps.parallelStream().filter(pi -> p.getId().equals(pi.get("instance_id"))).findAny().get());
142 158  
143 159 getCheckData(actTaskDTOS);
144 160  
... ... @@ -169,9 +185,17 @@ public class ActTaskServiceImpl implements IActTaskService {
169 185  
170 186 list.setTotal(processInstanceList.size());
171 187  
  188 + Set<String> idString = new HashSet<String>();
  189 + for(ProcessInstance pi:processInstanceList){
  190 + idString.add(pi.getBusinessKey());
  191 + }
  192 +
  193 + List<Map<String, String>> maps = actMapper.selectWorkByIds(idString);
  194 +
  195 +
172 196 if (processInstanceList.size() > 0) {
173 197 for (ProcessInstance p : processInstanceList) {
174   - ActTaskDTO actTaskDTOS = new ActTaskDTO(p, getData(p));
  198 + ActTaskDTO actTaskDTOS = new ActTaskDTO(p, maps.parallelStream().filter(pi -> p.getProcessInstanceId().equals(pi.get("instance_id"))).findAny().get());
175 199  
176 200 getCheckData(actTaskDTOS);
177 201  
... ... @@ -200,22 +224,6 @@ public class ActTaskServiceImpl implements IActTaskService {
200 224  
201 225 SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:SS");
202 226  
203   - public Map<String, String> getData(HistoricProcessInstance processInstance) {
204   - Map<String, String> map = actMapper.selectWorkById(processInstance.getBusinessKey());
205   - return map;
206   - }
207   -
208   - public Map<String, String> getHistoryData(HistoricProcessInstance processInstance) {
209   - Map<String, String> map = actMapper.selectHistoryWorkByPId(processInstance.getId());
210   - return map;
211   -
212   - }
213   -
214   - public Map<String, String> getData(ProcessInstance processInstance) {
215   - Map<String, String> map = actMapper.selectWorkById(processInstance.getBusinessKey());
216   - return map;
217   - }
218   -
219 227 @Override
220 228 public List<String> formDataShow(String taskID) {
221 229 Task task = taskRuntime.task(taskID);
... ...
trash-activiti/src/main/java/com/trash/activiti/service/impl/myTaskServiceImpl.java
  View file @bcf7be7
... ... @@ -42,6 +42,7 @@ import com.trash.activiti.service.myTaskService;
42 42 import com.trash.common.utils.SecurityUtils;
43 43  
44 44 import java.util.ArrayList;
  45 +import java.util.Date;
45 46 import java.util.List;
46 47 import java.util.Objects;
47 48  
... ... @@ -105,7 +106,8 @@ public class myTaskServiceImpl implements myTaskService {
105 106 @Override
106 107 public Page<Task> tasks(Pageable pageable,GetTasksPayload getTasksPayload) {
107 108  
108   -
  109 +
  110 + long time = new Date().getTime();
109 111 TaskQuery crossQuery = taskService.createTaskQuery();
110 112  
111 113  
... ... @@ -139,28 +141,26 @@ public class myTaskServiceImpl implements myTaskService {
139 141 continue;
140 142 }
141 143 }
  144 +
  145 + System.out.println(new Date().getTime() - time);
142 146  
143 147 for(org.activiti.engine.task.Task t1:list1){
144   - if(taskService.getIdentityLinksForTask(t1.getId()).size() == 1){
145   - pid.add(t1.getProcessInstanceId());
146   - continue;
147   - }
148   -
  148 +
149 149 for(org.activiti.engine.task.Task t2:list2){
150   - if(taskService.getIdentityLinksForTask(t2.getId()).size() == 1){
151   - pid.add(t2.getProcessInstanceId());
152   - continue;
153   - }
154   -
  150 +
155 151 if(t1.getId().equals(t2.getId())){
156 152 pid.add(t1.getProcessInstanceId());
157 153 }
158 154 }
159 155 }
  156 +
  157 + System.out.println(new Date().getTime() - time);
160 158  
161 159 for(org.activiti.engine.task.Task tasks : userQuery.list()){
162 160 pid.add(tasks.getProcessInstanceId());
163 161 }
  162 +
  163 + System.out.println(new Date().getTime() - time);
164 164  
165 165 if(pid.size() > 0){
166 166 taskQuery.processInstanceIdIn(pid);
... ... @@ -172,6 +172,8 @@ public class myTaskServiceImpl implements myTaskService {
172 172  
173 173 List<Task> tasks = taskConverter.from(taskQuery.listPage(pageable.getStartIndex(),
174 174 pageable.getMaxItems()));
  175 +
  176 + System.out.println(new Date().getTime() - time);
175 177  
176 178 return new PageImpl<>(tasks,Math.toIntExact(taskQuery.count()));
177 179 }
... ...
trash-activiti/src/main/resources/mapper/activiti/ActReDeploymentMapper.xml
  View file @bcf7be7
... ... @@ -23,12 +23,18 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
23 23 </foreach>
24 24 </select>
25 25  
26   - <select id="selectWorkById" parameterType="String" resultType="java.util.Map">
27   - select start_time as startTime,end_time as endTime, reason,type from workflow where id = #{id}
  26 + <select id="selectWorkByIds" parameterType="String" resultType="java.util.Map">
  27 + select start_time as startTime,end_time as endTime, reason,type,instance_id from workflow where id in
  28 + <foreach item="id" collection="ids" open="(" separator="," close=")">
  29 + #{id}
  30 + </foreach>
28 31 </select>
29 32  
30   - <select id="selectHistoryWorkByPId" parameterType="String" resultType="java.util.Map">
31   - select start_time as startTime,end_time as endTime, reason,type from workflow_hi where instance_id = #{id}
  33 + <select id="selectHistoryWorkByPIds" parameterType="String" resultType="java.util.Map">
  34 + select start_time as startTime,end_time as endTime, reason,type,instance_id from workflow_hi where instance_id in
  35 + <foreach item="id" collection="ids" open="(" separator="," close=")">
  36 + #{id}
  37 + </foreach>
32 38 </select>
33 39  
34 40  
... ...
trash-admin/src/main/resources/application-dev.yml
  View file @bcf7be7
... ... @@ -16,10 +16,10 @@ trash:
16 16 # 验证码类型 math 数组计算 char 字符验证
17 17 captchaType: math
18 18 # 远程服务器地址
19   - remotePath: http://175.6.47.84:8008
20   - token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0MzI3NzQ1ODkyfQ.4BrpgD9i_1TwjLRGqa3wo4Ikx8t8Gcl3FzHfjL_uolPnNMm2rd7fCvrUoBBN4Qp4cMGzg9h2Nt4NNx8PYThTaQ
21   - #remotePath: http://183.66.242.6:14601
22   - #token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0NDU5MjEzNzQ2fQ.85oIrOnU7cz7L_-IGt4Bt1LXDTkFtyrdqNt05K0v9-4nsrrzzpbjbemK-yMlbnUpe4Fx2FFES-Wbw8Yr8ML69w
  19 + #remotePath: http://175.6.47.84:8008
  20 + #token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0MzI3NzQ1ODkyfQ.4BrpgD9i_1TwjLRGqa3wo4Ikx8t8Gcl3FzHfjL_uolPnNMm2rd7fCvrUoBBN4Qp4cMGzg9h2Nt4NNx8PYThTaQ
  21 + remotePath: http://183.66.242.6:14601
  22 + token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0NDU5MjEzNzQ2fQ.85oIrOnU7cz7L_-IGt4Bt1LXDTkFtyrdqNt05K0v9-4nsrrzzpbjbemK-yMlbnUpe4Fx2FFES-Wbw8Yr8ML69w
23 23  
24 24 # 数据源配置
25 25 spring:
... ...
trash-ui/src/layout/index.vue
  View file @bcf7be7
1 1 <template>
  2 + <div :class="classObj" class="app-wrapper">
  3 + <sidebar class="sidebar-container" />
  4 + <div :class="{hasTagsView:needTagsView}" class="main-container">
  5 + <tags-view v-if="needTagsView" />
2 6 <app-main />
  7 +
  8 + </div>
  9 + </div>
3 10 </template>
4 11  
5 12 <script>
... ...
trash-ui/src/layout/index5.vue renamed to trash-ui/src/layout/index6.vue
  View file @bcf7be7
1 1 <template>
2   - <div :class="classObj" class="app-wrapper">
3   - <sidebar class="sidebar-container" />
4   - <div :class="{hasTagsView:needTagsView}" class="main-container">
5   - <tags-view v-if="needTagsView" />
6 2 <app-main />
7   -
8   - </div>
9   - </div>
10 3 </template>
11 4  
12 5 <script>
... ...
trash-ui/src/permission.js
  View file @bcf7be7
... ... @@ -17,7 +17,7 @@ router.beforeEach((to, from, next) =&gt; {
17 17 NProgress.start()
18 18 var token = getToken();
19 19  
20   - if(token && to.query.token.indexOf(token) == -1){
  20 + if(to.query.token && token && to.query.token.indexOf(token) == -1){
21 21 removeToken();
22 22 token = null;
23 23 }
... ...
trash-ui/src/views/activiti/task/taskCard.vue
  View file @bcf7be7
... ... @@ -7,7 +7,7 @@
7 7 <a @click="sendToParent(task)">详情>></a>
8 8 </div>
9 9 <el-row class="card_row">
10   - <el-col :span="2" class="card_grid">{{task.name}}</el-col>
  10 + <!-- <el-col :span="2" class="card_grid">{{task.name}}</el-col> -->
11 11 <div class="card_title">{{task.instanceName}}</div>
12 12 </el-row>
13 13  
... ...
trash-ui/vue.config.js
  View file @bcf7be7
... ... @@ -41,8 +41,8 @@ module.exports = {
41 41 }
42 42 },
43 43 ['/api']: {
44   - // target: `http://183.66.242.6:14601`,
45   - target: `http://183.66.242.6:6001`,
  44 + target: `http://183.66.242.6:14601`,
  45 + // target: `http://183.66.242.6:6001`,
46 46 changeOrigin: true,
47 47 },
48 48  
... ...