Browse Source

recode some code

tags/v0
zhaohe 8 months ago
parent
commit
cb2ce7581d
  1. BIN
      appresource/db/app.db
  2. 24
      src/main/java/a8k/extapi/controler/ExtApiControler.java
  3. 2
      src/main/java/a8k/extapi/service/ExtApiTabCfgService.java
  4. 10
      src/main/java/a8k/extapi/utils/ExtApiParamsTab.java
  5. 10
      src/main/java/a8k/extapi/utils/ExtApiTab.java
  6. 2
      src/main/java/a8k/service/app/background/BackgroudProcessCtrlService.java
  7. 33
      src/main/java/a8k/service/app/devicectrl/lowlevel/ctrlservice/LiquidOperationCtrlService.java
  8. 2
      src/main/java/a8k/service/app/devicectrl/lowlevel/ctrlservice/TubeFeedingCtrlService.java
  9. 3
      src/main/java/a8k/service/app/devicectrl/lowlevel/driver/PipetteCtrlDriver.java
  10. 2
      src/main/java/a8k/service/app/devicectrl/lowlevel/driver/StepMotorCtrlDriver.java
  11. 2
      src/main/java/a8k/service/app/devicectrl/lowlevel/exdriver/HbotBaseMoveExDriver.java
  12. 3
      src/main/java/a8k/service/app/devicectrl/param/LowerDeviceParamMgr.java
  13. 2
      src/main/java/a8k/service/app/devicectrl/param/calibration/Hbot2DCodeScanPosCalibration.java
  14. 2
      src/main/java/a8k/service/app/devicectrl/param/calibration/HbotLargeBottleBSPosCalibration.java
  15. 2
      src/main/java/a8k/service/app/devicectrl/param/calibration/HbotLittleBSPosCalibration.java
  16. 2
      src/main/java/a8k/service/app/devicectrl/param/calibration/HbotProbeSubstancePosCalibration.java
  17. 2
      src/main/java/a8k/service/app/devicectrl/param/calibration/HbotSamplePosCalibration.java
  18. 2
      src/main/java/a8k/service/app/devicectrl/param/calibration/HbotTipPosCalibration.java
  19. 2
      src/main/java/a8k/service/app/devicectrl/param/calibration/OptModuleParamCalibration.java
  20. 2
      src/main/java/a8k/service/app/devicectrl/param/calibration/PipetteGunLLDParamCalibration.java
  21. 2
      src/main/java/a8k/service/app/devicectrl/param/calibration/PipetteGunLLFParamCalibration.java
  22. 2
      src/main/java/a8k/service/app/devicectrl/param/calibration/ReactionPlatesTransmitControlerCalibration.java
  23. 2
      src/main/java/a8k/service/app/devicectrl/param/calibration/TemperatureCtrlParamCalibration.java
  24. 2
      src/main/java/a8k/service/app/devicectrl/param/calibration/TubeFeedingModulePosCalibration.java
  25. 2
      src/main/java/a8k/service/app/devicectrl/param/calibration/TubePreProcesPosCalibration.java
  26. 2
      src/main/java/a8k/service/app/devicectrl/param/calibration/init/MiniServoReferencePointIniter.java
  27. 2
      src/main/java/a8k/service/test/MainflowCtrlTestService.java
  28. 2
      src/main/java/a8k/service/test/PipetteGunTest.java
  29. 2
      src/main/java/a8k/service/test/PosMeasureUtils.java
  30. 2
      src/main/java/a8k/service/test/VirtualDeviceSimulationTest.java
  31. 2
      src/main/java/a8k/service/verification/A8kOptVerification.java
  32. 2
      src/main/java/a8k/service/verification/A8kTemperaturaVerfication.java
  33. 2
      src/main/java/a8k/service/verification/A8kVerificationUtils.java
  34. 2
      src/main/java/a8k/service/verification/PipetteGunVerificationV2.java
  35. 11
      src/main/java/a8k/type/pos/LargeBSPos.java
  36. 13
      src/main/java/a8k/type/pos/LittleBSPos.java

BIN
appresource/db/app.db

24
src/main/java/a8k/extapi/controler/ExtApiControler.java

