From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-common/src/main/java/com/java110/common/smo/impl/GoodCollectionUserInnerServiceSMOImpl.java | 113 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 70 insertions(+), 43 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/smo/impl/GoodCollectionUserInnerServiceSMOImpl.java b/service-common/src/main/java/com/java110/common/smo/impl/GoodCollectionUserInnerServiceSMOImpl.java
old mode 100644
new mode 100755
index e2b54f0..84cff2d
--- a/service-common/src/main/java/com/java110/common/smo/impl/GoodCollectionUserInnerServiceSMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/smo/impl/GoodCollectionUserInnerServiceSMOImpl.java
@@ -1,20 +1,23 @@
package com.java110.common.smo.impl;
-
import com.java110.core.base.smo.BaseServiceSMO;
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.IAuditUserInnerServiceSMO;
import com.java110.intf.common.IGoodCollectionUserInnerServiceSMO;
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.*;
import org.activiti.engine.history.HistoricProcessInstance;
@@ -35,7 +38,9 @@
import java.util.List;
import java.util.Map;
-
+/**
+ * 鐗╁搧棰嗙敤宸ヤ綔娴�
+ */
@RestController
public class GoodCollectionUserInnerServiceSMOImpl extends BaseServiceSMO implements IGoodCollectionUserInnerServiceSMO {
@@ -49,13 +54,6 @@
private TaskService taskService;
@Autowired
- private HistoryService historyService;
-
- @Autowired
- private RepositoryService repositoryService;
-
-
- @Autowired
private IUserInnerServiceSMO userInnerServiceSMOImpl;
@Autowired
@@ -65,11 +63,10 @@
private IPurchaseApplyInnerServiceSMO purchaseApplyInnerServiceSMOImpl;
@Autowired
- private IAuditUserInnerServiceSMO auditUserInnerServiceSMOImpl;
-
- @Autowired
private IWorkflowInnerServiceSMO workflowInnerServiceSMOImpl;
+ @Autowired
+ private IDataBusInnerServiceSMO dataBusInnerServiceSMOImpl;
/**
* 鍚姩娴佺▼
@@ -77,37 +74,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("userId", purchaseApplyDto.getCurrentUserId());
variables.put("startUserId", purchaseApplyDto.getCurrentUserId());
+ variables.put("nextUserId", purchaseApplyDto.getNextStaffId());
//寮�鍚祦绋�
- ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(getWorkflowDto(purchaseApplyDto.getStoreId()), purchaseApplyDto.getApplyOrderId(), variables);
-// //灏嗗緱鍒扮殑瀹炰緥娴佺▼id鍊艰祴缁欎箣鍓嶈缃殑鍙橀噺
+ ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(getWorkflowDto(purchaseApplyDto.getStoreId(),purchaseApplyDto.getCommunityId()), purchaseApplyDto.getApplyOrderId(), variables);
+ //灏嗗緱鍒扮殑瀹炰緥娴佺▼id鍊艰祴缁欎箣鍓嶈缃殑鍙橀噺
String processInstanceId = processInstance.getId();
-// // System.out.println("娴佺▼寮�鍚垚鍔�.......瀹炰緥娴佺▼id:" + processInstanceId);
-//
+ String processDefinitionId = processInstance.getProcessDefinitionId();
+ String businessKey = processInstance.getBusinessKey();
+ //鑾峰彇涓嬬骇澶勭悊浜篿d
+ PurchaseApplyDto purchaseApply = new PurchaseApplyDto();
+ purchaseApply.setBusinessKey(businessKey);
+ purchaseApply.setActRuTaskId(processInstanceId);
+ purchaseApply.setProcDefId(processDefinitionId);
+ List<PurchaseApplyDto> actRuTaskUserIds = purchaseApplyInnerServiceSMOImpl.getActRuTaskUserId(purchaseApply);
+ // System.out.println("娴佺▼寮�鍚垚鍔�.......瀹炰緥娴佺▼id:" + processInstanceId);
purchaseApplyDto.setProcessInstanceId(processInstanceId);
+ if (actRuTaskUserIds != null && actRuTaskUserIds.size() > 0) {
+ for (PurchaseApplyDto purchase : actRuTaskUserIds) {
+ String actRuTaskUserId = purchase.getTaskUserId();
+ MachineRecordPo machineRecordPo = new MachineRecordPo();
+ machineRecordPo.setApplyOrderId(businessKey);
+ machineRecordPo.setPurchaseUserId(actRuTaskUserId);
+ machineRecordPo.setResOrderType(resOrderType);
+ //浼犻�乨atabus
+ dataBusInnerServiceSMOImpl.customExchange(CustomBusinessDatabusDto.getInstance(
+ BusinessTypeConstant.BUSINESS_TYPE_DATABUS_PURCHASE_APPLY, BeanConvertUtil.beanCovertJson(machineRecordPo)));
+ }
+ }
//autoFinishFirstTask(purchaseApplyDto);
return purchaseApplyDto;
}
- private String getWorkflowDto(String storeId) {
+ private String getWorkflowDto(String storeId,String communityId) {
//寮�鍚祦绋�
//WorkflowDto.DEFAULT_PROCESS + workflowDto.getFlowId()
WorkflowDto workflowDto = new WorkflowDto();
workflowDto.setFlowType(WorkflowDto.FLOW_TYPE_COLLECTION);
workflowDto.setStoreId(storeId);
+ workflowDto.setCommunityId(communityId);
List<WorkflowDto> workflowDtos = workflowInnerServiceSMOImpl.queryWorkflows(workflowDto);
- Assert.listOnlyOne(workflowDtos, "鏈壘鍒� 閲囪喘娴佺▼鎴栨壘鍒板鏉�");
+ Assert.listOnlyOne(workflowDtos, "鏈壘鍒� 鐗╁搧棰嗙敤娴佺▼鎴栨壘鍒板鏉★紝璇峰湪鐗╀笟璐﹀彿绯荤粺绠＄悊涓嬫祦绋嬬鐞嗕腑閰嶇疆娴佺▼");
WorkflowDto tmpWorkflowDto = workflowDtos.get(0);
if (StringUtil.isEmpty(tmpWorkflowDto.getProcessDefinitionKey())) {
- throw new IllegalArgumentException("娴佺▼杩樻湭閮ㄧ讲");
+ throw new IllegalArgumentException("鐗╁搧棰嗙敤娴佺▼杩樻湭閮ㄧ讲");
}
return WorkflowDto.DEFAULT_PROCESS + tmpWorkflowDto.getFlowId();
}
@@ -142,7 +162,7 @@
*/
public long getUserTaskCount(@RequestBody AuditUser user) {
TaskService taskService = processEngine.getTaskService();
- TaskQuery query = taskService.createTaskQuery().processDefinitionKey(getWorkflowDto(user.getStoreId()));
+ TaskQuery query = taskService.createTaskQuery().processDefinitionKey(getWorkflowDto(user.getStoreId(),user.getCommunityId()));
query.taskAssignee(user.getUserId());
return query.count();
}
@@ -154,12 +174,12 @@
*/
public List<PurchaseApplyDto> getUserTasks(@RequestBody AuditUser user) {
TaskService taskService = processEngine.getTaskService();
- TaskQuery query = taskService.createTaskQuery().processDefinitionKey(getWorkflowDto(user.getStoreId()));
+ TaskQuery query = taskService.createTaskQuery().processDefinitionKey(getWorkflowDto(user.getStoreId(),user.getCommunityId()));
query.taskAssignee(user.getUserId());
query.orderByTaskCreateTime().desc();
List<Task> list = null;
if (user.getPage() >= 1) {
- user.setPage(user.getPage() - 1);
+ user.setPage((user.getPage() - 1) * user.getRow());
}
if (user.getPage() != PageDto.DEFAULT_PAGE) {
list = query.listPage(user.getPage(), user.getRow());
@@ -221,12 +241,13 @@
// .taskAssignee(user.getUserId());
HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
- .processDefinitionKey(getWorkflowDto(user.getStoreId()))
- .taskAssignee(user.getUserId());
+ .processDefinitionKey(getWorkflowDto(user.getStoreId(),user.getCommunityId()))
+ .taskAssignee(user.getUserId())
+ .finished();
if (!StringUtil.isEmpty(user.getAuditLink()) && "START".equals(user.getAuditLink())) {
- historicTaskInstanceQuery.taskName("resourceEnter");
+ historicTaskInstanceQuery.taskName("complaint");
} else if (!StringUtil.isEmpty(user.getAuditLink()) && "AUDIT".equals(user.getAuditLink())) {
- historicTaskInstanceQuery.taskName("resourceEnterDealUser");
+ historicTaskInstanceQuery.taskName("complaitDealUser");
}
Query query = historicTaskInstanceQuery;
@@ -242,13 +263,14 @@
HistoryService historyService = processEngine.getHistoryService();
HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
- .processDefinitionKey("resourceEnter")
- .taskAssignee(user.getUserId());
- if (!StringUtil.isEmpty(user.getAuditLink()) && "START".equals(user.getAuditLink())) {
- historicTaskInstanceQuery.taskName("resourceEnter");
- } else if (!StringUtil.isEmpty(user.getAuditLink()) && "AUDIT".equals(user.getAuditLink())) {
- historicTaskInstanceQuery.taskName("resourceEnterDealUser");
- }
+ .processDefinitionKey(getWorkflowDto(user.getStoreId(),user.getCommunityId()))
+ .taskAssignee(user.getUserId())
+ .finished();
+// if (!StringUtil.isEmpty(user.getAuditLink()) && "START".equals(user.getAuditLink())) {
+// historicTaskInstanceQuery.taskName("complaint");
+// } else if (!StringUtil.isEmpty(user.getAuditLink()) && "AUDIT".equals(user.getAuditLink())) {
+// historicTaskInstanceQuery.taskName("complaitDealUser");
+// }
Query query = historicTaskInstanceQuery.orderByHistoricTaskInstanceStartTime().desc();
@@ -259,23 +281,29 @@
list = query.list();
}
- List<String> complaintIds = new ArrayList<>();
+ List<String> applyOrderIds = new ArrayList<>();
+ Map<String, String> taskBusinessKeyMap = new HashMap<>();
+
for (HistoricTaskInstance task : list) {
String processInstanceId = task.getProcessInstanceId();
//3.浣跨敤娴佺▼瀹炰緥锛屾煡璇�
HistoricProcessInstance pi = historyService.createHistoricProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
//4.浣跨敤娴佺▼瀹炰緥瀵硅薄鑾峰彇BusinessKey
String business_key = pi.getBusinessKey();
- complaintIds.add(business_key);
+ applyOrderIds.add(business_key);
+ taskBusinessKeyMap.put(business_key, task.getId());
}
//鏌ヨ 鎶曡瘔淇℃伅
-// ComplaintDto complaintDto = new ComplaintDto();
-// complaintDto.setStoreId(user.getStoreId());
-// complaintDto.setCommunityId(user.getCommunityId());
-// complaintDto.setComplaintIds(complaintIds.toArray(new String[complaintIds.size()]));
-// List<ComplaintDto> tmpComplaintDtos = complaintInnerServiceSMOImpl.queryComplaints(complaintDto);
- return null;
+ PurchaseApplyDto purchaseApplyDto = new PurchaseApplyDto();
+ purchaseApplyDto.setStoreId(user.getStoreId());
+ purchaseApplyDto.setApplyOrderIds(applyOrderIds.toArray(new String[applyOrderIds.size()]));
+ List<PurchaseApplyDto> tmpPurchaseApplyDtos = purchaseApplyInnerServiceSMOImpl.queryPurchaseApplyAndDetails(purchaseApplyDto);
+
+ for (PurchaseApplyDto tmpPurchaseApplyDto : tmpPurchaseApplyDtos) {
+ tmpPurchaseApplyDto.setTaskId(taskBusinessKeyMap.get(tmpPurchaseApplyDto.getApplyOrderId()));
+ }
+ return tmpPurchaseApplyDtos;
}
@@ -291,7 +319,6 @@
variables.put("flag", "1200".equals(purchaseApplyDto.getAuditCode()) ? "false" : "true");
variables.put("startUserId", purchaseApplyDto.getStartUserId());
taskService.complete(purchaseApplyDto.getTaskId(), variables);
-
ProcessInstance pi = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
if (pi == null) {
return true;
--
Gitblit v1.8.0