From a3048fa6fa72fa3cc5da2c43c59bd000e00c9599 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 18 九月 2025 23:13:32 +0800
Subject: [PATCH] 工控网分析程序状态问题修复
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/ReplaceFlowController.java | 65 +++++++++++---------------------
1 files changed, 23 insertions(+), 42 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/ReplaceFlowController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/ReplaceFlowController.java
index 0047c08..61c5b2f 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/ReplaceFlowController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/ReplaceFlowController.java
@@ -5,27 +5,14 @@
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.flowable.engine.RuntimeService;
-import org.flowable.engine.TaskService;
-import org.flowable.engine.runtime.ProcessInstance;
-import org.flowable.task.api.Task;
import org.springblade.core.tool.api.R;
-import org.springblade.mdm.flow.constants.FlowContants;
-import org.springblade.mdm.flow.excution.StartDispatcher;
-import org.springblade.mdm.flow.service.ApproveRecordService;
-import org.springblade.mdm.flow.service.FlowProgramFileService;
+import org.springblade.mdm.basesetting.producedivision.entity.ProduceDivision;
+import org.springblade.mdm.basesetting.producedivision.service.ProduceDivisionService;
import org.springblade.mdm.flow.service.ReplaceFlowService;
-import org.springblade.mdm.flow.service.TaskDispatchService;
-import org.springblade.mdm.flow.service.execute.AbstractFlowCompleteService;
-import org.springblade.mdm.flow.service.execute.DefaultFlowCompleteService;
-import org.springblade.mdm.flow.service.execute.TryFlowCompleteService;
import org.springblade.mdm.flow.vo.ReplaceFlowStartVO;
-import org.springblade.mdm.flow.vo.TaskAssignVO;
-import org.springblade.mdm.program.service.ProcessProgRefService;
+import org.springblade.mdm.flow.vo.ReplaceUploadVO;
import org.springblade.mdm.program.vo.NcNodeVO;
import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
@Slf4j
@RestController
@@ -33,33 +20,8 @@
@RequestMapping("/flow/replace")
@Tag(name = "鏇挎崲娴佺▼", description = "鏇挎崲娴佺▼")
public class ReplaceFlowController {
-
- private final StartDispatcher dispatcher;
-
- private final TaskService taskService;
- private final RuntimeService runtimeService;
- private final ProcessProgRefService processProgRefService;
-
- private final ApproveRecordService approveRecordService;
- private final FlowProgramFileService flowProgramFileService;
- private final DefaultFlowCompleteService defaultFlowCompleteService;
- private final TaskDispatchService taskDispatchService;
+ private final ProduceDivisionService produceDivisionService;
private final ReplaceFlowService replaceFlowService;
-
-
- @PostMapping("/prestart")
- @Operation(summary = "鍑嗗绋嬪簭鏇挎崲娴佺▼", description = "鍑嗗绋嬪簭鏇挎崲娴佺▼锛屾墦寮�鐣岄潰涔嬪墠璋冪敤锛岃皟鐢ㄤ箣鍚庝細鍒濆鍖栨枃浠跺垪琛�,")
- public R<String> prestart(@Parameter(description = "绋嬪簭鍖呭悕 鑺傜偣鐨刬d") Long nodeId) {
- String tempInstanceId = "REP"+System.currentTimeMillis();
- try {
- replaceFlowService.prestart(nodeId,tempInstanceId);
- return R.data(tempInstanceId);
- }catch(Exception e){
- log.error("棰勫紑濮嬮敊璇�",e);
- return R.fail(e.getMessage());
- }
-
- }
@PostMapping("/pre")
@Operation(summary = "鍑嗗绋嬪簭鏇挎崲娴佺▼new", description = "鍑嗗绋嬪簭鏇挎崲娴佺▼锛屾墦寮�鐣岄潰涔嬪墠璋冪敤锛岃皟鐢ㄤ箣鍚庝細鍒濆鍖栨枃浠跺垪琛�,")
@@ -89,4 +51,23 @@
}
+
+ @PostMapping("/upload")
+ @Operation(summary = "鏇挎崲娴佺▼鍙戣捣涓婁紶绋嬪簭鏂囦欢", description = "鏇挎崲娴佺▼鍙戣捣涓婁紶绋嬪簭鏂囦欢")
+ public R<Boolean> upload(ReplaceUploadVO uploadVO) {
+ try {
+ replaceFlowService.uploadReplaceProgramFile(uploadVO);
+ }catch(Exception e) {
+ log.error("鏇挎崲绋嬪簭涓婁紶鎵ц閿欒",e);
+ return R.fail("涓婁紶澶辫触:" + e.getMessage());
+ }
+ return R.success();
+ }
+
+ @GetMapping("/default-assignees")
+ @Operation(summary = "榛樿鐨勫鏍哥敤鎴�", description = "鍑嗗绋嬪簭鏇挎崲娴佺▼锛屾墦寮�鐣岄潰涔嬪墠璋冪敤锛岃皟鐢ㄤ箣鍚庝細鍒濆鍖栨枃浠跺垪琛�,")
+ public R<ProduceDivision> defaultAssignees(@Parameter(description = "闆剁粍浠跺彿") String drawingNo) {
+ return R.data(produceDivisionService.getByDrawingNoWithQinzhe(drawingNo));
+
+ }
}
--
Gitblit v1.9.3