recode

src/main/java/a8k/opt_algo/A8kOptAlgo.java → src/main/java/a8k/algo/opt_algo/A8kOptAlgo.java

@@ -1,4 +1,4 @@
-package a8k.opt_algo;
+package a8k.algo.opt_algo;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/a8k/app_eventbus/appevent/AppEvent.java

@@ -1,6 +0,0 @@
-package a8k.app_eventbus.appevent;
-
-public class AppEvent {
-
-
-}

src/main/java/a8k/appbean/A8kScanCurve.java → src/main/java/a8k/appbase/A8kScanCurve.java

@@ -1,4 +1,4 @@
-package a8k.appbean;
+package a8k.appbase;
 
 import java.util.List;
 

src/main/java/a8k/appbean/A8kTubeType.java → src/main/java/a8k/appbase/A8kTubeType.java

@@ -1,4 +1,4 @@
-package a8k.appbean;
+package a8k.appbase;
 
 
 public enum A8kTubeType {

src/main/java/a8k/appbean/AppEventListener.java → src/main/java/a8k/appbase/AppEventListener.java

@@ -1,6 +1,6 @@
-package a8k.appbean;
+package a8k.appbase;
 
-import a8k.app_eventbus.appevent.AppEvent;
+import a8k.service.appeventbus.appevent.AppEvent;
 
 public interface AppEventListener {
 	public void onAppEvent(AppEvent event);

src/main/java/a8k/ConsumableGroup.java → src/main/java/a8k/appbase/ConsumableGroup.java

@@ -1,4 +1,4 @@
-package a8k;
+package a8k.appbase;
 
 public enum ConsumableGroup {
 	GROUP1, GROUP2, GROUP3, GROUP4, GROUP5, GROUP6;

src/main/java/a8k/appbean/HardwareException.java → src/main/java/a8k/appbase/HardwareException.java

@@ -1,8 +1,8 @@
-package a8k.appbean;
+package a8k.appbase;
 
-import a8k.canbus.protocol.A8kEcode;
-import a8k.canbus.protocol.CmdId;
-import a8k.canbus.protocol.MId;
+import a8k.service.hardware.canbus.protocol.A8kEcode;
+import a8k.service.hardware.canbus.protocol.CmdId;
+import a8k.service.hardware.canbus.protocol.MId;
 
 public class HardwareException extends Exception {
 	// 构造函数

src/main/java/a8k/appbean/IncubatorPos.java → src/main/java/a8k/appbase/IncubatorPos.java

@@ -1,4 +1,4 @@
-package a8k.appbean;
+package a8k.appbase;
 
 public enum IncubatorPos {
 	SPACE01, SPACE02, SPACE03, SPACE04, SPACE05, SPACE06, SPACE07, SPACE08, SPACE09, SPACE10, SPACE11, SPACE12, SPACE13, SPACE14, SPACE15, SPACE16, SPACE17, SPACE18, SPACE19, SPACE20;

src/main/java/a8k/appbean/OptScanDirection.java → src/main/java/a8k/appbase/OptScanDirection.java

@@ -1,4 +1,4 @@
-package a8k.appbean;
+package a8k.appbase;
 
 public enum OptScanDirection {
 	POSITIVE, NEGATIVE;

src/main/java/a8k/appbean/PlateInfo.java → src/main/java/a8k/appbase/PlateInfo.java

@@ -1,8 +1,6 @@
-package a8k.appbean;
+package a8k.appbase;
 
 
-import java.util.List;
-
 public class PlateInfo {
 
 	public Integer lot;

src/main/java/a8k/appbean/SampleTubeState.java → src/main/java/a8k/appbase/SampleTubeState.java

@@ -1,4 +1,4 @@
-package a8k.appbean;
+package a8k.appbase;
 
 /**
  * 样品试管状态

src/main/java/a8k/appbean/TargetPosMeasureDirection.java → src/main/java/a8k/appbase/TargetPosMeasureDirection.java

@@ -1,4 +1,4 @@
-package a8k.appbean;
+package a8k.appbase;
 
 public enum TargetPosMeasureDirection {
 	NOTCARE, POSITIVE, NEGATIVE;

src/main/java/a8k/appbean/cfg/BottleGroupsPosInfo.java → src/main/java/a8k/appbase/cfg/BottleGroupsPosInfo.java

@@ -1,4 +1,4 @@
-package a8k.appbean.cfg;
+package a8k.appbase.cfg;
 
 import a8k.utils.HbotScanerPosComputer;
 

src/main/java/a8k/appbean/cfg/BottlesPosInfo.java → src/main/java/a8k/appbase/cfg/BottlesPosInfo.java

@@ -1,4 +1,4 @@
-package a8k.appbean.cfg;
+package a8k.appbase.cfg;
 
 public class BottlesPosInfo {
 

src/main/java/a8k/appbean/cfg/HbotLimitArea.java → src/main/java/a8k/appbase/cfg/HbotLimitArea.java

@@ -1,4 +1,4 @@
-package a8k.appbean.cfg;
+package a8k.appbase.cfg;
 
 public class HbotLimitArea {
 

src/main/java/a8k/appbean/cfg/KeyValType.java → src/main/java/a8k/appbase/cfg/KeyValType.java

@@ -1,4 +1,4 @@
-package a8k.appbean.cfg;
+package a8k.appbase.cfg;
 
 public enum KeyValType {
 	Pos3d("Pos3d"),//

src/main/java/a8k/appbean/cfg/LargeBottleBufferPos.java → src/main/java/a8k/appbase/cfg/LargeBottleBufferPos.java

@@ -1,9 +1,7 @@
-package a8k.appbean.cfg;
+package a8k.appbase.cfg;
 
 import a8k.utils.HbotScanerPosComputer;
 
-import java.security.PublicKey;
-
 /**
  * 大瓶缓冲液位置信息
  */

src/main/java/a8k/appbean/cfg/PipetteCfg.java → src/main/java/a8k/appbase/cfg/PipetteCfg.java

@@ -1,4 +1,4 @@
-package a8k.appbean.cfg;
+package a8k.appbase.cfg;
 
 public class PipetteCfg {
 	public Integer LLFCThresh;//液面跟随电容阈值

src/main/java/a8k/appbean/cfg/Plates2dCodeScanPos.java → src/main/java/a8k/appbase/cfg/Plates2dCodeScanPos.java

@@ -1,6 +1,4 @@
-package a8k.appbean.cfg;
-
-import a8k.utils.HbotScanerPosComputer;
+package a8k.appbase.cfg;
 
 /**
  * 板夹仓扫码信息

src/main/java/a8k/appbean/cfg/Pos2d.java → src/main/java/a8k/appbase/cfg/Pos2d.java

@@ -1,4 +1,4 @@
-package a8k.appbean.cfg;
+package a8k.appbase.cfg;
 
 public class Pos2d {
 

src/main/java/a8k/appbean/cfg/Pos3d.java → src/main/java/a8k/appbase/cfg/Pos3d.java

@@ -1,4 +1,4 @@
-package a8k.appbean.cfg;
+package a8k.appbase.cfg;
 
 public class Pos3d {
 	public Integer x = 0;

src/main/java/a8k/appbean/cfg/SampleZPosInfo.java → src/main/java/a8k/appbase/cfg/SampleZPosInfo.java

@@ -1,4 +1,4 @@
-package a8k.appbean.cfg;
+package a8k.appbase.cfg;
 
 public class SampleZPosInfo {
 	public Integer sampleZPos;//采样探测起始位

src/main/java/a8k/appbean/cfg/TipPickUpPosInfo.java → src/main/java/a8k/appbase/cfg/TipPickUpPosInfo.java

@@ -1,4 +1,4 @@
-package a8k.appbean.cfg;
+package a8k.appbase.cfg;
 
 public class TipPickUpPosInfo {
 

src/main/java/a8k/appbean/cfg/TubeSamplePos.java → src/main/java/a8k/appbase/cfg/TubeSamplePos.java

@@ -1,4 +1,4 @@
-package a8k.appbean.cfg;
+package a8k.appbase.cfg;
 
 public class TubeSamplePos {
 

src/main/java/a8k/appbean/ecode/AppRet.java → src/main/java/a8k/appbase/ecode/AppRet.java

@@ -1,9 +1,9 @@
-package a8k.appbean.ecode;
+package a8k.appbase.ecode;
 
-import a8k.canbus.protocol.CmdId;
-import a8k.canbus.protocol.MId;
-import a8k.canbus.protocol.A8kEcode;
-import a8k.appbean.HardwareException;
+import a8k.service.hardware.canbus.protocol.CmdId;
+import a8k.service.hardware.canbus.protocol.MId;
+import a8k.service.hardware.canbus.protocol.A8kEcode;
+import a8k.appbase.HardwareException;
 
 public class AppRet<T> {
 

src/main/java/a8k/appbean/ecode/AppRetEcodeInfo.java → src/main/java/a8k/appbase/ecode/AppRetEcodeInfo.java

@@ -1,8 +1,8 @@
-package a8k.appbean.ecode;
+package a8k.appbase.ecode;
 
-import a8k.canbus.protocol.A8kEcode;
-import a8k.canbus.protocol.CmdId;
-import a8k.canbus.protocol.MId;
+import a8k.service.hardware.canbus.protocol.A8kEcode;
+import a8k.service.hardware.canbus.protocol.CmdId;
+import a8k.service.hardware.canbus.protocol.MId;
 
 public class AppRetEcodeInfo {
 	A8kEcode errorCode;

src/main/java/a8k/A8kApplication.java → src/main/java/a8k/controler/engineer/A8kExceptionProcesser.java

@@ -1,6 +1,6 @@
-package a8k;
+package a8k.controler.engineer;
 
-import a8k.appbean.ecode.AppRet;
+import a8k.appbase.ecode.AppRet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.ControllerAdvice;
@@ -8,9 +8,9 @@ import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 @ControllerAdvice
-public class A8kApplication {
+public class A8kExceptionProcesser {
 
-	Logger logger = LoggerFactory.getLogger(A8kApplication.class);
+	Logger logger = LoggerFactory.getLogger(A8kExceptionProcesser.class);
 
 	@ResponseBody
 	@ExceptionHandler(value = Exception.class)

src/main/java/a8k/hardware/controler/Controler.java → src/main/java/a8k/controler/engineer/EngineerPageControler.java

@@ -1,6 +1,6 @@
-package a8k.hardware.controler;
-import a8k.appbean.ecode.AppRet;
-import a8k.service.db.entity.HardwareServiceSetting;
+package a8k.controler.engineer;
+import a8k.appbase.ecode.AppRet;
+import a8k.db.HardwareServiceSetting;
 import a8k.utils.*;
 import com.iflytop.uf.UfApplication;
 import com.iflytop.uf.util.UfClassHelper;
@@ -16,7 +16,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 @Controller
-public class Controler {
+public class EngineerPageControler {
 	@PostMapping("/api/service-config/service-list")
 	@ResponseBody
 	public AppRet<Object> services() {

src/main/java/a8k/hardware/HardwareServiceOrder.java → src/main/java/a8k/controler/engineer/HardwareServiceOrder.java

@@ -1,4 +1,4 @@
-package a8k.hardware;
+package a8k.controler.engineer;
 public enum HardwareServiceOrder {
 	SamplesPreProcessModuleCtrlService,
 	ReactionPlatesTransmitCtrlService,

src/main/java/a8k/service/db/entity/HardwareServiceSetting.java → src/main/java/a8k/db/HardwareServiceSetting.java

@@ -1,4 +1,4 @@
-package a8k.service.db.entity;
+package a8k.db;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;

src/main/java/a8k/app_eventbus/A8kDebugTaskExecutorService.java → src/main/java/a8k/service/A8kDebugTaskExecutorService.java

@@ -1,4 +1,4 @@
-package a8k.app_eventbus;
+package a8k.service;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/a8k/app_eventbus/AppEventBusService.java → src/main/java/a8k/service/appeventbus/AppEventBusService.java

@@ -1,7 +1,7 @@
-package a8k.app_eventbus;
+package a8k.service.appeventbus;
 
-import a8k.appbean.AppEventListener;
-import a8k.app_eventbus.appevent.AppEvent;
+import a8k.appbase.AppEventListener;
+import a8k.service.appeventbus.appevent.AppEvent;
 import jakarta.annotation.PostConstruct;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/a8k/app_eventbus/appevent/A8kCanBusOnConnectEvent.java → src/main/java/a8k/service/appeventbus/appevent/A8kCanBusOnConnectEvent.java

@@ -1,4 +1,4 @@
-package a8k.app_eventbus.appevent;
+package a8k.service.appeventbus.appevent;
 
 public class A8kCanBusOnConnectEvent extends AppEvent {
 	public A8kCanBusOnConnectEvent() {

src/main/java/a8k/app_eventbus/appevent/A8kHardwareReport.java → src/main/java/a8k/service/appeventbus/appevent/A8kHardwareReport.java

@@ -1,6 +1,6 @@
-package a8k.app_eventbus.appevent;
+package a8k.service.appeventbus.appevent;
 
-import a8k.canbus.protocol.A8kPacket;
+import a8k.service.hardware.canbus.protocol.A8kPacket;
 import org.springframework.lang.NonNull;
 
 /**

src/main/java/a8k/service/appeventbus/appevent/AppEvent.java

@@ -0,0 +1,6 @@
+package a8k.service.appeventbus.appevent;
+
+public class AppEvent {
+
+
+}

src/main/java/a8k/app_eventbus/appevent/AppStepNotifyEvent.java → src/main/java/a8k/service/appeventbus/appevent/AppStepNotifyEvent.java

@@ -1,4 +1,4 @@
-package a8k.app_eventbus.appevent;
+package a8k.service.appeventbus.appevent;
 
 public class AppStepNotifyEvent extends AppEvent {
 	String displayInfo;

src/main/java/a8k/app_eventbus/appevent/AppWarningNotifyEvent.java → src/main/java/a8k/service/appeventbus/appevent/AppWarningNotifyEvent.java

@@ -1,4 +1,4 @@
-package a8k.app_eventbus.appevent;
+package a8k.service.appeventbus.appevent;
 
 public class AppWarningNotifyEvent extends AppEvent {
 	String displayInfo;

src/main/java/a8k/service/ctrl_service/DeviceInitializationCtrlService.java

@@ -1,11 +1,11 @@
 package a8k.service.ctrl_service;
 
-import a8k.canbus.protocol.A8kEcode;
-import a8k.canbus.protocol.IOId;
-import a8k.canbus.protocol.MId;
-import a8k.appbean.HardwareException;
-import a8k.appbean.ecode.AppRet;
-import a8k.canbus.A8kCanBusService;
+import a8k.service.hardware.canbus.protocol.A8kEcode;
+import a8k.service.hardware.canbus.protocol.IOId;
+import a8k.service.hardware.canbus.protocol.MId;
+import a8k.appbase.HardwareException;
+import a8k.appbase.ecode.AppRet;
+import a8k.service.hardware.canbus.A8kCanBusService;
 import a8k.service.hardware.CommonHardwareOpeartion;
 import a8k.service.hardware.SamplesPreProcessModuleCtrlService;
 import jakarta.annotation.Resource;

src/main/java/a8k/service/data_service/UsrMgrService.java

@@ -1,6 +1,6 @@
 package a8k.service.data_service;
 
-import a8k.canbus.protocol.A8kEcode;
+import a8k.service.hardware.canbus.protocol.A8kEcode;
 import a8k.service.appdb.dao.AppUsrDao;
 import a8k.service.appdb.entity.AppUsr;
 import a8k.service.state_service.A8kStateMgrService;

src/main/java/a8k/service/hardware/CommonHardwareOpeartion.java

@@ -1,9 +1,9 @@
 package a8k.service.hardware;
 
-import a8k.canbus.protocol.MId;
-import a8k.appbean.HardwareException;
-import a8k.appbean.ecode.AppRet;
-import a8k.canbus.A8kCanBusService;
+import a8k.service.hardware.canbus.protocol.MId;
+import a8k.appbase.HardwareException;
+import a8k.appbase.ecode.AppRet;
+import a8k.service.hardware.canbus.A8kCanBusService;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;

src/main/java/a8k/service/hardware/HardwareCtrlModule.java

@@ -1,7 +1,6 @@
 package a8k.service.hardware;
 
-import a8k.appbean.HardwareException;
-import a8k.appbean.ecode.AppRet;
+import a8k.appbase.HardwareException;
 
 public interface HardwareCtrlModule {
 	/**

src/main/java/a8k/service/hardware/HbotControlService.java

@@ -1,14 +1,14 @@
 package a8k.service.hardware;
 
-import a8k.ConsumableGroup;
-import a8k.appbean.HardwareException;
-import a8k.appbean.cfg.*;
-import a8k.appbean.ecode.AppRet;
-import a8k.canbus.A8kCanBusService;
-import a8k.canbus.protocol.A8kEcode;
-import a8k.canbus.protocol.IOId;
-import a8k.canbus.protocol.MId;
-import a8k.canbus.protocol.RegIndex;
+import a8k.appbase.ConsumableGroup;
+import a8k.appbase.HardwareException;
+import a8k.appbase.cfg.*;
+import a8k.appbase.ecode.AppRet;
+import a8k.service.hardware.canbus.A8kCanBusService;
+import a8k.service.hardware.canbus.protocol.A8kEcode;
+import a8k.service.hardware.canbus.protocol.IOId;
+import a8k.service.hardware.canbus.protocol.MId;
+import a8k.service.hardware.canbus.protocol.RegIndex;
 import a8k.utils.*;
 import jakarta.annotation.Resource;
 import org.slf4j.Logger;
@@ -16,9 +16,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Component;
 
-import java.util.HashMap;
-import java.util.Map;
-
 
 /**
  * Hbot控制服务
@@ -57,11 +54,11 @@ public class HbotControlService implements HardwareCtrlModule {
 	}
 
 	@HardwareServiceParam(name = "急诊位", group = "简单位置坐标")
-	public Pos3d getEmergencyPos() throws Exception {
+	public Pos3d getEmergencyPos()  {
 		return new Pos3d(
-				0,
-				0,
-				0
+				4858,
+				3196,
+				246
 		);
 	}
 
@@ -360,6 +357,11 @@ public class HbotControlService implements HardwareCtrlModule {
 		hbotCheckAndMoveTo(pos);
 	}
 
+	@HardwareServiceAction(name = "HBot移动到急诊位", group = "单步测试")
+	public void hbotMoveToEmergencyPos() throws HardwareException, InterruptedException {
+		hbotCheckAndMoveTo(getEmergencyPos());
+	}
+
 	//	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 	//	坐标获取工具
 	//	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -469,7 +471,6 @@ public class HbotControlService implements HardwareCtrlModule {
 	}
 
 
-
 	@HardwareServiceStatus(name = "Z轴光电⬆")
 	public Boolean getZPPS() throws HardwareException {
 		return canBus.stepMotorReadIoState(MId.PipetteModZM, 0);

src/main/java/a8k/service/hardware/MotorTubeRackMoveCtrlService.java

@@ -1,10 +1,10 @@
 package a8k.service.hardware;
 
-import a8k.appbean.TargetPosMeasureDirection;
-import a8k.canbus.protocol.*;
-import a8k.appbean.HardwareException;
-import a8k.appbean.ecode.AppRet;
-import a8k.canbus.A8kCanBusService;
+import a8k.appbase.TargetPosMeasureDirection;
+import a8k.service.hardware.canbus.protocol.*;
+import a8k.appbase.HardwareException;
+import a8k.appbase.ecode.AppRet;
+import a8k.service.hardware.canbus.A8kCanBusService;
 import a8k.utils.*;
 import jakarta.annotation.Resource;
 import org.slf4j.Logger;

src/main/java/a8k/service/hardware/ReactionPlatesTransmitCtrlService.java

@@ -1,15 +1,15 @@
 package a8k.service.hardware;
 
-import a8k.appbean.*;
-import a8k.ConsumableGroup;
-import a8k.canbus.protocol.A8kEcode;
-import a8k.canbus.protocol.IOId;
-import a8k.canbus.protocol.MId;
-import a8k.appbean.ecode.AppRet;
-import a8k.canbus.A8kCanBusService;
-import a8k.canbus.protocol.RegIndex;
-import a8k.hardware.HardwareServiceOrder;
-import a8k.opt_algo.A8kOptAlgo;
+import a8k.appbase.*;
+import a8k.appbase.ConsumableGroup;
+import a8k.service.hardware.canbus.protocol.A8kEcode;
+import a8k.service.hardware.canbus.protocol.IOId;
+import a8k.service.hardware.canbus.protocol.MId;
+import a8k.appbase.ecode.AppRet;
+import a8k.service.hardware.canbus.A8kCanBusService;
+import a8k.service.hardware.canbus.protocol.RegIndex;
+import a8k.controler.engineer.HardwareServiceOrder;
+import a8k.algo.opt_algo.A8kOptAlgo;
 import a8k.utils.*;
 import jakarta.annotation.Resource;
 import org.slf4j.Logger;

src/main/java/a8k/service/hardware/SamplesPreProcessModuleCtrlService.java

@@ -1,12 +1,11 @@
 package a8k.service.hardware;
 
-import a8k.appbean.A8kScanCurve;
-import a8k.canbus.protocol.A8kEcode;
-import a8k.canbus.protocol.MId;
-import a8k.appbean.A8kTubeType;
-import a8k.appbean.HardwareException;
-import a8k.appbean.ecode.AppRet;
-import a8k.canbus.A8kCanBusService;
+import a8k.service.hardware.canbus.protocol.A8kEcode;
+import a8k.service.hardware.canbus.protocol.MId;
+import a8k.appbase.A8kTubeType;
+import a8k.appbase.HardwareException;
+import a8k.appbase.ecode.AppRet;
+import a8k.service.hardware.canbus.A8kCanBusService;
 import a8k.utils.*;
 import jakarta.annotation.Resource;
 import org.slf4j.Logger;
@@ -14,7 +13,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.lang.reflect.Method;
-import java.util.ArrayList;
 import java.util.List;
 
 @Component

src/main/java/a8k/service/hardware/TestScript.java

@@ -1,13 +1,13 @@
 package a8k.service.hardware;
 
-import a8k.ConsumableGroup;
-import a8k.appbean.HardwareException;
-import a8k.appbean.cfg.*;
-import a8k.appbean.ecode.AppRet;
-import a8k.canbus.A8kCanBusService;
-import a8k.canbus.protocol.A8kEcode;
-import a8k.canbus.protocol.MId;
-import a8k.canbus.protocol.RegIndex;
+import a8k.appbase.ConsumableGroup;
+import a8k.appbase.HardwareException;
+import a8k.appbase.cfg.*;
+import a8k.appbase.ecode.AppRet;
+import a8k.service.hardware.canbus.A8kCanBusService;
+import a8k.service.hardware.canbus.protocol.A8kEcode;
+import a8k.service.hardware.canbus.protocol.MId;
+import a8k.service.hardware.canbus.protocol.RegIndex;
 import a8k.utils.HardwareParamReader;
 import a8k.utils.HardwareService;
 import a8k.utils.HardwareServiceAction;

src/main/java/a8k/canbus/A8kCanBusService.java → src/main/java/a8k/service/hardware/canbus/A8kCanBusService.java

@@ -1,16 +1,16 @@
-package a8k.canbus;
-
-import a8k.app_eventbus.appevent.A8kCanBusOnConnectEvent;
-import a8k.appbean.OptScanDirection;
-import a8k.appbean.PlateInfo;
-import a8k.canbus.custom_param_mgr.A8kModCustomParamMgr;
-import a8k.canbus.data.PipetteSampleData;
-import a8k.canbus.protocol.*;
-import a8k.canbus.protocol.MId;
-import a8k.appbean.HardwareException;
-import a8k.appbean.cfg.Pos2d;
-import a8k.app_eventbus.appevent.A8kHardwareReport;
-import a8k.app_eventbus.AppEventBusService;
+package a8k.service.hardware.canbus;
+
+import a8k.service.appeventbus.appevent.A8kCanBusOnConnectEvent;
+import a8k.appbase.OptScanDirection;
+import a8k.appbase.PlateInfo;
+import a8k.service.hardware.canbus.custom_param_mgr.A8kModCustomParamMgr;
+import a8k.service.hardware.canbus.data.PipetteSampleData;
+import a8k.service.hardware.canbus.protocol.*;
+import a8k.service.hardware.canbus.protocol.MId;
+import a8k.appbase.HardwareException;
+import a8k.appbase.cfg.Pos2d;
+import a8k.service.appeventbus.appevent.A8kHardwareReport;
+import a8k.service.appeventbus.AppEventBusService;
 import a8k.utils.ByteArray;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;

src/main/java/a8k/canbus/A8kModParamInitializer.java → src/main/java/a8k/service/hardware/canbus/A8kModParamInitializer.java

@@ -1,14 +1,14 @@
-package a8k.canbus;
-
-import a8k.app_eventbus.AppEventBusService;
-import a8k.app_eventbus.appevent.A8kCanBusOnConnectEvent;
-import a8k.app_eventbus.appevent.AppEvent;
-import a8k.appbean.AppEventListener;
-import a8k.appbean.HardwareException;
-import a8k.canbus.custom_param_mgr.ModCustomParamId;
-import a8k.canbus.custom_param_mgr.A8kModCustomParamMgr;
-import a8k.canbus.protocol.MId;
-import a8k.canbus.protocol.RegIndex;
+package a8k.service.hardware.canbus;
+
+import a8k.service.appeventbus.AppEventBusService;
+import a8k.service.appeventbus.appevent.A8kCanBusOnConnectEvent;
+import a8k.service.appeventbus.appevent.AppEvent;
+import a8k.appbase.AppEventListener;
+import a8k.appbase.HardwareException;
+import a8k.service.hardware.canbus.custom_param_mgr.ModCustomParamId;
+import a8k.service.hardware.canbus.custom_param_mgr.A8kModCustomParamMgr;
+import a8k.service.hardware.canbus.protocol.MId;
+import a8k.service.hardware.canbus.protocol.RegIndex;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;
 import org.slf4j.Logger;

src/main/java/a8k/canbus/custom_param_mgr/A8kModCustomParam.java → src/main/java/a8k/service/hardware/canbus/custom_param_mgr/A8kModCustomParam.java

@@ -1,6 +1,6 @@
-package a8k.canbus.custom_param_mgr;
+package a8k.service.hardware.canbus.custom_param_mgr;
 
-import a8k.canbus.protocol.MId;
+import a8k.service.hardware.canbus.protocol.MId;
 
 public class A8kModCustomParam {
 	MId mid;

src/main/java/a8k/canbus/custom_param_mgr/A8kModCustomParamMgr.java → src/main/java/a8k/service/hardware/canbus/custom_param_mgr/A8kModCustomParamMgr.java

@@ -1,6 +1,6 @@
-package a8k.canbus.custom_param_mgr;
+package a8k.service.hardware.canbus.custom_param_mgr;
 
-import a8k.canbus.protocol.MId;
+import a8k.service.hardware.canbus.protocol.MId;
 import org.springframework.stereotype.Component;
 
 import java.util.Set;

src/main/java/a8k/canbus/custom_param_mgr/ModCustomParamId.java → src/main/java/a8k/service/hardware/canbus/custom_param_mgr/ModCustomParamId.java

@@ -1,4 +1,4 @@
-package a8k.canbus.custom_param_mgr;
+package a8k.service.hardware.canbus.custom_param_mgr;
 
 public enum ModCustomParamId {
 

src/main/java/a8k/canbus/data/PipetteSampleData.java → src/main/java/a8k/service/hardware/canbus/data/PipetteSampleData.java

@@ -1,4 +1,4 @@
-package a8k.canbus.data;
+package a8k.service.hardware.canbus.data;
 
 public class PipetteSampleData {
 	public Integer motorPos;

src/main/java/a8k/canbus/protocol/A8kEcode.java → src/main/java/a8k/service/hardware/canbus/protocol/A8kEcode.java

@@ -1,4 +1,4 @@
-package a8k.canbus.protocol;
+package a8k.service.hardware.canbus.protocol;
 
 public enum A8kEcode {
 	//

src/main/java/a8k/canbus/protocol/A8kPacket.java → src/main/java/a8k/service/hardware/canbus/protocol/A8kPacket.java

@@ -1,4 +1,4 @@
-package a8k.canbus.protocol;
+package a8k.service.hardware.canbus.protocol;
 
 import a8k.utils.ByteArray;
 import org.slf4j.Logger;

src/main/java/a8k/canbus/protocol/CmdId.java → src/main/java/a8k/service/hardware/canbus/protocol/CmdId.java

@@ -1,4 +1,4 @@
-package a8k.canbus.protocol;
+package a8k.service.hardware.canbus.protocol;
 
 public enum CmdId {
 

src/main/java/a8k/canbus/protocol/IOId.java → src/main/java/a8k/service/hardware/canbus/protocol/IOId.java

@@ -1,4 +1,4 @@
-package a8k.canbus.protocol;
+package a8k.service.hardware.canbus.protocol;
 
 public enum IOId {
 	TubeHeightPPS(ModuleType.kboard, MId.FeedingModBoard, 0), //高低试管检测IO

src/main/java/a8k/canbus/protocol/MId.java → src/main/java/a8k/service/hardware/canbus/protocol/MId.java

@@ -1,4 +1,4 @@
-package a8k.canbus.protocol;
+package a8k.service.hardware.canbus.protocol;
 
 public enum MId {
 	NotSet(0, "未设置"),//

src/main/java/a8k/canbus/protocol/ModuleStatus.java → src/main/java/a8k/service/hardware/canbus/protocol/ModuleStatus.java

@@ -1,4 +1,4 @@
-package a8k.canbus.protocol;
+package a8k.service.hardware.canbus.protocol;
 
 public enum ModuleStatus {
 	IDLE(0), //

src/main/java/a8k/canbus/protocol/ModuleType.java → src/main/java/a8k/service/hardware/canbus/protocol/ModuleType.java

@@ -1,4 +1,4 @@
-package a8k.canbus.protocol;
+package a8k.service.hardware.canbus.protocol;
 
 public enum ModuleType {
 	khbot_module(1),  // hbot模块

src/main/java/a8k/canbus/protocol/RegIndex.java → src/main/java/a8k/service/hardware/canbus/protocol/RegIndex.java

@@ -1,4 +1,4 @@
-package a8k.canbus.protocol;
+package a8k.service.hardware.canbus.protocol;
 
 public enum RegIndex {
 

src/main/java/a8k/utils/HardwareParamReader.java

@@ -1,9 +1,6 @@
 package a8k.utils;
 
-import a8k.service.db.entity.HardwareServiceSetting;
-import jakarta.annotation.Resource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import a8k.db.HardwareServiceSetting;
 
 
 public class HardwareParamReader {

src/main/java/a8k/utils/HardwareService.java

@@ -1,5 +1,5 @@
 package a8k.utils;
-import a8k.hardware.HardwareServiceOrder;
+import a8k.controler.engineer.HardwareServiceOrder;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

src/main/java/a8k/utils/HbotScanerPosComputer.java

@@ -1,6 +1,6 @@
 package a8k.utils;
 
-import a8k.appbean.cfg.Pos2d;
+import a8k.appbase.cfg.Pos2d;
 
 public class HbotScanerPosComputer {
 	static public Pos2d getScanPos(Pos2d tipPos) {