From 7958f1dddb8a7f4e70d232b07a7703955ecedae0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 26 八月 2023 12:45:33 +0800
Subject: [PATCH] 优化diamante
---
service-common/src/main/java/com/java110/common/smo/impl/AllocationStorehouseUserInnerServiceSMOImpl.java | 87 ++++++++++++++++++++++++++++++++++---------
1 files changed, 69 insertions(+), 18 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/smo/impl/AllocationStorehouseUserInnerServiceSMOImpl.java b/service-common/src/main/java/com/java110/common/smo/impl/AllocationStorehouseUserInnerServiceSMOImpl.java
index 47fe8b6..ce4579e 100644
--- a/service-common/src/main/java/com/java110/common/smo/impl/AllocationStorehouseUserInnerServiceSMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/smo/impl/AllocationStorehouseUserInnerServiceSMOImpl.java
@@ -2,16 +2,18 @@
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
-import com.java110.dto.allocationStorehouseApply.AllocationStorehouseApplyDto;
-import com.java110.dto.businessDatabus.CustomBusinessDatabusDto;
-import com.java110.dto.purchaseApply.PurchaseApplyDto;
-import com.java110.dto.workflow.WorkflowDto;
-import com.java110.entity.audit.AuditUser;
+import com.java110.dto.purchase.AllocationStorehouseApplyDto;
+import com.java110.dto.data.DatabusDataDto;
+import com.java110.dto.purchase.PurchaseApplyDto;
+import com.java110.dto.store.StorehouseDto;
+import com.java110.dto.oaWorkflow.WorkflowDto;
+import com.java110.dto.audit.AuditUser;
import com.java110.intf.common.IAllocationStorehouseUserInnerServiceSMO;
import com.java110.intf.common.IWorkflowInnerServiceSMO;
import com.java110.intf.job.IDataBusInnerServiceSMO;
import com.java110.intf.store.IAllocationStorehouseApplyInnerServiceSMO;
import com.java110.intf.store.IPurchaseApplyInnerServiceSMO;
+import com.java110.intf.store.IStorehouseInnerServiceSMO;
import com.java110.po.machine.MachineRecordPo;
import com.java110.utils.constant.BusinessTypeConstant;
import com.java110.utils.util.Assert;
@@ -38,6 +40,8 @@
import java.util.List;
import java.util.Map;
+import static com.java110.dto.store.StorehouseDto.SH_TYPE_GROUP;
+
//@Service("resourceEntryStoreSMOImpl")
@RestController
public class AllocationStorehouseUserInnerServiceSMOImpl extends BaseServiceSMO implements IAllocationStorehouseUserInnerServiceSMO {
@@ -60,6 +64,10 @@
@Autowired
private IDataBusInnerServiceSMO dataBusInnerServiceSMOImpl;
+ @Autowired
+ private IStorehouseInnerServiceSMO iStorehouseInnerServiceSMO;
+
+
/**
* 鍚姩娴佺▼
*
@@ -71,8 +79,18 @@
variables.put("allocationStorehouseApplyDto", allocationStorehouseApplyDto);
variables.put("userId", allocationStorehouseApplyDto.getCurrentUserId());
variables.put("startUserId", allocationStorehouseApplyDto.getCurrentUserId());
+ variables.put("nextUserId", allocationStorehouseApplyDto.getNextUserId());
+ //鏌ヨ璋冩嫧婧愪粨搴撴槸闆嗗洟浠撳簱杩樻槸灏忓尯浠撳簱锛屽皬鍖轰粨搴撹蛋琚皟鎷ㄦ祦绋嬪鎵�
+ StorehouseDto storehouseDto = new StorehouseDto();
+ storehouseDto.setShId(allocationStorehouseApplyDto.getShId());
+ List<StorehouseDto> storehouseDtoList = iStorehouseInnerServiceSMO.queryStorehouses(storehouseDto);
+ StorehouseDto storehouseDto1 = new StorehouseDto();
+ String communityId = null;
+ if (storehouseDtoList != null && storehouseDtoList.size() > 0) {
+ storehouseDto1 = storehouseDtoList.get(0);
+ }
//寮�鍚祦绋�
- ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(getWorkflowDto(allocationStorehouseApplyDto.getStoreId()), allocationStorehouseApplyDto.getApplyId(), variables);
+ ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(getWorkflowDto(allocationStorehouseApplyDto.getStoreId(), communityId), allocationStorehouseApplyDto.getApplyId(), variables);
//灏嗗緱鍒扮殑瀹炰緥娴佺▼id鍊艰祴缁欎箣鍓嶈缃殑鍙橀噺
String processInstanceId = processInstance.getId();
// System.out.println("娴佺▼寮�鍚垚鍔�.......瀹炰緥娴佺▼id:" + processInstanceId);
@@ -92,7 +110,7 @@
machineRecordPo.setApplyOrderId(businessKey);
machineRecordPo.setPurchaseUserId(actRuTaskUserId);
//浼犻�乨atabus
- dataBusInnerServiceSMOImpl.customExchange(CustomBusinessDatabusDto.getInstance(
+ dataBusInnerServiceSMOImpl.databusData(DatabusDataDto.getInstance(
BusinessTypeConstant.BUSINESS_TYPE_DATABUS_ALLOCATION_STOREHOUSE_APPLY, BeanConvertUtil.beanCovertJson(machineRecordPo)));
}
}
@@ -107,7 +125,9 @@
*/
public long getUserTaskCount(@RequestBody AuditUser user) {
TaskService taskService = processEngine.getTaskService();
- TaskQuery query = taskService.createTaskQuery().processDefinitionKey(getWorkflowDto(user.getStoreId()));
+ List<String> workflowlist = getWorkflowDto1(user.getStoreId());
+ TaskQuery query = taskService.createTaskQuery().processDefinitionKeyIn(workflowlist);
+// TaskQuery query = taskService.createTaskQuery().processDefinitionKey(getWorkflowDto(user.getStoreId(), user.getCommunityId()));
query.taskAssignee(user.getUserId());
return query.count();
}
@@ -119,7 +139,7 @@
*/
public List<AllocationStorehouseApplyDto> getUserTasks(@RequestBody AuditUser user) {
TaskService taskService = processEngine.getTaskService();
- TaskQuery query = taskService.createTaskQuery().processDefinitionKey(getWorkflowDto(user.getStoreId()));
+ TaskQuery query = taskService.createTaskQuery().processDefinitionKeyIn(getWorkflowDto1(user.getStoreId()));
query.taskAssignee(user.getUserId());
query.orderByTaskCreateTime().desc();
List<Task> list = null;
@@ -142,6 +162,7 @@
String business_key = pi.getBusinessKey();
appIyIds.add(business_key);
taskBusinessKeyMap.put(business_key, task.getId());
+ taskBusinessKeyMap.put(business_key+"_ProcessDefinitionKey", pi.getProcessDefinitionKey());
}
if (appIyIds == null || appIyIds.size() == 0) {
@@ -155,6 +176,7 @@
List<AllocationStorehouseApplyDto> tmpAllocationStorehouseApplyDtos = allocationStorehouseApplyInnerServiceSMOImpl.queryAllocationStorehouseApplys(allocationStorehouseApplyDto);
for (AllocationStorehouseApplyDto tmpAllocationStorehouseApplyDto : tmpAllocationStorehouseApplyDtos) {
tmpAllocationStorehouseApplyDto.setTaskId(taskBusinessKeyMap.get(tmpAllocationStorehouseApplyDto.getApplyId()));
+ tmpAllocationStorehouseApplyDto.setProcessDefinitionKey(taskBusinessKeyMap.get(tmpAllocationStorehouseApplyDto.getApplyId()+"_ProcessDefinitionKey"));
}
return tmpAllocationStorehouseApplyDtos;
}
@@ -190,21 +212,49 @@
return true;
}
-
- 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_ALLOCATION_STOREHOUSE);
+ if (!StringUtil.isEmpty(communityId) && "9999".equals(communityId)) {
+ workflowDto.setFlowType(WorkflowDto.FLOW_TYPE_ALLOCATION_STOREHOUSE);
+ } else {
+ workflowDto.setFlowType(WorkflowDto.FLOW_TYPE_ALLOCATION_STOREHOUSE_GO);
+ }
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();
+ }
+
+ private List<String> getWorkflowDto1(String storeId) {
+
+ //寮�鍚祦绋�
+ //WorkflowDto.DEFAULT_PROCESS + workflowDto.getFlowId()
+ WorkflowDto workflowDto = new WorkflowDto();
+ String[] flowTypes = new String[]{WorkflowDto.FLOW_TYPE_ALLOCATION_STOREHOUSE, WorkflowDto.FLOW_TYPE_ALLOCATION_STOREHOUSE_GO};
+ workflowDto.setFlowTypes(flowTypes);
+ workflowDto.setStoreId(storeId);
+ List<WorkflowDto> workflowDtos = workflowInnerServiceSMOImpl.queryWorkflows(workflowDto);
+ if (workflowDtos != null && workflowDtos.size() == 0) {
+ throw new IllegalArgumentException("鏈壘鍒� 璋冩嫧娴佺▼锛岃鍦ㄧ墿涓氳处鍙风郴缁熺鐞嗕笅娴佺▼绠＄悊涓厤缃祦绋�!");
+ }
+ List<String> flowIdList = new ArrayList<String>();
+ for (WorkflowDto workflowDto1 : workflowDtos) {
+ if (StringUtil.isEmpty(workflowDto1.getProcessDefinitionKey()) && WorkflowDto.FLOW_TYPE_ALLOCATION_STOREHOUSE.equals(workflowDto1.getFlowType())) {
+ throw new IllegalArgumentException("灏忓尯缂栫爜=" + workflowDto1.getCommunityId() + "鐨勭墿鍝佽皟鎷ㄦ祦绋嬭繕鏈儴缃�");
+ }
+ if (StringUtil.isEmpty(workflowDto1.getProcessDefinitionKey()) && WorkflowDto.FLOW_TYPE_ALLOCATION_STOREHOUSE_GO.equals(workflowDto1.getFlowType())) {
+ throw new IllegalArgumentException("灏忓尯缂栫爜=" + workflowDto1.getCommunityId() + "鐨勭墿鍝佽璋冩嫧杩樻湭閮ㄧ讲");
+ }
+ flowIdList.add(WorkflowDto.DEFAULT_PROCESS + workflowDto1.getFlowId());
+ }
+ return flowIdList;
}
/**
@@ -220,7 +270,7 @@
// .taskAssignee(user.getUserId());
HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
- .processDefinitionKey(getWorkflowDto(user.getStoreId()))
+ .processDefinitionKeyIn(getWorkflowDto1(user.getStoreId()))
.taskAssignee(user.getUserId())
.finished();
if (!StringUtil.isEmpty(user.getAuditLink()) && "START".equals(user.getAuditLink())) {
@@ -242,7 +292,7 @@
HistoryService historyService = processEngine.getHistoryService();
HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
- .processDefinitionKey(getWorkflowDto(user.getStoreId()))
+ .processDefinitionKeyIn(getWorkflowDto1(user.getStoreId()))
.taskAssignee(user.getUserId())
.finished();
// if (!StringUtil.isEmpty(user.getAuditLink()) && "START".equals(user.getAuditLink())) {
@@ -306,6 +356,7 @@
variables.put("currentUserId", allocationStorehouseApplyDto.getCurrentUserId());
variables.put("flag", "1200".equals(allocationStorehouseApplyDto.getAuditCode()) ? "false" : "true");
variables.put("startUserId", allocationStorehouseApplyDto.getStartUserId());
+ variables.put("nextUserId", allocationStorehouseApplyDto.getNextUserId());
taskService.complete(allocationStorehouseApplyDto.getTaskId(), variables);
ProcessInstance pi = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
if (pi == null) {
@@ -329,7 +380,7 @@
machineRecordPo.setNoticeState(noticeState);
machineRecordPo.setAuditMessage(auditMessage);
//浼犻�乨atabus
- dataBusInnerServiceSMOImpl.customExchange(CustomBusinessDatabusDto.getInstance(
+ dataBusInnerServiceSMOImpl.databusData(DatabusDataDto.getInstance(
BusinessTypeConstant.BUSINESS_TYPE_DATABUS_ALLOCATION_STOREHOUSE_APPLY, BeanConvertUtil.beanCovertJson(machineRecordPo)));
}
}
--
Gitblit v1.8.0