diff --git a/src/main/java/a8k/opt_algo/A8kOptAlgo.java b/src/main/java/a8k/algo/opt_algo/A8kOptAlgo.java similarity index 98% rename from src/main/java/a8k/opt_algo/A8kOptAlgo.java rename to src/main/java/a8k/algo/opt_algo/A8kOptAlgo.java index c76297c..a1bf674 100644 --- a/src/main/java/a8k/opt_algo/A8kOptAlgo.java +++ b/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; diff --git a/src/main/java/a8k/app_eventbus/appevent/AppEvent.java b/src/main/java/a8k/app_eventbus/appevent/AppEvent.java deleted file mode 100644 index 72fb054..0000000 --- a/src/main/java/a8k/app_eventbus/appevent/AppEvent.java +++ /dev/null @@ -1,6 +0,0 @@ -package a8k.app_eventbus.appevent; - -public class AppEvent { - - -} diff --git a/src/main/java/a8k/appbean/A8kScanCurve.java b/src/main/java/a8k/appbase/A8kScanCurve.java similarity index 94% rename from src/main/java/a8k/appbean/A8kScanCurve.java rename to src/main/java/a8k/appbase/A8kScanCurve.java index 7a2d8a1..9fb9019 100644 --- a/src/main/java/a8k/appbean/A8kScanCurve.java +++ b/src/main/java/a8k/appbase/A8kScanCurve.java @@ -1,4 +1,4 @@ -package a8k.appbean; +package a8k.appbase; import java.util.List; diff --git a/src/main/java/a8k/appbean/A8kTubeType.java b/src/main/java/a8k/appbase/A8kTubeType.java similarity index 95% rename from src/main/java/a8k/appbean/A8kTubeType.java rename to src/main/java/a8k/appbase/A8kTubeType.java index 13de77f..ff1f092 100644 --- a/src/main/java/a8k/appbean/A8kTubeType.java +++ b/src/main/java/a8k/appbase/A8kTubeType.java @@ -1,4 +1,4 @@ -package a8k.appbean; +package a8k.appbase; public enum A8kTubeType { diff --git a/src/main/java/a8k/appbean/AppEventListener.java b/src/main/java/a8k/appbase/AppEventListener.java similarity index 53% rename from src/main/java/a8k/appbean/AppEventListener.java rename to src/main/java/a8k/appbase/AppEventListener.java index bbd36b8..e7ff6c2 100644 --- a/src/main/java/a8k/appbean/AppEventListener.java +++ b/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); diff --git a/src/main/java/a8k/ConsumableGroup.java b/src/main/java/a8k/appbase/ConsumableGroup.java similarity index 88% rename from src/main/java/a8k/ConsumableGroup.java rename to src/main/java/a8k/appbase/ConsumableGroup.java index dea6f01..7bdfdc3 100644 --- a/src/main/java/a8k/ConsumableGroup.java +++ b/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; diff --git a/src/main/java/a8k/appbean/HardwareException.java b/src/main/java/a8k/appbase/HardwareException.java similarity index 87% rename from src/main/java/a8k/appbean/HardwareException.java rename to src/main/java/a8k/appbase/HardwareException.java index 79e28f9..5330e28 100644 --- a/src/main/java/a8k/appbean/HardwareException.java +++ b/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 { // 构造函数 diff --git a/src/main/java/a8k/appbean/IncubatorPos.java b/src/main/java/a8k/appbase/IncubatorPos.java similarity index 93% rename from src/main/java/a8k/appbean/IncubatorPos.java rename to src/main/java/a8k/appbase/IncubatorPos.java index 176f8ed..9d6ee07 100644 --- a/src/main/java/a8k/appbean/IncubatorPos.java +++ b/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; diff --git a/src/main/java/a8k/appbean/OptScanDirection.java b/src/main/java/a8k/appbase/OptScanDirection.java similarity index 85% rename from src/main/java/a8k/appbean/OptScanDirection.java rename to src/main/java/a8k/appbase/OptScanDirection.java index 12b5614..1b6f603 100644 --- a/src/main/java/a8k/appbean/OptScanDirection.java +++ b/src/main/java/a8k/appbase/OptScanDirection.java @@ -1,4 +1,4 @@ -package a8k.appbean; +package a8k.appbase; public enum OptScanDirection { POSITIVE, NEGATIVE; diff --git a/src/main/java/a8k/appbean/PlateInfo.java b/src/main/java/a8k/appbase/PlateInfo.java similarity index 87% rename from src/main/java/a8k/appbean/PlateInfo.java rename to src/main/java/a8k/appbase/PlateInfo.java index 4dd6695..bb94f7f 100644 --- a/src/main/java/a8k/appbean/PlateInfo.java +++ b/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; diff --git a/src/main/java/a8k/appbean/SampleTubeState.java b/src/main/java/a8k/appbase/SampleTubeState.java similarity index 79% rename from src/main/java/a8k/appbean/SampleTubeState.java rename to src/main/java/a8k/appbase/SampleTubeState.java index c66989b..e763f24 100644 --- a/src/main/java/a8k/appbean/SampleTubeState.java +++ b/src/main/java/a8k/appbase/SampleTubeState.java @@ -1,4 +1,4 @@ -package a8k.appbean; +package a8k.appbase; /** * 样品试管状态 diff --git a/src/main/java/a8k/appbean/TargetPosMeasureDirection.java b/src/main/java/a8k/appbase/TargetPosMeasureDirection.java similarity index 77% rename from src/main/java/a8k/appbean/TargetPosMeasureDirection.java rename to src/main/java/a8k/appbase/TargetPosMeasureDirection.java index 4a65124..5d5ec77 100644 --- a/src/main/java/a8k/appbean/TargetPosMeasureDirection.java +++ b/src/main/java/a8k/appbase/TargetPosMeasureDirection.java @@ -1,4 +1,4 @@ -package a8k.appbean; +package a8k.appbase; public enum TargetPosMeasureDirection { NOTCARE, POSITIVE, NEGATIVE; diff --git a/src/main/java/a8k/appbean/cfg/BottleGroupsPosInfo.java b/src/main/java/a8k/appbase/cfg/BottleGroupsPosInfo.java similarity index 99% rename from src/main/java/a8k/appbean/cfg/BottleGroupsPosInfo.java rename to src/main/java/a8k/appbase/cfg/BottleGroupsPosInfo.java index 628b14a..e057705 100644 --- a/src/main/java/a8k/appbean/cfg/BottleGroupsPosInfo.java +++ b/src/main/java/a8k/appbase/cfg/BottleGroupsPosInfo.java @@ -1,4 +1,4 @@ -package a8k.appbean.cfg; +package a8k.appbase.cfg; import a8k.utils.HbotScanerPosComputer; diff --git a/src/main/java/a8k/appbean/cfg/BottlesPosInfo.java b/src/main/java/a8k/appbase/cfg/BottlesPosInfo.java similarity index 97% rename from src/main/java/a8k/appbean/cfg/BottlesPosInfo.java rename to src/main/java/a8k/appbase/cfg/BottlesPosInfo.java index a81b481..e41e8af 100644 --- a/src/main/java/a8k/appbean/cfg/BottlesPosInfo.java +++ b/src/main/java/a8k/appbase/cfg/BottlesPosInfo.java @@ -1,4 +1,4 @@ -package a8k.appbean.cfg; +package a8k.appbase.cfg; public class BottlesPosInfo { diff --git a/src/main/java/a8k/appbean/cfg/HbotLimitArea.java b/src/main/java/a8k/appbase/cfg/HbotLimitArea.java similarity index 96% rename from src/main/java/a8k/appbean/cfg/HbotLimitArea.java rename to src/main/java/a8k/appbase/cfg/HbotLimitArea.java index 0ace487..be10761 100644 --- a/src/main/java/a8k/appbean/cfg/HbotLimitArea.java +++ b/src/main/java/a8k/appbase/cfg/HbotLimitArea.java @@ -1,4 +1,4 @@ -package a8k.appbean.cfg; +package a8k.appbase.cfg; public class HbotLimitArea { diff --git a/src/main/java/a8k/appbean/cfg/KeyValType.java b/src/main/java/a8k/appbase/cfg/KeyValType.java similarity index 95% rename from src/main/java/a8k/appbean/cfg/KeyValType.java rename to src/main/java/a8k/appbase/cfg/KeyValType.java index 2ad8994..34fbdaa 100644 --- a/src/main/java/a8k/appbean/cfg/KeyValType.java +++ b/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"),// diff --git a/src/main/java/a8k/appbean/cfg/LargeBottleBufferPos.java b/src/main/java/a8k/appbase/cfg/LargeBottleBufferPos.java similarity index 96% rename from src/main/java/a8k/appbean/cfg/LargeBottleBufferPos.java rename to src/main/java/a8k/appbase/cfg/LargeBottleBufferPos.java index 86a2311..40d7251 100644 --- a/src/main/java/a8k/appbean/cfg/LargeBottleBufferPos.java +++ b/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; - /** * 大瓶缓冲液位置信息 */ diff --git a/src/main/java/a8k/appbean/cfg/PipetteCfg.java b/src/main/java/a8k/appbase/cfg/PipetteCfg.java similarity index 92% rename from src/main/java/a8k/appbean/cfg/PipetteCfg.java rename to src/main/java/a8k/appbase/cfg/PipetteCfg.java index 6706352..fc4c605 100644 --- a/src/main/java/a8k/appbean/cfg/PipetteCfg.java +++ b/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;//液面跟随电容阈值 diff --git a/src/main/java/a8k/appbean/cfg/Plates2dCodeScanPos.java b/src/main/java/a8k/appbase/cfg/Plates2dCodeScanPos.java similarity index 88% rename from src/main/java/a8k/appbean/cfg/Plates2dCodeScanPos.java rename to src/main/java/a8k/appbase/cfg/Plates2dCodeScanPos.java index 43dfbe5..0ee7bee 100644 --- a/src/main/java/a8k/appbean/cfg/Plates2dCodeScanPos.java +++ b/src/main/java/a8k/appbase/cfg/Plates2dCodeScanPos.java @@ -1,6 +1,4 @@ -package a8k.appbean.cfg; - -import a8k.utils.HbotScanerPosComputer; +package a8k.appbase.cfg; /** * 板夹仓扫码信息 diff --git a/src/main/java/a8k/appbean/cfg/Pos2d.java b/src/main/java/a8k/appbase/cfg/Pos2d.java similarity index 91% rename from src/main/java/a8k/appbean/cfg/Pos2d.java rename to src/main/java/a8k/appbase/cfg/Pos2d.java index be1922d..99f1625 100644 --- a/src/main/java/a8k/appbean/cfg/Pos2d.java +++ b/src/main/java/a8k/appbase/cfg/Pos2d.java @@ -1,4 +1,4 @@ -package a8k.appbean.cfg; +package a8k.appbase.cfg; public class Pos2d { diff --git a/src/main/java/a8k/appbean/cfg/Pos3d.java b/src/main/java/a8k/appbase/cfg/Pos3d.java similarity index 93% rename from src/main/java/a8k/appbean/cfg/Pos3d.java rename to src/main/java/a8k/appbase/cfg/Pos3d.java index 0975e6a..f419848 100644 --- a/src/main/java/a8k/appbean/cfg/Pos3d.java +++ b/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; diff --git a/src/main/java/a8k/appbean/cfg/SampleZPosInfo.java b/src/main/java/a8k/appbase/cfg/SampleZPosInfo.java similarity index 95% rename from src/main/java/a8k/appbean/cfg/SampleZPosInfo.java rename to src/main/java/a8k/appbase/cfg/SampleZPosInfo.java index 16e2e25..4062eee 100644 --- a/src/main/java/a8k/appbean/cfg/SampleZPosInfo.java +++ b/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;//采样探测起始位 diff --git a/src/main/java/a8k/appbean/cfg/TipPickUpPosInfo.java b/src/main/java/a8k/appbase/cfg/TipPickUpPosInfo.java similarity index 98% rename from src/main/java/a8k/appbean/cfg/TipPickUpPosInfo.java rename to src/main/java/a8k/appbase/cfg/TipPickUpPosInfo.java index 31bd020..ef08e28 100644 --- a/src/main/java/a8k/appbean/cfg/TipPickUpPosInfo.java +++ b/src/main/java/a8k/appbase/cfg/TipPickUpPosInfo.java @@ -1,4 +1,4 @@ -package a8k.appbean.cfg; +package a8k.appbase.cfg; public class TipPickUpPosInfo { diff --git a/src/main/java/a8k/appbean/cfg/TubeSamplePos.java b/src/main/java/a8k/appbase/cfg/TubeSamplePos.java similarity index 94% rename from src/main/java/a8k/appbean/cfg/TubeSamplePos.java rename to src/main/java/a8k/appbase/cfg/TubeSamplePos.java index 1991e8b..8f004fb 100644 --- a/src/main/java/a8k/appbean/cfg/TubeSamplePos.java +++ b/src/main/java/a8k/appbase/cfg/TubeSamplePos.java @@ -1,4 +1,4 @@ -package a8k.appbean.cfg; +package a8k.appbase.cfg; public class TubeSamplePos { diff --git a/src/main/java/a8k/appbean/ecode/AppRet.java b/src/main/java/a8k/appbase/ecode/AppRet.java similarity index 93% rename from src/main/java/a8k/appbean/ecode/AppRet.java rename to src/main/java/a8k/appbase/ecode/AppRet.java index 07da8d5..7eae2d5 100644 --- a/src/main/java/a8k/appbean/ecode/AppRet.java +++ b/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 { diff --git a/src/main/java/a8k/appbean/ecode/AppRetEcodeInfo.java b/src/main/java/a8k/appbase/ecode/AppRetEcodeInfo.java similarity index 89% rename from src/main/java/a8k/appbean/ecode/AppRetEcodeInfo.java rename to src/main/java/a8k/appbase/ecode/AppRetEcodeInfo.java index 7be16ed..8622344 100644 --- a/src/main/java/a8k/appbean/ecode/AppRetEcodeInfo.java +++ b/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; diff --git a/src/main/java/a8k/A8kApplication.java b/src/main/java/a8k/controler/engineer/A8kExceptionProcesser.java similarity index 72% rename from src/main/java/a8k/A8kApplication.java rename to src/main/java/a8k/controler/engineer/A8kExceptionProcesser.java index 15eb12f..db1d3ed 100644 --- a/src/main/java/a8k/A8kApplication.java +++ b/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) diff --git a/src/main/java/a8k/hardware/controler/Controler.java b/src/main/java/a8k/controler/engineer/EngineerPageControler.java similarity index 98% rename from src/main/java/a8k/hardware/controler/Controler.java rename to src/main/java/a8k/controler/engineer/EngineerPageControler.java index 5ad0b34..cb31fcb 100644 --- a/src/main/java/a8k/hardware/controler/Controler.java +++ b/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 services() { diff --git a/src/main/java/a8k/hardware/HardwareServiceOrder.java b/src/main/java/a8k/controler/engineer/HardwareServiceOrder.java similarity index 78% rename from src/main/java/a8k/hardware/HardwareServiceOrder.java rename to src/main/java/a8k/controler/engineer/HardwareServiceOrder.java index 383c755..480ad31 100644 --- a/src/main/java/a8k/hardware/HardwareServiceOrder.java +++ b/src/main/java/a8k/controler/engineer/HardwareServiceOrder.java @@ -1,4 +1,4 @@ -package a8k.hardware; +package a8k.controler.engineer; public enum HardwareServiceOrder { SamplesPreProcessModuleCtrlService, ReactionPlatesTransmitCtrlService, diff --git a/src/main/java/a8k/service/db/entity/HardwareServiceSetting.java b/src/main/java/a8k/db/HardwareServiceSetting.java similarity index 98% rename from src/main/java/a8k/service/db/entity/HardwareServiceSetting.java rename to src/main/java/a8k/db/HardwareServiceSetting.java index 497e321..c11091e 100644 --- a/src/main/java/a8k/service/db/entity/HardwareServiceSetting.java +++ b/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; diff --git a/src/main/java/a8k/app_eventbus/A8kDebugTaskExecutorService.java b/src/main/java/a8k/service/A8kDebugTaskExecutorService.java similarity index 96% rename from src/main/java/a8k/app_eventbus/A8kDebugTaskExecutorService.java rename to src/main/java/a8k/service/A8kDebugTaskExecutorService.java index 4f2339b..9603e1e 100644 --- a/src/main/java/a8k/app_eventbus/A8kDebugTaskExecutorService.java +++ b/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; diff --git a/src/main/java/a8k/app_eventbus/AppEventBusService.java b/src/main/java/a8k/service/appeventbus/AppEventBusService.java similarity index 93% rename from src/main/java/a8k/app_eventbus/AppEventBusService.java rename to src/main/java/a8k/service/appeventbus/AppEventBusService.java index 23ee31a..bcbce25 100644 --- a/src/main/java/a8k/app_eventbus/AppEventBusService.java +++ b/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; diff --git a/src/main/java/a8k/app_eventbus/appevent/A8kCanBusOnConnectEvent.java b/src/main/java/a8k/service/appeventbus/appevent/A8kCanBusOnConnectEvent.java similarity index 70% rename from src/main/java/a8k/app_eventbus/appevent/A8kCanBusOnConnectEvent.java rename to src/main/java/a8k/service/appeventbus/appevent/A8kCanBusOnConnectEvent.java index 5f3cd88..e6dc305 100644 --- a/src/main/java/a8k/app_eventbus/appevent/A8kCanBusOnConnectEvent.java +++ b/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() { diff --git a/src/main/java/a8k/app_eventbus/appevent/A8kHardwareReport.java b/src/main/java/a8k/service/appeventbus/appevent/A8kHardwareReport.java similarity index 79% rename from src/main/java/a8k/app_eventbus/appevent/A8kHardwareReport.java rename to src/main/java/a8k/service/appeventbus/appevent/A8kHardwareReport.java index f7e41ef..9887747 100644 --- a/src/main/java/a8k/app_eventbus/appevent/A8kHardwareReport.java +++ b/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; /** diff --git a/src/main/java/a8k/service/appeventbus/appevent/AppEvent.java b/src/main/java/a8k/service/appeventbus/appevent/AppEvent.java new file mode 100644 index 0000000..522a646 --- /dev/null +++ b/src/main/java/a8k/service/appeventbus/appevent/AppEvent.java @@ -0,0 +1,6 @@ +package a8k.service.appeventbus.appevent; + +public class AppEvent { + + +} diff --git a/src/main/java/a8k/app_eventbus/appevent/AppStepNotifyEvent.java b/src/main/java/a8k/service/appeventbus/appevent/AppStepNotifyEvent.java similarity index 83% rename from src/main/java/a8k/app_eventbus/appevent/AppStepNotifyEvent.java rename to src/main/java/a8k/service/appeventbus/appevent/AppStepNotifyEvent.java index f0107c9..fce4ee7 100644 --- a/src/main/java/a8k/app_eventbus/appevent/AppStepNotifyEvent.java +++ b/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; diff --git a/src/main/java/a8k/app_eventbus/appevent/AppWarningNotifyEvent.java b/src/main/java/a8k/service/appeventbus/appevent/AppWarningNotifyEvent.java similarity index 84% rename from src/main/java/a8k/app_eventbus/appevent/AppWarningNotifyEvent.java rename to src/main/java/a8k/service/appeventbus/appevent/AppWarningNotifyEvent.java index f0b3dc9..56f895c 100644 --- a/src/main/java/a8k/app_eventbus/appevent/AppWarningNotifyEvent.java +++ b/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; diff --git a/src/main/java/a8k/service/ctrl_service/DeviceInitializationCtrlService.java b/src/main/java/a8k/service/ctrl_service/DeviceInitializationCtrlService.java index bf99325..fbe6d0d 100644 --- a/src/main/java/a8k/service/ctrl_service/DeviceInitializationCtrlService.java +++ b/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; diff --git a/src/main/java/a8k/service/data_service/UsrMgrService.java b/src/main/java/a8k/service/data_service/UsrMgrService.java index c5919ab..91997e5 100644 --- a/src/main/java/a8k/service/data_service/UsrMgrService.java +++ b/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; diff --git a/src/main/java/a8k/service/hardware/CommonHardwareOpeartion.java b/src/main/java/a8k/service/hardware/CommonHardwareOpeartion.java index 44b0887..be5e0cf 100644 --- a/src/main/java/a8k/service/hardware/CommonHardwareOpeartion.java +++ b/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; diff --git a/src/main/java/a8k/service/hardware/HardwareCtrlModule.java b/src/main/java/a8k/service/hardware/HardwareCtrlModule.java index 0a7d17d..f6eb2ec 100644 --- a/src/main/java/a8k/service/hardware/HardwareCtrlModule.java +++ b/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 { /** diff --git a/src/main/java/a8k/service/hardware/HbotControlService.java b/src/main/java/a8k/service/hardware/HbotControlService.java index e6b817b..20b83d9 100644 --- a/src/main/java/a8k/service/hardware/HbotControlService.java +++ b/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); diff --git a/src/main/java/a8k/service/hardware/MotorTubeRackMoveCtrlService.java b/src/main/java/a8k/service/hardware/MotorTubeRackMoveCtrlService.java index dddcf77..a74473c 100644 --- a/src/main/java/a8k/service/hardware/MotorTubeRackMoveCtrlService.java +++ b/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; diff --git a/src/main/java/a8k/service/hardware/ReactionPlatesTransmitCtrlService.java b/src/main/java/a8k/service/hardware/ReactionPlatesTransmitCtrlService.java index cf0b4a1..ff6ab93 100644 --- a/src/main/java/a8k/service/hardware/ReactionPlatesTransmitCtrlService.java +++ b/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; diff --git a/src/main/java/a8k/service/hardware/SamplesPreProcessModuleCtrlService.java b/src/main/java/a8k/service/hardware/SamplesPreProcessModuleCtrlService.java index 939637b..32ae212 100644 --- a/src/main/java/a8k/service/hardware/SamplesPreProcessModuleCtrlService.java +++ b/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 diff --git a/src/main/java/a8k/service/hardware/TestScript.java b/src/main/java/a8k/service/hardware/TestScript.java index c4279b7..5bb9b33 100644 --- a/src/main/java/a8k/service/hardware/TestScript.java +++ b/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; diff --git a/src/main/java/a8k/canbus/A8kCanBusService.java b/src/main/java/a8k/service/hardware/canbus/A8kCanBusService.java similarity index 98% rename from src/main/java/a8k/canbus/A8kCanBusService.java rename to src/main/java/a8k/service/hardware/canbus/A8kCanBusService.java index efffc37..ee239fe 100644 --- a/src/main/java/a8k/canbus/A8kCanBusService.java +++ b/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; diff --git a/src/main/java/a8k/canbus/A8kModParamInitializer.java b/src/main/java/a8k/service/hardware/canbus/A8kModParamInitializer.java similarity index 91% rename from src/main/java/a8k/canbus/A8kModParamInitializer.java rename to src/main/java/a8k/service/hardware/canbus/A8kModParamInitializer.java index da71432..940da0e 100644 --- a/src/main/java/a8k/canbus/A8kModParamInitializer.java +++ b/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; diff --git a/src/main/java/a8k/canbus/custom_param_mgr/A8kModCustomParam.java b/src/main/java/a8k/service/hardware/canbus/custom_param_mgr/A8kModCustomParam.java similarity index 51% rename from src/main/java/a8k/canbus/custom_param_mgr/A8kModCustomParam.java rename to src/main/java/a8k/service/hardware/canbus/custom_param_mgr/A8kModCustomParam.java index b9f3f2c..ec8bb45 100644 --- a/src/main/java/a8k/canbus/custom_param_mgr/A8kModCustomParam.java +++ b/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; diff --git a/src/main/java/a8k/canbus/custom_param_mgr/A8kModCustomParamMgr.java b/src/main/java/a8k/service/hardware/canbus/custom_param_mgr/A8kModCustomParamMgr.java similarity index 87% rename from src/main/java/a8k/canbus/custom_param_mgr/A8kModCustomParamMgr.java rename to src/main/java/a8k/service/hardware/canbus/custom_param_mgr/A8kModCustomParamMgr.java index b8ad602..62a7588 100644 --- a/src/main/java/a8k/canbus/custom_param_mgr/A8kModCustomParamMgr.java +++ b/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; diff --git a/src/main/java/a8k/canbus/custom_param_mgr/ModCustomParamId.java b/src/main/java/a8k/service/hardware/canbus/custom_param_mgr/ModCustomParamId.java similarity index 84% rename from src/main/java/a8k/canbus/custom_param_mgr/ModCustomParamId.java rename to src/main/java/a8k/service/hardware/canbus/custom_param_mgr/ModCustomParamId.java index d6aa240..6fab35b 100644 --- a/src/main/java/a8k/canbus/custom_param_mgr/ModCustomParamId.java +++ b/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 { diff --git a/src/main/java/a8k/canbus/data/PipetteSampleData.java b/src/main/java/a8k/service/hardware/canbus/data/PipetteSampleData.java similarity index 71% rename from src/main/java/a8k/canbus/data/PipetteSampleData.java rename to src/main/java/a8k/service/hardware/canbus/data/PipetteSampleData.java index ab18790..3dad5ee 100644 --- a/src/main/java/a8k/canbus/data/PipetteSampleData.java +++ b/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; diff --git a/src/main/java/a8k/canbus/protocol/A8kEcode.java b/src/main/java/a8k/service/hardware/canbus/protocol/A8kEcode.java similarity index 99% rename from src/main/java/a8k/canbus/protocol/A8kEcode.java rename to src/main/java/a8k/service/hardware/canbus/protocol/A8kEcode.java index e9c2637..22f7a88 100644 --- a/src/main/java/a8k/canbus/protocol/A8kEcode.java +++ b/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 { // diff --git a/src/main/java/a8k/canbus/protocol/A8kPacket.java b/src/main/java/a8k/service/hardware/canbus/protocol/A8kPacket.java similarity index 99% rename from src/main/java/a8k/canbus/protocol/A8kPacket.java rename to src/main/java/a8k/service/hardware/canbus/protocol/A8kPacket.java index 6c043c9..bc6e445 100644 --- a/src/main/java/a8k/canbus/protocol/A8kPacket.java +++ b/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; diff --git a/src/main/java/a8k/canbus/protocol/CmdId.java b/src/main/java/a8k/service/hardware/canbus/protocol/CmdId.java similarity index 99% rename from src/main/java/a8k/canbus/protocol/CmdId.java rename to src/main/java/a8k/service/hardware/canbus/protocol/CmdId.java index 5f4523b..7451ac6 100644 --- a/src/main/java/a8k/canbus/protocol/CmdId.java +++ b/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 { diff --git a/src/main/java/a8k/canbus/protocol/IOId.java b/src/main/java/a8k/service/hardware/canbus/protocol/IOId.java similarity index 97% rename from src/main/java/a8k/canbus/protocol/IOId.java rename to src/main/java/a8k/service/hardware/canbus/protocol/IOId.java index e619741..cee92af 100644 --- a/src/main/java/a8k/canbus/protocol/IOId.java +++ b/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 diff --git a/src/main/java/a8k/canbus/protocol/MId.java b/src/main/java/a8k/service/hardware/canbus/protocol/MId.java similarity index 98% rename from src/main/java/a8k/canbus/protocol/MId.java rename to src/main/java/a8k/service/hardware/canbus/protocol/MId.java index bbd800a..fb42e8d 100644 --- a/src/main/java/a8k/canbus/protocol/MId.java +++ b/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, "未设置"),// diff --git a/src/main/java/a8k/canbus/protocol/ModuleStatus.java b/src/main/java/a8k/service/hardware/canbus/protocol/ModuleStatus.java similarity index 88% rename from src/main/java/a8k/canbus/protocol/ModuleStatus.java rename to src/main/java/a8k/service/hardware/canbus/protocol/ModuleStatus.java index 8f95d20..2381573 100644 --- a/src/main/java/a8k/canbus/protocol/ModuleStatus.java +++ b/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), // diff --git a/src/main/java/a8k/canbus/protocol/ModuleType.java b/src/main/java/a8k/service/hardware/canbus/protocol/ModuleType.java similarity index 92% rename from src/main/java/a8k/canbus/protocol/ModuleType.java rename to src/main/java/a8k/service/hardware/canbus/protocol/ModuleType.java index 94cf400..8ade0ce 100644 --- a/src/main/java/a8k/canbus/protocol/ModuleType.java +++ b/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模块 diff --git a/src/main/java/a8k/canbus/protocol/RegIndex.java b/src/main/java/a8k/service/hardware/canbus/protocol/RegIndex.java similarity index 99% rename from src/main/java/a8k/canbus/protocol/RegIndex.java rename to src/main/java/a8k/service/hardware/canbus/protocol/RegIndex.java index f7c288d..a2e5376 100644 --- a/src/main/java/a8k/canbus/protocol/RegIndex.java +++ b/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 { diff --git a/src/main/java/a8k/utils/HardwareParamReader.java b/src/main/java/a8k/utils/HardwareParamReader.java index d3c5cda..f203272 100644 --- a/src/main/java/a8k/utils/HardwareParamReader.java +++ b/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 { diff --git a/src/main/java/a8k/utils/HardwareService.java b/src/main/java/a8k/utils/HardwareService.java index 46fc2eb..b2c00fb 100644 --- a/src/main/java/a8k/utils/HardwareService.java +++ b/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; diff --git a/src/main/java/a8k/utils/HbotScanerPosComputer.java b/src/main/java/a8k/utils/HbotScanerPosComputer.java index 1b34a29..574b3b1 100644 --- a/src/main/java/a8k/utils/HbotScanerPosComputer.java +++ b/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) {