From 3fe8a4885ac0a34e201db40502aaf7a64abeb472 Mon Sep 17 00:00:00 2001 From: sige Date: Fri, 31 May 2024 10:22:20 +0800 Subject: [PATCH] sss --- app.db | Bin 978944 -> 978944 bytes doc/模拟流程操作步骤.md | 15 +++++++++++++++ doc/模拟流程操作步骤.pdf | Bin 0 -> 53775 bytes .../digester/DigestionTaskTheadManager.java | 5 ++++- .../com/iflytop/digester/StartResetTaskThread.java | 14 +++++++++++++- .../digester/controller/DeviceController.java | 7 ++++++- web | 2 +- 7 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 doc/模拟流程操作步骤.md create mode 100644 doc/模拟流程操作步骤.pdf diff --git a/app.db b/app.db index d5f5aed5c38b09ed13d6ee7f9dc11b238f63f6f5..670bf98c4646a52244c8e791c9311305ba9c5c4b 100644 GIT binary patch delta 1414 zcmchXOK4nG9LDcVdUIzcckX~Fu@9PYe2}y~<9XhD&cxP7EX9Q;K1QM4c+R=!YG67O zCk+&(BvUPMAs82O1vi2qQp6~t1G;r#QJT?G)Que%f(!;%T?NE5E$O1G!G(*Dv-$J? zfBe3Wv(}$o>(6fN&s=)vz+C3i=P#apdzu)@V+JV@io}2_ErCj+2w=`5OclnMB+1G1 z-=5$2Y9o{RY{GGzedGU(l`fWa*MB7YLMhd)%zNuQ^I5Agt36h()wq>sm9xrQ6|5$@ zJM(^iEwhliJ^$XUyO~b+{Fk%tg><9m-`V}R=U>id?nod0yLeys{VV<;^W4l>JsT35 zNTM|`38#QU9RrCX3PMh#A`Bw|jdNu;w{S9D===0w;SF~(dwo0}n<}0t9^A9-U!OSQ|KNYNkff} zLI?$YAh^T;5y+*H2qvL%ejH9J&Eq)11PBTZpqe6}v>n%oMO?8Mn#ef4nf1+q z-`yM(>woOS-nLWvx%6r2Lg`cqmAv4$;LF@(@RqmTJQ4R=Yyi)kCFqLoSKJj)uG5)4|?TdRB zzHuMy+~0ZDtM6UC>&e+sqDqU$gT_%*MzDsW8iQ3NSO;{T$<_CEigw2cFjN0{aBOw1 z)l3%Krz_{$M#eHkFeC&e5#oj^C_^n1!Wh8`vk4dsF$ItTvU?bcD#fgGtn+lPKG`|E z-yR+z8`EyL+H0OUm4{JzN!w_3!3%UBC zo6JTjOS<$|fNnuMQdyF1d3w20d+po}fXraS1rnN3oM@y8mV`5wV689@S#+BXR-?R% z7`FiDcL9#jt*kNW2V42O|9@_%hIus-#BzJ;7PnD8jA37oKE4~?e<>TRQCPKXyHkVU GclTdr$DYLi delta 368 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 H5$*o~q{xNo literal 0 HcmV?d00001 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