From 736c5c13aff0d787a126ff9a76343a07edf37a5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= Date: Fri, 25 Jul 2025 20:25:56 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=81=9C=E6=AD=A2=E5=B7=A5=E8=89=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../colortitration/app/controller/CraftsController.java | 12 ++++++------ .../colortitration/app/core/crafts/CraftsDispatcher.java | 14 ++++++++++++++ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/iflytop/colortitration/app/controller/CraftsController.java b/src/main/java/com/iflytop/colortitration/app/controller/CraftsController.java index 5f619af..763e069 100644 --- a/src/main/java/com/iflytop/colortitration/app/controller/CraftsController.java +++ b/src/main/java/com/iflytop/colortitration/app/controller/CraftsController.java @@ -81,11 +81,11 @@ public class CraftsController { return Result.success(); } -// @Operation(summary = "停止执行工艺") -// @PostMapping("/stop") -// public Result stopCrafts(@Valid @RequestBody CraftsStopDTO stopCraftsDto) { -// craftsService.stopCrafts(stopCraftsDto.getHeatId()); -// return Result.success(); -// } + @Operation(summary = "停止执行工艺") + @PostMapping("/stop") + public Result stopCrafts() { + craftsDispatcher.stop(); + return Result.success(); + } } diff --git a/src/main/java/com/iflytop/colortitration/app/core/crafts/CraftsDispatcher.java b/src/main/java/com/iflytop/colortitration/app/core/crafts/CraftsDispatcher.java index a48ac32..3e8cd23 100644 --- a/src/main/java/com/iflytop/colortitration/app/core/crafts/CraftsDispatcher.java +++ b/src/main/java/com/iflytop/colortitration/app/core/crafts/CraftsDispatcher.java @@ -145,4 +145,18 @@ public class CraftsDispatcher { } } + /** + * 停止工艺 + */ + public void stop(){ + //TODO 发送停止指令 + jobQueue.clear(); + deviceState.getTrayTubeStateMap().forEach((key, value) -> { + value.setCraftsId(null); + value.setCraftsName(null); + value.setTitrationModuleCodes(null); + value.setQueueNum(null); + }); + } + } \ No newline at end of file