feat: wire process monitor actions
This commit is contained in:
@@ -216,6 +216,16 @@ public class FlowableClient {
|
||||
Map.of(), Map.class);
|
||||
}
|
||||
|
||||
/**
|
||||
* 结束运行中流程实例。对应 flowable-service
|
||||
* {@code POST /api/flow/process/{processInstanceId}/terminate}。
|
||||
*/
|
||||
@SuppressWarnings("unchecked")
|
||||
public Map<String, Object> terminateProcessInstance(String processInstanceId, String comment) {
|
||||
return post("结束流程", "/api/flow/process/" + processInstanceId + "/terminate",
|
||||
comment == null ? Map.of() : Map.of("comment", comment), Map.class);
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- 内部:重试 + 异常分类
|
||||
|
||||
private List<FlowTaskDto> get(String op, java.util.function.Function<UriBuilder, java.net.URI> uriFn) {
|
||||
|
||||
@@ -227,6 +227,33 @@ public class TodoController {
|
||||
return ResponseEntity.ok(resp);
|
||||
}
|
||||
|
||||
@Operation(summary = "流程监控结束流程",
|
||||
description = "流程监控页专用:按流程实例结束活动流程,并按老系统语义回写 SYS_DATASTATUS=6(作废)。")
|
||||
@PostMapping("/api/workflow/process/{processInstanceId}/terminate")
|
||||
public ResponseEntity<Map<String, Object>> terminateProcess(@PathVariable String processInstanceId,
|
||||
@RequestBody(required = false) GatewayRequests.ApprovalActionRequest req) {
|
||||
String comment = firstNonBlank(req == null ? null : req.comment, "流程有误作废处理");
|
||||
Map<String, Object> engine = flowableClient.terminateProcessInstance(processInstanceId, comment);
|
||||
String businessKey = req != null && notBlank(req.businessKey)
|
||||
? req.businessKey
|
||||
: rowString(engine, "businessKey", "BUSINESSKEY");
|
||||
String table = req == null ? null : req.tableName;
|
||||
boolean written = false;
|
||||
if (notBlank(businessKey)) {
|
||||
statusWriteback.updateStatus(businessKey, table, ProcessCoreService.STATUS_INVALID);
|
||||
written = true;
|
||||
}
|
||||
Map<String, Object> resp = new LinkedHashMap<>();
|
||||
resp.put("status", 0);
|
||||
resp.put("msg", "已结束该流程");
|
||||
resp.put("terminated", true);
|
||||
resp.put("processEnded", true);
|
||||
resp.put("processInstanceId", processInstanceId);
|
||||
resp.put("businessKey", businessKey);
|
||||
resp.put("statusWritten", written);
|
||||
return ResponseEntity.ok(resp);
|
||||
}
|
||||
|
||||
@Operation(summary = "流程轨迹", description = "返回流程实例的历史任务节点(含当前活动节点),按开始时间升序;包含办理人姓名/审批意见/办理结果")
|
||||
@GetMapping("/api/flow/process/{processInstanceId}/trace")
|
||||
public ResponseEntity<List<TraceNodeDto>> trace(@PathVariable String processInstanceId) {
|
||||
|
||||
@@ -181,4 +181,22 @@ class FlowableClientTest {
|
||||
assertThat(result).containsEntry("businessKey", "BK-1");
|
||||
server.verify();
|
||||
}
|
||||
|
||||
@Test
|
||||
void 结束流程_POST实例terminate端点并传评论() {
|
||||
FlowGatewayProperties p = props();
|
||||
RestClient.Builder builder = RestClient.builder().baseUrl(p.getBaseUrl());
|
||||
MockRestServiceServer server = MockRestServiceServer.bindTo(builder).build();
|
||||
server.expect(requestTo("http://localhost:8089/api/flow/process/P1/terminate"))
|
||||
.andExpect(method(HttpMethod.POST))
|
||||
.andExpect(jsonPath("$.comment").value("流程有误作废处理"))
|
||||
.andRespond(withSuccess("{\"terminated\":true,\"businessKey\":\"BK-1\"}", MediaType.APPLICATION_JSON));
|
||||
FlowableClient client = new FlowableClient(builder.build(), p);
|
||||
|
||||
Map<String, Object> result = client.terminateProcessInstance("P1", "流程有误作废处理");
|
||||
|
||||
assertThat(result).containsEntry("terminated", true);
|
||||
assertThat(result).containsEntry("businessKey", "BK-1");
|
||||
server.verify();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,6 +16,7 @@ import org.mockito.ArgumentCaptor;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.jdbc.core.JdbcTemplate;
|
||||
|
||||
import com.dsasp.server.common.workflow.service.ProcessCoreService;
|
||||
import com.eip4.platform.auth.security.AuthPrincipal;
|
||||
import com.eip4.platform.flowgateway.aggregate.BusinessSummaryService;
|
||||
import com.eip4.platform.flowgateway.aggregate.TodoAggregator;
|
||||
@@ -207,6 +208,24 @@ class TodoControllerAmisTest {
|
||||
verify(flowableClient).deleteHistoricProcessInstance("PI-1");
|
||||
}
|
||||
|
||||
@Test
|
||||
void terminateProcess_透传结束流程并回写作废状态() {
|
||||
when(flowableClient.terminateProcessInstance("PI-1", "流程有误作废处理"))
|
||||
.thenReturn(Map.of("terminated", true, "businessKey", "BK-1"));
|
||||
GatewayRequests.ApprovalActionRequest req = new GatewayRequests.ApprovalActionRequest();
|
||||
req.tableName = "OA_NOTICE";
|
||||
|
||||
Map<String, Object> resp = controller.terminateProcess("PI-1", req).getBody();
|
||||
|
||||
assertThat(resp).containsEntry("status", 0);
|
||||
assertThat(resp).containsEntry("msg", "已结束该流程");
|
||||
assertThat(resp).containsEntry("terminated", true);
|
||||
assertThat(resp).containsEntry("statusWritten", true);
|
||||
assertThat(resp).containsEntry("businessKey", "BK-1");
|
||||
verify(flowableClient).terminateProcessInstance("PI-1", "流程有误作废处理");
|
||||
verify(statusWriteback).updateStatus("BK-1", "OA_NOTICE", ProcessCoreService.STATUS_INVALID);
|
||||
}
|
||||
|
||||
private static ProcessInstanceDto process(String id, String businessKey, boolean ended, long startMillis) {
|
||||
ProcessInstanceDto dto = new ProcessInstanceDto();
|
||||
dto.id = id;
|
||||
|
||||
Reference in New Issue
Block a user