From 4b86cf6bbe5a7204a801169398fa836e8e06c109 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 14 Dec 2022 17:04:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/master'

---
 src/main/java/org/springblade/flow/engine/controller/FlowFollowController.java |   73 ++++++++++++++++++++++++++++++++++++
 1 files changed, 73 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/flow/engine/controller/FlowFollowController.java b/src/main/java/org/springblade/flow/engine/controller/FlowFollowController.java
new file mode 100644
index 0000000..3693d50
--- /dev/null
+++ b/src/main/java/org/springblade/flow/engine/controller/FlowFollowController.java
@@ -0,0 +1,73 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.flow.engine.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import org.springblade.core.launch.constant.AppConstant;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.annotation.PreAuth;
+import org.springblade.core.tenant.annotation.NonDS;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.constant.RoleConstant;
+import org.springblade.flow.engine.entity.FlowExecution;
+import org.springblade.flow.engine.service.FlowEngineService;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+/**
+ * 流程状态控制器
+ *
+ * @author Chill
+ */
+@NonDS
+@RestController
+@RequestMapping(AppConstant.APPLICATION_FLOW_NAME + "/follow")
+@AllArgsConstructor
+@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+@ApiIgnore
+public class FlowFollowController {
+
+	private final FlowEngineService flowEngineService;
+
+	/**
+	 * 流程状态列表
+	 */
+	@GetMapping("list")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "分页", notes = "传入notice")
+	public R<IPage<FlowExecution>> list(Query query, @ApiParam(value = "流程实例id") String processInstanceId, @ApiParam(value = "流程key") String processDefinitionKey) {
+		IPage<FlowExecution> pages = flowEngineService.selectFollowPage(Condition.getPage(query), processInstanceId, processDefinitionKey);
+		return R.data(pages);
+	}
+
+	/**
+	 * 删除流程实例
+	 */
+	@PostMapping("delete-process-instance")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "删除", notes = "传入主键集合")
+	public R deleteProcessInstance(@ApiParam(value = "流程实例id") @RequestParam String processInstanceId, @ApiParam(value = "删除原因") @RequestParam String deleteReason) {
+		boolean temp = flowEngineService.deleteProcessInstance(processInstanceId, deleteReason);
+		return R.status(temp);
+	}
+
+}

--
Gitblit v1.9.3