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