From cb2ce7581d2c1819c8d61e6ad3051b784211ea1c Mon Sep 17 00:00:00 2001 From: zhaohe Date: Thu, 19 Dec 2024 16:33:01 +0800 Subject: [PATCH] recode some code --- appresource/db/app.db | Bin 225280 -> 225280 bytes .../java/a8k/extapi/controler/ExtApiControler.java | 26 ++++----- .../a8k/extapi/service/ExtApiTabCfgService.java | 2 - .../java/a8k/extapi/utils/ExtApiParamsTab.java | 10 ---- src/main/java/a8k/extapi/utils/ExtApiTab.java | 10 ---- .../background/BackgroudProcessCtrlService.java | 2 - .../ctrlservice/LiquidOperationCtrlService.java | 65 +++++++++++++++++++++ .../lowlevel/ctrlservice/PipetteCtrlService.java | 52 ----------------- .../ctrlservice/TubeFeedingCtrlService.java | 2 - .../lowlevel/driver/PipetteCtrlDriver.java | 3 - .../lowlevel/driver/StepMotorCtrlDriver.java | 2 - .../lowlevel/exdriver/HbotBaseMoveExDriver.java | 2 - .../app/devicectrl/param/LowerDeviceParamMgr.java | 3 - .../calibration/Hbot2DCodeScanPosCalibration.java | 2 - .../HbotLargeBottleBSPosCalibration.java | 2 - .../calibration/HbotLittleBSPosCalibration.java | 2 - .../HbotProbeSubstancePosCalibration.java | 2 - .../calibration/HbotSamplePosCalibration.java | 2 - .../param/calibration/HbotTipPosCalibration.java | 2 - .../calibration/OptModuleParamCalibration.java | 2 - .../calibration/PipetteGunLLDParamCalibration.java | 2 - .../calibration/PipetteGunLLFParamCalibration.java | 2 - ...ReactionPlatesTransmitControlerCalibration.java | 2 - .../TemperatureCtrlParamCalibration.java | 2 - .../TubeFeedingModulePosCalibration.java | 2 - .../calibration/TubePreProcesPosCalibration.java | 2 - .../init/MiniServoReferencePointIniter.java | 2 - .../a8k/service/test/MainflowCtrlTestService.java | 2 - src/main/java/a8k/service/test/PipetteGunTest.java | 2 - .../java/a8k/service/test/PosMeasureUtils.java | 2 - .../service/test/VirtualDeviceSimulationTest.java | 2 - .../service/verification/A8kOptVerification.java | 2 - .../verification/A8kTemperaturaVerfication.java | 2 - .../service/verification/A8kVerificationUtils.java | 2 - .../verification/PipetteGunVerificationV2.java | 2 - src/main/java/a8k/type/pos/LargeBSPos.java | 11 ---- src/main/java/a8k/type/pos/LittleBSPos.java | 13 ----- 37 files changed, 76 insertions(+), 171 deletions(-) delete mode 100644 src/main/java/a8k/extapi/utils/ExtApiParamsTab.java delete mode 100644 src/main/java/a8k/extapi/utils/ExtApiTab.java create mode 100644 src/main/java/a8k/service/app/devicectrl/lowlevel/ctrlservice/LiquidOperationCtrlService.java delete mode 100644 src/main/java/a8k/service/app/devicectrl/lowlevel/ctrlservice/PipetteCtrlService.java delete mode 100644 src/main/java/a8k/type/pos/LargeBSPos.java delete mode 100644 src/main/java/a8k/type/pos/LittleBSPos.java diff --git a/appresource/db/app.db b/appresource/db/app.db index 93569835b819da3c1de0850171853a929248622a..e601896868a259f000d266c074e4ef2cc4432453 100644 GIT binary patch delta 72 zcmZp8z}xVEcY>5q_$CGh26G@b17cYQ2FaX>Iz~+4n;H|gCNLghWlY$v%Eq{cjWK@v YB_76TM#i{yJw8StX45qSPugOgE> services = new ArrayList<>(); var classes = SpringBootBeanUtil.getBeans(); for (var clazz : classes) { - var hardwareServiceAnnotation = clazz.getAnnotation(ExtApiTab.class); - var cfg = extApiTabCfgService.getCfg(clazz); + var cfg = extApiTabCfgService.getCfg(clazz); if (cfg == null) { continue; } - if (null == hardwareServiceAnnotation || !cfg.display) { + if (!cfg.display) { continue; } @@ -145,8 +144,7 @@ public class ExtApiControler { Class serviceClass = null; var classes = SpringBootBeanUtil.getBeans(); for (var clazz : classes) { - var hardwareServiceAnnotation = clazz.getAnnotation(ExtApiTab.class); - if (null == hardwareServiceAnnotation || !clazz.getSimpleName().equals(serviceKey)) { + if ( !clazz.getSimpleName().equals(serviceKey)) { continue; } serviceClass = clazz; @@ -185,8 +183,7 @@ public class ExtApiControler { Class serviceClass = null; var classes = SpringBootBeanUtil.getBeans(); for (var clazz : classes) { - var hardwareServiceAnnotation = clazz.getAnnotation(ExtApiTab.class); - if (null == hardwareServiceAnnotation || !clazz.getSimpleName().equals(serviceKey)) { + if (!clazz.getSimpleName().equals(serviceKey)) { continue; } serviceClass = clazz; @@ -335,8 +332,7 @@ public class ExtApiControler { Class serviceClass = null; var classes = SpringBootBeanUtil.getBeans(); for (var clazz : classes) { - var hardwareServiceAnnotation = clazz.getAnnotation(ExtApiTab.class); - if (null == hardwareServiceAnnotation || !clazz.getSimpleName().equals(serviceKey)) { + if (!clazz.getSimpleName().equals(serviceKey)) { continue; } serviceClass = clazz; @@ -352,12 +348,12 @@ public class ExtApiControler { private Object getServiceParamHandlerByServiceKey(String serviceKey) { var classes = SpringBootBeanUtil.getBeans(); for (var clazz : classes) { - var hardwareServiceParamsAnnotation = clazz.getAnnotation(ExtApiParamsTab.class); - if (null == hardwareServiceParamsAnnotation) { - continue; - } - var serviceClass = hardwareServiceParamsAnnotation.service(); - if (!serviceClass.getSimpleName().equals(serviceKey)) { +// var hardwareServiceParamsAnnotation = clazz.getAnnotation(ExtApiParamsTab.class); +// if (null == hardwareServiceParamsAnnotation) { +// continue; +// } +// var serviceClass = hardwareServiceParamsAnnotation.service(); + if (!clazz.getSimpleName().equals(serviceKey)) { continue; } return SpringBootBeanUtil.getBean(clazz); diff --git a/src/main/java/a8k/extapi/service/ExtApiTabCfgService.java b/src/main/java/a8k/extapi/service/ExtApiTabCfgService.java index 3c7b91f..cbfc10e 100644 --- a/src/main/java/a8k/extapi/service/ExtApiTabCfgService.java +++ b/src/main/java/a8k/extapi/service/ExtApiTabCfgService.java @@ -2,7 +2,6 @@ package a8k.extapi.service; import a8k.extapi.utils.ExtApiFn; -import a8k.extapi.utils.ExtApiTab; import a8k.service.app.background.BackgroudProcessCtrlService; import a8k.service.app.devicectrl.lowlevel.ctrlservice.TubeFeedingCtrlService; import a8k.service.app.devicectrl.lowlevel.driver.PipetteCtrlDriver; @@ -19,7 +18,6 @@ import java.util.ArrayList; import java.util.List; @Component -@ExtApiTab() public class ExtApiTabCfgService { static int index; diff --git a/src/main/java/a8k/extapi/utils/ExtApiParamsTab.java b/src/main/java/a8k/extapi/utils/ExtApiParamsTab.java deleted file mode 100644 index 7dc9bc6..0000000 --- a/src/main/java/a8k/extapi/utils/ExtApiParamsTab.java +++ /dev/null @@ -1,10 +0,0 @@ -package a8k.extapi.utils; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.TYPE}) -public @interface ExtApiParamsTab { - Class service(); -} diff --git a/src/main/java/a8k/extapi/utils/ExtApiTab.java b/src/main/java/a8k/extapi/utils/ExtApiTab.java deleted file mode 100644 index 015d412..0000000 --- a/src/main/java/a8k/extapi/utils/ExtApiTab.java +++ /dev/null @@ -1,10 +0,0 @@ -package a8k.extapi.utils; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.TYPE}) -public @interface ExtApiTab { -} diff --git a/src/main/java/a8k/service/app/background/BackgroudProcessCtrlService.java b/src/main/java/a8k/service/app/background/BackgroudProcessCtrlService.java index 26f70c4..43e3742 100644 --- a/src/main/java/a8k/service/app/background/BackgroudProcessCtrlService.java +++ b/src/main/java/a8k/service/app/background/BackgroudProcessCtrlService.java @@ -1,7 +1,6 @@ package a8k.service.app.background; import a8k.extapi.utils.ExtApiFn; -import a8k.extapi.utils.ExtApiTab; import a8k.service.app.appdata.ProjIdCardInfoMgrService; import a8k.service.test.state.VirtualDevice; import a8k.type.exception.AppException; @@ -9,7 +8,6 @@ import jakarta.annotation.Resource; import org.springframework.stereotype.Component; @Component -@ExtApiTab() public class BackgroudProcessCtrlService { @Resource VirtualDevice virtualDevice; diff --git a/src/main/java/a8k/service/app/devicectrl/lowlevel/ctrlservice/LiquidOperationCtrlService.java b/src/main/java/a8k/service/app/devicectrl/lowlevel/ctrlservice/LiquidOperationCtrlService.java new file mode 100644 index 0000000..19b41a6 --- /dev/null +++ b/src/main/java/a8k/service/app/devicectrl/lowlevel/ctrlservice/LiquidOperationCtrlService.java @@ -0,0 +1,65 @@ +package a8k.service.app.devicectrl.lowlevel.ctrlservice; + + +import a8k.a8ktype.device.ConsumableIndex; +import a8k.service.app.devicectrl.lowlevel.driver.PipetteCtrlDriver; +import a8k.a8ktype.device.ConsumableGroup; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Component; + +@Component +public class LiquidOperationCtrlService { + /* + * + * 取样(取样位置lld，，目标位置吸吐混匀) + * 1. 取大瓶缓冲液到探测物质位置 （非接触分配）取样一般比较大，lld探测到液面后，直接吸取即可 + * 2. 取样本到探测物质 （接触分配） 取样比较小，lld探测到液面后，先排空，再吸取 + * 3. 取样本到小瓶缓冲液位置 （接触分配） + * + * + * 分配:(先接触分配，后快速分配) + * 1. 从探测物质取混合液到反应板 + * 2. 从小瓶缓冲液取混合液到反应板 + * + * + */ + + // + // 取大瓶缓冲液到探测物质位置 + // 取样本到探测物质 + // 取样本到小瓶缓冲液位置 + // + // 从探测物质取混合液到 + // 从小瓶缓冲液取混合液到 + // + // 吸吐混匀 + + /* + * CTRL-SERVICE + */ + @Resource + HbotCtrlService hbotCtrlService; + @Resource + PipetteCtrlDriver pipetteCtrlDriver; + + /* + * PARAM-MGR + */ + + + + /** + * 取大瓶缓冲液到探测物质位置 + * @param fromGroup 大瓶缓冲液 + * @param toCGroup 探测物质-GROUP + * @param toCIndex 探测物质-INDEX + * @param ul 吸取量 + */ + public void takeLargeBottleBufferLiquidToProbeSubstance(ConsumableGroup fromGroup, ConsumableGroup toCGroup, ConsumableIndex toCIndex, Integer ul) { + // + // 移动到 + // + + + } +} diff --git a/src/main/java/a8k/service/app/devicectrl/lowlevel/ctrlservice/PipetteCtrlService.java b/src/main/java/a8k/service/app/devicectrl/lowlevel/ctrlservice/PipetteCtrlService.java deleted file mode 100644 index 9f47dd6..0000000 --- a/src/main/java/a8k/service/app/devicectrl/lowlevel/ctrlservice/PipetteCtrlService.java +++ /dev/null @@ -1,52 +0,0 @@ -package a8k.service.app.devicectrl.lowlevel.ctrlservice; - - -import a8k.extapi.utils.ExtApiTab; -import a8k.service.app.devicectrl.lowlevel.driver.PipetteCtrlDriver; -import a8k.a8ktype.device.ConsumableGroup; -import jakarta.annotation.Resource; -import org.springframework.stereotype.Component; - -@Component -@ExtApiTab() -public class PipetteCtrlService { - @Resource - PipetteCtrlDriver pipetteCtrlDriver; - - /* - * - * 取样(取样位置lld，，目标位置吸吐混匀) - * 1. 取大瓶缓冲液到探测物质位置 （非接触分配）取样一般比较大，lld探测到液面后，直接吸取即可 - * 2. 取样本到探测物质 （接触分配） 取样比较小，lld探测到液面后，先排空，再吸取 - * 3. 取样本到小瓶缓冲液位置 （接触分配） - * - * - * 分配:(先接触分配，后快速分配) - * 1. 从探测物质取混合液到反应板 - * 2. 从小瓶缓冲液取混合液到反应板 - * - * - */ - - // - // 取大瓶缓冲液到探测物质位置 - // 取样本到探测物质 - // 取样本到小瓶缓冲液位置 - // - // 从探测物质取混合液到 - // 从小瓶缓冲液取混合液到 - // - // 吸吐混匀 - - - - public void takeLargeBottleBufferLiquidToProbeSubstance(ConsumableGroup consumableGroup,Integer ul) { - - - - - - } - - -} diff --git a/src/main/java/a8k/service/app/devicectrl/lowlevel/ctrlservice/TubeFeedingCtrlService.java b/src/main/java/a8k/service/app/devicectrl/lowlevel/ctrlservice/TubeFeedingCtrlService.java index 0f29010..3709baa 100644 --- a/src/main/java/a8k/service/app/devicectrl/lowlevel/ctrlservice/TubeFeedingCtrlService.java +++ b/src/main/java/a8k/service/app/devicectrl/lowlevel/ctrlservice/TubeFeedingCtrlService.java @@ -2,7 +2,6 @@ package a8k.service.app.devicectrl.lowlevel.ctrlservice; import a8k.OS; import a8k.extapi.utils.ExtApiFn; -import a8k.extapi.utils.ExtApiTab; import a8k.service.app.devicectrl.lowlevel.driver.CodeScanerDriver; import a8k.service.app.devicectrl.lowlevel.driver.MiniServoDriver; import a8k.service.app.devicectrl.lowlevel.driver.StepMotorCtrlDriver; @@ -26,7 +25,6 @@ import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @Component -@ExtApiTab() public class TubeFeedingCtrlService { static Logger logger = LoggerFactory.getLogger(TubeFeedingCtrlService.class); static Integer infeedOvertime = 10000; diff --git a/src/main/java/a8k/service/app/devicectrl/lowlevel/driver/PipetteCtrlDriver.java b/src/main/java/a8k/service/app/devicectrl/lowlevel/driver/PipetteCtrlDriver.java index 568d17d..130908b 100644 --- a/src/main/java/a8k/service/app/devicectrl/lowlevel/driver/PipetteCtrlDriver.java +++ b/src/main/java/a8k/service/app/devicectrl/lowlevel/driver/PipetteCtrlDriver.java @@ -1,6 +1,5 @@ package a8k.service.app.devicectrl.lowlevel.driver; -import a8k.extapi.utils.ExtApiTab; import a8k.extapi.utils.ExtApiFn; import a8k.hardware.A8kCanBusService; import a8k.hardware.type.LldType; @@ -30,9 +29,7 @@ import java.util.List; * * */ - @Component -@ExtApiTab() public class PipetteCtrlDriver { private static final Logger log = LoggerFactory.getLogger(PipetteCtrlDriver.class); diff --git a/src/main/java/a8k/service/app/devicectrl/lowlevel/driver/StepMotorCtrlDriver.java b/src/main/java/a8k/service/app/devicectrl/lowlevel/driver/StepMotorCtrlDriver.java index 366e13f..1631618 100644 --- a/src/main/java/a8k/service/app/devicectrl/lowlevel/driver/StepMotorCtrlDriver.java +++ b/src/main/java/a8k/service/app/devicectrl/lowlevel/driver/StepMotorCtrlDriver.java @@ -1,7 +1,6 @@ package a8k.service.app.devicectrl.lowlevel.driver; import a8k.extapi.utils.ExtApiFn; -import a8k.extapi.utils.ExtApiTab; import a8k.hardware.A8kCanBusService; import a8k.hardware.type.a8kcanprotocol.A8kPacket; import a8k.hardware.type.a8kcanprotocol.CmdId; @@ -16,7 +15,6 @@ import org.slf4j.Logger; import org.springframework.stereotype.Component; @Component -@ExtApiTab() public class StepMotorCtrlDriver { static Logger logger = org.slf4j.LoggerFactory.getLogger(StepMotorCtrlDriver.class); diff --git a/src/main/java/a8k/service/app/devicectrl/lowlevel/exdriver/HbotBaseMoveExDriver.java b/src/main/java/a8k/service/app/devicectrl/lowlevel/exdriver/HbotBaseMoveExDriver.java index ba75019..1917b33 100644 --- a/src/main/java/a8k/service/app/devicectrl/lowlevel/exdriver/HbotBaseMoveExDriver.java +++ b/src/main/java/a8k/service/app/devicectrl/lowlevel/exdriver/HbotBaseMoveExDriver.java @@ -1,6 +1,5 @@ package a8k.service.app.devicectrl.lowlevel.exdriver; -import a8k.extapi.utils.ExtApiTab; import a8k.service.app.devicectrl.lowlevel.driver.type.PipetteRegIndex; import a8k.service.app.devicectrl.lowlevel.driver.HbotDriver; import a8k.service.app.devicectrl.lowlevel.driver.PipetteCtrlDriver; @@ -20,7 +19,6 @@ import org.springframework.stereotype.Component; * Hbot控制服务 */ @Component -@ExtApiTab() public class HbotBaseMoveExDriver { static Logger logger = LoggerFactory.getLogger(HbotBaseMoveExDriver.class); diff --git a/src/main/java/a8k/service/app/devicectrl/param/LowerDeviceParamMgr.java b/src/main/java/a8k/service/app/devicectrl/param/LowerDeviceParamMgr.java index 2138670..a909693 100644 --- a/src/main/java/a8k/service/app/devicectrl/param/LowerDeviceParamMgr.java +++ b/src/main/java/a8k/service/app/devicectrl/param/LowerDeviceParamMgr.java @@ -1,7 +1,5 @@ package a8k.service.app.devicectrl.param; -import a8k.extapi.utils.ExtApiFn; -import a8k.extapi.utils.ExtApiTab; import a8k.service.dao.LowerDeviceParameterDao; import a8k.service.dao.type.Parameter; import jakarta.annotation.Resource; @@ -9,7 +7,6 @@ import org.springframework.stereotype.Component; import org.springframework.util.Assert; @Component -@ExtApiTab() public class LowerDeviceParamMgr { @Resource diff --git a/src/main/java/a8k/service/app/devicectrl/param/calibration/Hbot2DCodeScanPosCalibration.java b/src/main/java/a8k/service/app/devicectrl/param/calibration/Hbot2DCodeScanPosCalibration.java index 0e29677..b3ea978 100644 --- a/src/main/java/a8k/service/app/devicectrl/param/calibration/Hbot2DCodeScanPosCalibration.java +++ b/src/main/java/a8k/service/app/devicectrl/param/calibration/Hbot2DCodeScanPosCalibration.java @@ -2,7 +2,6 @@ package a8k.service.app.devicectrl.param.calibration; import a8k.extapi.utils.ExtApiFn; -import a8k.extapi.utils.ExtApiTab; import a8k.service.app.devicectrl.lowlevel.exdriver.HbotBaseMoveExDriver; import a8k.service.app.devicectrl.lowlevel.driver.HbotDriver; import a8k.service.app.devicectrl.lowlevel.driver.PipetteCtrlDriver; @@ -16,7 +15,6 @@ import jakarta.annotation.Resource; import org.slf4j.Logger; import org.springframework.stereotype.Component; -@ExtApiTab() @Component public class Hbot2DCodeScanPosCalibration { static Logger logger = org.slf4j.LoggerFactory.getLogger(Hbot2DCodeScanPosCalibration.class); diff --git a/src/main/java/a8k/service/app/devicectrl/param/calibration/HbotLargeBottleBSPosCalibration.java b/src/main/java/a8k/service/app/devicectrl/param/calibration/HbotLargeBottleBSPosCalibration.java index b72f152..3bee56d 100644 --- a/src/main/java/a8k/service/app/devicectrl/param/calibration/HbotLargeBottleBSPosCalibration.java +++ b/src/main/java/a8k/service/app/devicectrl/param/calibration/HbotLargeBottleBSPosCalibration.java @@ -3,7 +3,6 @@ package a8k.service.app.devicectrl.param.calibration; import a8k.a8ktype.device.ConsumableGroup; import a8k.extapi.utils.ExtApiFn; -import a8k.extapi.utils.ExtApiTab; import a8k.service.app.devicectrl.lowlevel.exdriver.HbotBaseMoveExDriver; import a8k.service.app.devicectrl.param.type.HbotLargeBottleBSPos; import a8k.service.app.devicectrl.lowlevel.driver.HbotDriver; @@ -19,7 +18,6 @@ import org.aspectj.lang.annotation.Aspect; import org.slf4j.Logger; import org.springframework.stereotype.Component; -@ExtApiTab() @Component @Aspect public class HbotLargeBottleBSPosCalibration { diff --git a/src/main/java/a8k/service/app/devicectrl/param/calibration/HbotLittleBSPosCalibration.java b/src/main/java/a8k/service/app/devicectrl/param/calibration/HbotLittleBSPosCalibration.java index bb4dc36..95396c8 100644 --- a/src/main/java/a8k/service/app/devicectrl/param/calibration/HbotLittleBSPosCalibration.java +++ b/src/main/java/a8k/service/app/devicectrl/param/calibration/HbotLittleBSPosCalibration.java @@ -4,7 +4,6 @@ package a8k.service.app.devicectrl.param.calibration; import a8k.a8ktype.device.ConsumableGroup; import a8k.constant.AppConstant; import a8k.extapi.utils.ExtApiFn; -import a8k.extapi.utils.ExtApiTab; import a8k.service.app.devicectrl.lowlevel.exdriver.HbotBaseMoveExDriver; import a8k.service.app.devicectrl.param.param_mgr.HbotLittleBSPosMgr; import a8k.service.app.devicectrl.param.type.HbotLittleBSPos; @@ -22,7 +21,6 @@ import org.springframework.stereotype.Component; import java.util.List; -@ExtApiTab() @Component public class HbotLittleBSPosCalibration { static Logger logger = org.slf4j.LoggerFactory.getLogger(HbotLittleBSPosCalibration.class); diff --git a/src/main/java/a8k/service/app/devicectrl/param/calibration/HbotProbeSubstancePosCalibration.java b/src/main/java/a8k/service/app/devicectrl/param/calibration/HbotProbeSubstancePosCalibration.java index 0f4d938..4c94d4c 100644 --- a/src/main/java/a8k/service/app/devicectrl/param/calibration/HbotProbeSubstancePosCalibration.java +++ b/src/main/java/a8k/service/app/devicectrl/param/calibration/HbotProbeSubstancePosCalibration.java @@ -3,7 +3,6 @@ package a8k.service.app.devicectrl.param.calibration; import a8k.constant.AppConstant; import a8k.extapi.utils.ExtApiFn; -import a8k.extapi.utils.ExtApiTab; import a8k.service.app.devicectrl.lowlevel.exdriver.HbotBaseMoveExDriver; import a8k.service.app.devicectrl.param.param_mgr.HbotProbeSubstancePosMgr; import a8k.service.app.devicectrl.param.type.HbotProbeSubstancePos; @@ -22,7 +21,6 @@ import org.springframework.stereotype.Component; import java.util.List; -@ExtApiTab() @Component public class HbotProbeSubstancePosCalibration { static Logger logger = org.slf4j.LoggerFactory.getLogger(HbotProbeSubstancePosCalibration.class); diff --git a/src/main/java/a8k/service/app/devicectrl/param/calibration/HbotSamplePosCalibration.java b/src/main/java/a8k/service/app/devicectrl/param/calibration/HbotSamplePosCalibration.java index 5979897..eb0ba67 100644 --- a/src/main/java/a8k/service/app/devicectrl/param/calibration/HbotSamplePosCalibration.java +++ b/src/main/java/a8k/service/app/devicectrl/param/calibration/HbotSamplePosCalibration.java @@ -2,7 +2,6 @@ package a8k.service.app.devicectrl.param.calibration; import a8k.extapi.utils.ExtApiFn; -import a8k.extapi.utils.ExtApiTab; import a8k.service.app.devicectrl.lowlevel.ctrlservice.TubePreProcesCtrlService; import a8k.service.app.devicectrl.lowlevel.exdriver.HbotBaseMoveExDriver; import a8k.service.app.devicectrl.lowlevel.exdriver.MotorMoveZeroExDriver; @@ -23,7 +22,6 @@ import org.aspectj.lang.annotation.Aspect; import org.slf4j.Logger; import org.springframework.stereotype.Component; -@ExtApiTab() @Component @Aspect public class HbotSamplePosCalibration { diff --git a/src/main/java/a8k/service/app/devicectrl/param/calibration/HbotTipPosCalibration.java b/src/main/java/a8k/service/app/devicectrl/param/calibration/HbotTipPosCalibration.java index 6e8fecd..2b68add 100644 --- a/src/main/java/a8k/service/app/devicectrl/param/calibration/HbotTipPosCalibration.java +++ b/src/main/java/a8k/service/app/devicectrl/param/calibration/HbotTipPosCalibration.java @@ -3,7 +3,6 @@ package a8k.service.app.devicectrl.param.calibration; import a8k.constant.AppConstant; import a8k.extapi.utils.ExtApiFn; -import a8k.extapi.utils.ExtApiTab; import a8k.service.app.devicectrl.lowlevel.exdriver.HbotBaseMoveExDriver; import a8k.service.app.devicectrl.param.ext_param_mgr.HbotConsumableParamMgr; import a8k.service.app.devicectrl.param.param_mgr.HbotTipPosMgr; @@ -23,7 +22,6 @@ import org.springframework.stereotype.Component; import java.util.List; import java.util.Map; -@ExtApiTab() @Component public class HbotTipPosCalibration { static Logger logger = org.slf4j.LoggerFactory.getLogger(HbotTipPosCalibration.class); diff --git a/src/main/java/a8k/service/app/devicectrl/param/calibration/OptModuleParamCalibration.java b/src/main/java/a8k/service/app/devicectrl/param/calibration/OptModuleParamCalibration.java index cc983f7..a59269e 100644 --- a/src/main/java/a8k/service/app/devicectrl/param/calibration/OptModuleParamCalibration.java +++ b/src/main/java/a8k/service/app/devicectrl/param/calibration/OptModuleParamCalibration.java @@ -5,7 +5,6 @@ import a8k.a8ktype.device.IncubatorPos; import a8k.extapi.bean.A8kScanCurve; import a8k.extapi.utils.ExtApiFn; import a8k.extapi.utils.ExtApiStatu; -import a8k.extapi.utils.ExtApiTab; import a8k.service.app.devicectrl.lowlevel.ctrlservice.OptScanModuleCtrlService; import a8k.service.app.devicectrl.lowlevel.ctrlservice.PlateBoxCtrlService; import a8k.service.app.devicectrl.lowlevel.driver.OptModuleDriver; @@ -38,7 +37,6 @@ import java.util.List; * TOptScanStartPos (T光学扫描起始位置) * FOptScanStartPos (F光学扫描起始位置) */ -@ExtApiTab() @Component public class OptModuleParamCalibration { diff --git a/src/main/java/a8k/service/app/devicectrl/param/calibration/PipetteGunLLDParamCalibration.java b/src/main/java/a8k/service/app/devicectrl/param/calibration/PipetteGunLLDParamCalibration.java index a6d4392..7b2fca9 100644 --- a/src/main/java/a8k/service/app/devicectrl/param/calibration/PipetteGunLLDParamCalibration.java +++ b/src/main/java/a8k/service/app/devicectrl/param/calibration/PipetteGunLLDParamCalibration.java @@ -1,9 +1,7 @@ package a8k.service.app.devicectrl.param.calibration; -import a8k.extapi.utils.ExtApiTab; import org.springframework.stereotype.Component; -@ExtApiTab() @Component public class PipetteGunLLDParamCalibration { diff --git a/src/main/java/a8k/service/app/devicectrl/param/calibration/PipetteGunLLFParamCalibration.java b/src/main/java/a8k/service/app/devicectrl/param/calibration/PipetteGunLLFParamCalibration.java index edbcb0c..0444be7 100644 --- a/src/main/java/a8k/service/app/devicectrl/param/calibration/PipetteGunLLFParamCalibration.java +++ b/src/main/java/a8k/service/app/devicectrl/param/calibration/PipetteGunLLFParamCalibration.java @@ -1,10 +1,8 @@ package a8k.service.app.devicectrl.param.calibration; -import a8k.extapi.utils.ExtApiTab; import org.springframework.stereotype.Component; -@ExtApiTab() @Component public class PipetteGunLLFParamCalibration { // diff --git a/src/main/java/a8k/service/app/devicectrl/param/calibration/ReactionPlatesTransmitControlerCalibration.java b/src/main/java/a8k/service/app/devicectrl/param/calibration/ReactionPlatesTransmitControlerCalibration.java index 3f2aa1d..48b9ca1 100644 --- a/src/main/java/a8k/service/app/devicectrl/param/calibration/ReactionPlatesTransmitControlerCalibration.java +++ b/src/main/java/a8k/service/app/devicectrl/param/calibration/ReactionPlatesTransmitControlerCalibration.java @@ -1,7 +1,6 @@ package a8k.service.app.devicectrl.param.calibration; import a8k.extapi.utils.ExtApiFn; -import a8k.extapi.utils.ExtApiTab; import a8k.service.app.devicectrl.lowlevel.exdriver.HbotBaseMoveExDriver; import a8k.service.app.devicectrl.param.param_mgr.HbotFixedPosParamMgr; import a8k.service.app.devicectrl.param.param_mgr.OptModuleParamsMgr; @@ -26,7 +25,6 @@ import jakarta.annotation.Resource; import org.springframework.stereotype.Component; @Component -@ExtApiTab() public class ReactionPlatesTransmitControlerCalibration { final static int overtime = 10000; diff --git a/src/main/java/a8k/service/app/devicectrl/param/calibration/TemperatureCtrlParamCalibration.java b/src/main/java/a8k/service/app/devicectrl/param/calibration/TemperatureCtrlParamCalibration.java index 54d7d0f..48c50d7 100644 --- a/src/main/java/a8k/service/app/devicectrl/param/calibration/TemperatureCtrlParamCalibration.java +++ b/src/main/java/a8k/service/app/devicectrl/param/calibration/TemperatureCtrlParamCalibration.java @@ -2,7 +2,6 @@ package a8k.service.app.devicectrl.param.calibration; import a8k.extapi.utils.ExtApiFn; -import a8k.extapi.utils.ExtApiTab; import a8k.service.app.devicectrl.lowlevel.driver.TemperatureControlDriver; import a8k.service.app.devicectrl.param.param_mgr.TemperatureCtrlParamMgr; import a8k.service.app.devicectrl.param.type.TemperatureCtrlParam; @@ -13,7 +12,6 @@ import jakarta.annotation.Resource; import org.slf4j.Logger; import org.springframework.stereotype.Component; -@ExtApiTab() @Component public class TemperatureCtrlParamCalibration { static Logger logger = org.slf4j.LoggerFactory.getLogger(TemperatureCtrlParamCalibration.class); diff --git a/src/main/java/a8k/service/app/devicectrl/param/calibration/TubeFeedingModulePosCalibration.java b/src/main/java/a8k/service/app/devicectrl/param/calibration/TubeFeedingModulePosCalibration.java index 4b85bc2..b6f314b 100644 --- a/src/main/java/a8k/service/app/devicectrl/param/calibration/TubeFeedingModulePosCalibration.java +++ b/src/main/java/a8k/service/app/devicectrl/param/calibration/TubeFeedingModulePosCalibration.java @@ -1,7 +1,6 @@ package a8k.service.app.devicectrl.param.calibration; import a8k.extapi.utils.ExtApiFn; -import a8k.extapi.utils.ExtApiTab; import a8k.hardware.A8kCanBusService; import a8k.service.app.devicectrl.lowlevel.driver.StepMotorCtrlDriver; import a8k.service.app.devicectrl.lowlevel.exdriver.MotorEnableExDriver; @@ -22,7 +21,6 @@ import org.springframework.stereotype.Component; import java.util.List; -@ExtApiTab() @Component public class TubeFeedingModulePosCalibration { diff --git a/src/main/java/a8k/service/app/devicectrl/param/calibration/TubePreProcesPosCalibration.java b/src/main/java/a8k/service/app/devicectrl/param/calibration/TubePreProcesPosCalibration.java index f103ea4..3845c6d 100644 --- a/src/main/java/a8k/service/app/devicectrl/param/calibration/TubePreProcesPosCalibration.java +++ b/src/main/java/a8k/service/app/devicectrl/param/calibration/TubePreProcesPosCalibration.java @@ -1,7 +1,6 @@ package a8k.service.app.devicectrl.param.calibration; import a8k.extapi.utils.ExtApiFn; -import a8k.extapi.utils.ExtApiTab; import a8k.service.app.devicectrl.lowlevel.driver.MiniServoDriver; import a8k.service.app.devicectrl.lowlevel.driver.StepMotorCtrlDriver; import a8k.service.app.devicectrl.lowlevel.driver.type.MiniServoMId; @@ -20,7 +19,6 @@ import a8k.utils.ZJsonHelper; import jakarta.annotation.Resource; import org.springframework.stereotype.Component; -@ExtApiTab() @Component public class TubePreProcesPosCalibration { diff --git a/src/main/java/a8k/service/app/devicectrl/param/calibration/init/MiniServoReferencePointIniter.java b/src/main/java/a8k/service/app/devicectrl/param/calibration/init/MiniServoReferencePointIniter.java index ad3a110..7e3ece1 100644 --- a/src/main/java/a8k/service/app/devicectrl/param/calibration/init/MiniServoReferencePointIniter.java +++ b/src/main/java/a8k/service/app/devicectrl/param/calibration/init/MiniServoReferencePointIniter.java @@ -2,7 +2,6 @@ package a8k.service.app.devicectrl.param.calibration.init; import a8k.extapi.utils.ExtApiFn; -import a8k.extapi.utils.ExtApiTab; import a8k.service.app.devicectrl.lowlevel.driver.MiniServoDriver; import a8k.service.app.devicectrl.lowlevel.driver.type.MiniServoMId; import a8k.type.exception.AppException; @@ -10,7 +9,6 @@ import jakarta.annotation.Resource; import org.springframework.stereotype.Component; @Component -@ExtApiTab() public class MiniServoReferencePointIniter { @Resource diff --git a/src/main/java/a8k/service/test/MainflowCtrlTestService.java b/src/main/java/a8k/service/test/MainflowCtrlTestService.java index 1a241b8..61f36ac 100644 --- a/src/main/java/a8k/service/test/MainflowCtrlTestService.java +++ b/src/main/java/a8k/service/test/MainflowCtrlTestService.java @@ -6,7 +6,6 @@ import a8k.a8ktype.device.ConsumableGroup; import a8k.a8ktype.device.IncubatorPos; import a8k.constant.AppConstant; import a8k.extapi.utils.ExtApiFn; -import a8k.extapi.utils.ExtApiTab; import a8k.service.app.appctrl.AppConsumablesScanService; import a8k.service.app.appctrl.AppDeviceCtrlService; import a8k.service.app.appctrl.AppTubeSettingMgrService; @@ -47,7 +46,6 @@ import java.util.List; @Component @Slf4j -@ExtApiTab() public class MainflowCtrlTestService { diff --git a/src/main/java/a8k/service/test/PipetteGunTest.java b/src/main/java/a8k/service/test/PipetteGunTest.java index 5f2f1af..828c972 100644 --- a/src/main/java/a8k/service/test/PipetteGunTest.java +++ b/src/main/java/a8k/service/test/PipetteGunTest.java @@ -1,9 +1,7 @@ package a8k.service.test; -import a8k.extapi.utils.ExtApiTab; import org.springframework.stereotype.Component; -@ExtApiTab() @Component public class PipetteGunTest { diff --git a/src/main/java/a8k/service/test/PosMeasureUtils.java b/src/main/java/a8k/service/test/PosMeasureUtils.java index 8e38969..bfbf282 100644 --- a/src/main/java/a8k/service/test/PosMeasureUtils.java +++ b/src/main/java/a8k/service/test/PosMeasureUtils.java @@ -2,7 +2,6 @@ package a8k.service.test; import a8k.extapi.utils.ExtApiFn; -import a8k.extapi.utils.ExtApiTab; import a8k.service.app.devicectrl.lowlevel.driver.HbotDriver; import a8k.service.app.devicectrl.lowlevel.driver.PipetteCtrlDriver; import a8k.service.app.devicectrl.lowlevel.exdriver.HbotBaseMoveExDriver; @@ -13,7 +12,6 @@ import a8k.type.exception.AppException; import jakarta.annotation.Resource; import org.springframework.stereotype.Component; -@ExtApiTab() @Component public class PosMeasureUtils { diff --git a/src/main/java/a8k/service/test/VirtualDeviceSimulationTest.java b/src/main/java/a8k/service/test/VirtualDeviceSimulationTest.java index 28f32b5..1f2a1fb 100644 --- a/src/main/java/a8k/service/test/VirtualDeviceSimulationTest.java +++ b/src/main/java/a8k/service/test/VirtualDeviceSimulationTest.java @@ -3,7 +3,6 @@ package a8k.service.test; import a8k.SpringBootBeanUtil; import a8k.a8kproj.fakeproj.*; import a8k.extapi.utils.ExtApiFn; -import a8k.extapi.utils.ExtApiTab; import a8k.factory.ZAppPromoptFactory; import a8k.hardware.type.a8kcanprotocol.A8kEcode; import a8k.service.app.appctrl.AppDeviceCtrlService; @@ -36,7 +35,6 @@ import java.util.ArrayList; import java.util.List; @Component -@ExtApiTab() public class VirtualDeviceSimulationTest { @Resource VirtualDevice virtualDevice; diff --git a/src/main/java/a8k/service/verification/A8kOptVerification.java b/src/main/java/a8k/service/verification/A8kOptVerification.java index abc67d5..bb6f3a0 100644 --- a/src/main/java/a8k/service/verification/A8kOptVerification.java +++ b/src/main/java/a8k/service/verification/A8kOptVerification.java @@ -4,7 +4,6 @@ import a8k.a8kproj.optalgo.type.OptScanResult; import a8k.controler.filemgr.StorageControler; import a8k.extapi.bean.FileToBeDownload; import a8k.extapi.utils.ExtApiFn; -import a8k.extapi.utils.ExtApiTab; import a8k.service.app.appdata.FileMgrService; import a8k.service.app.appdata.ProjInfoMgrService; import a8k.service.app.devicectrl.lowlevel.ctrlservice.OptScanModuleCtrlService; @@ -33,7 +32,6 @@ import java.util.Map; * * */ -@ExtApiTab() @Component public class A8kOptVerification { diff --git a/src/main/java/a8k/service/verification/A8kTemperaturaVerfication.java b/src/main/java/a8k/service/verification/A8kTemperaturaVerfication.java index 6a82181..5633ac5 100644 --- a/src/main/java/a8k/service/verification/A8kTemperaturaVerfication.java +++ b/src/main/java/a8k/service/verification/A8kTemperaturaVerfication.java @@ -4,7 +4,6 @@ import a8k.extapi.bean.ExtApiCurve; import a8k.extapi.factory.CurveBuilder; import a8k.extapi.utils.ExtApiFn; import a8k.extapi.utils.ExtApiStatu; -import a8k.extapi.utils.ExtApiTab; import a8k.service.app.background.TemperatureCtrlService; import a8k.service.app.devicectrl.lowlevel.driver.TemperatureControlDriver; import a8k.type.exception.AppException; @@ -20,7 +19,6 @@ import java.util.List; * * */ -@ExtApiTab() @Component @Slf4j public class A8kTemperaturaVerfication { diff --git a/src/main/java/a8k/service/verification/A8kVerificationUtils.java b/src/main/java/a8k/service/verification/A8kVerificationUtils.java index c58c243..38be0ed 100644 --- a/src/main/java/a8k/service/verification/A8kVerificationUtils.java +++ b/src/main/java/a8k/service/verification/A8kVerificationUtils.java @@ -1,7 +1,6 @@ package a8k.service.verification; import a8k.extapi.utils.ExtApiFn; -import a8k.extapi.utils.ExtApiTab; import a8k.service.app.devicectrl.lowlevel.ctrlservice.DeviceInitCtrlService; import a8k.type.checkpoint.CheckResult; import a8k.type.exception.AppException; @@ -15,7 +14,6 @@ import java.util.List; * * */ -@ExtApiTab() @Component public class A8kVerificationUtils { diff --git a/src/main/java/a8k/service/verification/PipetteGunVerificationV2.java b/src/main/java/a8k/service/verification/PipetteGunVerificationV2.java index 0694f2d..c58f09f 100644 --- a/src/main/java/a8k/service/verification/PipetteGunVerificationV2.java +++ b/src/main/java/a8k/service/verification/PipetteGunVerificationV2.java @@ -2,7 +2,6 @@ package a8k.service.verification; import a8k.constant.AppConstant; import a8k.extapi.utils.ExtApiFn; -import a8k.extapi.utils.ExtApiTab; import a8k.hardware.type.LldType; import a8k.service.app.devicectrl.lowlevel.ctrlservice.DeviceInitCtrlService; import a8k.service.app.devicectrl.lowlevel.ctrlservice.HbotCtrlService; @@ -22,7 +21,6 @@ import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -@ExtApiTab() @Component @Slf4j public class PipetteGunVerificationV2 { diff --git a/src/main/java/a8k/type/pos/LargeBSPos.java b/src/main/java/a8k/type/pos/LargeBSPos.java deleted file mode 100644 index e83c12d..0000000 --- a/src/main/java/a8k/type/pos/LargeBSPos.java +++ /dev/null @@ -1,11 +0,0 @@ -package a8k.type.pos; - -import a8k.a8ktype.device.ConsumableGroup; - -public class LargeBSPos { - public ConsumableGroup group; - - public LargeBSPos(ConsumableGroup group) { - this.group = group; - } -} diff --git a/src/main/java/a8k/type/pos/LittleBSPos.java b/src/main/java/a8k/type/pos/LittleBSPos.java deleted file mode 100644 index e9db5b2..0000000 --- a/src/main/java/a8k/type/pos/LittleBSPos.java +++ /dev/null @@ -1,13 +0,0 @@ -package a8k.type.pos; - -import a8k.a8ktype.device.ConsumableGroup; - -public class LittleBSPos { - public ConsumableGroup group; - public Integer pos; - - public LittleBSPos(ConsumableGroup group, Integer pos) { - this.group = group; - this.pos = pos; - } -}