⚡ 流程优化

blade-ops/blade-flow/src/main/java/org/springblade/flow/business/service/impl/FlowBusinessServiceImpl.java

@@ -34,7 +34,7 @@ import org.springblade.flow.business.service.FlowBusinessService;
 import org.springblade.flow.core.constant.ProcessConstant;
 import org.springblade.flow.core.entity.BladeFlow;
 import org.springblade.flow.core.utils.TaskUtil;
-import org.springblade.flow.engine.constant.FlowConstant;
+import org.springblade.flow.engine.constant.FlowEngineConstant;
 import org.springblade.flow.engine.utils.FlowCache;
 import org.springframework.stereotype.Service;
 
@@ -68,8 +68,8 @@ public class FlowBusinessServiceImpl implements FlowBusinessService {
 			.includeProcessVariables().active().orderByTaskCreateTime().desc();
 
 		// 构建列表数据
-		buildFlowTaskList(bladeFlow, flowList, claimUserQuery, FlowConstant.STATUS_CLAIM);
-		buildFlowTaskList(bladeFlow, flowList, claimRoleQuery, FlowConstant.STATUS_CLAIM);
+		buildFlowTaskList(bladeFlow, flowList, claimUserQuery, FlowEngineConstant.STATUS_CLAIM);
+		buildFlowTaskList(bladeFlow, flowList, claimRoleQuery, FlowEngineConstant.STATUS_CLAIM);
 
 		// 计算总数
 		long count = claimUserQuery.count() + claimRoleQuery.count();
@@ -92,7 +92,7 @@ public class FlowBusinessServiceImpl implements FlowBusinessService {
 			.includeProcessVariables().orderByTaskCreateTime().desc();
 
 		// 构建列表数据
-		buildFlowTaskList(bladeFlow, flowList, todoQuery, FlowConstant.STATUS_TODO);
+		buildFlowTaskList(bladeFlow, flowList, todoQuery, FlowEngineConstant.STATUS_TODO);
 
 		// 计算总数
 		long count = todoQuery.count();
@@ -155,11 +155,11 @@ public class FlowBusinessServiceImpl implements FlowBusinessService {
 			flow.setTaskDefinitionKey(historyTask.getTaskDefinitionKey());
 			// Status
 			if (historicProcessInstance.getEndActivityId() != null) {
-				flow.setProcessIsFinished(FlowConstant.STATUS_FINISHED);
+				flow.setProcessIsFinished(FlowEngineConstant.STATUS_FINISHED);
 			} else {
-				flow.setProcessIsFinished(FlowConstant.STATUS_UNFINISHED);
+				flow.setProcessIsFinished(FlowEngineConstant.STATUS_UNFINISHED);
 			}
-			flow.setStatus(FlowConstant.STATUS_FINISH);
+			flow.setStatus(FlowEngineConstant.STATUS_FINISH);
 			flowList.add(flow);
 		});
 
@@ -218,12 +218,12 @@ public class FlowBusinessServiceImpl implements FlowBusinessService {
 				flow.setBusinessTable(businessKey[0]);
 				flow.setBusinessId(businessKey[1]);
 				if (historicProcessInstance.getEndActivityId() != null) {
-					flow.setProcessIsFinished(FlowConstant.STATUS_FINISHED);
+					flow.setProcessIsFinished(FlowEngineConstant.STATUS_FINISHED);
 				} else {
-					flow.setProcessIsFinished(FlowConstant.STATUS_UNFINISHED);
+					flow.setProcessIsFinished(FlowEngineConstant.STATUS_UNFINISHED);
 				}
 			}
-			flow.setStatus(FlowConstant.STATUS_FINISH);
+			flow.setStatus(FlowEngineConstant.STATUS_FINISH);
 			flowList.add(flow);
 		});
 		// 计算总数

blade-ops/blade-flow/src/main/java/org/springblade/flow/engine/constant/FlowEngineConstant.java

@@ -21,7 +21,7 @@ package org.springblade.flow.engine.constant;
  *
  * @author zhuangqian
  */
