diff --git a/app.db b/app.db index d5f5aed..670bf98 100644 Binary files a/app.db and b/app.db differ diff --git a/doc/模拟流程操作步骤.md b/doc/模拟流程操作步骤.md new file mode 100644 index 0000000..765a319 --- /dev/null +++ b/doc/模拟流程操作步骤.md @@ -0,0 +1,15 @@ +**模拟流程操作步骤** + +取出设备内部所有试管架(如果存在) + +加液转盘15号位置移至胶带箭头位置 + +加热转盘3号位旋转至黑色胶带位置 + +开机等待设备初始化 + +准备异常处理区空试管架 + +等待初始化开机完成 + +放入模拟处理完成试管架 \ No newline at end of file diff --git a/doc/模拟流程操作步骤.pdf b/doc/模拟流程操作步骤.pdf new file mode 100644 index 0000000..96fdbb0 Binary files /dev/null and b/doc/模拟流程操作步骤.pdf differ diff --git a/src/main/java/com/iflytop/digester/DigestionTaskTheadManager.java b/src/main/java/com/iflytop/digester/DigestionTaskTheadManager.java index 33a6674..ea8ce70 100644 --- a/src/main/java/com/iflytop/digester/DigestionTaskTheadManager.java +++ b/src/main/java/com/iflytop/digester/DigestionTaskTheadManager.java @@ -152,7 +152,10 @@ public class DigestionTaskTheadManager { task.executeAction(actionName, actionParams); } - // 启动演示消解任务 + /** + * 启动演示消解任务 + * @TODO : 明天还要改 + */ private void startDemoDigestion() { var digestion = UfActiveRecord.findOne(MdbDigestionSolution.class, Map.of("name", "消解演示")); if ( null == digestion ) { diff --git a/src/main/java/com/iflytop/digester/StartResetTaskThread.java b/src/main/java/com/iflytop/digester/StartResetTaskThread.java index 551e684..60633b5 100644 --- a/src/main/java/com/iflytop/digester/StartResetTaskThread.java +++ b/src/main/java/com/iflytop/digester/StartResetTaskThread.java @@ -10,6 +10,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.HashMap; import java.util.List; +import java.util.Map; + public class StartResetTaskThread extends Thread { // logger public static final Logger LOG = LoggerFactory.getLogger(StartResetTaskThread.class); @@ -17,6 +19,8 @@ public class StartResetTaskThread extends Thread { private Boolean isErrorTubeRackRequired = true; // pause lock private final Object pauseLock = new Object(); + // action result + private Map actionResult; @Override public void run() { @@ -115,6 +119,13 @@ public class StartResetTaskThread extends Thread { // 放入异常处理位试管架 public void setupErrorTubeRack() { + UfMdbNotification.action("TaskStartResetErrorTubeRackPutInConfirm", new HashMap<>()); + this.waitAction("TaskStartResetErrorTubeRackPutInConfirm"); + var putInConfirm = (Boolean)this.actionResult.get("confirm"); + if ( !putInConfirm ) { + return ; + } + Integer errorSlotIndex = UfApplication.getApp().getEnv().getProperty("app.errorSlotIndex", Integer.class); this.setProgressMessage("设备初始化 : 放入异常处理试管架"); @@ -141,8 +152,9 @@ public class StartResetTaskThread extends Thread { } // execute action - public void executeAction( String key ) { + public void executeAction( String key, Map actionParams ) { LOG.info("Start reset execute action : {}", key); + this.actionResult = actionParams; synchronized (pauseLock) { pauseLock.notifyAll(); } diff --git a/src/main/java/com/iflytop/digester/controller/DeviceController.java b/src/main/java/com/iflytop/digester/controller/DeviceController.java index 5fa5ed5..054c21d 100644 --- a/src/main/java/com/iflytop/digester/controller/DeviceController.java +++ b/src/main/java/com/iflytop/digester/controller/DeviceController.java @@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.ResponseBody; +import java.util.HashMap; import java.util.Map; @Controller @@ -35,7 +36,11 @@ public class DeviceController extends UfApiControllerBase { @PostMapping("/api/device/start-action-execute") public UfApiResponse startActionExecute(@RequestBody Map params) { String action = (String)params.get("action"); - this.startReset.executeAction(action); + Map actionParams = new HashMap<>(); + if (params.containsKey("params")) { + actionParams = (Map)params.get("params"); + } + this.startReset.executeAction(action, actionParams); return this.success(); } diff --git a/web b/web index 1e3bfbf..d3ea62c 160000 --- a/web +++ b/web @@ -1 +1 @@ -Subproject commit 1e3bfbfccbd91a2df0b33e5323d6cedb6612364f +Subproject commit d3ea62cc83cd574f123b5fdf0d30db1420a9bcef