From 5173c99276023cac788875d5fa8d5cad84112777 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 04 八月 2025 00:36:00 +0800
Subject: [PATCH] dnc导入导出格式修改
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java | 148 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 130 insertions(+), 18 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java
index 93fec5a..6bdee86 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java
@@ -4,8 +4,10 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
import org.flowable.engine.HistoryService;
+import org.flowable.engine.RuntimeService;
import org.flowable.engine.TaskService;
import org.flowable.engine.history.HistoricProcessInstance;
+import org.flowable.engine.history.HistoricProcessInstanceQuery;
import org.flowable.engine.task.Comment;
import org.flowable.task.api.Task;
import org.flowable.task.api.TaskQuery;
@@ -14,10 +16,12 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.*;
-import org.springblade.mdm.basesetting.machine.MachineService;
+import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.entity.MdmFlowProcess;
import org.springblade.mdm.flow.util.MdmFlowCache;
import org.springblade.mdm.flow.vo.FlowVO;
+import org.springblade.mdm.program.service.NcProgramService;
+import org.springblade.mdm.program.service.ProcessProgRefService;
import org.springblade.system.feign.IUserClient;
import org.springblade.system.pojo.entity.User;
import org.springframework.stereotype.Service;
@@ -28,7 +32,6 @@
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
-import java.util.stream.Collectors;
/**
* 娴佺▼涓氬姟瀹炵幇绫�
@@ -38,17 +41,20 @@
@Service
@AllArgsConstructor
public class FlowBusinessService {
-
+ private final RuntimeService runtimeService;
private final TaskService taskService;
private final HistoryService historyService;
private final IUserClient userClient;
-
+ private final ProcessProgRefService processProgRefService;
+ private final ApproveRecordService approveRecordService;
+ private final NcProgramService ncProgramService;
+ private final FlowProgramFileService flowProgramFileService;
/**
* 鏌ヨ鎴戠殑娴佺▼(涓汉寰呭姙鍒楄〃)
- * @param page
- * @param createTimeBegin
- * @param createTimeEnd
- * @param keyword
+ * @param page 鍒嗛〉淇℃伅
+ * @param createTimeBegin 鍒涘缓鏃堕棿寮�濮�
+ * @param createTimeEnd 鍒涘缓鏃堕棿鎴
+ * @param keyword 鏌ヨ鍏抽敭瀛�
* @return
*/
public IPage<FlowVO> selectTodoPage(IPage<FlowVO> page, LocalDateTime createTimeBegin, LocalDateTime createTimeEnd, String keyword) {
@@ -75,7 +81,7 @@
// 鏋勫缓鍒楄〃鏁版嵁
FlowVO bladeFlow = new FlowVO();
- buildFlowTaskList(bladeFlow, flowList, todoQuery);//FlowEngineConstant.STATUS_TODO , "todo"
+ buildFlowTaskList(bladeFlow, flowList, todoQuery,page.getCurrent(),page.getSize());
flowList.forEach(flowVO -> {
if(flowVO.getVariables().containsKey("machineCode")){
//Machine machinemachineService.getByCode((String)flowVO.getVariables().get("machineCode"))
@@ -83,8 +89,7 @@
});
// 璁＄畻鎬绘暟
long count = todoQuery.count();
- // 璁剧疆椤垫暟
- page.setSize(count);
+
// 璁剧疆鎬绘暟
page.setTotal(count);
// 璁剧疆鏁版嵁
@@ -253,7 +258,7 @@
* @param flowList 娴佺▼鍒楄〃
* @param taskQuery 浠诲姟鏌ヨ绫�
*/
- private void buildFlowTaskList(FlowVO bladeFlow, List<FlowVO> flowList, TaskQuery taskQuery) {
+ private void buildFlowTaskList(FlowVO bladeFlow, List<FlowVO> flowList, TaskQuery taskQuery,Long currentPage,Long pageSize) {
if (bladeFlow.getCategory() != null) {
taskQuery.processCategoryIn(Func.toStrList(bladeFlow.getCategory()));
}
@@ -267,7 +272,10 @@
taskQuery.taskCreatedBefore(bladeFlow.getEndDate());
}
- List<Task> tasks = taskQuery.list();
+ //List<Task> tasks = taskQuery.list();
+ long total = taskQuery.count();
+ Long firstResult = (currentPage-1)*pageSize;
+ List<Task> tasks = taskQuery.listPage(Func.toInt(firstResult), Func.toInt(pageSize));
tasks.forEach(task -> {
FlowVO flow = new FlowVO();
flow.setTaskId(task.getId());
@@ -282,6 +290,7 @@
flow.setProcessDefinitionId(task.getProcessDefinitionId());
+ flow.setFile(getFileString(task.getProcessInstanceId()));
//flow.setProcessDefinitionKey(processDefinition.getKey());
//flow.setProcessDefinitionVersion(processDefinition.getVersion());
flow.setProcessInstanceId(task.getProcessInstanceId());
@@ -366,12 +375,12 @@
// 鏋勫缓鍒楄〃鏁版嵁
FlowVO bladeFlow = new FlowVO();
- buildFlowTaskList(bladeFlow, flowList, todoQuery);//FlowEngineConstant.STATUS_TODO
+ buildFlowTaskList(bladeFlow, flowList, todoQuery,page.getCurrent(),page.getSize());//FlowEngineConstant.STATUS_TODO
// 璁＄畻鎬绘暟
long count = todoQuery.count();
// 璁剧疆椤垫暟
- page.setSize(count);
+ //page.setSize(count);
// 璁剧疆鎬绘暟
page.setTotal(count);
// 璁剧疆鏁版嵁
@@ -407,16 +416,119 @@
// 鏋勫缓鍒楄〃鏁版嵁
FlowVO bladeFlow = new FlowVO();
- buildFlowTaskList(bladeFlow, flowList, todoQuery);//FlowEngineConstant.STATUS_TODO
+ buildFlowTaskList(bladeFlow, flowList, todoQuery,page.getCurrent(),page.getSize());//FlowEngineConstant.STATUS_TODO
// 璁＄畻鎬绘暟
long count = todoQuery.count();
- // 璁剧疆椤垫暟
- page.setSize(count);
+
// 璁剧疆鎬绘暟
page.setTotal(count);
// 璁剧疆鏁版嵁
page.setRecords(flowList);
return page;
}
+
+ /**
+ * 娴佺▼鏌ヨ 鍔熻兘 鐨勫垎椤�
+ * @param page
+ * @param createTimeBegin
+ * @param createTimeEnd
+ * @param keyword
+ * @return
+ */
+ public IPage<FlowVO> selectSearchPage(IPage<FlowVO> page, LocalDate createTimeBegin, LocalDate createTimeEnd,String processDefinitionKey,String keyword) {
+
+ List<FlowVO> flowList = new LinkedList<>();
+ Date now = new Date();
+ TaskQuery taskQuery = taskService.createTaskQuery().active().includeProcessVariables();
+ if(Func.isNotEmpty(createTimeBegin)) {
+ taskQuery.taskCreatedAfter(DateUtil.toDate(createTimeBegin));
+ }
+ if(Func.isNotEmpty(createTimeEnd)) {
+ taskQuery.taskCreatedBefore(DateUtil.toDate(createTimeEnd.plusDays(1)));
+ }
+ if(Func.isNotEmpty(processDefinitionKey)) {
+ taskQuery.processDefinitionKey(processDefinitionKey);
+ }
+
+ addKeywordCondition(taskQuery, keyword);
+
+ taskQuery.orderByTaskCreateTime().desc();
+
+ // 鏋勫缓鍒楄〃鏁版嵁
+ FlowVO bladeFlow = new FlowVO();
+ buildFlowTaskList(bladeFlow, flowList, taskQuery,page.getCurrent(),page.getSize());//FlowEngineConstant.STATUS_TODO
+
+ // 璁＄畻鎬绘暟
+ long count = taskQuery.count();
+ // 璁剧疆鎬绘暟
+ page.setTotal(count);
+ // 璁剧疆鏁版嵁
+ page.setRecords(flowList);
+ return page;
+ }
+
+ public void deleteProcessInstance(String processInstancesId) {
+ runtimeService.deleteProcessInstance(processInstancesId, "娴佺▼鏌ヨ-鍒犻櫎");
+ //TODO 鍒犻櫎鍑哄叧鑱斿瓧娈�
+ }
+
+ /**
+ * 宸插畬缁撶殑娴佺▼鍒嗛〉鍒楄〃
+ * @param page 鍒嗛〉淇℃伅
+ * @param createTimeBegin
+ * @param createTimeEnd
+ * @param keyword 鍏抽敭瀛�
+ * @return
+ */
+ public IPage<FlowVO> selectFinishedPage(IPage<FlowVO> page, String processDefinitionKey,LocalDate createTimeBegin, LocalDate createTimeEnd, String keyword) {
+ HistoricProcessInstanceQuery query = this.historyService.createHistoricProcessInstanceQuery().includeProcessVariables();
+ //.finished() // 鍙煡璇㈠凡瀹屾垚鐨勬祦绋�.unfinished() // 鏌ヨ鏈畬鎴愮殑娴佺▼
+ if(Func.isNotEmpty(processDefinitionKey)) {
+ query.processDefinitionKey(processDefinitionKey);
+ }
+ if(createTimeBegin!=null) {
+ query.startedAfter(DateUtil.toDate(createTimeBegin));
+ }
+ if(createTimeEnd!=null) {
+ query.startedBefore(DateUtil.toDate(createTimeEnd));
+ }
+ query.orderByProcessInstanceEndTime().desc(); // 鎸夌粨鏉熸椂闂撮檷搴忔帓鍒�
+ page.setTotal(query.count());
+
+ long firstResult = (page.getCurrent()-1) * page.getSize();
+ List<HistoricProcessInstance> processes = query
+ .listPage((int)firstResult, (int)page.getSize());
+
+ List<FlowVO> records = new LinkedList<>();
+
+ for(HistoricProcessInstance processInstance : processes) {
+ FlowVO vo = new FlowVO();
+ vo.setProcessDefinitionKey(processInstance.getProcessDefinitionKey());
+ vo.setProcessInstanceId(processInstance.getId());
+ vo.setProcessDefinitionName(processInstance.getProcessDefinitionName());
+ vo.setVariables(processInstance.getProcessVariables());
+
+ vo.setProcessCreateTime(processInstance.getStartTime());
+ vo.setHistoryTaskEndTime(processInstance.getEndTime());
+
+ vo.setFile(getFileString(processInstance.getId()));
+ records.add(vo);
+ }
+
+ page.setRecords(records);
+
+ return page;
+ }
+ /*
+ 鑾峰彇鍒楄〃涓殑鏂囦欢鍚�
+ */
+ String getFileString(String processInstanceId){
+ String result = "";
+ List<FlowProgramFile> fileList = flowProgramFileService.lambdaQuery().eq(FlowProgramFile::getProcessInstanceId, processInstanceId).list();
+
+ result = String.join(",",fileList.stream().map(FlowProgramFile::getName).toList());
+
+ return result;
+ }
}
--
Gitblit v1.9.3