@ -35,13 +35,12 @@ public class ExtApiControler {
List<Map<String, Object>> services = new ArrayList<>(); List<Map<String, Object>> services = new ArrayList<>();
var classes = SpringBootBeanUtil.getBeans(); var classes = SpringBootBeanUtil.getBeans();
for (var clazz : classes) { for (var clazz : classes) {
var hardwareServiceAnnotation = clazz.getAnnotation(ExtApiTab.class);
var cfg = extApiTabCfgService.getCfg(clazz); var cfg = extApiTabCfgService.getCfg(clazz);
if (cfg == null) { if (cfg == null) {
continue; continue;
} }
if (null == hardwareServiceAnnotation || !cfg.display) {
if (!cfg.display) {
continue; continue;
} }
@ -145,8 +144,7 @@ public class ExtApiControler {
Class<?> serviceClass = null; Class<?> serviceClass = null;
var classes = SpringBootBeanUtil.getBeans(); var classes = SpringBootBeanUtil.getBeans();
for (var clazz : classes) { for (var clazz : classes) {
var hardwareServiceAnnotation = clazz.getAnnotation(ExtApiTab.class);
if (null == hardwareServiceAnnotation || !clazz.getSimpleName().equals(serviceKey)) {
if ( !clazz.getSimpleName().equals(serviceKey)) {
continue; continue;
} }
serviceClass = clazz; serviceClass = clazz;
@ -185,8 +183,7 @@ public class ExtApiControler {
Class<?> serviceClass = null; Class<?> serviceClass = null;
var classes = SpringBootBeanUtil.getBeans(); var classes = SpringBootBeanUtil.getBeans();
for (var clazz : classes) { for (var clazz : classes) {
var hardwareServiceAnnotation = clazz.getAnnotation(ExtApiTab.class);
if (null == hardwareServiceAnnotation || !clazz.getSimpleName().equals(serviceKey)) {
if (!clazz.getSimpleName().equals(serviceKey)) {
continue; continue;
} }
serviceClass = clazz; serviceClass = clazz;
@ -335,8 +332,7 @@ public class ExtApiControler {
Class<?> serviceClass = null; Class<?> serviceClass = null;
var classes = SpringBootBeanUtil.getBeans(); var classes = SpringBootBeanUtil.getBeans();
for (var clazz : classes) { for (var clazz : classes) {
var hardwareServiceAnnotation = clazz.getAnnotation(ExtApiTab.class);
if (null == hardwareServiceAnnotation || !clazz.getSimpleName().equals(serviceKey)) {
if (!clazz.getSimpleName().equals(serviceKey)) {
continue; continue;
} }
serviceClass = clazz; serviceClass = clazz;
@ -352,12 +348,12 @@ public class ExtApiControler {
private Object getServiceParamHandlerByServiceKey(String serviceKey) { private Object getServiceParamHandlerByServiceKey(String serviceKey) {
var classes = SpringBootBeanUtil.getBeans(); var classes = SpringBootBeanUtil.getBeans();
for (var clazz : classes) { 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; continue;
} }
return SpringBootBeanUtil.getBean(clazz); return SpringBootBeanUtil.getBean(clazz);

2
src/main/java/a8k/extapi/service/ExtApiTabCfgService.java

@ -2,7 +2,6 @@
package a8k.extapi.service; package a8k.extapi.service;
import a8k.extapi.utils.ExtApiFn; import a8k.extapi.utils.ExtApiFn;
import a8k.extapi.utils.ExtApiTab;
import a8k.service.app.background.BackgroudProcessCtrlService; import a8k.service.app.background.BackgroudProcessCtrlService;
import a8k.service.app.devicectrl.lowlevel.ctrlservice.TubeFeedingCtrlService; import a8k.service.app.devicectrl.lowlevel.ctrlservice.TubeFeedingCtrlService;
import a8k.service.app.devicectrl.lowlevel.driver.PipetteCtrlDriver; import a8k.service.app.devicectrl.lowlevel.driver.PipetteCtrlDriver;
@ -19,7 +18,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
@Component @Component
@ExtApiTab()
public class ExtApiTabCfgService { public class ExtApiTabCfgService {
static int index; static int index;

10
src/main/java/a8k/extapi/utils/ExtApiParamsTab.java

@ -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();
}

10
src/main/java/a8k/extapi/utils/ExtApiTab.java

@ -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 {
}

2
src/main/java/a8k/service/app/background/BackgroudProcessCtrlService.java

@ -1,7 +1,6 @@
package a8k.service.app.background; package a8k.service.app.background;
import a8k.extapi.utils.ExtApiFn; import a8k.extapi.utils.ExtApiFn;
import a8k.extapi.utils.ExtApiTab;
import a8k.service.app.appdata.ProjIdCardInfoMgrService; import a8k.service.app.appdata.ProjIdCardInfoMgrService;
import a8k.service.test.state.VirtualDevice; import a8k.service.test.state.VirtualDevice;
import a8k.type.exception.AppException; import a8k.type.exception.AppException;
@ -9,7 +8,6 @@ import jakarta.annotation.Resource;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@Component @Component
@ExtApiTab()
public class BackgroudProcessCtrlService { public class BackgroudProcessCtrlService {
@Resource @Resource
VirtualDevice virtualDevice; VirtualDevice virtualDevice;

33
src/main/java/a8k/service/app/devicectrl/lowlevel/ctrlservice/PipetteCtrlService.java → src/main/java/a8k/service/app/devicectrl/lowlevel/ctrlservice/LiquidOperationCtrlService.java

@ -1,18 +1,14 @@
package a8k.service.app.devicectrl.lowlevel.ctrlservice; package a8k.service.app.devicectrl.lowlevel.ctrlservice;
import a8k.extapi.utils.ExtApiTab;
import a8k.a8ktype.device.ConsumableIndex;
import a8k.service.app.devicectrl.lowlevel.driver.PipetteCtrlDriver; import a8k.service.app.devicectrl.lowlevel.driver.PipetteCtrlDriver;
import a8k.a8ktype.device.ConsumableGroup; import a8k.a8ktype.device.ConsumableGroup;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@Component @Component
@ExtApiTab()
public class PipetteCtrlService {
@Resource
PipetteCtrlDriver pipetteCtrlDriver;
public class LiquidOperationCtrlService {
/* /*
* *
* 取样(取样位置lld目标位置吸吐混匀) * 取样(取样位置lld目标位置吸吐混匀)
@ -38,15 +34,32 @@ public class PipetteCtrlService {
// //
// 吸吐混匀 // 吸吐混匀
/*
* CTRL-SERVICE
*/
@Resource
HbotCtrlService hbotCtrlService;
@Resource
PipetteCtrlDriver pipetteCtrlDriver;
public void takeLargeBottleBufferLiquidToProbeSubstance(ConsumableGroup consumableGroup,Integer ul) {
/*
* PARAM-MGR
*/
/**
* 取大瓶缓冲液到探测物质位置
* @param fromGroup 大瓶缓冲液
* @param toCGroup 探测物质-GROUP
* @param toCIndex 探测物质-INDEX
* @param ul 吸取量
*/
public void takeLargeBottleBufferLiquidToProbeSubstance(ConsumableGroup fromGroup, ConsumableGroup toCGroup, ConsumableIndex toCIndex, Integer ul) {
//
// 移动到
//
} }
} }

2
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.OS;
import a8k.extapi.utils.ExtApiFn; 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.CodeScanerDriver;
import a8k.service.app.devicectrl.lowlevel.driver.MiniServoDriver; import a8k.service.app.devicectrl.lowlevel.driver.MiniServoDriver;
import a8k.service.app.devicectrl.lowlevel.driver.StepMotorCtrlDriver; import a8k.service.app.devicectrl.lowlevel.driver.StepMotorCtrlDriver;
@ -26,7 +25,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@Component @Component
@ExtApiTab()
public class TubeFeedingCtrlService { public class TubeFeedingCtrlService {
static Logger logger = LoggerFactory.getLogger(TubeFeedingCtrlService.class); static Logger logger = LoggerFactory.getLogger(TubeFeedingCtrlService.class);
static Integer infeedOvertime = 10000; static Integer infeedOvertime = 10000;

3
src/main/java/a8k/service/app/devicectrl/lowlevel/driver/PipetteCtrlDriver.java

@ -1,6 +1,5 @@
package a8k.service.app.devicectrl.lowlevel.driver; package a8k.service.app.devicectrl.lowlevel.driver;
import a8k.extapi.utils.ExtApiTab;
import a8k.extapi.utils.ExtApiFn; import a8k.extapi.utils.ExtApiFn;
import a8k.hardware.A8kCanBusService; import a8k.hardware.A8kCanBusService;
import a8k.hardware.type.LldType; import a8k.hardware.type.LldType;
@ -30,9 +29,7 @@ import java.util.List;
* *
* *
*/ */
@Component @Component
@ExtApiTab()
public class PipetteCtrlDriver { public class PipetteCtrlDriver {
private static final Logger log = LoggerFactory.getLogger(PipetteCtrlDriver.class); private static final Logger log = LoggerFactory.getLogger(PipetteCtrlDriver.class);

2
src/main/java/a8k/service/app/devicectrl/lowlevel/driver/StepMotorCtrlDriver.java

@ -1,7 +1,6 @@
package a8k.service.app.devicectrl.lowlevel.driver; package a8k.service.app.devicectrl.lowlevel.driver;
import a8k.extapi.utils.ExtApiFn; import a8k.extapi.utils.ExtApiFn;
import a8k.extapi.utils.ExtApiTab;
import a8k.hardware.A8kCanBusService; import a8k.hardware.A8kCanBusService;
import a8k.hardware.type.a8kcanprotocol.A8kPacket; import a8k.hardware.type.a8kcanprotocol.A8kPacket;
import a8k.hardware.type.a8kcanprotocol.CmdId; import a8k.hardware.type.a8kcanprotocol.CmdId;
@ -16,7 +15,6 @@ import org.slf4j.Logger;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@Component @Component
@ExtApiTab()
public class StepMotorCtrlDriver { public class StepMotorCtrlDriver {
static Logger logger = org.slf4j.LoggerFactory.getLogger(StepMotorCtrlDriver.class); static Logger logger = org.slf4j.LoggerFactory.getLogger(StepMotorCtrlDriver.class);

2
src/main/java/a8k/service/app/devicectrl/lowlevel/exdriver/HbotBaseMoveExDriver.java

@ -1,6 +1,5 @@
package a8k.service.app.devicectrl.lowlevel.exdriver; 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.type.PipetteRegIndex;
import a8k.service.app.devicectrl.lowlevel.driver.HbotDriver; import a8k.service.app.devicectrl.lowlevel.driver.HbotDriver;
import a8k.service.app.devicectrl.lowlevel.driver.PipetteCtrlDriver; import a8k.service.app.devicectrl.lowlevel.driver.PipetteCtrlDriver;
@ -20,7 +19,6 @@ import org.springframework.stereotype.Component;
* Hbot控制服务 * Hbot控制服务
*/ */
@Component @Component
@ExtApiTab()
public class HbotBaseMoveExDriver { public class HbotBaseMoveExDriver {
static Logger logger = LoggerFactory.getLogger(HbotBaseMoveExDriver.class); static Logger logger = LoggerFactory.getLogger(HbotBaseMoveExDriver.class);

3
src/main/java/a8k/service/app/devicectrl/param/LowerDeviceParamMgr.java

@ -1,7 +1,5 @@
package a8k.service.app.devicectrl.param; 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.LowerDeviceParameterDao;
import a8k.service.dao.type.Parameter; import a8k.service.dao.type.Parameter;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
@ -9,7 +7,6 @@ import org.springframework.stereotype.Component;
import org.springframework.util.Assert; import org.springframework.util.Assert;
@Component @Component
@ExtApiTab()
public class LowerDeviceParamMgr { public class LowerDeviceParamMgr {
@Resource @Resource

2
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.ExtApiFn;
import a8k.extapi.utils.ExtApiTab;
import a8k.service.app.devicectrl.lowlevel.exdriver.HbotBaseMoveExDriver; import a8k.service.app.devicectrl.lowlevel.exdriver.HbotBaseMoveExDriver;
import a8k.service.app.devicectrl.lowlevel.driver.HbotDriver; import a8k.service.app.devicectrl.lowlevel.driver.HbotDriver;
import a8k.service.app.devicectrl.lowlevel.driver.PipetteCtrlDriver; import a8k.service.app.devicectrl.lowlevel.driver.PipetteCtrlDriver;
@ -16,7 +15,6 @@ import jakarta.annotation.Resource;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ExtApiTab()
@Component @Component
public class Hbot2DCodeScanPosCalibration { public class Hbot2DCodeScanPosCalibration {
static Logger logger = org.slf4j.LoggerFactory.getLogger(Hbot2DCodeScanPosCalibration.class); static Logger logger = org.slf4j.LoggerFactory.getLogger(Hbot2DCodeScanPosCalibration.class);

2
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.a8ktype.device.ConsumableGroup;
import a8k.extapi.utils.ExtApiFn; import a8k.extapi.utils.ExtApiFn;
import a8k.extapi.utils.ExtApiTab;
import a8k.service.app.devicectrl.lowlevel.exdriver.HbotBaseMoveExDriver; import a8k.service.app.devicectrl.lowlevel.exdriver.HbotBaseMoveExDriver;
import a8k.service.app.devicectrl.param.type.HbotLargeBottleBSPos; import a8k.service.app.devicectrl.param.type.HbotLargeBottleBSPos;
import a8k.service.app.devicectrl.lowlevel.driver.HbotDriver; import a8k.service.app.devicectrl.lowlevel.driver.HbotDriver;
@ -19,7 +18,6 @@ import org.aspectj.lang.annotation.Aspect;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ExtApiTab()
@Component @Component
@Aspect @Aspect
public class HbotLargeBottleBSPosCalibration { public class HbotLargeBottleBSPosCalibration {

2
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.a8ktype.device.ConsumableGroup;
import a8k.constant.AppConstant; import a8k.constant.AppConstant;
import a8k.extapi.utils.ExtApiFn; import a8k.extapi.utils.ExtApiFn;
import a8k.extapi.utils.ExtApiTab;
import a8k.service.app.devicectrl.lowlevel.exdriver.HbotBaseMoveExDriver; import a8k.service.app.devicectrl.lowlevel.exdriver.HbotBaseMoveExDriver;
import a8k.service.app.devicectrl.param.param_mgr.HbotLittleBSPosMgr; import a8k.service.app.devicectrl.param.param_mgr.HbotLittleBSPosMgr;
import a8k.service.app.devicectrl.param.type.HbotLittleBSPos; import a8k.service.app.devicectrl.param.type.HbotLittleBSPos;
@ -22,7 +21,6 @@ import org.springframework.stereotype.Component;
import java.util.List; import java.util.List;
@ExtApiTab()
@Component @Component
public class HbotLittleBSPosCalibration { public class HbotLittleBSPosCalibration {
static Logger logger = org.slf4j.LoggerFactory.getLogger(HbotLittleBSPosCalibration.class); static Logger logger = org.slf4j.LoggerFactory.getLogger(HbotLittleBSPosCalibration.class);

2
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.constant.AppConstant;
import a8k.extapi.utils.ExtApiFn; import a8k.extapi.utils.ExtApiFn;
import a8k.extapi.utils.ExtApiTab;
import a8k.service.app.devicectrl.lowlevel.exdriver.HbotBaseMoveExDriver; import a8k.service.app.devicectrl.lowlevel.exdriver.HbotBaseMoveExDriver;
import a8k.service.app.devicectrl.param.param_mgr.HbotProbeSubstancePosMgr; import a8k.service.app.devicectrl.param.param_mgr.HbotProbeSubstancePosMgr;
import a8k.service.app.devicectrl.param.type.HbotProbeSubstancePos; import a8k.service.app.devicectrl.param.type.HbotProbeSubstancePos;
@ -22,7 +21,6 @@ import org.springframework.stereotype.Component;
import java.util.List; import java.util.List;
@ExtApiTab()
@Component @Component
public class HbotProbeSubstancePosCalibration { public class HbotProbeSubstancePosCalibration {
static Logger logger = org.slf4j.LoggerFactory.getLogger(HbotProbeSubstancePosCalibration.class); static Logger logger = org.slf4j.LoggerFactory.getLogger(HbotProbeSubstancePosCalibration.class);

2
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.ExtApiFn;
import a8k.extapi.utils.ExtApiTab;
import a8k.service.app.devicectrl.lowlevel.ctrlservice.TubePreProcesCtrlService; import a8k.service.app.devicectrl.lowlevel.ctrlservice.TubePreProcesCtrlService;
import a8k.service.app.devicectrl.lowlevel.exdriver.HbotBaseMoveExDriver; import a8k.service.app.devicectrl.lowlevel.exdriver.HbotBaseMoveExDriver;
import a8k.service.app.devicectrl.lowlevel.exdriver.MotorMoveZeroExDriver; import a8k.service.app.devicectrl.lowlevel.exdriver.MotorMoveZeroExDriver;
@ -23,7 +22,6 @@ import org.aspectj.lang.annotation.Aspect;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ExtApiTab()
@Component @Component
@Aspect @Aspect
public class HbotSamplePosCalibration { public class HbotSamplePosCalibration {

2
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.constant.AppConstant;
import a8k.extapi.utils.ExtApiFn; import a8k.extapi.utils.ExtApiFn;
import a8k.extapi.utils.ExtApiTab;
import a8k.service.app.devicectrl.lowlevel.exdriver.HbotBaseMoveExDriver; import a8k.service.app.devicectrl.lowlevel.exdriver.HbotBaseMoveExDriver;
import a8k.service.app.devicectrl.param.ext_param_mgr.HbotConsumableParamMgr; import a8k.service.app.devicectrl.param.ext_param_mgr.HbotConsumableParamMgr;
import a8k.service.app.devicectrl.param.param_mgr.HbotTipPosMgr; 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.List;
import java.util.Map; import java.util.Map;
@ExtApiTab()
@Component @Component
public class HbotTipPosCalibration { public class HbotTipPosCalibration {
static Logger logger = org.slf4j.LoggerFactory.getLogger(HbotTipPosCalibration.class); static Logger logger = org.slf4j.LoggerFactory.getLogger(HbotTipPosCalibration.class);

2
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.bean.A8kScanCurve;
import a8k.extapi.utils.ExtApiFn; import a8k.extapi.utils.ExtApiFn;
import a8k.extapi.utils.ExtApiStatu; 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.OptScanModuleCtrlService;
import a8k.service.app.devicectrl.lowlevel.ctrlservice.PlateBoxCtrlService; import a8k.service.app.devicectrl.lowlevel.ctrlservice.PlateBoxCtrlService;
import a8k.service.app.devicectrl.lowlevel.driver.OptModuleDriver; import a8k.service.app.devicectrl.lowlevel.driver.OptModuleDriver;
@ -38,7 +37,6 @@ import java.util.List;
* TOptScanStartPos (T光学扫描起始位置) * TOptScanStartPos (T光学扫描起始位置)
* FOptScanStartPos (F光学扫描起始位置) * FOptScanStartPos (F光学扫描起始位置)
*/ */
@ExtApiTab()
@Component @Component
public class OptModuleParamCalibration { public class OptModuleParamCalibration {

2
src/main/java/a8k/service/app/devicectrl/param/calibration/PipetteGunLLDParamCalibration.java

@ -1,9 +1,7 @@
package a8k.service.app.devicectrl.param.calibration; package a8k.service.app.devicectrl.param.calibration;
import a8k.extapi.utils.ExtApiTab;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ExtApiTab()
@Component @Component
public class PipetteGunLLDParamCalibration { public class PipetteGunLLDParamCalibration {

2
src/main/java/a8k/service/app/devicectrl/param/calibration/PipetteGunLLFParamCalibration.java

@ -1,10 +1,8 @@
package a8k.service.app.devicectrl.param.calibration; package a8k.service.app.devicectrl.param.calibration;
import a8k.extapi.utils.ExtApiTab;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ExtApiTab()
@Component @Component
public class PipetteGunLLFParamCalibration { public class PipetteGunLLFParamCalibration {
// //

2
src/main/java/a8k/service/app/devicectrl/param/calibration/ReactionPlatesTransmitControlerCalibration.java

@ -1,7 +1,6 @@
package a8k.service.app.devicectrl.param.calibration; package a8k.service.app.devicectrl.param.calibration;
import a8k.extapi.utils.ExtApiFn; import a8k.extapi.utils.ExtApiFn;
import a8k.extapi.utils.ExtApiTab;
import a8k.service.app.devicectrl.lowlevel.exdriver.HbotBaseMoveExDriver; 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.HbotFixedPosParamMgr;
import a8k.service.app.devicectrl.param.param_mgr.OptModuleParamsMgr; import a8k.service.app.devicectrl.param.param_mgr.OptModuleParamsMgr;
@ -26,7 +25,6 @@ import jakarta.annotation.Resource;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@Component @Component
@ExtApiTab()
public class ReactionPlatesTransmitControlerCalibration { public class ReactionPlatesTransmitControlerCalibration {
final static int overtime = 10000; final static int overtime = 10000;

2
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.ExtApiFn;
import a8k.extapi.utils.ExtApiTab;
import a8k.service.app.devicectrl.lowlevel.driver.TemperatureControlDriver; import a8k.service.app.devicectrl.lowlevel.driver.TemperatureControlDriver;
import a8k.service.app.devicectrl.param.param_mgr.TemperatureCtrlParamMgr; import a8k.service.app.devicectrl.param.param_mgr.TemperatureCtrlParamMgr;
import a8k.service.app.devicectrl.param.type.TemperatureCtrlParam; import a8k.service.app.devicectrl.param.type.TemperatureCtrlParam;
@ -13,7 +12,6 @@ import jakarta.annotation.Resource;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ExtApiTab()
@Component @Component
public class TemperatureCtrlParamCalibration { public class TemperatureCtrlParamCalibration {
static Logger logger = org.slf4j.LoggerFactory.getLogger(TemperatureCtrlParamCalibration.class); static Logger logger = org.slf4j.LoggerFactory.getLogger(TemperatureCtrlParamCalibration.class);

2
src/main/java/a8k/service/app/devicectrl/param/calibration/TubeFeedingModulePosCalibration.java

@ -1,7 +1,6 @@
package a8k.service.app.devicectrl.param.calibration; package a8k.service.app.devicectrl.param.calibration;
import a8k.extapi.utils.ExtApiFn; import a8k.extapi.utils.ExtApiFn;
import a8k.extapi.utils.ExtApiTab;
import a8k.hardware.A8kCanBusService; import a8k.hardware.A8kCanBusService;
import a8k.service.app.devicectrl.lowlevel.driver.StepMotorCtrlDriver; import a8k.service.app.devicectrl.lowlevel.driver.StepMotorCtrlDriver;
import a8k.service.app.devicectrl.lowlevel.exdriver.MotorEnableExDriver; import a8k.service.app.devicectrl.lowlevel.exdriver.MotorEnableExDriver;
@ -22,7 +21,6 @@ import org.springframework.stereotype.Component;
import java.util.List; import java.util.List;
@ExtApiTab()
@Component @Component
public class TubeFeedingModulePosCalibration { public class TubeFeedingModulePosCalibration {

2
src/main/java/a8k/service/app/devicectrl/param/calibration/TubePreProcesPosCalibration.java

@ -1,7 +1,6 @@
package a8k.service.app.devicectrl.param.calibration; package a8k.service.app.devicectrl.param.calibration;
import a8k.extapi.utils.ExtApiFn; 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.MiniServoDriver;
import a8k.service.app.devicectrl.lowlevel.driver.StepMotorCtrlDriver; import a8k.service.app.devicectrl.lowlevel.driver.StepMotorCtrlDriver;
import a8k.service.app.devicectrl.lowlevel.driver.type.MiniServoMId; import a8k.service.app.devicectrl.lowlevel.driver.type.MiniServoMId;
@ -20,7 +19,6 @@ import a8k.utils.ZJsonHelper;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ExtApiTab()
@Component @Component
public class TubePreProcesPosCalibration { public class TubePreProcesPosCalibration {

2
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.ExtApiFn;
import a8k.extapi.utils.ExtApiTab;
import a8k.service.app.devicectrl.lowlevel.driver.MiniServoDriver; import a8k.service.app.devicectrl.lowlevel.driver.MiniServoDriver;
import a8k.service.app.devicectrl.lowlevel.driver.type.MiniServoMId; import a8k.service.app.devicectrl.lowlevel.driver.type.MiniServoMId;
import a8k.type.exception.AppException; import a8k.type.exception.AppException;
@ -10,7 +9,6 @@ import jakarta.annotation.Resource;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@Component @Component
@ExtApiTab()
public class MiniServoReferencePointIniter { public class MiniServoReferencePointIniter {
@Resource @Resource

2
src/main/java/a8k/service/test/MainflowCtrlTestService.java

@ -6,7 +6,6 @@ import a8k.a8ktype.device.ConsumableGroup;
import a8k.a8ktype.device.IncubatorPos; import a8k.a8ktype.device.IncubatorPos;
import a8k.constant.AppConstant; import a8k.constant.AppConstant;
import a8k.extapi.utils.ExtApiFn; import a8k.extapi.utils.ExtApiFn;
import a8k.extapi.utils.ExtApiTab;
import a8k.service.app.appctrl.AppConsumablesScanService; import a8k.service.app.appctrl.AppConsumablesScanService;
import a8k.service.app.appctrl.AppDeviceCtrlService; import a8k.service.app.appctrl.AppDeviceCtrlService;
import a8k.service.app.appctrl.AppTubeSettingMgrService; import a8k.service.app.appctrl.AppTubeSettingMgrService;
@ -47,7 +46,6 @@ import java.util.List;
@Component @Component
@Slf4j @Slf4j
@ExtApiTab()
public class MainflowCtrlTestService { public class MainflowCtrlTestService {

2
src/main/java/a8k/service/test/PipetteGunTest.java

@ -1,9 +1,7 @@
package a8k.service.test; package a8k.service.test;
import a8k.extapi.utils.ExtApiTab;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ExtApiTab()
@Component @Component
public class PipetteGunTest { public class PipetteGunTest {

2
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.ExtApiFn;
import a8k.extapi.utils.ExtApiTab;
import a8k.service.app.devicectrl.lowlevel.driver.HbotDriver; import a8k.service.app.devicectrl.lowlevel.driver.HbotDriver;
import a8k.service.app.devicectrl.lowlevel.driver.PipetteCtrlDriver; import a8k.service.app.devicectrl.lowlevel.driver.PipetteCtrlDriver;
import a8k.service.app.devicectrl.lowlevel.exdriver.HbotBaseMoveExDriver; import a8k.service.app.devicectrl.lowlevel.exdriver.HbotBaseMoveExDriver;
@ -13,7 +12,6 @@ import a8k.type.exception.AppException;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ExtApiTab()
@Component @Component
public class PosMeasureUtils { public class PosMeasureUtils {

2
src/main/java/a8k/service/test/VirtualDeviceSimulationTest.java

@ -3,7 +3,6 @@ package a8k.service.test;
import a8k.SpringBootBeanUtil; import a8k.SpringBootBeanUtil;
import a8k.a8kproj.fakeproj.*; import a8k.a8kproj.fakeproj.*;
import a8k.extapi.utils.ExtApiFn; import a8k.extapi.utils.ExtApiFn;
import a8k.extapi.utils.ExtApiTab;
import a8k.factory.ZAppPromoptFactory; import a8k.factory.ZAppPromoptFactory;
import a8k.hardware.type.a8kcanprotocol.A8kEcode; import a8k.hardware.type.a8kcanprotocol.A8kEcode;
import a8k.service.app.appctrl.AppDeviceCtrlService; import a8k.service.app.appctrl.AppDeviceCtrlService;
@ -36,7 +35,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
@Component @Component
@ExtApiTab()
public class VirtualDeviceSimulationTest { public class VirtualDeviceSimulationTest {
@Resource @Resource
VirtualDevice virtualDevice; VirtualDevice virtualDevice;

2
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.controler.filemgr.StorageControler;
import a8k.extapi.bean.FileToBeDownload; import a8k.extapi.bean.FileToBeDownload;
import a8k.extapi.utils.ExtApiFn; import a8k.extapi.utils.ExtApiFn;
import a8k.extapi.utils.ExtApiTab;
import a8k.service.app.appdata.FileMgrService; import a8k.service.app.appdata.FileMgrService;
import a8k.service.app.appdata.ProjInfoMgrService; import a8k.service.app.appdata.ProjInfoMgrService;
import a8k.service.app.devicectrl.lowlevel.ctrlservice.OptScanModuleCtrlService; import a8k.service.app.devicectrl.lowlevel.ctrlservice.OptScanModuleCtrlService;
@ -33,7 +32,6 @@ import java.util.Map;
* *
* *
*/ */
@ExtApiTab()
@Component @Component
public class A8kOptVerification { public class A8kOptVerification {

2
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.factory.CurveBuilder;
import a8k.extapi.utils.ExtApiFn; import a8k.extapi.utils.ExtApiFn;
import a8k.extapi.utils.ExtApiStatu; import a8k.extapi.utils.ExtApiStatu;
import a8k.extapi.utils.ExtApiTab;
import a8k.service.app.background.TemperatureCtrlService; import a8k.service.app.background.TemperatureCtrlService;
import a8k.service.app.devicectrl.lowlevel.driver.TemperatureControlDriver; import a8k.service.app.devicectrl.lowlevel.driver.TemperatureControlDriver;
import a8k.type.exception.AppException; import a8k.type.exception.AppException;
@ -20,7 +19,6 @@ import java.util.List;
* *
* *
*/ */
@ExtApiTab()
@Component @Component
@Slf4j @Slf4j
public class A8kTemperaturaVerfication { public class A8kTemperaturaVerfication {

2
src/main/java/a8k/service/verification/A8kVerificationUtils.java

@ -1,7 +1,6 @@
package a8k.service.verification; package a8k.service.verification;
import a8k.extapi.utils.ExtApiFn; import a8k.extapi.utils.ExtApiFn;
import a8k.extapi.utils.ExtApiTab;
import a8k.service.app.devicectrl.lowlevel.ctrlservice.DeviceInitCtrlService; import a8k.service.app.devicectrl.lowlevel.ctrlservice.DeviceInitCtrlService;
import a8k.type.checkpoint.CheckResult; import a8k.type.checkpoint.CheckResult;
import a8k.type.exception.AppException; import a8k.type.exception.AppException;
@ -15,7 +14,6 @@ import java.util.List;
* *
* *
*/ */
@ExtApiTab()
@Component @Component
public class A8kVerificationUtils { public class A8kVerificationUtils {

2
src/main/java/a8k/service/verification/PipetteGunVerificationV2.java

@ -2,7 +2,6 @@ package a8k.service.verification;
import a8k.constant.AppConstant; import a8k.constant.AppConstant;
import a8k.extapi.utils.ExtApiFn; import a8k.extapi.utils.ExtApiFn;
import a8k.extapi.utils.ExtApiTab;
import a8k.hardware.type.LldType; import a8k.hardware.type.LldType;
import a8k.service.app.devicectrl.lowlevel.ctrlservice.DeviceInitCtrlService; import a8k.service.app.devicectrl.lowlevel.ctrlservice.DeviceInitCtrlService;
import a8k.service.app.devicectrl.lowlevel.ctrlservice.HbotCtrlService; import a8k.service.app.devicectrl.lowlevel.ctrlservice.HbotCtrlService;
@ -22,7 +21,6 @@ import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ExtApiTab()
@Component @Component
@Slf4j @Slf4j
public class PipetteGunVerificationV2 { public class PipetteGunVerificationV2 {

11
src/main/java/a8k/type/pos/LargeBSPos.java

@ -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;
}
}

13
src/main/java/a8k/type/pos/LittleBSPos.java

@ -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;
}
}
Loading…
Cancel
Save