From 6e8c95d31d85b53857e4e3ce12ea303eb0ea42eb Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 19 八月 2021 00:47:48 +0800
Subject: [PATCH] 优化代码
---
service-common/src/main/java/com/java110/common/smo/impl/PurchaseApplyUserInnerServiceSMOImpl.java | 167 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 120 insertions(+), 47 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/smo/impl/PurchaseApplyUserInnerServiceSMOImpl.java b/service-common/src/main/java/com/java110/common/smo/impl/PurchaseApplyUserInnerServiceSMOImpl.java
old mode 100644
new mode 100755
index c1b1292..59b683d
--- a/service-common/src/main/java/com/java110/common/smo/impl/PurchaseApplyUserInnerServiceSMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/smo/impl/PurchaseApplyUserInnerServiceSMOImpl.java
@@ -1,23 +1,25 @@
package com.java110.common.smo.impl;
-
import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.core.smo.common.IAuditUserInnerServiceSMO;
-import com.java110.core.smo.store.IComplaintInnerServiceSMO;
-import com.java110.core.smo.common.IPurchaseApplyUserInnerServiceSMO;
-import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.auditMessage.AuditMessageDto;
+import com.java110.dto.businessDatabus.CustomBusinessDatabusDto;
import com.java110.dto.purchaseApply.PurchaseApplyDto;
import com.java110.dto.user.UserDto;
+import com.java110.dto.workflow.WorkflowDto;
import com.java110.entity.audit.AuditUser;
+import com.java110.intf.common.IPurchaseApplyUserInnerServiceSMO;
+import com.java110.intf.common.IWorkflowInnerServiceSMO;
+import com.java110.intf.job.IDataBusInnerServiceSMO;
+import com.java110.intf.store.IComplaintInnerServiceSMO;
+import com.java110.intf.store.IPurchaseApplyInnerServiceSMO;
+import com.java110.intf.user.IUserInnerServiceSMO;
+import com.java110.po.machine.MachineRecordPo;
+import com.java110.utils.constant.BusinessTypeConstant;
import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.StringUtil;
-import org.activiti.engine.HistoryService;
-import org.activiti.engine.ProcessEngine;
-import org.activiti.engine.RepositoryService;
-import org.activiti.engine.RuntimeService;
-import org.activiti.engine.TaskService;
+import org.activiti.engine.*;
import org.activiti.engine.history.HistoricProcessInstance;
import org.activiti.engine.history.HistoricTaskInstance;
import org.activiti.engine.history.HistoricTaskInstanceQuery;
@@ -36,7 +38,6 @@
import java.util.List;
import java.util.Map;
-
@RestController
public class PurchaseApplyUserInnerServiceSMOImpl extends BaseServiceSMO implements IPurchaseApplyUserInnerServiceSMO {
@@ -50,20 +51,19 @@
private TaskService taskService;
@Autowired
- private HistoryService historyService;
-
- @Autowired
- private RepositoryService repositoryService;
-
-
- @Autowired
private IUserInnerServiceSMO userInnerServiceSMOImpl;
@Autowired
private IComplaintInnerServiceSMO complaintInnerServiceSMOImpl;
@Autowired
- private IAuditUserInnerServiceSMO auditUserInnerServiceSMOImpl;
+ private IWorkflowInnerServiceSMO workflowInnerServiceSMOImpl;
+
+ @Autowired
+ private IPurchaseApplyInnerServiceSMO purchaseApplyInnerServiceSMOImpl;
+
+ @Autowired
+ private IDataBusInnerServiceSMO dataBusInnerServiceSMOImpl;
/**
* 鍚姩娴佺▼
@@ -71,20 +71,60 @@
* @return
*/
public PurchaseApplyDto startProcess(@RequestBody PurchaseApplyDto purchaseApplyDto) {
+ //鑾峰彇鍑哄叆搴撶姸鎬�
+ String resOrderType = purchaseApplyDto.getResOrderType();
//灏嗕俊鎭姞鍏ap,浠ヤ究浼犲叆娴佺▼涓�
Map<String, Object> variables = new HashMap<String, Object>();
variables.put("purchaseApplyDto", purchaseApplyDto);
- variables.put("nextAuditStaffId",purchaseApplyDto.getStaffId());
+ variables.put("nextAuditStaffId", purchaseApplyDto.getStaffId());
variables.put("userId", purchaseApplyDto.getCurrentUserId());
+ variables.put("startUserId", purchaseApplyDto.getCurrentUserId());
//寮�鍚祦绋�
- ProcessInstance processInstance = runtimeService.startProcessInstanceByKey("resourceEntry", purchaseApplyDto.getApplyOrderId(), variables);
-// //灏嗗緱鍒扮殑瀹炰緥娴佺▼id鍊艰祴缁欎箣鍓嶈缃殑鍙橀噺
+ ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(getWorkflowDto(purchaseApplyDto.getStoreId()), purchaseApplyDto.getApplyOrderId(), variables);
+ //鑾峰彇鐢宠id
+ String applyOrderId = processInstance.getBusinessKey();
+ //灏嗗緱鍒扮殑瀹炰緥娴佺▼id鍊艰祴缁欎箣鍓嶈缃殑鍙橀噺
String processInstanceId = processInstance.getId();
-// // System.out.println("娴佺▼寮�鍚垚鍔�.......瀹炰緥娴佺▼id:" + processInstanceId);
-//
+ String processDefinitionId = processInstance.getProcessDefinitionId();
+ //鑾峰彇涓嬬骇澶勭悊浜篿d
+ PurchaseApplyDto purchaseDto = new PurchaseApplyDto();
+ purchaseDto.setActRuTaskId(processInstanceId);
+ purchaseDto.setProcDefId(processDefinitionId);
+ purchaseDto.setBusinessKey(applyOrderId);
+ List<PurchaseApplyDto> actRuTaskUserIds = purchaseApplyInnerServiceSMOImpl.getActRuTaskUserId(purchaseDto);
+ if (actRuTaskUserIds != null && actRuTaskUserIds.size() > 0) {
+ for (PurchaseApplyDto purchaseApply : actRuTaskUserIds) {
+ String actRuTaskUserId = purchaseApply.getTaskUserId();
+ MachineRecordPo machineRecordPo = new MachineRecordPo();
+ machineRecordPo.setApplyOrderId(applyOrderId);
+ machineRecordPo.setPurchaseUserId(actRuTaskUserId);
+ machineRecordPo.setResOrderType(resOrderType);
+ //浼犻�乨atabus
+ dataBusInnerServiceSMOImpl.customExchange(CustomBusinessDatabusDto.getInstance(
+ BusinessTypeConstant.BUSINESS_TYPE_DATABUS_PURCHASE_APPLY, BeanConvertUtil.beanCovertJson(machineRecordPo)));
+ }
+ }
+ // System.out.println("娴佺▼寮�鍚垚鍔�.......瀹炰緥娴佺▼id:" + processInstanceId);
purchaseApplyDto.setProcessInstanceId(processInstanceId);
- autoFinishFirstTask(purchaseApplyDto);
+ //autoFinishFirstTask(purchaseApplyDto);
return purchaseApplyDto;
+ }
+
+ private String getWorkflowDto(String storeId) {
+ //寮�鍚祦绋�
+ //WorkflowDto.DEFAULT_PROCESS + workflowDto.getFlowId()
+ WorkflowDto workflowDto = new WorkflowDto();
+ workflowDto.setFlowType(WorkflowDto.FLOW_TYPE_PURCHASE);
+ workflowDto.setStoreId(storeId);
+ List<WorkflowDto> workflowDtos = workflowInnerServiceSMOImpl.queryWorkflows(workflowDto);
+
+ Assert.listOnlyOne(workflowDtos, "鏈壘鍒� 鎶曡瘔寤鸿娴佺▼鎴栨壘鍒板鏉★紝璇峰湪鐗╀笟璐﹀彿绯荤粺绠＄悊涓嬫祦绋嬬鐞嗕腑閰嶇疆娴佺▼");
+
+ WorkflowDto tmpWorkflowDto = workflowDtos.get(0);
+ if (StringUtil.isEmpty(tmpWorkflowDto.getProcessDefinitionKey())) {
+ throw new IllegalArgumentException("閲囪喘娴佺▼杩樻湭閮ㄧ讲");
+ }
+ return WorkflowDto.DEFAULT_PROCESS + tmpWorkflowDto.getFlowId();
}
/**
@@ -117,7 +157,7 @@
*/
public long getUserTaskCount(@RequestBody AuditUser user) {
TaskService taskService = processEngine.getTaskService();
- TaskQuery query = taskService.createTaskQuery().processDefinitionKey("resourceEnter");
+ TaskQuery query = taskService.createTaskQuery().processDefinitionKey(getWorkflowDto(user.getStoreId()));
query.taskAssignee(user.getUserId());
return query.count();
}
@@ -129,7 +169,7 @@
*/
public List<PurchaseApplyDto> getUserTasks(@RequestBody AuditUser user) {
TaskService taskService = processEngine.getTaskService();
- TaskQuery query = taskService.createTaskQuery().processDefinitionKey("resourceEnter");
+ TaskQuery query = taskService.createTaskQuery().processDefinitionKey(getWorkflowDto(user.getStoreId()));
;
query.taskAssignee(user.getUserId());
query.orderByTaskCreateTime().desc();
@@ -186,7 +226,7 @@
// .taskAssignee(user.getUserId());
HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
- .processDefinitionKey("resourceEnter")
+ .processDefinitionKey(getWorkflowDto(user.getStoreId()))
.taskAssignee(user.getUserId());
if (!StringUtil.isEmpty(user.getAuditLink()) && "START".equals(user.getAuditLink())) {
historicTaskInstanceQuery.taskName("resourceEnter");
@@ -245,6 +285,17 @@
public boolean completeTask(@RequestBody PurchaseApplyDto purchaseApplyDto) {
+ //鑾峰彇鐘舵�佹爣璇�
+ String noticeState = purchaseApplyDto.getNoticeState();
+ //鑾峰彇瀹℃壒鐘舵��
+ String auditCode = purchaseApplyDto.getAuditCode();
+ //鑾峰彇鎷掔粷鐞嗙敱
+ String auditMessage = "";
+ if (!StringUtil.isEmpty(auditCode) && auditCode.equals("1200")) {
+ auditMessage = purchaseApplyDto.getAuditMessage();
+ }
+ //鑾峰彇鍑哄叆搴撶姸鎬�
+ String resOrderType = purchaseApplyDto.getResOrderType();
TaskService taskService = processEngine.getTaskService();
Task task = taskService.createTaskQuery().taskId(purchaseApplyDto.getTaskId()).singleResult();
String processInstanceId = task.getProcessInstanceId();
@@ -253,16 +304,37 @@
Map<String, Object> variables = new HashMap<String, Object>();
variables.put("auditCode", purchaseApplyDto.getAuditCode());
variables.put("currentUserId", purchaseApplyDto.getCurrentUserId());
- variables.put("nextAuditStaffId",purchaseApplyDto.getStaffId());
- //taskService.setAssignee(complaintDto.getTaskId(),complaintDto.getCurrentUserId());
- //taskService.addCandidateUser(complaintDto.getTaskId(), complaintDto.getCurrentUserId());
- //taskService.claim(complaintDto.getTaskId(), complaintDto.getCurrentUserId());
+ variables.put("flag", "1200".equals(purchaseApplyDto.getAuditCode()) ? "false" : "true");
+ variables.put("startUserId", purchaseApplyDto.getStartUserId());
taskService.complete(purchaseApplyDto.getTaskId(), variables);
- //taskService.setVariable(purchaseApplyDto.getTaskId(), "purchaseApplyDto", purchaseApplyDto);
-
ProcessInstance pi = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
if (pi == null) {
return true;
+ }
+ //鑾峰彇鐢宠id
+ String applyOrderId = pi.getBusinessKey();
+ //灏嗗緱鍒扮殑瀹炰緥娴佺▼id鍊艰祴缁欎箣鍓嶈缃殑鍙橀噺
+ String processId = pi.getId();
+ String processDefinitionId = pi.getProcessDefinitionId();
+ //鑾峰彇涓嬬骇澶勭悊浜篿d
+ PurchaseApplyDto purchaseDto = new PurchaseApplyDto();
+ purchaseDto.setActRuTaskId(processId);
+ purchaseDto.setProcDefId(processDefinitionId);
+ purchaseDto.setBusinessKey(applyOrderId);
+ List<PurchaseApplyDto> actRuTaskUserIds = purchaseApplyInnerServiceSMOImpl.getActRuTaskUserId(purchaseDto);
+ if (actRuTaskUserIds != null && actRuTaskUserIds.size() > 0) {
+ for (PurchaseApplyDto purchaseApply : actRuTaskUserIds) {
+ String actRuTaskUserId = purchaseApply.getTaskUserId();
+ MachineRecordPo machineRecordPo = new MachineRecordPo();
+ machineRecordPo.setApplyOrderId(applyOrderId);
+ machineRecordPo.setPurchaseUserId(actRuTaskUserId);
+ machineRecordPo.setNoticeState(noticeState);
+ machineRecordPo.setResOrderType(resOrderType);
+ machineRecordPo.setAuditMessage(auditMessage);
+ //浼犻�乨atabus
+ dataBusInnerServiceSMOImpl.customExchange(CustomBusinessDatabusDto.getInstance(
+ BusinessTypeConstant.BUSINESS_TYPE_DATABUS_PURCHASE_APPLY, BeanConvertUtil.beanCovertJson(machineRecordPo)));
+ }
}
return false;
}
@@ -297,32 +369,33 @@
public PurchaseApplyDto getTaskCurrentUser(@RequestBody PurchaseApplyDto purchaseApplyDto) {
TaskService taskService = processEngine.getTaskService();
- Task task = taskService.createTaskQuery().processInstanceBusinessKey(purchaseApplyDto.getApplyOrderId()).singleResult();
+ List<Task> taskList = taskService.createTaskQuery().processInstanceBusinessKey(purchaseApplyDto.getApplyOrderId()).list();
- if (task == null) {
+ if (taskList == null) {
purchaseApplyDto.setStaffId("");
purchaseApplyDto.setStaffName("");
purchaseApplyDto.setStaffTel("");
return purchaseApplyDto;
}
+ for (Task task : taskList) {
+ String userId = task.getAssignee();
+ List<UserDto> users = userInnerServiceSMOImpl.getUserInfo(new String[]{userId});
- String userId = task.getAssignee();
- List<UserDto> users = userInnerServiceSMOImpl.getUserInfo(new String[]{userId});
+ if (users == null || users.size() == 0) {
+ purchaseApplyDto.setStaffId("");
+ purchaseApplyDto.setStaffName("");
+ purchaseApplyDto.setStaffTel("");
+ return purchaseApplyDto;
+ }
- if (users == null || users.size() == 0) {
- purchaseApplyDto.setStaffId("");
- purchaseApplyDto.setStaffName("");
- purchaseApplyDto.setStaffTel("");
- return purchaseApplyDto;
+ purchaseApplyDto.setCurrentUserId(userId);
+ purchaseApplyDto.setStaffName(users.get(0).getName());
+ purchaseApplyDto.setStaffTel(users.get(0).getTel());
}
- purchaseApplyDto.setCurrentUserId(userId);
- purchaseApplyDto.setStaffName(users.get(0).getName());
- purchaseApplyDto.setStaffTel(users.get(0).getTel());
return purchaseApplyDto;
}
-
public ProcessEngine getProcessEngine() {
--
Gitblit v1.8.0