From 0ba1c3779ba333643800708af42bf220b3a66562 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Thu, 1 Aug 2024 19:46:01 +0800 Subject: [PATCH] update --- .../service/devicectrl/testscript/TestScript.java | 27 +++++++++++++++------ zhaohe_app.db | Bin 188416 -> 188416 bytes 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/main/java/a8k/service/devicectrl/testscript/TestScript.java b/src/main/java/a8k/service/devicectrl/testscript/TestScript.java index 5c9c723..69eb2e5 100644 --- a/src/main/java/a8k/service/devicectrl/testscript/TestScript.java +++ b/src/main/java/a8k/service/devicectrl/testscript/TestScript.java @@ -34,6 +34,17 @@ import java.util.Map; public class TestScript { static Logger logger = LoggerFactory.getLogger(TestScript.class); + static class ORDER { + static final int testTakeAllTipStop = 0; + static final int takeTipTestStep = 1; + static final int testTakeAllTip = 2; + static final int testAllLittleBottleBufferPos = 3; + static final int testAllDetectMaterialPos = 4; + static final int testAllBigBottleBufferPos = 5; + static final int pushAllPlateAndDrop = 6; + static final int testSamplePreProcessModule = 7; + } + @Resource A8kCanBusService canBus; @@ -73,12 +84,12 @@ public class TestScript { } } - @EnginnerPageAction(name = "停止测试脚本", group = "控制") + @EnginnerPageAction(name = "停止测试脚本", group = "控制", order = ORDER.testTakeAllTipStop) public void testTakeAllTipStop() { testScriptWorkFlag = false; } - @EnginnerPageAction(name = "取放Tip-单步", group = "Hbot测试脚本") + @EnginnerPageAction(name = "取放Tip-单步", group = "Hbot测试脚本", order = ORDER.takeTipTestStep) public AppRet takeTipTestStep(Integer tipgroup, Integer index) throws HardwareException, InterruptedException { checkTestScriptWorkFlag(); testScriptWorkFlag = true; @@ -97,7 +108,7 @@ public class TestScript { return ret; } - @EnginnerPageAction(name = "取放Tip-全部", group = "Hbot测试脚本") + @EnginnerPageAction(name = "取放Tip-全部", group = "Hbot测试脚本", order = ORDER.testTakeAllTip) public AppRet> testTakeAllTip(Integer groupId, Integer startFrom) throws HardwareException, InterruptedException { checkTestScriptWorkFlag(); @@ -119,7 +130,7 @@ public class TestScript { return AppRet.success(result); } - @EnginnerPageAction(name = "测试所有小瓶缓冲液位置", group = "Hbot测试脚本") + @EnginnerPageAction(name = "测试所有小瓶缓冲液位置", group = "Hbot测试脚本", order = ORDER.testAllLittleBottleBufferPos) public void testAllLittleBottleBufferPos(ConsumableGroup group) throws HardwareException, InterruptedException { checkTestScriptWorkFlag(); @@ -137,7 +148,7 @@ public class TestScript { testScriptWorkFlag = false; } - @EnginnerPageAction(name = "测试所有探测物质位置", group = "Hbot测试脚本") + @EnginnerPageAction(name = "测试所有探测物质位置", group = "Hbot测试脚本", order = ORDER.testAllDetectMaterialPos) public void testAllDetectMaterialPos(ConsumableGroup group) throws HardwareException, InterruptedException { checkTestScriptWorkFlag(); @@ -154,7 +165,7 @@ public class TestScript { testScriptWorkFlag = false; } - @EnginnerPageAction(name = "测试所有大瓶缓冲液位置", group = "Hbot测试脚本") + @EnginnerPageAction(name = "测试所有大瓶缓冲液位置", group = "Hbot测试脚本", order = ORDER.testAllBigBottleBufferPos) public void testAllBigBottleBufferPos() throws HardwareException, InterruptedException { checkTestScriptWorkFlag(); @@ -171,7 +182,7 @@ public class TestScript { testScriptWorkFlag = false; } - @EnginnerPageAction(name = "推全部板同时丢弃", group = "板夹移动测试脚本") + @EnginnerPageAction(name = "推全部板同时丢弃", group = "板夹移动测试脚本", order = ORDER.pushAllPlateAndDrop) public void pushAllPlateAndDrop(ConsumableGroup PBCh, IncubatorPos startPos) throws HardwareException, InterruptedException { checkTestScriptWorkFlag(); testScriptWorkFlag = true; @@ -193,7 +204,7 @@ public class TestScript { testScriptWorkFlag = false; } - @EnginnerPageAction(name = "测试摇匀模组", group = "摇匀模组测试") + @EnginnerPageAction(name = "测试摇匀模组", group = "摇匀模组测试",order = ORDER.testSamplePreProcessModule) public AppRet testSamplePreProcessModule() throws HardwareException, InterruptedException { checkTestScriptWorkFlag(); testScriptWorkFlag = true; diff --git a/zhaohe_app.db b/zhaohe_app.db index cdf383ce6dd3509f078b0f217221052fb63bf3d7..9698f32de639722c066fbb21d7732647a7896541 100644 GIT binary patch delta 649 zcma)&J!@1^5QgtPcQ+)i@mj}#(Jd5V;C!E%RKfqSrLgyW4E_TfabuxiXMTx+Ah*qr zP_PlK(%IN3*m(AWt!^<>z0bVNbAG)zzh1mQ61SgR96zo5_4>`a{kRq{Uu_D?jH*C! zN`hrBKtvvrWY#$%ihzHIayM&n-J@hk}76MnJn07HQ-=8kRi|7JH^s2 z(KDl$Vj?mR-pJ^HO{gW-)JKA2kd6Xk$T?+QJ1U`MI}vH{R8BP(uq7z4Lwy@#iBK#O zCeA_XToKf0ZZ%D_*Dsp>S^u{G(tqe}zqopE^7GE-akpxD2Z?*z;4bdw+u*;H{WUh* z1~bA*U1c^u8>R|HnA1#N~M{~E%)xp{C`{V3Ve0wOYA8&rN-&@Xi$!q@=pLrhkk?e1#2#?Vl-p0~2x2K*7w5?hQ;8 z4w=N@9^wQ81p}YJM8U+~1ygT>s_6Tu;yXHZrHnMlmGTTf-&k>;vO6*n$AD z(Gbd2P#i-v%8-wtC{8&&tEy_!&a3uyOYM{POZ&c^pB^6ky1c&IEbC%k7;&-zcWF1? zfd5POuh?h#i95}5y6tj7mc7!Wx>DwJ`tZ-qVe~ZHG7C#53_1A3?0y