-public interface FlowConstant {
+public interface FlowEngineConstant {
 
 	String FLOWABLE_BASE_PACKAGES = "org.flowable.ui";
 

blade-ops/blade-flow/src/main/java/org/springblade/flow/engine/controller/FlowManagerController.java

@@ -26,12 +26,15 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.annotation.PreAuth;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.constant.RoleConstant;
+import org.springblade.core.tool.support.Kv;
+import org.springblade.flow.engine.constant.FlowEngineConstant;
 import org.springblade.flow.engine.entity.FlowProcess;
 import org.springblade.flow.engine.service.FlowService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 流程管理接口
@@ -81,6 +84,18 @@ public class FlowManagerController {
 		return R.status(flowService.deleteDeployment(deploymentIds));
 	}
 
+	/**
+	 * 检查流程文件格式
+	 *
+	 * @param file    流程文件
+	 */
+	@PostMapping("check-upload")
+	@ApiOperation(value = "上传部署流程文件", notes = "传入文件", position = 4)
+	public R checkUpload(@RequestParam MultipartFile file) {
+		boolean temp = Objects.requireNonNull(file.getOriginalFilename()).endsWith(FlowEngineConstant.SUFFIX);
+		return R.data(Kv.create().set("name", file.getOriginalFilename()).set("success", temp));
+	}
+
 	/**
 	 * 上传部署流程文件
 	 *

blade-ops/blade-flow/src/main/java/org/springblade/flow/engine/service/impl/FlowServiceImpl.java

@@ -47,7 +47,7 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.flow.core.entity.BladeFlow;
 import org.springblade.flow.core.utils.TaskUtil;
-import org.springblade.flow.engine.constant.FlowConstant;
+import org.springblade.flow.engine.constant.FlowEngineConstant;
 import org.springblade.flow.engine.entity.FlowExecution;
 import org.springblade.flow.engine.entity.FlowModel;
 import org.springblade.flow.engine.entity.FlowProcess;
@@ -158,8 +158,8 @@ public class FlowServiceImpl extends ServiceImpl<FlowMapper, FlowModel> implemen
 			}
 			// 显示开始节点和结束节点，并且执行人不为空的任务
 			if (StringUtils.isNotBlank(historicActivityInstance.getAssignee())
-				|| FlowConstant.START_EVENT.equals(historicActivityInstance.getActivityType())
-				|| FlowConstant.END_EVENT.equals(historicActivityInstance.getActivityType())) {
+				|| FlowEngineConstant.START_EVENT.equals(historicActivityInstance.getActivityType())
+				|| FlowEngineConstant.END_EVENT.equals(historicActivityInstance.getActivityType())) {
 				// 给节点增加序号
 				Integer activityNum = activityMap.get(historicActivityInstance.getActivityId());
 				if (activityNum == null) {
@@ -172,7 +172,7 @@ public class FlowServiceImpl extends ServiceImpl<FlowMapper, FlowModel> implemen
 				String durationTime = DateUtil.secondToTime(Func.toLong(historicActivityInstance.getDurationInMillis(), 0L) / 1000);
 				flow.setHistoryActivityDurationTime(durationTime);
 				// 获取流程发起人名称
-				if (FlowConstant.START_EVENT.equals(historicActivityInstance.getActivityType())) {
+				if (FlowEngineConstant.START_EVENT.equals(historicActivityInstance.getActivityType())) {
 					List<HistoricProcessInstance> processInstanceList = historyService.createHistoricProcessInstanceQuery().processInstanceId(processInstanceId).orderByProcessInstanceStartTime().asc().list();
 					if (processInstanceList.size() > 0) {
 						if (StringUtil.isNotBlank(processInstanceList.get(0).getStartUserId())) {
@@ -226,10 +226,10 @@ public class FlowServiceImpl extends ServiceImpl<FlowMapper, FlowModel> implemen
 
 	@Override
 	public String changeState(String state, String processId) {
-		if (state.equals(FlowConstant.ACTIVE)) {
+		if (state.equals(FlowEngineConstant.ACTIVE)) {
 			repositoryService.activateProcessDefinitionById(processId, true, null);
 			return StringUtil.format("激活ID为 [{}] 的流程成功", processId);
-		} else if (state.equals(FlowConstant.SUSPEND)) {
+		} else if (state.equals(FlowEngineConstant.SUSPEND)) {
 			repositoryService.suspendProcessDefinitionById(processId, true, null);
 			return StringUtil.format("挂起ID为 [{}] 的流程成功", processId);
 		} else {
@@ -266,8 +266,8 @@ public class FlowServiceImpl extends ServiceImpl<FlowMapper, FlowModel> implemen
 		}
 		byte[] bytes = getBpmnXML(model);
 		String processName = model.getName();
-		if (!StringUtil.endsWithIgnoreCase(processName, FlowConstant.SUFFIX)) {
-			processName += FlowConstant.SUFFIX;
+		if (!StringUtil.endsWithIgnoreCase(processName, FlowEngineConstant.SUFFIX)) {
+			processName += FlowEngineConstant.SUFFIX;
 		}
 		Deployment deployment = repositoryService.createDeployment().addBytes(processName, bytes).name(model.getName()).key(model.getModelKey()).deploy();
 		return deploy(deployment, category);