diff --git a/src/main/java/a8k/app/channel/net/BiLisDoubleTrackTcpClient.java b/src/main/java/a8k/app/client/BiLisDoubleTrackTcpClient.java similarity index 95% rename from src/main/java/a8k/app/channel/net/BiLisDoubleTrackTcpClient.java rename to src/main/java/a8k/app/client/BiLisDoubleTrackTcpClient.java index b1a3333..c0028ff 100644 --- a/src/main/java/a8k/app/channel/net/BiLisDoubleTrackTcpClient.java +++ b/src/main/java/a8k/app/client/BiLisDoubleTrackTcpClient.java @@ -1,4 +1,4 @@ -package a8k.app.channel.net; +package a8k.app.client; import a8k.app.type.lisprotocol.BiLisDoubleTrackFrame; import a8k.app.utils.ByteArrayUtils; @@ -41,7 +41,7 @@ public class BiLisDoubleTrackTcpClient extends ChannelInboundHandlerAdapter { private volatile boolean isShuttingDown = false; private final ByteBuf rxBuffer = Unpooled.buffer(rxBufferSize); // 接收数据缓冲区，初始大小为1024字节 private OnDataReceivedListener onDataReceivedListener; - private OnLostConnectionListener onLostConnectionListener; + // // External API @@ -121,9 +121,6 @@ public class BiLisDoubleTrackTcpClient extends ChannelInboundHandlerAdapter { this.onDataReceivedListener = listener; } - public synchronized void regOnLostConnectionListener(OnLostConnectionListener listener) { - this.onLostConnectionListener = listener; - } public synchronized boolean isConnected() { return channel != null && channel.isActive(); @@ -196,13 +193,13 @@ public class BiLisDoubleTrackTcpClient extends ChannelInboundHandlerAdapter { if (isShuttingDown) { return; } - log.info("try connect to {}:{}", serverIp, port); + log.warn("try connect to {}:{}", serverIp, port); bootstrap.connect(serverIp, port).addListener((ChannelFuture future) -> { if (future.isSuccess()) { log.info("successfully connected to {}:{}", serverIp, port); channel = future.channel(); } else { - log.error("failed,{}", future.cause().getMessage()); + log.warn("failed,{}", future.cause().getMessage()); if (!isShuttingDown) group.schedule(this::doConnect, reconnectDelay, TimeUnit.SECONDS); } diff --git a/src/main/java/a8k/app/channel/net/BiLisSingleTrackTcpClient.java b/src/main/java/a8k/app/client/BiLisSingleTrackTcpClient.java similarity index 99% rename from src/main/java/a8k/app/channel/net/BiLisSingleTrackTcpClient.java rename to src/main/java/a8k/app/client/BiLisSingleTrackTcpClient.java index 850108d..1fbec4e 100644 --- a/src/main/java/a8k/app/channel/net/BiLisSingleTrackTcpClient.java +++ b/src/main/java/a8k/app/client/BiLisSingleTrackTcpClient.java @@ -1,4 +1,4 @@ -package a8k.app.channel.net; +package a8k.app.client; import a8k.app.utils.NettyUtils; import io.netty.bootstrap.Bootstrap; diff --git a/src/main/java/a8k/app/config/A8kSubModuleInitRegConfig.java b/src/main/java/a8k/app/config/A8kSubModuleInitRegConfig.java index bd929e7..b1a7c68 100644 --- a/src/main/java/a8k/app/config/A8kSubModuleInitRegConfig.java +++ b/src/main/java/a8k/app/config/A8kSubModuleInitRegConfig.java @@ -1,7 +1,7 @@ package a8k.app.config; -import a8k.app.channel.iflytophald.type.protocol.ModuleType; -import a8k.app.channel.iflytophald.type.protocol.RegIndex; +import a8k.app.iflytophald.type.protocol.ModuleType; +import a8k.app.iflytophald.type.protocol.RegIndex; import a8k.app.utils.ZList; import jakarta.annotation.PostConstruct; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/app/config/IflytophaldConnectionConfig.java b/src/main/java/a8k/app/config/IflytophaldConnectionConfig.java index 6ecdeee..213ea73 100644 --- a/src/main/java/a8k/app/config/IflytophaldConnectionConfig.java +++ b/src/main/java/a8k/app/config/IflytophaldConnectionConfig.java @@ -1,6 +1,6 @@ package a8k.app.config; -import a8k.app.channel.iflytophald.channel.A8kCanBusConnection; +import a8k.app.iflytophald.channel.A8kCanBusCommunicationChannel; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -26,7 +26,7 @@ public class IflytophaldConnectionConfig { } @Bean - A8kCanBusConnection a8kCanBusBaseService() { - return new A8kCanBusConnection(getCmdChBaseUrl("zexcan"), getDatachUrl("zexcan")); + A8kCanBusCommunicationChannel a8kCanBusBaseService() { + return new A8kCanBusCommunicationChannel(getCmdChBaseUrl("zexcan"), getDatachUrl("zexcan")); } } diff --git a/src/main/java/a8k/app/constant/ActionOvertimeConstant.java b/src/main/java/a8k/app/constant/ActionOvertimeConstant.java index 0deb7ca..af33a42 100644 --- a/src/main/java/a8k/app/constant/ActionOvertimeConstant.java +++ b/src/main/java/a8k/app/constant/ActionOvertimeConstant.java @@ -1,8 +1,8 @@ package a8k.app.constant; -import a8k.app.channel.iflytophald.type.protocol.StepMotorMId; -import a8k.app.channel.iflytophald.type.protocol.CmdId; -import a8k.app.channel.iflytophald.type.protocol.MId; +import a8k.app.iflytophald.type.protocol.StepMotorMId; +import a8k.app.iflytophald.type.protocol.CmdId; +import a8k.app.iflytophald.type.protocol.MId; import jakarta.annotation.PostConstruct; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/app/constant/MiniServoConstant.java b/src/main/java/a8k/app/constant/MiniServoConstant.java index 7c5c363..45fe044 100644 --- a/src/main/java/a8k/app/constant/MiniServoConstant.java +++ b/src/main/java/a8k/app/constant/MiniServoConstant.java @@ -1,6 +1,6 @@ package a8k.app.constant; -import a8k.app.channel.iflytophald.type.protocol.MiniServoMId; +import a8k.app.iflytophald.type.protocol.MiniServoMId; import org.springframework.util.Assert; import java.util.Map; diff --git a/src/main/java/a8k/app/controler/api/v1/app/assistant/ApiRetTestControler.java b/src/main/java/a8k/app/controler/api/v1/app/assistant/ApiRetTestControler.java index 0750909..f569680 100644 --- a/src/main/java/a8k/app/controler/api/v1/app/assistant/ApiRetTestControler.java +++ b/src/main/java/a8k/app/controler/api/v1/app/assistant/ApiRetTestControler.java @@ -1,8 +1,8 @@ package a8k.app.controler.api.v1.app.assistant; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; -import a8k.app.channel.iflytophald.type.protocol.CmdId; -import a8k.app.channel.iflytophald.type.protocol.MId; +import a8k.app.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.CmdId; +import a8k.app.iflytophald.type.protocol.MId; import a8k.app.type.exception.AppException; import a8k.app.type.ui.ApiRet; import a8k.app.type.error.*; diff --git a/src/main/java/a8k/app/controler/api/v1/app/ctrl/OsCtrlControler.java b/src/main/java/a8k/app/controler/api/v1/app/ctrl/OsCtrlControler.java index ba1033d..7ecf703 100644 --- a/src/main/java/a8k/app/controler/api/v1/app/ctrl/OsCtrlControler.java +++ b/src/main/java/a8k/app/controler/api/v1/app/ctrl/OsCtrlControler.java @@ -4,7 +4,7 @@ import a8k.OS; import a8k.app.service.os.OSBeepCtrlService; import a8k.app.service.os.OSDeviceInfoMgrService; import a8k.app.type.exception.AppException; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; import a8k.app.service.statemgr.DeviceWorkStateMgrService; import a8k.app.service.statemgr.GStateMgrService; import a8k.app.type.ui.ApiRet; diff --git a/src/main/java/a8k/app/controler/api/v1/app/data/A8kProjectCardControler.java b/src/main/java/a8k/app/controler/api/v1/app/data/A8kProjectCardControler.java index 1ac1964..b83a7f9 100644 --- a/src/main/java/a8k/app/controler/api/v1/app/data/A8kProjectCardControler.java +++ b/src/main/java/a8k/app/controler/api/v1/app/data/A8kProjectCardControler.java @@ -1,6 +1,6 @@ package a8k.app.controler.api.v1.app.data; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; import a8k.app.service.background.ProjIDCardCtrlAndMonitorService; import a8k.app.service.data.ProjIdCardInfoMgrService; import a8k.app.service.statemgr.GStateMgrService; diff --git a/src/main/java/a8k/app/controler/api/v1/app/data/UsrControler.java b/src/main/java/a8k/app/controler/api/v1/app/data/UsrControler.java index 7426ef9..f91708e 100644 --- a/src/main/java/a8k/app/controler/api/v1/app/data/UsrControler.java +++ b/src/main/java/a8k/app/controler/api/v1/app/data/UsrControler.java @@ -1,6 +1,6 @@ package a8k.app.controler.api.v1.app.data; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; import a8k.app.service.data.AppUserMgrService; import a8k.app.dao.type.db.AppUser; import a8k.app.type.exception.AppException; diff --git a/src/main/java/a8k/app/controler/api/v1/app/ws/AppStateWebsocketEndpoint.java b/src/main/java/a8k/app/controler/api/v1/app/ws/AppStateWebsocketEndpoint.java index dd17065..fa5c5c6 100644 --- a/src/main/java/a8k/app/controler/api/v1/app/ws/AppStateWebsocketEndpoint.java +++ b/src/main/java/a8k/app/controler/api/v1/app/ws/AppStateWebsocketEndpoint.java @@ -32,7 +32,6 @@ public class AppStateWebsocketEndpoint { // 保存 session 到对象 this.session = session; SpringBootBeanUtil.getBean(AppWebSocketEndpointMgr.class).pushStateWebsocketSession(session); - log.info("[websocket] 新的连接：id={}", this.session.getId()); } // 连接关闭 diff --git a/src/main/java/a8k/app/controler/api/v1/app/ws/AppWebSocketEndpointMgr.java b/src/main/java/a8k/app/controler/api/v1/app/ws/AppWebSocketEndpointMgr.java index 71814e4..32f7eca 100644 --- a/src/main/java/a8k/app/controler/api/v1/app/ws/AppWebSocketEndpointMgr.java +++ b/src/main/java/a8k/app/controler/api/v1/app/ws/AppWebSocketEndpointMgr.java @@ -36,10 +36,10 @@ public class AppWebSocketEndpointMgr { public static class Report { - public String messageType = "Report"; - public String dataType; - public Object data; - public Long timestamp = (System.currentTimeMillis()); + public String messageType = "Report"; + public String dataType; + public Object data; + public Long timestamp = (System.currentTimeMillis()); public Report(String dataType, Object object) { this.dataType = dataType; @@ -189,23 +189,15 @@ public class AppWebSocketEndpointMgr { } public void quickReportStateSchedule(boolean force) { - reportState("ConsumablesState", consumablesMgrService.getStateVersion(), force, - consumablesMgrService::getState); - reportState("EngineerModeState", engineerModeStateMgrService.getVersion(), force, - engineerModeStateMgrService::getState); - reportState("DeviceWorkState", deviceWorkStateMgrService.getVersion(), force, - deviceWorkStateMgrService::getDeviceWorkState); - - reportState("OptScanModuleState", optScanModuleStateMgr.getStateVersion(), force, - optScanModuleStateMgr::getOptScanModule); - reportState("TubeHolderSetting", tubeHolderSettingMgrService.getTubeHolderSettingVersion(), force, - tubeHolderSettingMgrService::getTubeHolderSettings); - - reportState("AppFlagStateList", appFlagStateMgrService.getStateVersion(), force, - appFlagStateMgrService::getFlagState); - reportState("MessageBoxState", frontEndMessageBoxAndEventMgr.getMessageBoxStateVersion(), force, - frontEndMessageBoxAndEventMgr::getMessageBoxState); + reportState("ConsumablesState", consumablesMgrService.getStateVersion(), force, consumablesMgrService::getState); + reportState("EngineerModeState", engineerModeStateMgrService.getVersion(), force, engineerModeStateMgrService::getState); + reportState("DeviceWorkState", deviceWorkStateMgrService.getVersion(), force, deviceWorkStateMgrService::getDeviceWorkState); + reportState("OptScanModuleState", optScanModuleStateMgr.getStateVersion(), force, optScanModuleStateMgr::getOptScanModule); + reportState("TubeHolderSetting", tubeHolderSettingMgrService.getTubeHolderSettingVersion(), force, tubeHolderSettingMgrService::getTubeHolderSettings); + + reportState("AppFlagStateList", appFlagStateMgrService.getStateVersion(), force, appFlagStateMgrService::getFlagState); + reportState("MessageBoxState", frontEndMessageBoxAndEventMgr.getMessageBoxStateVersion(), force, frontEndMessageBoxAndEventMgr::getMessageBoxState); reportState("TubeHolderState", tubeStateMgrService.getVersion(), force, tubeStateMgrService::getTubeHolderState); reportState("EmergencyPosState", tubeStateMgrService.getVersion(), force, tubeStateMgrService::getEmergencyPosRunState); diff --git a/src/main/java/a8k/app/controler/api/v1/engineer/LiquidAbsorptionAndDistributionTestControler.java b/src/main/java/a8k/app/controler/api/v1/engineer/LiquidAbsorptionAndDistributionTestControler.java index af7b619..f42e94e 100644 --- a/src/main/java/a8k/app/controler/api/v1/engineer/LiquidAbsorptionAndDistributionTestControler.java +++ b/src/main/java/a8k/app/controler/api/v1/engineer/LiquidAbsorptionAndDistributionTestControler.java @@ -2,7 +2,7 @@ package a8k.app.controler.api.v1.engineer; import a8k.app.service.engineer.qatest.LiquidAbsorptionAndDistributionTestService; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; import a8k.app.type.exception.AppException; import a8k.app.type.ui.ApiRet; import io.swagger.v3.oas.annotations.Operation; diff --git a/src/main/java/a8k/app/dao/A8kProjExtInfoCardDao.java b/src/main/java/a8k/app/dao/A8kProjExtInfoCardDao.java index 6cc8ce8..b14fe23 100644 --- a/src/main/java/a8k/app/dao/A8kProjExtInfoCardDao.java +++ b/src/main/java/a8k/app/dao/A8kProjExtInfoCardDao.java @@ -3,7 +3,7 @@ package a8k.app.dao; import a8k.app.dao.type.common.CommonPage; import a8k.app.type.exception.AppException; import a8k.app.dao.type.db.ProjExtInfoCard; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; import a8k.app.service.data.UtilsProjectColorAllocer; import a8k.app.utils.ZSqlite; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/a8k/app/dao/SubModuleConfigDao.java b/src/main/java/a8k/app/dao/SubModuleConfigDao.java index 79e2dde..6aa3f32 100644 --- a/src/main/java/a8k/app/dao/SubModuleConfigDao.java +++ b/src/main/java/a8k/app/dao/SubModuleConfigDao.java @@ -1,8 +1,7 @@ package a8k.app.dao; import a8k.app.dao.type.db.SubModuleConfigValue; -import a8k.app.channel.iflytophald.type.protocol.MId; -import a8k.app.channel.iflytophald.type.protocol.RegIndex; +import a8k.app.iflytophald.type.protocol.MId; import a8k.app.utils.ZSqlite; import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/a8k/app/dao/SubModuleRegInitialValueDao.java b/src/main/java/a8k/app/dao/SubModuleRegInitialValueDao.java index c0d828b..3e23974 100644 --- a/src/main/java/a8k/app/dao/SubModuleRegInitialValueDao.java +++ b/src/main/java/a8k/app/dao/SubModuleRegInitialValueDao.java @@ -1,8 +1,8 @@ package a8k.app.dao; import a8k.app.dao.type.db.SubModuleRegInitialValue; -import a8k.app.channel.iflytophald.type.protocol.MId; -import a8k.app.channel.iflytophald.type.protocol.RegIndex; +import a8k.app.iflytophald.type.protocol.MId; +import a8k.app.iflytophald.type.protocol.RegIndex; import a8k.app.utils.ZSqlite; import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/a8k/app/dao/type/db/SubModuleConfigValue.java b/src/main/java/a8k/app/dao/type/db/SubModuleConfigValue.java index 4169644..af87dbd 100644 --- a/src/main/java/a8k/app/dao/type/db/SubModuleConfigValue.java +++ b/src/main/java/a8k/app/dao/type/db/SubModuleConfigValue.java @@ -1,8 +1,7 @@ package a8k.app.dao.type.db; -import a8k.app.channel.iflytophald.type.protocol.MId; -import a8k.app.channel.iflytophald.type.protocol.ModuleType; -import a8k.app.channel.iflytophald.type.protocol.RegIndex; +import a8k.app.iflytophald.type.protocol.MId; +import a8k.app.iflytophald.type.protocol.ModuleType; import java.io.Serializable; diff --git a/src/main/java/a8k/app/dao/type/db/SubModuleRegInitialValue.java b/src/main/java/a8k/app/dao/type/db/SubModuleRegInitialValue.java index 37b7cd1..d17c6fa 100644 --- a/src/main/java/a8k/app/dao/type/db/SubModuleRegInitialValue.java +++ b/src/main/java/a8k/app/dao/type/db/SubModuleRegInitialValue.java @@ -1,7 +1,7 @@ package a8k.app.dao.type.db; -import a8k.app.channel.iflytophald.type.protocol.MId; -import a8k.app.channel.iflytophald.type.protocol.RegIndex; +import a8k.app.iflytophald.type.protocol.MId; +import a8k.app.iflytophald.type.protocol.RegIndex; import java.io.Serializable; diff --git a/src/main/java/a8k/app/factory/A8kPacketFactory.java b/src/main/java/a8k/app/factory/A8kPacketFactory.java index 08dcf01..36c2b9b 100644 --- a/src/main/java/a8k/app/factory/A8kPacketFactory.java +++ b/src/main/java/a8k/app/factory/A8kPacketFactory.java @@ -1,7 +1,7 @@ package a8k.app.factory; -import a8k.app.channel.iflytophald.type.protocol.A8kPacket; -import a8k.app.channel.iflytophald.type.protocol.CmdId; +import a8k.app.iflytophald.type.protocol.A8kPacket; +import a8k.app.iflytophald.type.protocol.CmdId; import java.util.List; diff --git a/src/main/java/a8k/app/factory/BiLisDoubleTrackFrameFactory.java b/src/main/java/a8k/app/factory/BiLisDoubleTrackFrameFactory.java index d674a85..24ce4b2 100644 --- a/src/main/java/a8k/app/factory/BiLisDoubleTrackFrameFactory.java +++ b/src/main/java/a8k/app/factory/BiLisDoubleTrackFrameFactory.java @@ -2,6 +2,8 @@ package a8k.app.factory; import a8k.app.constant.AppConstant; import a8k.app.dao.type.db.ReactionRecord; +import a8k.app.iflytophald.type.protocol.A8kEcode; +import a8k.app.type.exception.AppException; import a8k.app.type.lisprotocol.BiLisDoubleTrackFrame; import a8k.app.type.lisprotocol.BiLisDoubleTrackFrameBuildContext; import a8k.app.type.lisprotocol.BiLisFrameParseErrorCode; @@ -19,7 +21,7 @@ import java.lang.reflect.Field; @Slf4j public class BiLisDoubleTrackFrameFactory { // - static public BiLisDoubleTrackFrameBuildContext createRFrame(ReactionRecord reactionRecord, Integer subProjIndex) { + static public BiLisDoubleTrackFrameBuildContext createRFrame(ReactionRecord reactionRecord, Integer subProjIndex) throws AppException { //R|A10|123456789|^PCT/CRP^CRP^#|46|mg/L|0.5-200||L_1^_03|F||||20141201144906||0| BiLisDoubleTrackFrameBuildContext buildContext = new BiLisDoubleTrackFrameBuildContext(); @@ -80,7 +82,7 @@ public class BiLisDoubleTrackFrameFactory { } - static public BiLisDoubleTrackFrameBuildContext createQFrameBytes(String deviceName, String barcode) { + static public BiLisDoubleTrackFrameBuildContext createQFrameBytes(String deviceName, String barcode) throws AppException { BiLisDoubleTrackFrameBuildContext context = new BiLisDoubleTrackFrameBuildContext(); BiLisDoubleTrackFrame frame = new BiLisDoubleTrackFrame(); @@ -144,7 +146,7 @@ public class BiLisDoubleTrackFrameFactory { char[] checkcode = computeChecksum(cmdContent); - if (!isCheckcodeEq(c1,c2,checkcode)) { + if (!isCheckcodeEq(c1, c2, checkcode)) { log.warn("Received frame has invalid checksum: {}, {} !={} {}", c1, c2, checkcode[0], checkcode[1]); throw new BiLisFrameParseException(BiLisFrameParseErrorCode.ChecksumError, "rx checksum error: " + c1 + ", " + c2); } @@ -183,14 +185,14 @@ public class BiLisDoubleTrackFrameFactory { } - static public void serialize(BiLisDoubleTrackFrameBuildContext buildContext, BiLisDoubleTrackFrame frame) { + static public void serialize(BiLisDoubleTrackFrameBuildContext buildContext, BiLisDoubleTrackFrame frame) throws AppException { /* * Frame Structure: * STX,FN,Content,ETX,C1,C2,CR,LF */ if (frame.frameType != BiLisDoubleTrackFrame.STX) { log.warn("Frame type is not STX, cannot serialize: {}", frame.frameType); - buildContext.buildSuccess = false; + throw AppException.of(A8kEcode.CODEERROR, "Frame type is not STX, cannot serialize: %s", frame.frameType); } if ((frame.frameContent instanceof QFrame @@ -201,7 +203,7 @@ public class BiLisDoubleTrackFrameFactory { createBiLisDoubleTrackFrame(buildContext, content); } else { log.warn("Unsupported frame content type: {}", frame.frameContent.getClass().getSimpleName()); - buildContext.buildSuccess = false; + throw AppException.of(A8kEcode.CODEERROR, "Unsupported frame content type: %s", frame.frameContent.getClass().getSimpleName()); } } diff --git a/src/main/java/a8k/app/factory/FakeAppErrorFactory.java b/src/main/java/a8k/app/factory/FakeAppErrorFactory.java index 9a43654..7d4c76b 100644 --- a/src/main/java/a8k/app/factory/FakeAppErrorFactory.java +++ b/src/main/java/a8k/app/factory/FakeAppErrorFactory.java @@ -1,8 +1,8 @@ package a8k.app.factory; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; -import a8k.app.channel.iflytophald.type.protocol.CmdId; -import a8k.app.channel.iflytophald.type.protocol.MId; +import a8k.app.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.CmdId; +import a8k.app.iflytophald.type.protocol.MId; import a8k.app.service.analyzer.ConsumableStateAnalyzerService; import a8k.app.type.error.AEConsumeNotEnoughError; import a8k.app.type.error.AEHardwareError; diff --git a/src/main/java/a8k/app/i18n/Internationalization.java b/src/main/java/a8k/app/i18n/Internationalization.java index 6446ead..48bc5be 100644 --- a/src/main/java/a8k/app/i18n/Internationalization.java +++ b/src/main/java/a8k/app/i18n/Internationalization.java @@ -1,11 +1,11 @@ package a8k.app.i18n; -import a8k.app.channel.iflytophald.type.protocol.MId; +import a8k.app.iflytophald.type.protocol.MId; import a8k.app.optalgo.type.ReactionResultStatus; import a8k.app.type.AppFlagKey; import a8k.app.type.a8k.BloodType; import a8k.app.type.error.ConsumablesScanReportErrorType; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; public class Internationalization { public static String A8kEcode2String(A8kEcode ecode) { @@ -84,6 +84,10 @@ public class Internationalization { case APPE_WAST_BIN_IS_FULL -> "废料箱已满"; case SYS_CMD_EXEC_OVERTIME -> "系统指令超时"; case NETWORK_PARAMETER_ERROR -> "网络参数错误"; + case LIS_LOST_CONNECTION -> "LIS断开连接"; + case LIS_REPORT_RECORD_FAIL -> "LIS上报记录失败"; + case LIS_REQUEST_SAMPLE_INFO_FAIL -> "LIS请求样本信息失败"; + case LIS_REQUEST_SAMPLE_INFO_PARSE_RESPONSE_FAIL -> "LIS请求样本信息解析响应失败"; default -> ecode.toString(); }; } diff --git a/src/main/java/a8k/app/channel/iflytophald/A8kChannelStateMgr.java b/src/main/java/a8k/app/iflytophald/A8kChannelStateMgr.java similarity index 66% rename from src/main/java/a8k/app/channel/iflytophald/A8kChannelStateMgr.java rename to src/main/java/a8k/app/iflytophald/A8kChannelStateMgr.java index fe506a0..a6b4920 100644 --- a/src/main/java/a8k/app/channel/iflytophald/A8kChannelStateMgr.java +++ b/src/main/java/a8k/app/iflytophald/A8kChannelStateMgr.java @@ -1,6 +1,6 @@ -package a8k.app.channel.iflytophald; +package a8k.app.iflytophald; -import a8k.app.channel.iflytophald.channel.A8kCanBusService; +import a8k.app.iflytophald.driver.A8kCanBusBaseDriver; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -9,7 +9,7 @@ import org.springframework.stereotype.Component; @Slf4j @RequiredArgsConstructor public class A8kChannelStateMgr { - private final A8kCanBusService canBus; + private final A8kCanBusBaseDriver canBus; public Boolean isCanBusConnected() { diff --git a/src/main/java/a8k/app/channel/iflytophald/channel/A8kCanBusConnection.java b/src/main/java/a8k/app/iflytophald/channel/A8kCanBusCommunicationChannel.java similarity index 97% rename from src/main/java/a8k/app/channel/iflytophald/channel/A8kCanBusConnection.java rename to src/main/java/a8k/app/iflytophald/channel/A8kCanBusCommunicationChannel.java index 64ffc94..c956404 100644 --- a/src/main/java/a8k/app/channel/iflytophald/channel/A8kCanBusConnection.java +++ b/src/main/java/a8k/app/iflytophald/channel/A8kCanBusCommunicationChannel.java @@ -1,7 +1,8 @@ -package a8k.app.channel.iflytophald.channel; +package a8k.app.iflytophald.channel; import a8k.OS; -import a8k.app.channel.iflytophald.type.protocol.*; +import a8k.app.client.iflytophald.type.protocol.*; +import a8k.app.iflytophald.type.protocol.*; import a8k.app.type.appevent.A8kCanBusOnConnectEvent; import a8k.app.type.appevent.A8kHardwareReport; import a8k.app.type.error.AEHardwareError; @@ -31,7 +32,7 @@ import java.util.concurrent.TimeUnit; @Slf4j -public class A8kCanBusConnection extends WebSocketClient { +public class A8kCanBusCommunicationChannel extends WebSocketClient { @Resource AppEventBusService eventBus; @@ -117,7 +118,7 @@ public class A8kCanBusConnection extends WebSocketClient { int packetIndex = 0;//发送包的packetIndex - public A8kCanBusConnection(String cmdchurl, String datachurl) { + public A8kCanBusCommunicationChannel(String cmdchurl, String datachurl) { super(URI.create(datachurl)); log.info("new A8kCanBusConnection: {} {}", cmdchurl, datachurl); diff --git a/src/main/java/a8k/app/channel/iflytophald/channel/LisUartChannel.java b/src/main/java/a8k/app/iflytophald/channel/LisUartCommunicationChannel.java similarity index 91% rename from src/main/java/a8k/app/channel/iflytophald/channel/LisUartChannel.java rename to src/main/java/a8k/app/iflytophald/channel/LisUartCommunicationChannel.java index 0013d3c..c7b235c 100644 --- a/src/main/java/a8k/app/channel/iflytophald/channel/LisUartChannel.java +++ b/src/main/java/a8k/app/iflytophald/channel/LisUartCommunicationChannel.java @@ -1,7 +1,7 @@ -package a8k.app.channel.iflytophald.channel; +package a8k.app.iflytophald.channel; import a8k.app.config.IflytophaldConnectionConfig; -import a8k.app.channel.iflytophald.channelctrl.IflytophaldChannelCtrl; +import a8k.app.iflytophald.utils.IflytophaldChannelCtrlRequester; import a8k.app.utils.ByteArrayUtils; import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; @@ -21,7 +21,7 @@ import java.nio.ByteBuffer; @Slf4j @Component @RequiredArgsConstructor -public class LisUartChannel { +public class LisUartCommunicationChannel { @Value("${iflytophald.enable}") Boolean iflytophaldEnable; @@ -30,8 +30,8 @@ public class LisUartChannel { private final String channelName = "lis"; private final String charsetName = "UTF-8"; - private final IflytophaldConnectionConfig config; - private final IflytophaldChannelCtrl cmdSender; + private final IflytophaldConnectionConfig config; + private final IflytophaldChannelCtrlRequester cmdSender; private OnMessageListener onMessageListener; private WebSocketClient conn; @@ -146,7 +146,7 @@ public class LisUartChannel { conn = new WebSocketClient(URI.create(url)) { @Override public void onOpen(ServerHandshake serverHandshake) { - LisUartChannel.this.onOpen(serverHandshake); + LisUartCommunicationChannel.this.onOpen(serverHandshake); } @Override @@ -156,17 +156,17 @@ public class LisUartChannel { @Override public void onClose(int i, String s, boolean b) { - LisUartChannel.this.onClose(i, s, b); + LisUartCommunicationChannel.this.onClose(i, s, b); } @Override public void onError(Exception e) { - LisUartChannel.this.onError(e); + LisUartCommunicationChannel.this.onError(e); } @Override public void onMessage(ByteBuffer bytes) { - LisUartChannel.this.onMessage(bytes); + LisUartCommunicationChannel.this.onMessage(bytes); } }; conn.connect(); diff --git a/src/main/java/a8k/app/channel/iflytophald/channel/PrinterUartChannel.java b/src/main/java/a8k/app/iflytophald/channel/PrinterUartCommunicationChannel.java similarity index 91% rename from src/main/java/a8k/app/channel/iflytophald/channel/PrinterUartChannel.java rename to src/main/java/a8k/app/iflytophald/channel/PrinterUartCommunicationChannel.java index 439c6a8..a0957de 100644 --- a/src/main/java/a8k/app/channel/iflytophald/channel/PrinterUartChannel.java +++ b/src/main/java/a8k/app/iflytophald/channel/PrinterUartCommunicationChannel.java @@ -1,4 +1,4 @@ -package a8k.app.channel.iflytophald.channel; +package a8k.app.iflytophald.channel; import a8k.app.config.IflytophaldConnectionConfig; import jakarta.annotation.PostConstruct; @@ -20,7 +20,7 @@ import java.util.Queue; @Slf4j @Component @RequiredArgsConstructor -public class PrinterUartChannel { +public class PrinterUartCommunicationChannel { @Value("${iflytophald.enable}") Boolean iflytophaldEnable; @@ -36,22 +36,22 @@ public class PrinterUartChannel { conn = new WebSocketClient(URI.create(url)) { @Override public void onOpen(ServerHandshake serverHandshake) { - PrinterUartChannel.this.onOpen(serverHandshake); + PrinterUartCommunicationChannel.this.onOpen(serverHandshake); } @Override public void onMessage(String s) { - PrinterUartChannel.this.onMessage(s); + PrinterUartCommunicationChannel.this.onMessage(s); } @Override public void onClose(int i, String s, boolean b) { - PrinterUartChannel.this.onClose(i, s, b); + PrinterUartCommunicationChannel.this.onClose(i, s, b); } @Override public void onError(Exception e) { - PrinterUartChannel.this.onError(e); + PrinterUartCommunicationChannel.this.onError(e); } }; conn.connect(); diff --git a/src/main/java/a8k/app/channel/iflytophald/channel/A8kCanBusService.java b/src/main/java/a8k/app/iflytophald/driver/A8kCanBusBaseDriver.java similarity index 93% rename from src/main/java/a8k/app/channel/iflytophald/channel/A8kCanBusService.java rename to src/main/java/a8k/app/iflytophald/driver/A8kCanBusBaseDriver.java index 9d5cb35..dab8097 100644 --- a/src/main/java/a8k/app/channel/iflytophald/channel/A8kCanBusService.java +++ b/src/main/java/a8k/app/iflytophald/driver/A8kCanBusBaseDriver.java @@ -1,6 +1,8 @@ -package a8k.app.channel.iflytophald.channel; +package a8k.app.iflytophald.driver; -import a8k.app.channel.iflytophald.type.protocol.*; +import a8k.app.iflytophald.channel.A8kCanBusCommunicationChannel; +import a8k.app.client.iflytophald.type.protocol.*; +import a8k.app.iflytophald.type.protocol.*; import a8k.app.type.error.AEHardwareError; import a8k.app.type.exception.AppException; import a8k.OS; @@ -15,9 +17,9 @@ import java.net.URISyntaxException; @Component @Slf4j -public class A8kCanBusService { +public class A8kCanBusBaseDriver { @Resource - A8kCanBusConnection connection; + A8kCanBusCommunicationChannel connection; @Value("${iflytophald.enable}") diff --git a/src/main/java/a8k/app/channel/iflytophald/driver/CodeScanerDriver.java b/src/main/java/a8k/app/iflytophald/driver/CodeScanerDriver.java similarity index 89% rename from src/main/java/a8k/app/channel/iflytophald/driver/CodeScanerDriver.java rename to src/main/java/a8k/app/iflytophald/driver/CodeScanerDriver.java index e06e7ce..b82714f 100644 --- a/src/main/java/a8k/app/channel/iflytophald/driver/CodeScanerDriver.java +++ b/src/main/java/a8k/app/iflytophald/driver/CodeScanerDriver.java @@ -1,10 +1,9 @@ -package a8k.app.channel.iflytophald.driver; +package a8k.app.iflytophald.driver; import a8k.OS; -import a8k.app.channel.iflytophald.channel.A8kCanBusService; -import a8k.app.channel.iflytophald.type.protocol.A8kPacket; -import a8k.app.channel.iflytophald.type.protocol.CmdId; -import a8k.app.channel.iflytophald.type.protocol.MId; +import a8k.app.iflytophald.type.protocol.A8kPacket; +import a8k.app.iflytophald.type.protocol.CmdId; +import a8k.app.iflytophald.type.protocol.MId; import a8k.app.type.exception.AppException; import jakarta.annotation.Resource; import org.springframework.stereotype.Component; @@ -13,7 +12,7 @@ import org.springframework.stereotype.Component; public class CodeScanerDriver { @Resource - A8kCanBusService canBus; + A8kCanBusBaseDriver canBus; public String pipetteModCodeScannerScanCode(Integer overtime) throws AppException { try { diff --git a/src/main/java/a8k/app/channel/iflytophald/driver/HbotDriver.java b/src/main/java/a8k/app/iflytophald/driver/HbotDriver.java similarity index 89% rename from src/main/java/a8k/app/channel/iflytophald/driver/HbotDriver.java rename to src/main/java/a8k/app/iflytophald/driver/HbotDriver.java index 4f8152b..e7e02d8 100644 --- a/src/main/java/a8k/app/channel/iflytophald/driver/HbotDriver.java +++ b/src/main/java/a8k/app/iflytophald/driver/HbotDriver.java @@ -1,9 +1,8 @@ -package a8k.app.channel.iflytophald.driver; +package a8k.app.iflytophald.driver; -import a8k.app.channel.iflytophald.channel.A8kCanBusService; -import a8k.app.channel.iflytophald.type.protocol.CmdId; -import a8k.app.channel.iflytophald.type.protocol.MId; -import a8k.app.channel.iflytophald.type.protocol.HbotRegIndex; +import a8k.app.iflytophald.type.protocol.CmdId; +import a8k.app.iflytophald.type.protocol.MId; +import a8k.app.iflytophald.type.protocol.HbotRegIndex; import a8k.app.type.a8k.Pos2d; import a8k.app.type.exception.AppException; import jakarta.annotation.Resource; @@ -13,7 +12,7 @@ import org.springframework.stereotype.Component; public class HbotDriver { @Resource - A8kCanBusService canBus; + A8kCanBusBaseDriver canBus; Integer actionOvertime = 10000; Integer moveToZeroActionOvertime = 20000; diff --git a/src/main/java/a8k/app/channel/iflytophald/driver/InputDetectDriver.java b/src/main/java/a8k/app/iflytophald/driver/InputDetectDriver.java similarity index 61% rename from src/main/java/a8k/app/channel/iflytophald/driver/InputDetectDriver.java rename to src/main/java/a8k/app/iflytophald/driver/InputDetectDriver.java index 2829711..cd44783 100644 --- a/src/main/java/a8k/app/channel/iflytophald/driver/InputDetectDriver.java +++ b/src/main/java/a8k/app/iflytophald/driver/InputDetectDriver.java @@ -1,11 +1,10 @@ -package a8k.app.channel.iflytophald.driver; +package a8k.app.iflytophald.driver; import a8k.app.type.error.AECodeError; import a8k.app.type.exception.AppException; -import a8k.app.channel.iflytophald.channel.A8kCanBusService; -import a8k.app.channel.iflytophald.type.protocol.CmdId; -import a8k.app.channel.iflytophald.type.protocol.InputIOId; -import a8k.app.channel.iflytophald.type.protocol.ModuleType; +import a8k.app.iflytophald.type.protocol.CmdId; +import a8k.app.iflytophald.type.protocol.InputIOId; +import a8k.app.iflytophald.type.protocol.ModuleType; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -15,7 +14,7 @@ import org.springframework.stereotype.Component; @Slf4j public class InputDetectDriver { - private final A8kCanBusService a8kCanBusService; + private final A8kCanBusBaseDriver a8KCanBusBaseDriver; public Boolean getIOState(InputIOId ioid) throws AppException { while (true) { @@ -39,11 +38,11 @@ public class InputDetectDriver { private Boolean priGetIOState(InputIOId ioid, long overtime) throws AppException { if (ioid.mtype == ModuleType.Board) { - return a8kCanBusService.callcmd(ioid.mid, CmdId.extboard_read_inio, overtime, ioid.ioIndex).getContentI32(0) != 0; + return a8KCanBusBaseDriver.callcmd(ioid.mid, CmdId.extboard_read_inio, overtime, ioid.ioIndex).getContentI32(0) != 0; } else if (ioid.mtype == ModuleType.TMCStepMotor) { - return a8kCanBusService.callcmd(ioid.mid, CmdId.step_motor_read_io_state, overtime, ioid.ioIndex).getContentI32(0) != 0; + return a8KCanBusBaseDriver.callcmd(ioid.mid, CmdId.step_motor_read_io_state, overtime, ioid.ioIndex).getContentI32(0) != 0; } else if (ioid.mtype == ModuleType.MiniServo) { - return a8kCanBusService.callcmd(ioid.mid, CmdId.mini_servo_read_io_state, overtime, ioid.ioIndex).getContentI32(0) != 0; + return a8KCanBusBaseDriver.callcmd(ioid.mid, CmdId.mini_servo_read_io_state, overtime, ioid.ioIndex).getContentI32(0) != 0; } else { throw new AppException(new AECodeError(String.format("IOID MODULE TYPE %s NOT SUPPORT", ioid.mtype))); } diff --git a/src/main/java/a8k/app/channel/iflytophald/driver/MiniServoDriver.java b/src/main/java/a8k/app/iflytophald/driver/MiniServoDriver.java similarity index 96% rename from src/main/java/a8k/app/channel/iflytophald/driver/MiniServoDriver.java rename to src/main/java/a8k/app/iflytophald/driver/MiniServoDriver.java index 8a5ad34..fb4657a 100644 --- a/src/main/java/a8k/app/channel/iflytophald/driver/MiniServoDriver.java +++ b/src/main/java/a8k/app/iflytophald/driver/MiniServoDriver.java @@ -1,9 +1,9 @@ -package a8k.app.channel.iflytophald.driver; +package a8k.app.iflytophald.driver; import a8k.OS; import a8k.app.constant.MiniServoConstant; -import a8k.app.channel.iflytophald.channel.A8kCanBusService; -import a8k.app.channel.iflytophald.type.protocol.*; +import a8k.app.client.iflytophald.type.protocol.*; +import a8k.app.iflytophald.type.protocol.*; import a8k.app.type.error.AEHardwareError; import a8k.app.type.exception.AppException; import lombok.RequiredArgsConstructor; @@ -15,7 +15,7 @@ import org.springframework.stereotype.Component; @Slf4j @RequiredArgsConstructor public class MiniServoDriver { - final private A8kCanBusService canBus; + final private A8kCanBusBaseDriver canBus; public void moduleStop(MiniServoMId id) throws AppException { canBus.moduleStop(id.mid); diff --git a/src/main/java/a8k/app/channel/iflytophald/driver/ModuleEnableCtrlDriver.java b/src/main/java/a8k/app/iflytophald/driver/ModuleEnableCtrlDriver.java similarity index 92% rename from src/main/java/a8k/app/channel/iflytophald/driver/ModuleEnableCtrlDriver.java rename to src/main/java/a8k/app/iflytophald/driver/ModuleEnableCtrlDriver.java index 9dc09b1..aa95f5e 100644 --- a/src/main/java/a8k/app/channel/iflytophald/driver/ModuleEnableCtrlDriver.java +++ b/src/main/java/a8k/app/iflytophald/driver/ModuleEnableCtrlDriver.java @@ -1,10 +1,9 @@ -package a8k.app.channel.iflytophald.driver; +package a8k.app.iflytophald.driver; -import a8k.app.channel.iflytophald.channel.A8kCanBusService; -import a8k.app.channel.iflytophald.type.protocol.MiniServoMId; -import a8k.app.channel.iflytophald.type.protocol.StepMotorMId; +import a8k.app.iflytophald.type.protocol.MiniServoMId; +import a8k.app.iflytophald.type.protocol.StepMotorMId; import a8k.app.type.exception.AppException; -import a8k.app.channel.iflytophald.type.protocol.MId; +import a8k.app.iflytophald.type.protocol.MId; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -18,7 +17,7 @@ public class ModuleEnableCtrlDriver { private final PipetteCtrlDriverV2 pipetteCtrlDriver; private final StepMotorCtrlDriver stepMotorCtrlDriver; private final MiniServoDriver miniServoDriver; - private final A8kCanBusService canBus; + private final A8kCanBusBaseDriver canBus; public void forceDisableAllMotor() { // StepMotorMId.values() diff --git a/src/main/java/a8k/app/channel/iflytophald/driver/OptModuleDriver.java b/src/main/java/a8k/app/iflytophald/driver/OptModuleDriver.java similarity index 90% rename from src/main/java/a8k/app/channel/iflytophald/driver/OptModuleDriver.java rename to src/main/java/a8k/app/iflytophald/driver/OptModuleDriver.java index 0800083..6b20b9a 100644 --- a/src/main/java/a8k/app/channel/iflytophald/driver/OptModuleDriver.java +++ b/src/main/java/a8k/app/iflytophald/driver/OptModuleDriver.java @@ -1,13 +1,12 @@ -package a8k.app.channel.iflytophald.driver; +package a8k.app.iflytophald.driver; import a8k.OS; import a8k.app.factory.A8kPacketFactory; -import a8k.app.channel.iflytophald.channel.A8kCanBusService; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; -import a8k.app.channel.iflytophald.type.protocol.CmdId; -import a8k.app.channel.iflytophald.type.protocol.MId; -import a8k.app.channel.iflytophald.type.protocol.ModuleStatus; -import a8k.app.channel.iflytophald.type.protocol.OptModuleRegIndex; +import a8k.app.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.CmdId; +import a8k.app.iflytophald.type.protocol.MId; +import a8k.app.iflytophald.type.protocol.ModuleStatus; +import a8k.app.iflytophald.type.protocol.OptModuleRegIndex; import a8k.app.type.error.AEHardwareError; import a8k.app.type.exception.AppException; import a8k.app.utils.ByteArrayUtils; @@ -35,7 +34,7 @@ public class OptModuleDriver { } @Resource - A8kCanBusService canBus; + A8kCanBusBaseDriver canBus; void waittingForOptFinish(Integer overtime) throws AppException { diff --git a/src/main/java/a8k/app/channel/iflytophald/driver/OutputIOCtrlDriver.java b/src/main/java/a8k/app/iflytophald/driver/OutputIOCtrlDriver.java similarity index 64% rename from src/main/java/a8k/app/channel/iflytophald/driver/OutputIOCtrlDriver.java rename to src/main/java/a8k/app/iflytophald/driver/OutputIOCtrlDriver.java index 807f963..241a4e8 100644 --- a/src/main/java/a8k/app/channel/iflytophald/driver/OutputIOCtrlDriver.java +++ b/src/main/java/a8k/app/iflytophald/driver/OutputIOCtrlDriver.java @@ -1,11 +1,10 @@ -package a8k.app.channel.iflytophald.driver; +package a8k.app.iflytophald.driver; +import a8k.app.iflytophald.type.protocol.CmdId; +import a8k.app.iflytophald.type.protocol.ModuleType; import a8k.app.type.error.AECodeError; import a8k.app.type.exception.AppException; -import a8k.app.channel.iflytophald.channel.A8kCanBusService; -import a8k.app.channel.iflytophald.type.protocol.CmdId; -import a8k.app.channel.iflytophald.type.protocol.ModuleType; -import a8k.app.channel.iflytophald.type.protocol.OutputIOId; +import a8k.app.iflytophald.type.protocol.OutputIOId; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; @@ -13,7 +12,7 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class OutputIOCtrlDriver { - private final A8kCanBusService canBus; + private final A8kCanBusBaseDriver canBus; public void setIOState(OutputIOId outputIOId, Boolean state) throws AppException { if (outputIOId.mtype == ModuleType.Board) { diff --git a/src/main/java/a8k/app/channel/iflytophald/driver/PipetteCtrlDriverV2.java b/src/main/java/a8k/app/iflytophald/driver/PipetteCtrlDriverV2.java similarity index 95% rename from src/main/java/a8k/app/channel/iflytophald/driver/PipetteCtrlDriverV2.java rename to src/main/java/a8k/app/iflytophald/driver/PipetteCtrlDriverV2.java index 65548f8..404a79d 100644 --- a/src/main/java/a8k/app/channel/iflytophald/driver/PipetteCtrlDriverV2.java +++ b/src/main/java/a8k/app/iflytophald/driver/PipetteCtrlDriverV2.java @@ -1,20 +1,20 @@ -package a8k.app.channel.iflytophald.driver; - -import a8k.app.channel.iflytophald.channel.A8kCanBusService; -import a8k.app.channel.iflytophald.type.protocol.*; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.DistribuAllParamId; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.PipetteConfig; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.PipetteStateIndex; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.cfg.*; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.cfgbean.*; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.cpyidx.*; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.param.AspirationParam; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.param.DistribuAllParam; +package a8k.app.iflytophald.driver; + +import a8k.app.client.iflytophald.type.protocol.*; +import a8k.app.iflytophald.type.protocol.pipette_module.DistribuAllParamId; +import a8k.app.iflytophald.type.protocol.pipette_module.PipetteConfig; +import a8k.app.iflytophald.type.protocol.pipette_module.PipetteStateIndex; +import a8k.app.client.iflytophald.type.protocol.pipette_module.cfg.*; +import a8k.app.client.iflytophald.type.protocol.pipette_module.cfgbean.*; +import a8k.app.client.iflytophald.type.protocol.pipette_module.cpyidx.*; +import a8k.app.iflytophald.type.protocol.pipette_module.cfg.*; +import a8k.app.iflytophald.type.protocol.pipette_module.cpyidx.*; +import a8k.app.iflytophald.type.protocol.pipette_module.param.AspirationParam; +import a8k.app.iflytophald.type.protocol.pipette_module.param.DistribuAllParam; import a8k.app.constant.ActionOvertimeConstant; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.AspirationParamId; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.cfgbean.*; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.cpyidx.*; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.cfg.*; +import a8k.app.iflytophald.type.protocol.pipette_module.AspirationParamId; +import a8k.app.iflytophald.type.protocol.*; +import a8k.app.iflytophald.type.protocol.pipette_module.cfgbean.*; import a8k.app.type.exception.AppException; import a8k.app.utils.ZJsonHelper; import lombok.RequiredArgsConstructor; @@ -28,7 +28,7 @@ import java.util.List; @RequiredArgsConstructor @Slf4j public class PipetteCtrlDriverV2 { - private final A8kCanBusService canBus; + private final A8kCanBusBaseDriver canBus; private final ActionOvertimeConstant actionOvertimeConstant; public void moduleStop() throws AppException { diff --git a/src/main/java/a8k/app/channel/iflytophald/driver/StepMotorCtrlDriver.java b/src/main/java/a8k/app/iflytophald/driver/StepMotorCtrlDriver.java similarity index 97% rename from src/main/java/a8k/app/channel/iflytophald/driver/StepMotorCtrlDriver.java rename to src/main/java/a8k/app/iflytophald/driver/StepMotorCtrlDriver.java index 9b3ad0c..647924b 100644 --- a/src/main/java/a8k/app/channel/iflytophald/driver/StepMotorCtrlDriver.java +++ b/src/main/java/a8k/app/iflytophald/driver/StepMotorCtrlDriver.java @@ -1,15 +1,14 @@ -package a8k.app.channel.iflytophald.driver; +package a8k.app.iflytophald.driver; -import a8k.app.channel.iflytophald.channel.A8kCanBusService; import a8k.app.constant.ActionOvertimeConstant; -import a8k.app.channel.iflytophald.type.protocol.*; +import a8k.app.client.iflytophald.type.protocol.*; +import a8k.app.iflytophald.type.protocol.*; import a8k.app.type.exception.AppException; import a8k.app.utils.ZJsonHelper; import a8k.iflyutils.BitUtils; import com.fasterxml.jackson.databind.node.ObjectNode; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.slf4j.Logger; import org.springframework.stereotype.Component; @Component @@ -17,7 +16,7 @@ import org.springframework.stereotype.Component; @Slf4j public class StepMotorCtrlDriver { - final private A8kCanBusService canBus; + final private A8kCanBusBaseDriver canBus; private final ActionOvertimeConstant actionOvertimeConstant; diff --git a/src/main/java/a8k/app/channel/iflytophald/driver/WaterTemperatureControllerDriver.java b/src/main/java/a8k/app/iflytophald/driver/WaterTemperatureControllerDriver.java similarity index 92% rename from src/main/java/a8k/app/channel/iflytophald/driver/WaterTemperatureControllerDriver.java rename to src/main/java/a8k/app/iflytophald/driver/WaterTemperatureControllerDriver.java index 59219dd..03c1e9c 100644 --- a/src/main/java/a8k/app/channel/iflytophald/driver/WaterTemperatureControllerDriver.java +++ b/src/main/java/a8k/app/iflytophald/driver/WaterTemperatureControllerDriver.java @@ -1,9 +1,8 @@ -package a8k.app.channel.iflytophald.driver; +package a8k.app.iflytophald.driver; -import a8k.app.channel.iflytophald.channel.A8kCanBusService; -import a8k.app.channel.iflytophald.type.protocol.CmdId; -import a8k.app.channel.iflytophald.type.protocol.TemperatureControlerMid; -import a8k.app.channel.iflytophald.type.protocol.TemperatureControlerRegIndex; +import a8k.app.iflytophald.type.protocol.CmdId; +import a8k.app.iflytophald.type.protocol.TemperatureControlerMid; +import a8k.app.iflytophald.type.protocol.TemperatureControlerRegIndex; import a8k.app.service.param.misc.TemperatureCtrlParamMgr; import a8k.app.type.exception.AppException; import a8k.app.type.param.TemperatureCtrlParam; @@ -15,7 +14,7 @@ import org.springframework.stereotype.Component; @Slf4j public class WaterTemperatureControllerDriver { @Resource - A8kCanBusService canBus; + A8kCanBusBaseDriver canBus; Double incubatorTCMTempOffset = 0.0; Double platesBoxTCMTempOffset = 0.0; diff --git a/src/main/java/a8k/app/channel/iflytophald/type/channelctrl/IflytophaldResponse.java b/src/main/java/a8k/app/iflytophald/type/channelctrl/IflytophaldResponse.java similarity index 66% rename from src/main/java/a8k/app/channel/iflytophald/type/channelctrl/IflytophaldResponse.java rename to src/main/java/a8k/app/iflytophald/type/channelctrl/IflytophaldResponse.java index d5ae8c6..f06e48c 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/channelctrl/IflytophaldResponse.java +++ b/src/main/java/a8k/app/iflytophald/type/channelctrl/IflytophaldResponse.java @@ -1,4 +1,4 @@ -package a8k.app.channel.iflytophald.type.channelctrl; +package a8k.app.iflytophald.type.channelctrl; public class IflytophaldResponse { public Integer status; diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/A8kEcode.java b/src/main/java/a8k/app/iflytophald/type/protocol/A8kEcode.java similarity index 96% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/A8kEcode.java rename to src/main/java/a8k/app/iflytophald/type/protocol/A8kEcode.java index d6414d7..8e44ab0 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/A8kEcode.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/A8kEcode.java @@ -1,4 +1,4 @@ -package a8k.app.channel.iflytophald.type.protocol; +package a8k.app.iflytophald.type.protocol; import lombok.extern.slf4j.Slf4j; @@ -35,6 +35,12 @@ public enum A8kEcode { SYS_CMD_EXEC_OVERTIME(23), //Linux命令执行超时 NETWORK_PARAMETER_ERROR(24), //网络参数错误 + LIS_LOST_CONNECTION(25), //LIS连接错误 + LIS_REPORT_RECORD_FAIL(26), //Lis报告记录失败 + LIS_REQUEST_SAMPLE_INFO_FAIL(27), //Lis请求样本信息失败 + LIS_REQUEST_SAMPLE_INFO_PARSE_RESPONSE_FAIL(28), //Lis请求样本信息失败 + LIS_SAMPLE_TYPE_NOT_SUPPORT(29), //Lis样本类型不支持 + // // 参数错误 diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/A8kPacket.java b/src/main/java/a8k/app/iflytophald/type/protocol/A8kPacket.java similarity index 99% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/A8kPacket.java rename to src/main/java/a8k/app/iflytophald/type/protocol/A8kPacket.java index 302d90e..bb62121 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/A8kPacket.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/A8kPacket.java @@ -1,4 +1,4 @@ -package a8k.app.channel.iflytophald.type.protocol; +package a8k.app.iflytophald.type.protocol; import a8k.app.utils.ByteArrayUtils; import org.slf4j.Logger; diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/CmdId.java b/src/main/java/a8k/app/iflytophald/type/protocol/CmdId.java similarity index 99% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/CmdId.java rename to src/main/java/a8k/app/iflytophald/type/protocol/CmdId.java index 47e4b42..86a0cf6 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/CmdId.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/CmdId.java @@ -1,4 +1,4 @@ -package a8k.app.channel.iflytophald.type.protocol; +package a8k.app.iflytophald.type.protocol; public enum CmdId { NotSet(0xFFFF, "NOACTION"),// diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/HbotRegIndex.java b/src/main/java/a8k/app/iflytophald/type/protocol/HbotRegIndex.java similarity index 97% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/HbotRegIndex.java rename to src/main/java/a8k/app/iflytophald/type/protocol/HbotRegIndex.java index 66635f5..5825814 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/HbotRegIndex.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/HbotRegIndex.java @@ -1,4 +1,4 @@ -package a8k.app.channel.iflytophald.type.protocol; +package a8k.app.iflytophald.type.protocol; public enum HbotRegIndex { // kreg_module_version(RegIndex.kreg_module_version), // 模块版本 diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/InputIOId.java b/src/main/java/a8k/app/iflytophald/type/protocol/InputIOId.java similarity index 97% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/InputIOId.java rename to src/main/java/a8k/app/iflytophald/type/protocol/InputIOId.java index d79abe3..a2db301 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/InputIOId.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/InputIOId.java @@ -1,4 +1,4 @@ -package a8k.app.channel.iflytophald.type.protocol; +package a8k.app.iflytophald.type.protocol; public enum InputIOId { TubeHeightPPS("入料平移通道-试管高低检测IO", ModuleType.Board, MId.FeedingModBoard, 0, false), //高低试管检测IO diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/LldType.java b/src/main/java/a8k/app/iflytophald/type/protocol/LldType.java similarity index 83% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/LldType.java rename to src/main/java/a8k/app/iflytophald/type/protocol/LldType.java index 00e4f72..5871133 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/LldType.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/LldType.java @@ -1,4 +1,4 @@ -package a8k.app.channel.iflytophald.type.protocol; +package a8k.app.iflytophald.type.protocol; /** * 液位探测方式 diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/MId.java b/src/main/java/a8k/app/iflytophald/type/protocol/MId.java similarity index 97% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/MId.java rename to src/main/java/a8k/app/iflytophald/type/protocol/MId.java index 0b8a08a..04283c8 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/MId.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/MId.java @@ -1,4 +1,4 @@ -package a8k.app.channel.iflytophald.type.protocol; +package a8k.app.iflytophald.type.protocol; public enum MId { NotSet(0, "未设置"),// diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/MiniServoMId.java b/src/main/java/a8k/app/iflytophald/type/protocol/MiniServoMId.java similarity index 91% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/MiniServoMId.java rename to src/main/java/a8k/app/iflytophald/type/protocol/MiniServoMId.java index d7575af..dd29f7a 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/MiniServoMId.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/MiniServoMId.java @@ -1,4 +1,4 @@ -package a8k.app.channel.iflytophald.type.protocol; +package a8k.app.iflytophald.type.protocol; import org.springframework.util.Assert; diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/MiniServoRegIndex.java b/src/main/java/a8k/app/iflytophald/type/protocol/MiniServoRegIndex.java similarity index 99% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/MiniServoRegIndex.java rename to src/main/java/a8k/app/iflytophald/type/protocol/MiniServoRegIndex.java index e9e75bc..3119f65 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/MiniServoRegIndex.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/MiniServoRegIndex.java @@ -1,4 +1,4 @@ -package a8k.app.channel.iflytophald.type.protocol; +package a8k.app.iflytophald.type.protocol; public enum MiniServoRegIndex { // kreg_module_version(RegIndex.kreg_module_version), // 模块版本 diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/ModuleStatus.java b/src/main/java/a8k/app/iflytophald/type/protocol/ModuleStatus.java similarity index 90% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/ModuleStatus.java rename to src/main/java/a8k/app/iflytophald/type/protocol/ModuleStatus.java index 038008b..8448f42 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/ModuleStatus.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/ModuleStatus.java @@ -1,4 +1,4 @@ -package a8k.app.channel.iflytophald.type.protocol; +package a8k.app.iflytophald.type.protocol; import org.springframework.util.Assert; diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/ModuleType.java b/src/main/java/a8k/app/iflytophald/type/protocol/ModuleType.java similarity index 93% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/ModuleType.java rename to src/main/java/a8k/app/iflytophald/type/protocol/ModuleType.java index 5d34a4d..d26ace4 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/ModuleType.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/ModuleType.java @@ -1,4 +1,4 @@ -package a8k.app.channel.iflytophald.type.protocol; +package a8k.app.iflytophald.type.protocol; public enum ModuleType { Board(0), // 板子 diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/OptModuleRegIndex.java b/src/main/java/a8k/app/iflytophald/type/protocol/OptModuleRegIndex.java similarity index 98% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/OptModuleRegIndex.java rename to src/main/java/a8k/app/iflytophald/type/protocol/OptModuleRegIndex.java index dc7d9f4..3137c08 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/OptModuleRegIndex.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/OptModuleRegIndex.java @@ -1,4 +1,4 @@ -package a8k.app.channel.iflytophald.type.protocol; +package a8k.app.iflytophald.type.protocol; public enum OptModuleRegIndex { kreg_a8k_opt_t_pos_offset(RegIndex.kreg_a8k_opt_t_pos_offset), diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/OutputIOId.java b/src/main/java/a8k/app/iflytophald/type/protocol/OutputIOId.java similarity index 92% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/OutputIOId.java rename to src/main/java/a8k/app/iflytophald/type/protocol/OutputIOId.java index e65756e..88801a2 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/OutputIOId.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/OutputIOId.java @@ -1,4 +1,4 @@ -package a8k.app.channel.iflytophald.type.protocol; +package a8k.app.iflytophald.type.protocol; public enum OutputIOId { RecycleBinOverflowPPSPowerCtrl("废料仓-光栅电源", ModuleType.Board, MId.PlatesBoxTCMBoard, 0, false),//废料桶光栅电源 diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/PipetteRegIndex.java b/src/main/java/a8k/app/iflytophald/type/protocol/PipetteRegIndex.java similarity index 98% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/PipetteRegIndex.java rename to src/main/java/a8k/app/iflytophald/type/protocol/PipetteRegIndex.java index 58c57b3..92e383a 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/PipetteRegIndex.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/PipetteRegIndex.java @@ -1,4 +1,4 @@ -package a8k.app.channel.iflytophald.type.protocol; +package a8k.app.iflytophald.type.protocol; import org.springframework.util.Assert; diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/RegIndex.java b/src/main/java/a8k/app/iflytophald/type/protocol/RegIndex.java similarity index 99% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/RegIndex.java rename to src/main/java/a8k/app/iflytophald/type/protocol/RegIndex.java index 3a04fc0..c2fd78e 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/RegIndex.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/RegIndex.java @@ -1,4 +1,4 @@ -package a8k.app.channel.iflytophald.type.protocol; +package a8k.app.iflytophald.type.protocol; public enum RegIndex { diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/StepMotorMId.java b/src/main/java/a8k/app/iflytophald/type/protocol/StepMotorMId.java similarity index 92% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/StepMotorMId.java rename to src/main/java/a8k/app/iflytophald/type/protocol/StepMotorMId.java index 529445d..c118194 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/StepMotorMId.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/StepMotorMId.java @@ -1,4 +1,4 @@ -package a8k.app.channel.iflytophald.type.protocol; +package a8k.app.iflytophald.type.protocol; import org.springframework.util.Assert; diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/StepMotorRegIndex.java b/src/main/java/a8k/app/iflytophald/type/protocol/StepMotorRegIndex.java similarity index 98% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/StepMotorRegIndex.java rename to src/main/java/a8k/app/iflytophald/type/protocol/StepMotorRegIndex.java index da3caa3..0a067f5 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/StepMotorRegIndex.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/StepMotorRegIndex.java @@ -1,4 +1,4 @@ -package a8k.app.channel.iflytophald.type.protocol; +package a8k.app.iflytophald.type.protocol; public enum StepMotorRegIndex { // kreg_module_version(RegIndex.kreg_module_version), // 模块版本 diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/StepMotorSpeedLevel.java b/src/main/java/a8k/app/iflytophald/type/protocol/StepMotorSpeedLevel.java similarity index 57% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/StepMotorSpeedLevel.java rename to src/main/java/a8k/app/iflytophald/type/protocol/StepMotorSpeedLevel.java index dd81fe2..f0653d8 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/StepMotorSpeedLevel.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/StepMotorSpeedLevel.java @@ -1,4 +1,4 @@ -package a8k.app.channel.iflytophald.type.protocol; +package a8k.app.iflytophald.type.protocol; public enum StepMotorSpeedLevel { DEFAULT, diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/TemperatureControlerMid.java b/src/main/java/a8k/app/iflytophald/type/protocol/TemperatureControlerMid.java similarity index 85% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/TemperatureControlerMid.java rename to src/main/java/a8k/app/iflytophald/type/protocol/TemperatureControlerMid.java index 6ba7fa4..773f7e0 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/TemperatureControlerMid.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/TemperatureControlerMid.java @@ -1,4 +1,4 @@ -package a8k.app.channel.iflytophald.type.protocol; +package a8k.app.iflytophald.type.protocol; import org.springframework.util.Assert; diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/TemperatureControlerRegIndex.java b/src/main/java/a8k/app/iflytophald/type/protocol/TemperatureControlerRegIndex.java similarity index 97% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/TemperatureControlerRegIndex.java rename to src/main/java/a8k/app/iflytophald/type/protocol/TemperatureControlerRegIndex.java index 96866cf..95eb951 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/TemperatureControlerRegIndex.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/TemperatureControlerRegIndex.java @@ -1,4 +1,4 @@ -package a8k.app.channel.iflytophald.type.protocol; +package a8k.app.iflytophald.type.protocol; import org.springframework.util.Assert; diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/AspirationParamId.java b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/AspirationParamId.java similarity index 86% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/AspirationParamId.java rename to src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/AspirationParamId.java index b2b3445..8f4ecfd 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/AspirationParamId.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/AspirationParamId.java @@ -1,4 +1,4 @@ -package a8k.app.channel.iflytophald.type.protocol.pipette_module; +package a8k.app.iflytophald.type.protocol.pipette_module; public enum AspirationParamId { // diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/DistribuAllParamId.java b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/DistribuAllParamId.java similarity index 90% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/DistribuAllParamId.java rename to src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/DistribuAllParamId.java index bdbd03f..b3211c5 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/DistribuAllParamId.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/DistribuAllParamId.java @@ -1,4 +1,4 @@ -package a8k.app.channel.iflytophald.type.protocol.pipette_module; +package a8k.app.iflytophald.type.protocol.pipette_module; public enum DistribuAllParamId { // diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/DistribuType.java b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/DistribuType.java similarity index 70% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/DistribuType.java rename to src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/DistribuType.java index 7ac72ec..2a97e65 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/DistribuType.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/DistribuType.java @@ -1,4 +1,4 @@ -package a8k.app.channel.iflytophald.type.protocol.pipette_module; +package a8k.app.iflytophald.type.protocol.pipette_module; public enum DistribuType { JET_DIST, //液面上分配 diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/PipetteConfig.java b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/PipetteConfig.java similarity index 70% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/PipetteConfig.java rename to src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/PipetteConfig.java index d63a0b6..953d8f1 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/PipetteConfig.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/PipetteConfig.java @@ -1,7 +1,7 @@ -package a8k.app.channel.iflytophald.type.protocol.pipette_module; +package a8k.app.iflytophald.type.protocol.pipette_module; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.cfgbean.*; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.cfgbean.*; +import a8k.app.client.iflytophald.type.protocol.pipette_module.cfgbean.*; +import a8k.app.iflytophald.type.protocol.pipette_module.cfgbean.*; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/PipetteStateIndex.java b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/PipetteStateIndex.java similarity index 86% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/PipetteStateIndex.java rename to src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/PipetteStateIndex.java index 06284b4..c13b347 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/PipetteStateIndex.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/PipetteStateIndex.java @@ -1,4 +1,4 @@ -package a8k.app.channel.iflytophald.type.protocol.pipette_module; +package a8k.app.iflytophald.type.protocol.pipette_module; public enum PipetteStateIndex { enable, diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/TipType.java b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/TipType.java similarity index 89% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/TipType.java rename to src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/TipType.java index d800fa0..fc8d879 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/TipType.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/TipType.java @@ -1,4 +1,4 @@ -package a8k.app.channel.iflytophald.type.protocol.pipette_module; +package a8k.app.iflytophald.type.protocol.pipette_module; public enum TipType { TS1000UL, // 0 1000ul max=1002.6ul diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfg/ContainerInfoIndex.java b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfg/ContainerInfoIndex.java similarity index 94% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfg/ContainerInfoIndex.java rename to src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfg/ContainerInfoIndex.java index 9f5b589..9a35b83 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfg/ContainerInfoIndex.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfg/ContainerInfoIndex.java @@ -1,4 +1,4 @@ -package a8k.app.channel.iflytophald.type.protocol.pipette_module.cfg; +package a8k.app.iflytophald.type.protocol.pipette_module.cfg; public enum ContainerInfoIndex { containerType, // 容器类型 0:平面 1:flat(平底) 2:conical(锥底) 3:round(圆底) diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfg/LiquidInfoIndex.java b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfg/LiquidInfoIndex.java similarity index 97% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfg/LiquidInfoIndex.java rename to src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfg/LiquidInfoIndex.java index 999e529..00abb29 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfg/LiquidInfoIndex.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfg/LiquidInfoIndex.java @@ -1,4 +1,4 @@ -package a8k.app.channel.iflytophald.type.protocol.pipette_module.cfg; +package a8k.app.iflytophald.type.protocol.pipette_module.cfg; public enum LiquidInfoIndex { // // diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfg/PMBasicConfigIndex.java b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfg/PMBasicConfigIndex.java similarity index 60% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfg/PMBasicConfigIndex.java rename to src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfg/PMBasicConfigIndex.java index 2731903..1488073 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfg/PMBasicConfigIndex.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfg/PMBasicConfigIndex.java @@ -1,4 +1,4 @@ -package a8k.app.channel.iflytophald.type.protocol.pipette_module.cfg; +package a8k.app.iflytophald.type.protocol.pipette_module.cfg; public enum PMBasicConfigIndex { Pad, diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfg/PMVConfigIndex.java b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfg/PMVConfigIndex.java similarity index 83% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfg/PMVConfigIndex.java rename to src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfg/PMVConfigIndex.java index 40ec6a6..abbb310 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfg/PMVConfigIndex.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfg/PMVConfigIndex.java @@ -1,4 +1,4 @@ -package a8k.app.channel.iflytophald.type.protocol.pipette_module.cfg; +package a8k.app.iflytophald.type.protocol.pipette_module.cfg; public enum PMVConfigIndex { acc, // 加速度 level 1…20 default:14 1:797.5 ul/s^2 ... 20:797*20 nl/s^2 diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfg/PipetteCommonConfigIndex.java b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfg/PipetteCommonConfigIndex.java similarity index 84% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfg/PipetteCommonConfigIndex.java rename to src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfg/PipetteCommonConfigIndex.java index f716110..b566a48 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfg/PipetteCommonConfigIndex.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfg/PipetteCommonConfigIndex.java @@ -1,4 +1,4 @@ -package a8k.app.channel.iflytophald.type.protocol.pipette_module.cfg; +package a8k.app.iflytophald.type.protocol.pipette_module.cfg; public enum PipetteCommonConfigIndex { pressureRecordEnable, diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfg/PlatformInfoIndex.java b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfg/PlatformInfoIndex.java similarity index 92% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfg/PlatformInfoIndex.java rename to src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfg/PlatformInfoIndex.java index 1f08342..1fe9d11 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfg/PlatformInfoIndex.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfg/PlatformInfoIndex.java @@ -1,4 +1,4 @@ -package a8k.app.channel.iflytophald.type.protocol.pipette_module.cfg; +package a8k.app.iflytophald.type.protocol.pipette_module.cfg; public enum PlatformInfoIndex { /** diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfg/ZMBasicConfigIndex.java b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfg/ZMBasicConfigIndex.java similarity index 83% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfg/ZMBasicConfigIndex.java rename to src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfg/ZMBasicConfigIndex.java index a073ccf..ad5a246 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfg/ZMBasicConfigIndex.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfg/ZMBasicConfigIndex.java @@ -1,4 +1,4 @@ -package a8k.app.channel.iflytophald.type.protocol.pipette_module.cfg; +package a8k.app.iflytophald.type.protocol.pipette_module.cfg; /** * Z轴电机基础配置 diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfg/ZMVConfigIndex.java b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfg/ZMVConfigIndex.java similarity index 68% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfg/ZMVConfigIndex.java rename to src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfg/ZMVConfigIndex.java index 658e445..a51ff7b 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfg/ZMVConfigIndex.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfg/ZMVConfigIndex.java @@ -1,4 +1,4 @@ -package a8k.app.channel.iflytophald.type.protocol.pipette_module.cfg; +package a8k.app.iflytophald.type.protocol.pipette_module.cfg; public enum ZMVConfigIndex { vstart, diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfgbean/PipetteCommonConfig.java b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfgbean/PipetteCommonConfig.java similarity index 94% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfgbean/PipetteCommonConfig.java rename to src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfgbean/PipetteCommonConfig.java index e950907..69f695a 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfgbean/PipetteCommonConfig.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfgbean/PipetteCommonConfig.java @@ -1,6 +1,6 @@ -package a8k.app.channel.iflytophald.type.protocol.pipette_module.cfgbean; +package a8k.app.iflytophald.type.protocol.pipette_module.cfgbean; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.cfg.PipetteCommonConfigIndex; +import a8k.app.iflytophald.type.protocol.pipette_module.cfg.PipetteCommonConfigIndex; import a8k.app.type.exception.AppException; public class PipetteCommonConfig { diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfgbean/PipetteContainerInfo.java b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfgbean/PipetteContainerInfo.java similarity index 95% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfgbean/PipetteContainerInfo.java rename to src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfgbean/PipetteContainerInfo.java index a5eeffe..90c3b92 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfgbean/PipetteContainerInfo.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfgbean/PipetteContainerInfo.java @@ -1,6 +1,6 @@ -package a8k.app.channel.iflytophald.type.protocol.pipette_module.cfgbean; +package a8k.app.iflytophald.type.protocol.pipette_module.cfgbean; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.cfg.ContainerInfoIndex; +import a8k.app.iflytophald.type.protocol.pipette_module.cfg.ContainerInfoIndex; import a8k.app.type.exception.AppException; public class PipetteContainerInfo { diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfgbean/PipetteLiquidInfo.java b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfgbean/PipetteLiquidInfo.java similarity index 96% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfgbean/PipetteLiquidInfo.java rename to src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfgbean/PipetteLiquidInfo.java index a2c8264..b9c3af5 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfgbean/PipetteLiquidInfo.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfgbean/PipetteLiquidInfo.java @@ -1,6 +1,6 @@ -package a8k.app.channel.iflytophald.type.protocol.pipette_module.cfgbean; +package a8k.app.iflytophald.type.protocol.pipette_module.cfgbean; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.cfg.LiquidInfoIndex; +import a8k.app.iflytophald.type.protocol.pipette_module.cfg.LiquidInfoIndex; import a8k.app.type.exception.AppException; public class PipetteLiquidInfo { diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfgbean/PipettePMVCfg.java b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfgbean/PipettePMVCfg.java similarity index 92% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfgbean/PipettePMVCfg.java rename to src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfgbean/PipettePMVCfg.java index f504594..3c3f134 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfgbean/PipettePMVCfg.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfgbean/PipettePMVCfg.java @@ -1,6 +1,6 @@ -package a8k.app.channel.iflytophald.type.protocol.pipette_module.cfgbean; +package a8k.app.iflytophald.type.protocol.pipette_module.cfgbean; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.cfg.PMVConfigIndex; +import a8k.app.iflytophald.type.protocol.pipette_module.cfg.PMVConfigIndex; import a8k.app.type.exception.AppException; public class PipettePMVCfg { diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfgbean/PipettePlatInfo.java b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfgbean/PipettePlatInfo.java similarity index 94% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfgbean/PipettePlatInfo.java rename to src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfgbean/PipettePlatInfo.java index d140384..a5a5701 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfgbean/PipettePlatInfo.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfgbean/PipettePlatInfo.java @@ -1,6 +1,6 @@ -package a8k.app.channel.iflytophald.type.protocol.pipette_module.cfgbean; +package a8k.app.iflytophald.type.protocol.pipette_module.cfgbean; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.cfg.PlatformInfoIndex; +import a8k.app.iflytophald.type.protocol.pipette_module.cfg.PlatformInfoIndex; import a8k.app.type.exception.AppException; public class PipettePlatInfo { diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfgbean/PipetteZMBCfg.java b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfgbean/PipetteZMBCfg.java similarity index 94% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfgbean/PipetteZMBCfg.java rename to src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfgbean/PipetteZMBCfg.java index 8fffbef..577e24d 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfgbean/PipetteZMBCfg.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfgbean/PipetteZMBCfg.java @@ -1,6 +1,6 @@ -package a8k.app.channel.iflytophald.type.protocol.pipette_module.cfgbean; +package a8k.app.iflytophald.type.protocol.pipette_module.cfgbean; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.cfg.ZMBasicConfigIndex; +import a8k.app.iflytophald.type.protocol.pipette_module.cfg.ZMBasicConfigIndex; import a8k.app.type.exception.AppException; public class PipetteZMBCfg { diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfgbean/PipetteZMVCfg.java b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfgbean/PipetteZMVCfg.java similarity index 92% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfgbean/PipetteZMVCfg.java rename to src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfgbean/PipetteZMVCfg.java index b4bbc94..0909b17 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cfgbean/PipetteZMVCfg.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cfgbean/PipetteZMVCfg.java @@ -1,6 +1,6 @@ -package a8k.app.channel.iflytophald.type.protocol.pipette_module.cfgbean; +package a8k.app.iflytophald.type.protocol.pipette_module.cfgbean; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.cfg.ZMVConfigIndex; +import a8k.app.iflytophald.type.protocol.pipette_module.cfg.ZMVConfigIndex; import a8k.app.type.exception.AppException; public class PipetteZMVCfg { diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cpyidx/ContainerCpyId.java b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cpyidx/ContainerCpyId.java similarity index 91% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cpyidx/ContainerCpyId.java rename to src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cpyidx/ContainerCpyId.java index dfdcc2f..afeaabc 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cpyidx/ContainerCpyId.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cpyidx/ContainerCpyId.java @@ -1,4 +1,4 @@ -package a8k.app.channel.iflytophald.type.protocol.pipette_module.cpyidx; +package a8k.app.iflytophald.type.protocol.pipette_module.cpyidx; public enum ContainerCpyId { Default, diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cpyidx/LiquidConfigCpyIdx.java b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cpyidx/LiquidConfigCpyIdx.java similarity index 91% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cpyidx/LiquidConfigCpyIdx.java rename to src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cpyidx/LiquidConfigCpyIdx.java index 0b79af3..67b6c83 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cpyidx/LiquidConfigCpyIdx.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cpyidx/LiquidConfigCpyIdx.java @@ -1,4 +1,4 @@ -package a8k.app.channel.iflytophald.type.protocol.pipette_module.cpyidx; +package a8k.app.iflytophald.type.protocol.pipette_module.cpyidx; /** * 液体类型配置索引 diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cpyidx/PMVCpyIdx.java b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cpyidx/PMVCpyIdx.java similarity index 89% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cpyidx/PMVCpyIdx.java rename to src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cpyidx/PMVCpyIdx.java index 08d6ec9..f2fc1f7 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cpyidx/PMVCpyIdx.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cpyidx/PMVCpyIdx.java @@ -1,4 +1,4 @@ -package a8k.app.channel.iflytophald.type.protocol.pipette_module.cpyidx; +package a8k.app.iflytophald.type.protocol.pipette_module.cpyidx; /** * 泵电机速度配置索引 diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cpyidx/PlatInfoCpyIdx.java b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cpyidx/PlatInfoCpyIdx.java similarity index 83% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cpyidx/PlatInfoCpyIdx.java rename to src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cpyidx/PlatInfoCpyIdx.java index f4d6342..f87f87c 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cpyidx/PlatInfoCpyIdx.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cpyidx/PlatInfoCpyIdx.java @@ -1,4 +1,4 @@ -package a8k.app.channel.iflytophald.type.protocol.pipette_module.cpyidx; +package a8k.app.iflytophald.type.protocol.pipette_module.cpyidx; public enum PlatInfoCpyIdx { Default, diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cpyidx/ZMVCpyIdx.java b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cpyidx/ZMVCpyIdx.java similarity index 90% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cpyidx/ZMVCpyIdx.java rename to src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cpyidx/ZMVCpyIdx.java index 6f1de15..2f6a8ee 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/cpyidx/ZMVCpyIdx.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/cpyidx/ZMVCpyIdx.java @@ -1,4 +1,4 @@ -package a8k.app.channel.iflytophald.type.protocol.pipette_module.cpyidx; +package a8k.app.iflytophald.type.protocol.pipette_module.cpyidx; /** * Z轴电机速度配置索引 diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/param/AspirationParam.java b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/param/AspirationParam.java similarity index 90% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/param/AspirationParam.java rename to src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/param/AspirationParam.java index de1b480..490441d 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/param/AspirationParam.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/param/AspirationParam.java @@ -1,8 +1,8 @@ -package a8k.app.channel.iflytophald.type.protocol.pipette_module.param; +package a8k.app.iflytophald.type.protocol.pipette_module.param; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.cpyidx.ContainerCpyId; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.cpyidx.LiquidConfigCpyIdx; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.AspirationParamId; +import a8k.app.iflytophald.type.protocol.pipette_module.cpyidx.ContainerCpyId; +import a8k.app.iflytophald.type.protocol.pipette_module.cpyidx.LiquidConfigCpyIdx; +import a8k.app.iflytophald.type.protocol.pipette_module.AspirationParamId; import a8k.app.type.exception.AppException; public class AspirationParam { diff --git a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/param/DistribuAllParam.java b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/param/DistribuAllParam.java similarity index 84% rename from src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/param/DistribuAllParam.java rename to src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/param/DistribuAllParam.java index ae71333..9659726 100644 --- a/src/main/java/a8k/app/channel/iflytophald/type/protocol/pipette_module/param/DistribuAllParam.java +++ b/src/main/java/a8k/app/iflytophald/type/protocol/pipette_module/param/DistribuAllParam.java @@ -1,9 +1,9 @@ -package a8k.app.channel.iflytophald.type.protocol.pipette_module.param; +package a8k.app.iflytophald.type.protocol.pipette_module.param; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.DistribuAllParamId; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.DistribuType; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.cpyidx.ContainerCpyId; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.cpyidx.LiquidConfigCpyIdx; +import a8k.app.iflytophald.type.protocol.pipette_module.DistribuAllParamId; +import a8k.app.iflytophald.type.protocol.pipette_module.DistribuType; +import a8k.app.iflytophald.type.protocol.pipette_module.cpyidx.ContainerCpyId; +import a8k.app.iflytophald.type.protocol.pipette_module.cpyidx.LiquidConfigCpyIdx; import a8k.app.type.exception.AppException; public class DistribuAllParam { diff --git a/src/main/java/a8k/app/channel/iflytophald/channelctrl/IflytophaldChannelCtrl.java b/src/main/java/a8k/app/iflytophald/utils/IflytophaldChannelCtrlRequester.java similarity index 88% rename from src/main/java/a8k/app/channel/iflytophald/channelctrl/IflytophaldChannelCtrl.java rename to src/main/java/a8k/app/iflytophald/utils/IflytophaldChannelCtrlRequester.java index fcc9f35..4d3d4cb 100644 --- a/src/main/java/a8k/app/channel/iflytophald/channelctrl/IflytophaldChannelCtrl.java +++ b/src/main/java/a8k/app/iflytophald/utils/IflytophaldChannelCtrlRequester.java @@ -1,7 +1,7 @@ -package a8k.app.channel.iflytophald.channelctrl; +package a8k.app.iflytophald.utils; import a8k.app.config.IflytophaldConnectionConfig; -import a8k.app.channel.iflytophald.type.channelctrl.IflytophaldResponse; +import a8k.app.iflytophald.type.channelctrl.IflytophaldResponse; import a8k.app.utils.ZJsonHelper; import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.ObjectMapper; @@ -17,7 +17,7 @@ import java.net.http.HttpResponse; @Component @Slf4j @RequiredArgsConstructor -public class IflytophaldChannelCtrl { +public class IflytophaldChannelCtrlRequester { private final IflytophaldConnectionConfig config; @@ -87,12 +87,12 @@ public class IflytophaldChannelCtrl { { IflytophaldResponse response = - IflytophaldChannelCtrl.callCmdStatic("http://192.168.8.10:19004/lis", "setBaudrate", Void.class, "baudrate=9600"); + IflytophaldChannelCtrlRequester.callCmdStatic("http://192.168.8.10:19004/lis", "setBaudrate", Void.class, "baudrate=9600"); log.info("1Response: {}", ZJsonHelper.objToPrettyJson(response)); } { IflytophaldResponse response = - IflytophaldChannelCtrl.callCmdStatic("http://192.168.8.10:19004/lis", "getBaudrate", GetBaudrateResponse.class); + IflytophaldChannelCtrlRequester.callCmdStatic("http://192.168.8.10:19004/lis", "getBaudrate", GetBaudrateResponse.class); log.info("2Response: {}", ZJsonHelper.objToPrettyJson(response)); diff --git a/src/main/java/a8k/app/channel/iflytophald/utils/OptGainConvert.java b/src/main/java/a8k/app/iflytophald/utils/OptGainConvert.java similarity index 98% rename from src/main/java/a8k/app/channel/iflytophald/utils/OptGainConvert.java rename to src/main/java/a8k/app/iflytophald/utils/OptGainConvert.java index 22f7f42..1ffe965 100644 --- a/src/main/java/a8k/app/channel/iflytophald/utils/OptGainConvert.java +++ b/src/main/java/a8k/app/iflytophald/utils/OptGainConvert.java @@ -1,4 +1,4 @@ -package a8k.app.channel.iflytophald.utils; +package a8k.app.iflytophald.utils; import a8k.app.type.a8k.opt.A8kOptType; diff --git a/src/main/java/a8k/app/service/analyzer/A8kEcodeAnalyzer.java b/src/main/java/a8k/app/service/analyzer/A8kEcodeAnalyzer.java index 97cb57e..b326024 100644 --- a/src/main/java/a8k/app/service/analyzer/A8kEcodeAnalyzer.java +++ b/src/main/java/a8k/app/service/analyzer/A8kEcodeAnalyzer.java @@ -1,6 +1,6 @@ package a8k.app.service.analyzer; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; import a8k.app.type.error.AppError; public class A8kEcodeAnalyzer { diff --git a/src/main/java/a8k/app/service/analyzer/A8kIdCardDataParseService.java b/src/main/java/a8k/app/service/analyzer/A8kIdCardDataParseService.java index 4e3790c..c1a8b0c 100644 --- a/src/main/java/a8k/app/service/analyzer/A8kIdCardDataParseService.java +++ b/src/main/java/a8k/app/service/analyzer/A8kIdCardDataParseService.java @@ -3,7 +3,7 @@ package a8k.app.service.analyzer; import a8k.app.dao.type.combination.ProjBuildInInfo; import a8k.app.service.data.ProjInfoMgrService; import a8k.app.type.a8k.optfn.A8kNormalFn; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; import a8k.app.type.a8k.optfn.A8kOptX; import a8k.app.type.a8k.optfn.A8kPiecewiseFn; import a8k.app.type.a8k.optfn.A8kFnType; diff --git a/src/main/java/a8k/app/service/appsetup/A8kSubModuleRegInitService.java b/src/main/java/a8k/app/service/appsetup/A8kSubModuleRegInitService.java index 216d6ae..8fa0777 100644 --- a/src/main/java/a8k/app/service/appsetup/A8kSubModuleRegInitService.java +++ b/src/main/java/a8k/app/service/appsetup/A8kSubModuleRegInitService.java @@ -6,11 +6,9 @@ import a8k.app.type.BoardVersions; import a8k.app.type.DeviceRunMode; import a8k.app.type.appevent.AppEvent; import a8k.app.type.exception.AppException; -import a8k.app.channel.iflytophald.channel.A8kCanBusService; -import a8k.app.channel.iflytophald.driver.ModuleEnableCtrlDriver; -import a8k.app.channel.iflytophald.type.protocol.MId; -import a8k.app.channel.iflytophald.type.protocol.ModuleType; -import a8k.app.channel.iflytophald.type.protocol.RegIndex; +import a8k.app.iflytophald.driver.A8kCanBusBaseDriver; +import a8k.app.iflytophald.driver.ModuleEnableCtrlDriver; +import a8k.app.iflytophald.type.protocol.MId; import a8k.app.service.background.AppEventBusService; import a8k.app.service.data.SubModuleRegInitialValueMgrService; import a8k.app.service.statemgr.GStateMgrService; @@ -32,8 +30,8 @@ import java.util.List; public class A8kSubModuleRegInitService { - private final A8kCanBusService canBus; - private final ModuleEnableCtrlDriver moduleEnableCtrlDriver; + private final A8kCanBusBaseDriver canBus; + private final ModuleEnableCtrlDriver moduleEnableCtrlDriver; private final GStateMgrService gStateMgrService; private final AppEventBusService eventBus; private final SubModuleRegInitialValueMgrService subModuleRegInitialValueMgrService; diff --git a/src/main/java/a8k/app/service/background/ProjIDCardCtrlAndMonitorService.java b/src/main/java/a8k/app/service/background/ProjIDCardCtrlAndMonitorService.java index 0b29f48..4b618d9 100644 --- a/src/main/java/a8k/app/service/background/ProjIDCardCtrlAndMonitorService.java +++ b/src/main/java/a8k/app/service/background/ProjIDCardCtrlAndMonitorService.java @@ -2,16 +2,16 @@ package a8k.app.service.background; import a8k.app.factory.ZAppPromptFactory; -import a8k.app.channel.iflytophald.type.protocol.A8kPacket; -import a8k.app.channel.iflytophald.type.protocol.CmdId; -import a8k.app.channel.iflytophald.type.protocol.MId; +import a8k.app.iflytophald.type.protocol.A8kPacket; +import a8k.app.iflytophald.type.protocol.CmdId; +import a8k.app.iflytophald.type.protocol.MId; import a8k.app.service.data.ProjInfoMgrService; import a8k.app.service.statemgr.GStateMgrService; import a8k.app.type.appevent.*; -import a8k.app.channel.iflytophald.type.protocol.RegIndex; +import a8k.app.iflytophald.type.protocol.RegIndex; import a8k.app.dao.type.db.ProjExtInfoCard; import a8k.app.type.exception.AppException; -import a8k.app.channel.iflytophald.channel.A8kCanBusService; +import a8k.app.iflytophald.driver.A8kCanBusBaseDriver; import a8k.app.service.analyzer.A8kIdCardDataParseService; import a8k.app.dao.type.combination.ProjBuildInInfo; import a8k.app.utils.ZWorkQueue; @@ -30,8 +30,8 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class ProjIDCardCtrlAndMonitorService { - private final A8kCanBusService canBus; - private final AppEventBusService eventBus; + private final A8kCanBusBaseDriver canBus; + private final AppEventBusService eventBus; private final A8kIdCardDataParseService idCardDataParseService; private final ProjInfoMgrService projInfoMgrService; private final GStateMgrService gstat; diff --git a/src/main/java/a8k/app/service/background/SensorDataUpdateService.java b/src/main/java/a8k/app/service/background/SensorDataUpdateService.java index 0ad3793..6510de8 100644 --- a/src/main/java/a8k/app/service/background/SensorDataUpdateService.java +++ b/src/main/java/a8k/app/service/background/SensorDataUpdateService.java @@ -1,18 +1,18 @@ package a8k.app.service.background; import a8k.OS; -import a8k.app.channel.iflytophald.driver.InputDetectDriver; -import a8k.app.channel.iflytophald.driver.OutputIOCtrlDriver; -import a8k.app.channel.iflytophald.type.protocol.InputIOId; +import a8k.app.iflytophald.driver.InputDetectDriver; +import a8k.app.iflytophald.driver.OutputIOCtrlDriver; +import a8k.app.iflytophald.type.protocol.InputIOId; import a8k.app.service.statemgr.AppFlagStateMgr; import a8k.app.type.AppFlagKey; import a8k.app.type.DeviceRunMode; import a8k.app.type.TemperatureRecordPoint; import a8k.app.type.error.AppError; -import a8k.app.channel.iflytophald.channel.A8kCanBusService; +import a8k.app.iflytophald.driver.A8kCanBusBaseDriver; import a8k.app.service.statemgr.GStateMgrService; import a8k.app.service.statemgr.OptScanModuleStateMgr; -import a8k.app.channel.iflytophald.driver.WaterTemperatureControllerDriver; +import a8k.app.iflytophald.driver.WaterTemperatureControllerDriver; import a8k.app.type.exception.AppException; import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; @@ -34,9 +34,9 @@ public class SensorDataUpdateService { private final GStateMgrService gStateMgrService; private final WaterTemperatureControllerDriver waterTemperatureControllerDriver; private final OptScanModuleStateMgr optScanModuleStateMgr; - private final AppEventBusService appEventBusService; - private final A8kCanBusService canBus; - private final OutputIOCtrlDriver outputIOCtrlDriver; + private final AppEventBusService appEventBusService; + private final A8kCanBusBaseDriver canBus; + private final OutputIOCtrlDriver outputIOCtrlDriver; private final InputDetectDriver inputDetectDriver; private final AppFlagStateMgr appFlagStateMgr; diff --git a/src/main/java/a8k/app/service/background/TemperatureCtrlService.java b/src/main/java/a8k/app/service/background/TemperatureCtrlService.java index 9b2a139..b67e0c6 100644 --- a/src/main/java/a8k/app/service/background/TemperatureCtrlService.java +++ b/src/main/java/a8k/app/service/background/TemperatureCtrlService.java @@ -2,8 +2,8 @@ package a8k.app.service.background; import a8k.OS; -import a8k.app.channel.iflytophald.A8kChannelStateMgr; -import a8k.app.channel.iflytophald.driver.WaterTemperatureControllerDriver; +import a8k.app.iflytophald.A8kChannelStateMgr; +import a8k.app.iflytophald.driver.WaterTemperatureControllerDriver; import a8k.app.service.setting.AppSettingsMgrService; import a8k.app.service.statemgr.GStateMgrService; import a8k.app.teststate.VirtualDevice; diff --git a/src/main/java/a8k/app/service/ctrlmodule/TipOperationCtrlModule.java b/src/main/java/a8k/app/service/ctrlmodule/TipOperationCtrlModule.java index 32b3938..668fa55 100644 --- a/src/main/java/a8k/app/service/ctrlmodule/TipOperationCtrlModule.java +++ b/src/main/java/a8k/app/service/ctrlmodule/TipOperationCtrlModule.java @@ -2,8 +2,8 @@ package a8k.app.service.ctrlmodule; import a8k.app.constant.AppConstant; -import a8k.app.channel.iflytophald.driver.PipetteCtrlDriverV2; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.driver.PipetteCtrlDriverV2; +import a8k.app.iflytophald.type.protocol.A8kEcode; import a8k.app.service.lowerctrl.HbotMoveExCtrlService; import a8k.app.service.statemgr.ConsumablesMgrService; import a8k.app.service.statemgr.GStateMgrService; diff --git a/src/main/java/a8k/app/service/data/AppUserMgrService.java b/src/main/java/a8k/app/service/data/AppUserMgrService.java index 480b2fb..f06fc5a 100644 --- a/src/main/java/a8k/app/service/data/AppUserMgrService.java +++ b/src/main/java/a8k/app/service/data/AppUserMgrService.java @@ -4,19 +4,16 @@ import a8k.app.dao.AppUsrDao; import a8k.app.dao.DeviceSettingDao; import a8k.app.dao.type.db.AppUser; import a8k.app.dao.type.db.DeviceSetting; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; import a8k.app.service.background.AppEventBusService; import a8k.app.type.appevent.AppLoginEvent; import a8k.app.type.exception.AppException; import jakarta.annotation.PostConstruct; -import jakarta.annotation.Resource; import lombok.RequiredArgsConstructor; import org.slf4j.Logger; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.stereotype.Component; -import java.time.Duration; -import java.time.Instant; import java.util.List; diff --git a/src/main/java/a8k/app/service/data/ProjIdCardInfoMgrService.java b/src/main/java/a8k/app/service/data/ProjIdCardInfoMgrService.java index d1d5114..665cca6 100644 --- a/src/main/java/a8k/app/service/data/ProjIdCardInfoMgrService.java +++ b/src/main/java/a8k/app/service/data/ProjIdCardInfoMgrService.java @@ -8,7 +8,7 @@ import a8k.app.type.a8k.optfn.A8kNormalFn; import a8k.app.type.a8k.optfn.A8kPiecewiseFn; import a8k.app.type.a8k.optfn.A8kFnType; import a8k.app.type.a8k.proj.A8kResultUnit; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; import a8k.app.service.background.ProjIDCardCtrlAndMonitorService; import a8k.app.service.statemgr.GStateMgrService; import a8k.app.type.a8k.proj.A8kProjInfoCardBreif; diff --git a/src/main/java/a8k/app/service/data/ProjInfoMgrService.java b/src/main/java/a8k/app/service/data/ProjInfoMgrService.java index 52914b9..d714434 100644 --- a/src/main/java/a8k/app/service/data/ProjInfoMgrService.java +++ b/src/main/java/a8k/app/service/data/ProjInfoMgrService.java @@ -4,7 +4,7 @@ import a8k.SpringBootBeanUtil; import a8k.app.dao.A8kProjExtInfoCardDao; import a8k.app.dao.ProjOptInfoDao; import a8k.app.dao.ProjectBaseInfoDao; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; import a8k.app.dao.type.db.ProjExtInfoCard; import a8k.app.dao.type.db.ProjectBaseInfo; diff --git a/src/main/java/a8k/app/service/data/SubModuleConfigService.java b/src/main/java/a8k/app/service/data/SubModuleConfigService.java index 6d032c5..d8e2bdc 100644 --- a/src/main/java/a8k/app/service/data/SubModuleConfigService.java +++ b/src/main/java/a8k/app/service/data/SubModuleConfigService.java @@ -2,10 +2,10 @@ package a8k.app.service.data; import a8k.app.dao.SubModuleConfigDao; import a8k.app.dao.type.db.SubModuleConfigValue; -import a8k.app.channel.iflytophald.driver.PipetteCtrlDriverV2; -import a8k.app.channel.iflytophald.type.protocol.MId; -import a8k.app.channel.iflytophald.type.protocol.ModuleType; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.PipetteConfig; +import a8k.app.iflytophald.driver.PipetteCtrlDriverV2; +import a8k.app.iflytophald.type.protocol.MId; +import a8k.app.iflytophald.type.protocol.ModuleType; +import a8k.app.iflytophald.type.protocol.pipette_module.PipetteConfig; import a8k.app.type.exception.AppException; import a8k.app.utils.ZJsonHelper; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/a8k/app/service/data/SubModuleRegInitialValueMgrService.java b/src/main/java/a8k/app/service/data/SubModuleRegInitialValueMgrService.java index 06a66a6..7f66fc7 100644 --- a/src/main/java/a8k/app/service/data/SubModuleRegInitialValueMgrService.java +++ b/src/main/java/a8k/app/service/data/SubModuleRegInitialValueMgrService.java @@ -1,14 +1,14 @@ package a8k.app.service.data; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; import a8k.app.type.exception.AppException; import a8k.app.config.A8kSubModuleInitRegConfig; import a8k.app.dao.SubModuleRegInitialValueDao; import a8k.app.dao.type.db.SubModuleRegInitialValue; -import a8k.app.channel.iflytophald.channel.A8kCanBusService; -import a8k.app.channel.iflytophald.type.protocol.MId; -import a8k.app.channel.iflytophald.type.protocol.ModuleType; -import a8k.app.channel.iflytophald.type.protocol.RegIndex; +import a8k.app.iflytophald.driver.A8kCanBusBaseDriver; +import a8k.app.iflytophald.type.protocol.MId; +import a8k.app.iflytophald.type.protocol.ModuleType; +import a8k.app.iflytophald.type.protocol.RegIndex; import a8k.app.utils.ZList; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -23,7 +23,7 @@ import java.util.List; public class SubModuleRegInitialValueMgrService { private final SubModuleRegInitialValueDao subModuleRegInitialValueDao; - private final A8kCanBusService canBus; + private final A8kCanBusBaseDriver canBus; private final A8kSubModuleInitRegConfig a8kSubModuleInitRegConfig; diff --git a/src/main/java/a8k/app/service/engineer/qatest/LiquidAbsorptionAndDistributionTestService.java b/src/main/java/a8k/app/service/engineer/qatest/LiquidAbsorptionAndDistributionTestService.java index d2d35bb..dc55b2a 100644 --- a/src/main/java/a8k/app/service/engineer/qatest/LiquidAbsorptionAndDistributionTestService.java +++ b/src/main/java/a8k/app/service/engineer/qatest/LiquidAbsorptionAndDistributionTestService.java @@ -2,12 +2,12 @@ package a8k.app.service.engineer.qatest; import a8k.app.service.engineer.executor.EngineerModeActionExecutor; import a8k.app.service.engineer.utils.BeforeDoEngineerActionChecker; -import a8k.app.channel.iflytophald.driver.PipetteCtrlDriverV2; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.DistribuType; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.cpyidx.ContainerCpyId; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.cpyidx.LiquidConfigCpyIdx; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.param.AspirationParam; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.param.DistribuAllParam; +import a8k.app.iflytophald.driver.PipetteCtrlDriverV2; +import a8k.app.iflytophald.type.protocol.pipette_module.DistribuType; +import a8k.app.iflytophald.type.protocol.pipette_module.cpyidx.ContainerCpyId; +import a8k.app.iflytophald.type.protocol.pipette_module.cpyidx.LiquidConfigCpyIdx; +import a8k.app.iflytophald.type.protocol.pipette_module.param.AspirationParam; +import a8k.app.iflytophald.type.protocol.pipette_module.param.DistribuAllParam; import a8k.app.service.lowerctrl.*; import a8k.app.service.ctrlmodule.TipOperationCtrlModule; import a8k.app.service.param.hbotpos.HbotLargeBottleBSPosMgr; diff --git a/src/main/java/a8k/app/service/engineer/utils/BeforeDoEngineerActionChecker.java b/src/main/java/a8k/app/service/engineer/utils/BeforeDoEngineerActionChecker.java index a54724b..5bb6730 100644 --- a/src/main/java/a8k/app/service/engineer/utils/BeforeDoEngineerActionChecker.java +++ b/src/main/java/a8k/app/service/engineer/utils/BeforeDoEngineerActionChecker.java @@ -4,7 +4,7 @@ package a8k.app.service.engineer.utils; import a8k.SpringBootBeanUtil; import a8k.app.service.engineer.state.EngineerModeStateMgrService; import a8k.app.service.engineer.type.EngineerWorkState; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; import a8k.app.service.statemgr.DeviceWorkStateMgrService; import a8k.app.service.statemgr.GStateMgrService; import a8k.app.type.a8k.state.enumtype.A8kWorkState; diff --git a/src/main/java/a8k/app/service/lis/BiLisDoubleTrackChannel.java b/src/main/java/a8k/app/service/lis/BiLisDoubleTrackChannel.java index 37aecdd..32ea3fa 100644 --- a/src/main/java/a8k/app/service/lis/BiLisDoubleTrackChannel.java +++ b/src/main/java/a8k/app/service/lis/BiLisDoubleTrackChannel.java @@ -1,12 +1,16 @@ package a8k.app.service.lis; import a8k.OS; -import a8k.app.channel.iflytophald.channel.LisUartChannel; -import a8k.app.channel.net.BiLisDoubleTrackTcpClient; +import a8k.app.iflytophald.channel.LisUartCommunicationChannel; +import a8k.app.iflytophald.type.protocol.A8kEcode; +import a8k.app.client.BiLisDoubleTrackTcpClient; import a8k.app.constant.AppConstant; import a8k.app.dao.type.db.ReactionRecord; import a8k.app.factory.BiLisDoubleTrackFrameFactory; +import a8k.app.type.a8k.BloodType; +import a8k.app.type.exception.AppException; import a8k.app.type.lisprotocol.BiLisDoubleTrackFrame; +import a8k.app.type.lisprotocol.BiLisDoubleTrackFrameBuildContext; import a8k.app.type.lisprotocol.BiLisFrameParseException; import a8k.app.type.lisprotocol.subframe.OFrame; import a8k.app.utils.ByteArrayUtils; @@ -16,7 +20,7 @@ import a8k.app.utils.ZJsonHelper; import lombok.extern.slf4j.Slf4j; @Slf4j -public class BiLisDoubleTrackChannel { +public class BiLisDoubleTrackChannel implements LisChannel { static final Integer PING_PERIOD = 10 * 1000; // Ping周期，单位毫秒 @@ -26,15 +30,16 @@ public class BiLisDoubleTrackChannel { } // Channel - BiLisDoubleTrackTcpClient biLisDoubleTrackTcpClient = new BiLisDoubleTrackTcpClient(); - LisUartChannel lisUartChannel; - Thread monitorThread = new Thread(this::monitorThread); + BiLisDoubleTrackTcpClient biLisDoubleTrackTcpClient = new BiLisDoubleTrackTcpClient(); + LisUartCommunicationChannel lisUartCommunicationChannel; + Thread monitorThread = new Thread(this::monitorThread); //Config String hostIp; Integer port; ChannelType channelType; + Integer baudrate; final ZByteRxBuffer rxBuffer = new ZByteRxBuffer(BiLisDoubleTrackFrame.PACKET_MAX_LENGTH); // 接收数据缓冲区，初始大小为1024字节 @@ -48,12 +53,13 @@ public class BiLisDoubleTrackChannel { channelType = ChannelType.TCP; } - public BiLisDoubleTrackChannel(LisUartChannel lisUartChannel) { - this.lisUartChannel = lisUartChannel; - channelType = ChannelType.UART; + public BiLisDoubleTrackChannel(LisUartCommunicationChannel lisUartCommunicationChannel, Integer baudrate) { + this.lisUartCommunicationChannel = lisUartCommunicationChannel; + channelType = ChannelType.UART; + this.baudrate = baudrate; } - public void start() { + @Override public void start() { isShuttingDown = false; switch (channelType) { @@ -63,23 +69,55 @@ public class BiLisDoubleTrackChannel { monitorThread.start(); } case UART -> { - lisUartChannel.regRxMessageListener(this::onRxFromUART); + lisUartCommunicationChannel.setBaudRate(baudrate); + lisUartCommunicationChannel.regRxMessageListener(this::onRxFromUART); monitorThread.start(); } } } - public boolean isConnected() { + @Override public boolean isConnected() { return connectedState; } - public void shotdown() { + @Override public String getChannelDescription() { + return switch (channelType) { + case UART -> String.format("BiLisDoubleTrackChannel via UART, Baudrate: %d", lisUartCommunicationChannel.getBaudRateDirect()); + case TCP -> String.format("BiLisDoubleTrackChannel via TCP, Host: %s, Port: %d", hostIp, port); + }; + } + + @Override public Boolean isSupportRequestSampleInfo() { + return true; + } + + @Override public LisSampleInfo requestSampleInfo(String sampleId) throws AppException { + OFrame oFrame = requestSampleInfo0(sampleId); + + LisSampleInfo lisSampleInfo = new LisSampleInfo(); + + if (oFrame.sampleType == 0) { + lisSampleInfo.bloodType = BloodType.WHOLE_BLOOD; + } else if (oFrame.sampleType == 1) { + lisSampleInfo.bloodType = BloodType.SERUM_OR_PLASMA; + } else if (oFrame.sampleType == 2) { + lisSampleInfo.bloodType = BloodType.FECES; + } else { + log.warn("BiLisDoubleTrackChannel: 未知样本类型: {}", oFrame.sampleType); + throw AppException.of(A8kEcode.LIS_SAMPLE_TYPE_NOT_SUPPORT, "不支持样本类型: %s", oFrame.sampleTypeToStr()); + } + + lisSampleInfo.projNameList = oFrame.projList; + return lisSampleInfo; + } + + @Override public void shutdown() { isShuttingDown = true; monitorThread.interrupt(); ThreadUtils.threadForceJoin(monitorThread); switch (channelType) { case UART -> { - lisUartChannel.unRegRxMessageListener(); + lisUartCommunicationChannel.unRegRxMessageListener(); } case TCP -> { if (biLisDoubleTrackTcpClient != null) { @@ -90,6 +128,20 @@ public class BiLisDoubleTrackChannel { } } + synchronized private boolean ping(Integer reTryTimes) { + for (int i = 0; i < reTryTimes; i++) { + if (channelType.equals(ChannelType.TCP) && !biLisDoubleTrackTcpClient.isConnected()) { + return false; + } + if (ping()) { + return true; + } else { + log.warn("BiLisDoubleTrackChannel: Ping失败，尝试重试第{}次", i + 1); + } + } + return false; + } + synchronized public boolean ping() { /* * 设备探测协议 @@ -114,7 +166,7 @@ public class BiLisDoubleTrackChannel { return rxAckOrNak; } - public synchronized OFrame requestSampleInfo(String barcode) { + public synchronized OFrame requestSampleInfo0(String barcode) throws AppException { /* * 请求样本信息协议 * TX: FN Q|A5000P|^1111 C1 C2 @@ -123,7 +175,13 @@ public class BiLisDoubleTrackChannel { * RX: */ rxBuffer.clear(); - var cxt = BiLisDoubleTrackFrameFactory.createQFrameBytes(AppConstant.deviceTypeName, barcode); + BiLisDoubleTrackFrameBuildContext cxt = null; + try { + cxt = BiLisDoubleTrackFrameFactory.createQFrameBytes(AppConstant.deviceTypeName, barcode); + } catch (AppException ignored) { + log.error("BiLisDoubleTrackChannel: 创建请求样本信息的Q帧失败，可能是设备类型或条码格式错误"); + throw AppException.of(A8kEcode.CODEERROR, "创建请求样本信息的Q帧失败，可能是设备类型或条码格式错误"); + } txBytes(cxt.frameBytes); ThreadUtils.waitingForSomeCondition("BiLisDoubleTrackChannel", 30, 2000, @@ -132,10 +190,12 @@ public class BiLisDoubleTrackChannel { byte[] rxData = rxBuffer.cpy(); if (rxData.length == 1 && rxData[0] == BiLisDoubleTrackFrame.NAK) { txBytes(new byte[]{BiLisDoubleTrackFrame.EOT}); - return null; + throw AppException.of(A8kEcode.LIS_REQUEST_SAMPLE_INFO_FAIL, + "barcode: %s", barcode); } else if (rxData.length == 0) { txBytes(new byte[]{BiLisDoubleTrackFrame.EOT}); - return null; + throw AppException.of(A8kEcode.LIS_LOST_CONNECTION, + "barcode: %s", barcode); } OFrame oFrame; try { @@ -143,7 +203,8 @@ public class BiLisDoubleTrackChannel { } catch (BiLisFrameParseException e) { log.error("BiLisDoubleTrackChannel: 解析样本信息失败: {}", ByteArrayUtils.toByteString(rxData), e); txBytes(new byte[]{BiLisDoubleTrackFrame.EOT}); - return null; + throw AppException.of(A8kEcode.LIS_REQUEST_SAMPLE_INFO_FAIL, + "barcode: %s", barcode); } log.info("BiLisDoubleTrackChannel: 收到样本信息: {}", ZJsonHelper.objectToJson(oFrame)); @@ -157,42 +218,34 @@ public class BiLisDoubleTrackChannel { return oFrame; } - public boolean reportReactionReport(ReactionRecord reactionRecord) { + public void reportReactionRecord(ReactionRecord reactionRecord) throws AppException { if (reactionRecord == null) { - return false; + throw AppException.of(A8kEcode.CODEERROR, "reactionRecord == null"); } - boolean success = false; for (int i = 0; i < reactionRecord.getSubProjNum(); i++) { var cxt = BiLisDoubleTrackFrameFactory.createRFrame(reactionRecord, i); - if (!cxt.buildSuccess) { - log.error("BiLisDoubleTrackChannel: 发送反应报告失败: {}", ZJsonHelper.objectToJson(cxt)); - break; - } - success = reportRFrameAutoReSend(cxt.frameBytes); - if (!success) { - break; - } + log.info("Report {}", ZJsonHelper.objectToJson(cxt.frame.frameContent)); + reportRFrameAutoReSend(cxt.frameBytes); } - return success; } - private boolean reportRFrameAutoReSend(byte[] rFrame) { + private void reportRFrameAutoReSend(byte[] rFrame) throws AppException { for (int i = 0; i < 3; i++) { if (!connectedState) { log.warn("BiLisDoubleTrackChannel: 连接状态异常，无法发送反应报告"); - return false; + throw AppException.of(A8kEcode.LIS_LOST_CONNECTION); } if (reportRFrame(rFrame)) { - return true; + return; } else { log.warn("BiLisDoubleTrackChannel: 发送反应报告失败，尝试重发第{}次", i + 1); } - } - return false; + throw AppException.of(A8kEcode.LIS_REPORT_RECORD_FAIL, + "BiLisDoubleTrackChannel: 发送反应报告失败，已重试3次仍然失败"); } private boolean reportRFrame(byte[] rFrame) { @@ -215,8 +268,8 @@ public class BiLisDoubleTrackChannel { synchronized public boolean isChannelReady() { switch (channelType) { case UART -> { - if (lisUartChannel != null) { - return lisUartChannel.isConnected(); + if (lisUartCommunicationChannel != null) { + return lisUartCommunicationChannel.isConnected(); } } case TCP -> { @@ -239,7 +292,7 @@ public class BiLisDoubleTrackChannel { void txBytes(byte[] data) { switch (channelType) { - case UART -> lisUartChannel.tx(data); + case UART -> lisUartCommunicationChannel.tx(data); case TCP -> biLisDoubleTrackTcpClient.tx(data); } } @@ -251,13 +304,15 @@ public class BiLisDoubleTrackChannel { if (connectedState) { if (channelType.equals(ChannelType.TCP) && !biLisDoubleTrackTcpClient.isConnected()) { connectedState = false; + log.warn("BiLisDoubleTrackChannel: TCP连接断开，尝试重新连接"); continue; } if (OS.monotonicClockHasElapsed(lastPingTimestamp, PING_PERIOD)) { lastPingTimestamp = OS.getMonotonicClockTimestamp(); - if (!ping()) { + if (!ping(5)) { connectedState = false; + log.warn("BiLisDoubleTrackChannel: Ping失败，连接状态异常"); continue; } } @@ -268,6 +323,7 @@ public class BiLisDoubleTrackChannel { } if (ping()) { + log.info("BiLisDoubleTrackChannel: 连接成功"); connectedState = true; } } diff --git a/src/main/java/a8k/app/service/lis/BiLisSingleTrackChannel.java b/src/main/java/a8k/app/service/lis/BiLisSingleTrackChannel.java index a0f64f3..08695a4 100644 --- a/src/main/java/a8k/app/service/lis/BiLisSingleTrackChannel.java +++ b/src/main/java/a8k/app/service/lis/BiLisSingleTrackChannel.java @@ -1,16 +1,17 @@ package a8k.app.service.lis; -import a8k.app.channel.iflytophald.channel.LisUartChannel; -import a8k.app.channel.net.BiLisSingleTrackTcpClient; +import a8k.app.iflytophald.channel.LisUartCommunicationChannel; +import a8k.app.client.BiLisSingleTrackTcpClient; import a8k.app.dao.type.db.ReactionRecord; import a8k.app.factory.BoditechLisSingleTrackFrameFactory; +import a8k.app.type.exception.AppException; import a8k.app.type.lisprotocol.BiLisSingleTrackFrame; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.List; -public class BiLisSingleTrackChannel { +public class BiLisSingleTrackChannel implements LisChannel { private static final Logger log = LoggerFactory.getLogger(BiLisSingleTrackChannel.class); enum ChannelType { @@ -18,74 +19,95 @@ public class BiLisSingleTrackChannel { TCP, } - BiLisSingleTrackTcpClient biLisSingleTrackTcpClient; - LisUartChannel lisUartChannel; - ChannelType channelType; + BiLisSingleTrackTcpClient biLisSingleTrackTcpClient; + LisUartCommunicationChannel lisUartCommunicationChannel; + ChannelType channelType; String hostip; Integer port; + Integer baudrate; + public BiLisSingleTrackChannel(String hostip, Integer port) { biLisSingleTrackTcpClient = new BiLisSingleTrackTcpClient(); this.hostip = hostip; - this.port = port; - channelType = ChannelType.TCP; + this.port = port; + channelType = ChannelType.TCP; } - public BiLisSingleTrackChannel(LisUartChannel lisUartChannel) { - this.lisUartChannel = lisUartChannel; - channelType = ChannelType.UART; + public BiLisSingleTrackChannel(LisUartCommunicationChannel lisUartCommunicationChannel, Integer baudrate) { + this.baudrate = baudrate; + this.lisUartCommunicationChannel = lisUartCommunicationChannel; + channelType = ChannelType.UART; } - public void start() { + @Override public void start() { switch (channelType) { case TCP -> { biLisSingleTrackTcpClient.start(hostip, port); } case UART -> { - + lisUartCommunicationChannel.setBaudRate(baudrate); } } } - public boolean isConnected() { + @Override public void shutdown() { switch (channelType) { case UART -> { - if (lisUartChannel != null) { - return lisUartChannel.isConnected(); - } } case TCP -> { if (biLisSingleTrackTcpClient != null) { - return biLisSingleTrackTcpClient.isConnected(); + biLisSingleTrackTcpClient.shutdown(); } } } - return false; } - public void shotdown() { + @Override public void reportReactionRecord(ReactionRecord reactionRecord) { + if (reactionRecord == null) { + return; + } + List frames = BoditechLisSingleTrackFrameFactory.buildBoditechLisSingleTrackFrame(reactionRecord); + for (BiLisSingleTrackFrame frame : frames) { + tx(frame); + } + } + + public boolean isConnected() { switch (channelType) { case UART -> { + if (lisUartCommunicationChannel != null) { + return lisUartCommunicationChannel.isConnected(); + } } case TCP -> { if (biLisSingleTrackTcpClient != null) { - biLisSingleTrackTcpClient.shutdown(); + return biLisSingleTrackTcpClient.isConnected(); } } } + return false; } - public void reportReactionReport(ReactionRecord reactionRecord) { - if (reactionRecord == null) { - return; - } - List frames = BoditechLisSingleTrackFrameFactory.buildBoditechLisSingleTrackFrame(reactionRecord); - for (BiLisSingleTrackFrame frame : frames) { - tx(frame); + @Override public String getChannelDescription() { + if (channelType.equals(ChannelType.UART)) { + return String.format("%s,baudrate:%s", "BiLisSingleTrackChannel", baudrate); + } else if (channelType.equals(ChannelType.TCP)) { + return String.format("%s,ip:%s,port:%s", "BiLisSingleTrackChannel", hostip, port); } + return "BiLisSingleTrackChannel:...."; + } + + @Override public Boolean isSupportRequestSampleInfo() { + return false; + } + + @Override public LisSampleInfo requestSampleInfo(String sampleId) throws AppException { + return null; } + public void tx(BiLisSingleTrackFrame frame) { if (frame == null) { return; @@ -93,9 +115,9 @@ public class BiLisSingleTrackChannel { String frameStr = frame.serialization(); switch (channelType) { case UART -> { - if (lisUartChannel != null) { + if (lisUartCommunicationChannel != null) { log.debug("BoditechLisSingleTrackChannel tx frame by uart: {}", frameStr); - lisUartChannel.tx(frameStr); + lisUartCommunicationChannel.tx(frameStr); } } case TCP -> { diff --git a/src/main/java/a8k/app/service/lis/LisChannel.java b/src/main/java/a8k/app/service/lis/LisChannel.java new file mode 100644 index 0000000..46c1296 --- /dev/null +++ b/src/main/java/a8k/app/service/lis/LisChannel.java @@ -0,0 +1,21 @@ +package a8k.app.service.lis; + +import a8k.app.dao.type.db.ReactionRecord; +import a8k.app.type.exception.AppException; + +public interface LisChannel { + + void start(); + + void shutdown(); + + void reportReactionRecord(ReactionRecord reactionRecord) throws AppException; + + boolean isConnected(); + + String getChannelDescription(); + + Boolean isSupportRequestSampleInfo(); + + LisSampleInfo requestSampleInfo(String sampleId) throws AppException; +} diff --git a/src/main/java/a8k/app/service/lis/LisCommunicationService.java b/src/main/java/a8k/app/service/lis/LisCommunicationService.java index 461cc12..3bbbed2 100644 --- a/src/main/java/a8k/app/service/lis/LisCommunicationService.java +++ b/src/main/java/a8k/app/service/lis/LisCommunicationService.java @@ -1,9 +1,11 @@ package a8k.app.service.lis; -import a8k.app.channel.iflytophald.channel.LisUartChannel; +import a8k.app.iflytophald.channel.LisUartCommunicationChannel; import a8k.app.dao.type.db.LISSetting; import a8k.app.dao.type.db.ReactionRecord; import a8k.app.service.setting.AppSettingsMgrService; +import a8k.app.service.utils.UISender; +import a8k.app.type.exception.AppException; import a8k.app.type.lis.LISDirectionTypeEnum; import a8k.app.type.lis.LISIFType; import a8k.app.type.lis.LISProtocolEnum; @@ -18,14 +20,18 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor @Slf4j public class LisCommunicationService { - private final AppSettingsMgrService appSettingsMgrService; - private final LisUartChannel lisUartChannel; - private LISSetting setting; + private final AppSettingsMgrService appSettingsMgrService; + private final LisUartCommunicationChannel lisUartCommunicationChannel; + + + private LISSetting setting; + private LisChannel lisChannel; + @Value("${lis.enable}") public Boolean lisEnable = true; - BiLisSingleTrackChannel boditechLisSingleTrackChannel; + public void updateLisSetting(LISSetting lisSetting) { if (!lisEnable) { log.warn("LIS communication is disabled by configuration, ignore updateLisSetting"); @@ -37,30 +43,40 @@ public class LisCommunicationService { doUpdateLisSetting(); } - public String getProtocolDetail() { - if (isChannelEq(LISProtocolEnum.Boditech, LISDirectionTypeEnum.SINGLE_TRACK, LISIFType.SERIAL)) { - return String.format("%s.%s.%s,baudrate:%s", setting.lisProtocol, setting.lisType, setting.lisIf, setting.lisSerialBaudrate.baudrate); - } else if (isChannelEq(LISProtocolEnum.Boditech, LISDirectionTypeEnum.SINGLE_TRACK, LISIFType.NETWORK)) { - return String.format("%s.%s.%s,ip:%s,port:%d", setting.lisProtocol, setting.lisType, setting.lisIf, setting.lisNetIp, setting.lisNetPort); - } else { + public String getChannelDescription() { + if (lisChannel == null) { return String.format("%s.%s.%s", setting.lisProtocol, setting.lisType, setting.lisIf); } + return lisChannel.getChannelDescription(); } public Boolean getConnectionState() { - //巴迪泰串口单向 && 巴迪泰网口单向 - if (isChannelEq(LISProtocolEnum.Boditech, LISDirectionTypeEnum.SINGLE_TRACK, null)) { - return boditechLisSingleTrackChannel.isConnected(); + if (lisChannel == null) { + return false; } - return false; + return lisChannel.isConnected(); } public void reportReactionRecord(ReactionRecord reactionRecord) { - //巴迪泰串口单向 && 巴迪泰网口单向 - if (isChannelEq(LISProtocolEnum.Boditech, LISDirectionTypeEnum.SINGLE_TRACK, null)) { - boditechLisSingleTrackChannel.reportReactionReport(reactionRecord); - } else { - log.warn("LIS Type is not support, ignore report"); + /* + * 上报失败无须向上返回异常, 静默处理即可 + */ + if (lisChannel == null) { + return; + } + if (!setting.lisAutoExport) { + return; + } + + if (!lisChannel.isConnected()) { + log.warn("LIS channel is not connected, cannot report reaction record."); + return; + } + try { + lisChannel.reportReactionRecord(reactionRecord); + } catch (AppException e) { + log.warn("LIS 上报失败: {}", e.getMessage(), e); + UISender.txWarnMsg("LIS 上报记录 %s 失败, %s", reactionRecord.sampleUserid,e.getMessage()); } } @@ -77,23 +93,33 @@ public class LisCommunicationService { } // - // Channel builder + // !!!构建新的通道 // - private void doUpdateLisSetting() { shutdownAllChannel(); //巴迪泰串口单向 if (isChannelEq(LISProtocolEnum.Boditech, LISDirectionTypeEnum.SINGLE_TRACK, LISIFType.SERIAL)) { log.info("new BoditechLisSingleTrackChannel with SERIAL , baudrate: {}", setting.lisSerialBaudrate.baudrate); - lisUartChannel.setBaudRate(setting.lisSerialBaudrate.baudrate); - boditechLisSingleTrackChannel = new BiLisSingleTrackChannel(lisUartChannel); - boditechLisSingleTrackChannel.start(); + lisChannel = new BiLisSingleTrackChannel(lisUartCommunicationChannel, setting.lisSerialBaudrate.baudrate); + lisChannel.start(); } //巴迪泰网口单向 else if (isChannelEq(LISProtocolEnum.Boditech, LISDirectionTypeEnum.SINGLE_TRACK, LISIFType.NETWORK)) { log.info("new BoditechLisSingleTrackChannel with NETWORK, ip: {}, port: {}", setting.lisNetIp, setting.lisNetPort); - boditechLisSingleTrackChannel = new BiLisSingleTrackChannel(setting.lisNetIp, setting.lisNetPort); - boditechLisSingleTrackChannel.start(); + lisChannel = new BiLisSingleTrackChannel(setting.lisNetIp, setting.lisNetPort); + lisChannel.start(); + } + //巴迪泰网口双向 + else if (isChannelEq(LISProtocolEnum.Boditech, LISDirectionTypeEnum.SINGLE_TRACK, LISIFType.NETWORK)) { + log.info("new BiLisDoubleTrackChannel with NETWORK, ip: {}, port: {}", setting.lisNetIp, setting.lisNetPort); + lisChannel = new BiLisDoubleTrackChannel(setting.lisNetIp, setting.lisNetPort); + lisChannel.start(); + } + //巴迪泰串口双向 + else if (isChannelEq(LISProtocolEnum.Boditech, LISDirectionTypeEnum.DOUBLE_TRACK, LISIFType.SERIAL)) { + log.info("new BiLisDoubleTrackChannel with SERIAL, baudrate: {}", setting.lisSerialBaudrate.baudrate); + lisChannel = new BiLisDoubleTrackChannel(lisUartCommunicationChannel, setting.lisSerialBaudrate.baudrate); + lisChannel.start(); } else { log.warn("Unsupported LIS channel configuration: protocol={}, direction={}, ifType={}", setting.lisProtocol, setting.lisType, setting.lisIf); @@ -117,9 +143,9 @@ public class LisCommunicationService { private void shutdownAllChannel() { - if (boditechLisSingleTrackChannel != null) { - boditechLisSingleTrackChannel.shotdown(); - boditechLisSingleTrackChannel = null; + if (lisChannel != null) { + lisChannel.shutdown(); + lisChannel = null; } log.info("shutdownAllChannel done"); } diff --git a/src/main/java/a8k/app/service/lis/LisSampleInfo.java b/src/main/java/a8k/app/service/lis/LisSampleInfo.java new file mode 100644 index 0000000..a306413 --- /dev/null +++ b/src/main/java/a8k/app/service/lis/LisSampleInfo.java @@ -0,0 +1,12 @@ +package a8k.app.service.lis; + +import a8k.app.type.a8k.BloodType; + +import java.util.ArrayList; +import java.util.List; + +public class LisSampleInfo { + public List projNameList = new ArrayList<>(); + public List projIds = new ArrayList<>(); //项目代码 + public BloodType bloodType = BloodType.WHOLE_BLOOD; //血液类型 +} diff --git a/src/main/java/a8k/app/service/lowerctrl/ConsumablesScanCtrlService.java b/src/main/java/a8k/app/service/lowerctrl/ConsumablesScanCtrlService.java index c3d2762..7947dfb 100644 --- a/src/main/java/a8k/app/service/lowerctrl/ConsumablesScanCtrlService.java +++ b/src/main/java/a8k/app/service/lowerctrl/ConsumablesScanCtrlService.java @@ -1,6 +1,6 @@ package a8k.app.service.lowerctrl; -import a8k.app.channel.iflytophald.driver.CodeScanerDriver; +import a8k.app.iflytophald.driver.CodeScanerDriver; import a8k.app.teststate.VirtualDevice; import a8k.app.type.exception.AppException; import a8k.app.utils.DoAction; diff --git a/src/main/java/a8k/app/service/lowerctrl/HbotMoveCtrlService.java b/src/main/java/a8k/app/service/lowerctrl/HbotMoveCtrlService.java index f2216c5..eaf94da 100644 --- a/src/main/java/a8k/app/service/lowerctrl/HbotMoveCtrlService.java +++ b/src/main/java/a8k/app/service/lowerctrl/HbotMoveCtrlService.java @@ -1,17 +1,17 @@ package a8k.app.service.lowerctrl; import a8k.app.constant.GearBacklashConstant; -import a8k.app.channel.iflytophald.driver.PipetteCtrlDriverV2; +import a8k.app.iflytophald.driver.PipetteCtrlDriverV2; import a8k.app.type.a8k.Pos2d; import a8k.app.type.a8k.Pos3d; -import a8k.app.channel.iflytophald.driver.InputDetectDriver; -import a8k.app.channel.iflytophald.driver.HbotDriver; +import a8k.app.iflytophald.driver.InputDetectDriver; +import a8k.app.iflytophald.driver.HbotDriver; import a8k.app.type.exception.AppException; -import a8k.app.channel.iflytophald.channel.A8kCanBusService; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; -import a8k.app.channel.iflytophald.type.protocol.InputIOId; -import a8k.app.channel.iflytophald.type.protocol.MId; -import a8k.app.channel.iflytophald.type.protocol.RegIndex; +import a8k.app.iflytophald.driver.A8kCanBusBaseDriver; +import a8k.app.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.InputIOId; +import a8k.app.iflytophald.type.protocol.MId; +import a8k.app.iflytophald.type.protocol.RegIndex; import lombok.RequiredArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,7 +25,7 @@ import org.springframework.stereotype.Component; public class HbotMoveCtrlService { static Logger logger = LoggerFactory.getLogger(HbotMoveCtrlService.class); - private final A8kCanBusService canBus; + private final A8kCanBusBaseDriver canBus; private final PipetteCtrlDriverV2 pipetteCtrlDriver; private final HbotDriver hbotDriver; private final InputDetectDriver inputDetectDriver; diff --git a/src/main/java/a8k/app/service/lowerctrl/HbotMoveExCtrlService.java b/src/main/java/a8k/app/service/lowerctrl/HbotMoveExCtrlService.java index 472d71f..ff971cc 100644 --- a/src/main/java/a8k/app/service/lowerctrl/HbotMoveExCtrlService.java +++ b/src/main/java/a8k/app/service/lowerctrl/HbotMoveExCtrlService.java @@ -1,14 +1,14 @@ package a8k.app.service.lowerctrl; import a8k.app.constant.GearBacklashConstant; -import a8k.app.channel.iflytophald.driver.PipetteCtrlDriverV2; +import a8k.app.iflytophald.driver.PipetteCtrlDriverV2; import a8k.app.service.param.hbotpos.*; import a8k.app.type.a8k.ConsumableGroup; import a8k.app.type.a8k.pos.PreReactionPos; import a8k.app.type.a8k.pos.TipGroupPos; import a8k.app.type.a8k.Pos2d; import a8k.app.type.a8k.Pos3d; -import a8k.app.channel.iflytophald.driver.HbotDriver; +import a8k.app.iflytophald.driver.HbotDriver; import a8k.app.type.exception.AppException; import a8k.app.type.param.type.A8kSamplePos; import a8k.app.type.param.hbotpos.HbotSamplePos; diff --git a/src/main/java/a8k/app/service/lowerctrl/LiquidOperationCtrService.java b/src/main/java/a8k/app/service/lowerctrl/LiquidOperationCtrService.java index 094d7d2..fcf297d 100644 --- a/src/main/java/a8k/app/service/lowerctrl/LiquidOperationCtrService.java +++ b/src/main/java/a8k/app/service/lowerctrl/LiquidOperationCtrService.java @@ -3,13 +3,13 @@ package a8k.app.service.lowerctrl; import a8k.app.dao.type.combination.ProjBuildInInfo; import a8k.app.dao.type.db.ProjExtInfoCard; -import a8k.app.channel.iflytophald.driver.PipetteCtrlDriverV2; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.DistribuType; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.cpyidx.ContainerCpyId; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.cpyidx.LiquidConfigCpyIdx; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.param.AspirationParam; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.param.DistribuAllParam; +import a8k.app.iflytophald.driver.PipetteCtrlDriverV2; +import a8k.app.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.pipette_module.DistribuType; +import a8k.app.iflytophald.type.protocol.pipette_module.cpyidx.ContainerCpyId; +import a8k.app.iflytophald.type.protocol.pipette_module.cpyidx.LiquidConfigCpyIdx; +import a8k.app.iflytophald.type.protocol.pipette_module.param.AspirationParam; +import a8k.app.iflytophald.type.protocol.pipette_module.param.DistribuAllParam; import a8k.app.service.ctrlmodule.TipOperationCtrlModule; import a8k.app.service.param.hbotpos.*; import a8k.app.service.utils.UISender; diff --git a/src/main/java/a8k/app/service/lowerctrl/OptScanModuleLowerCtrlService.java b/src/main/java/a8k/app/service/lowerctrl/OptScanModuleLowerCtrlService.java index 2576baf..00b1ec1 100644 --- a/src/main/java/a8k/app/service/lowerctrl/OptScanModuleLowerCtrlService.java +++ b/src/main/java/a8k/app/service/lowerctrl/OptScanModuleLowerCtrlService.java @@ -4,10 +4,10 @@ import a8k.app.optalgo.type.A8kOptPeakInfo; import a8k.app.constant.OptConstant; import a8k.app.optalgo.A8kOptCurveAnalyzer; import a8k.app.type.a8k.opt.OptScanResult; -import a8k.app.channel.iflytophald.driver.OptModuleDriver; -import a8k.app.channel.iflytophald.driver.StepMotorCtrlDriver; -import a8k.app.channel.iflytophald.type.protocol.OptModuleRegIndex; -import a8k.app.channel.iflytophald.type.protocol.StepMotorMId; +import a8k.app.iflytophald.driver.OptModuleDriver; +import a8k.app.iflytophald.driver.StepMotorCtrlDriver; +import a8k.app.iflytophald.type.protocol.OptModuleRegIndex; +import a8k.app.iflytophald.type.protocol.StepMotorMId; import a8k.app.service.utils.UISender; import a8k.app.service.param.optparam.OptModuleExtParamsMgr; import a8k.app.service.param.optparam.OptModuleParamsMgr; @@ -16,7 +16,7 @@ import a8k.app.type.a8k.opt.A8kOptType; import a8k.app.type.a8k.pos.IncubatorPos; import a8k.app.type.exception.AppException; import a8k.app.dao.type.combination.ProjBuildInInfo; -import a8k.app.channel.iflytophald.utils.OptGainConvert; +import a8k.app.iflytophald.utils.OptGainConvert; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/a8k/app/service/lowerctrl/PlateBoxCtrlService.java b/src/main/java/a8k/app/service/lowerctrl/PlateBoxCtrlService.java index b6457e9..35a210a 100644 --- a/src/main/java/a8k/app/service/lowerctrl/PlateBoxCtrlService.java +++ b/src/main/java/a8k/app/service/lowerctrl/PlateBoxCtrlService.java @@ -1,7 +1,7 @@ package a8k.app.service.lowerctrl; -import a8k.app.channel.iflytophald.driver.StepMotorCtrlDriver; -import a8k.app.channel.iflytophald.type.protocol.StepMotorMId; +import a8k.app.iflytophald.driver.StepMotorCtrlDriver; +import a8k.app.iflytophald.type.protocol.StepMotorMId; import a8k.app.service.param.pos.PlatesBoxPosParamMgr; import a8k.app.type.a8k.ConsumableGroup; import a8k.app.type.a8k.pos.IncubatorPos; diff --git a/src/main/java/a8k/app/service/lowerctrl/TubeFeedingCtrlService.java b/src/main/java/a8k/app/service/lowerctrl/TubeFeedingCtrlService.java index 167b3c3..1b9ba73 100644 --- a/src/main/java/a8k/app/service/lowerctrl/TubeFeedingCtrlService.java +++ b/src/main/java/a8k/app/service/lowerctrl/TubeFeedingCtrlService.java @@ -2,19 +2,19 @@ package a8k.app.service.lowerctrl; import a8k.OS; import a8k.app.type.a8k.A8kTubeHolderType; -import a8k.app.channel.iflytophald.driver.CodeScanerDriver; -import a8k.app.channel.iflytophald.driver.InputDetectDriver; -import a8k.app.channel.iflytophald.driver.MiniServoDriver; -import a8k.app.channel.iflytophald.driver.StepMotorCtrlDriver; -import a8k.app.channel.iflytophald.type.protocol.MiniServoMId; -import a8k.app.channel.iflytophald.type.protocol.StepMotorMId; +import a8k.app.iflytophald.driver.CodeScanerDriver; +import a8k.app.iflytophald.driver.InputDetectDriver; +import a8k.app.iflytophald.driver.MiniServoDriver; +import a8k.app.iflytophald.driver.StepMotorCtrlDriver; +import a8k.app.iflytophald.type.protocol.MiniServoMId; +import a8k.app.iflytophald.type.protocol.StepMotorMId; import a8k.app.service.param.pos.TubeFeedingModuleParamMgr; import a8k.app.service.background.AppEventBusService; import a8k.app.type.exception.AppException; -import a8k.app.channel.iflytophald.channel.A8kCanBusService; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; -import a8k.app.channel.iflytophald.type.protocol.InputIOId; -import a8k.app.channel.iflytophald.type.protocol.MId; +import a8k.app.iflytophald.driver.A8kCanBusBaseDriver; +import a8k.app.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.InputIOId; +import a8k.app.iflytophald.type.protocol.MId; import a8k.app.type.misc.TubeHolderScanResult; import a8k.app.type.misc.TubeScanResult; import lombok.RequiredArgsConstructor; @@ -29,7 +29,7 @@ public class TubeFeedingCtrlService { static Integer tubeHolderScanOvertime = 3000; // 试管架类型扫码超时 private final AppEventBusService ebus; - private final A8kCanBusService canBus; + private final A8kCanBusBaseDriver canBus; private final TubeFeedingModuleParamMgr stp; private final CodeScanerDriver codeScanner; private final TubeFeedingExCtrlService tubeFeedingExCtrlService; diff --git a/src/main/java/a8k/app/service/lowerctrl/TubeFeedingExCtrlService.java b/src/main/java/a8k/app/service/lowerctrl/TubeFeedingExCtrlService.java index b982161..3ef9439 100644 --- a/src/main/java/a8k/app/service/lowerctrl/TubeFeedingExCtrlService.java +++ b/src/main/java/a8k/app/service/lowerctrl/TubeFeedingExCtrlService.java @@ -2,12 +2,12 @@ package a8k.app.service.lowerctrl; import a8k.app.config.DeviceBehaviorConfig; import a8k.app.constant.MiniServoConstant; -import a8k.app.channel.iflytophald.channel.A8kCanBusService; +import a8k.app.iflytophald.driver.A8kCanBusBaseDriver; import a8k.app.constant.ActionOvertimeConstant; -import a8k.app.channel.iflytophald.driver.MiniServoDriver; -import a8k.app.channel.iflytophald.driver.StepMotorCtrlDriver; -import a8k.app.channel.iflytophald.type.protocol.MiniServoMId; -import a8k.app.channel.iflytophald.type.protocol.StepMotorMId; +import a8k.app.iflytophald.driver.MiniServoDriver; +import a8k.app.iflytophald.driver.StepMotorCtrlDriver; +import a8k.app.iflytophald.type.protocol.MiniServoMId; +import a8k.app.iflytophald.type.protocol.StepMotorMId; import a8k.app.type.exception.AppException; import a8k.app.service.param.pos.TubePreProcesPosParamMgr; import lombok.RequiredArgsConstructor; @@ -27,8 +27,8 @@ public class TubeFeedingExCtrlService { static Integer overtime = 10000; - private final A8kCanBusService canBus; - private final MiniServoDriver miniServoDriver; + private final A8kCanBusBaseDriver canBus; + private final MiniServoDriver miniServoDriver; private final StepMotorCtrlDriver stepMotorCtrlDriver; private final ActionOvertimeConstant actionOvertimeConstant; private final TubePreProcesPosParamMgr tubePreProcesPosParamMgr; diff --git a/src/main/java/a8k/app/service/lowerctrl/TubePreProcessModuleCtrlService.java b/src/main/java/a8k/app/service/lowerctrl/TubePreProcessModuleCtrlService.java index 0738d25..de5f2e6 100644 --- a/src/main/java/a8k/app/service/lowerctrl/TubePreProcessModuleCtrlService.java +++ b/src/main/java/a8k/app/service/lowerctrl/TubePreProcessModuleCtrlService.java @@ -1,11 +1,11 @@ package a8k.app.service.lowerctrl; -import a8k.app.channel.iflytophald.driver.MiniServoDriver; -import a8k.app.channel.iflytophald.driver.StepMotorCtrlDriver; -import a8k.app.channel.iflytophald.type.protocol.MiniServoMId; -import a8k.app.channel.iflytophald.type.protocol.StepMotorMId; +import a8k.app.iflytophald.driver.MiniServoDriver; +import a8k.app.iflytophald.driver.StepMotorCtrlDriver; +import a8k.app.iflytophald.type.protocol.MiniServoMId; +import a8k.app.iflytophald.type.protocol.StepMotorMId; import a8k.app.constant.ActionOvertimeConstant; -import a8k.app.channel.iflytophald.type.protocol.CmdId; +import a8k.app.iflytophald.type.protocol.CmdId; import a8k.app.service.param.pos.TubePreProcesPosParamMgr; import a8k.app.type.exception.AppException; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/a8k/app/service/lowerctrl/TubePreProcessModuleExCtrlService.java b/src/main/java/a8k/app/service/lowerctrl/TubePreProcessModuleExCtrlService.java index a7f15ba..b4995e8 100644 --- a/src/main/java/a8k/app/service/lowerctrl/TubePreProcessModuleExCtrlService.java +++ b/src/main/java/a8k/app/service/lowerctrl/TubePreProcessModuleExCtrlService.java @@ -1,9 +1,9 @@ package a8k.app.service.lowerctrl; import a8k.app.constant.MiniServoConstant; -import a8k.app.channel.iflytophald.driver.MiniServoDriver; -import a8k.app.channel.iflytophald.driver.StepMotorCtrlDriver; -import a8k.app.channel.iflytophald.type.protocol.*; +import a8k.app.iflytophald.driver.MiniServoDriver; +import a8k.app.iflytophald.driver.StepMotorCtrlDriver; +import a8k.app.iflytophald.type.protocol.*; import a8k.app.type.exception.AppException; import a8k.app.service.param.pos.TubePreProcesPosParamMgr; import a8k.app.utils.ZEQ; diff --git a/src/main/java/a8k/app/service/lowerctrl/TurnableMoveCtrlService.java b/src/main/java/a8k/app/service/lowerctrl/TurnableMoveCtrlService.java index 06c5ae3..9dc5e75 100644 --- a/src/main/java/a8k/app/service/lowerctrl/TurnableMoveCtrlService.java +++ b/src/main/java/a8k/app/service/lowerctrl/TurnableMoveCtrlService.java @@ -1,14 +1,14 @@ package a8k.app.service.lowerctrl; -import a8k.app.channel.iflytophald.driver.InputDetectDriver; -import a8k.app.channel.iflytophald.driver.StepMotorCtrlDriver; -import a8k.app.channel.iflytophald.type.protocol.StepMotorMId; +import a8k.app.iflytophald.driver.InputDetectDriver; +import a8k.app.iflytophald.driver.StepMotorCtrlDriver; +import a8k.app.iflytophald.type.protocol.StepMotorMId; import a8k.app.service.param.pos.TurntablePosParamMgr; import a8k.app.type.a8k.pos.IncubatorPos; import a8k.app.type.exception.AppException; -import a8k.app.channel.iflytophald.channel.A8kCanBusService; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; -import a8k.app.channel.iflytophald.type.protocol.InputIOId; +import a8k.app.iflytophald.driver.A8kCanBusBaseDriver; +import a8k.app.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.InputIOId; import a8k.app.utils.MinRotationAngle; import lombok.RequiredArgsConstructor; @@ -22,8 +22,8 @@ public class TurnableMoveCtrlService { static final Integer overtime = 10000; - private final A8kCanBusService canBus; - private final StepMotorCtrlDriver stepMotorCtrlDriver; + private final A8kCanBusBaseDriver canBus; + private final StepMotorCtrlDriver stepMotorCtrlDriver; private final TurntablePosParamMgr turntablePosParamMgr; private final InputDetectDriver inputDetectDriver; diff --git a/src/main/java/a8k/app/service/mainctrl/AppConsumablesScanService.java b/src/main/java/a8k/app/service/mainctrl/AppConsumablesScanService.java index 04f2a23..349a1bb 100644 --- a/src/main/java/a8k/app/service/mainctrl/AppConsumablesScanService.java +++ b/src/main/java/a8k/app/service/mainctrl/AppConsumablesScanService.java @@ -1,6 +1,6 @@ package a8k.app.service.mainctrl; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; import a8k.app.i18n.Internationalization; import a8k.app.dao.type.combination.ProjBuildInInfo; import a8k.app.service.data.ProjInfoMgrService; diff --git a/src/main/java/a8k/app/service/mainctrl/AppDeviceInitCtrlService.java b/src/main/java/a8k/app/service/mainctrl/AppDeviceInitCtrlService.java index 1aaec9b..45ecd96 100644 --- a/src/main/java/a8k/app/service/mainctrl/AppDeviceInitCtrlService.java +++ b/src/main/java/a8k/app/service/mainctrl/AppDeviceInitCtrlService.java @@ -1,7 +1,7 @@ package a8k.app.service.mainctrl; -import a8k.app.channel.iflytophald.driver.*; -import a8k.app.channel.iflytophald.type.protocol.*; +import a8k.app.iflytophald.driver.*; +import a8k.app.iflytophald.type.protocol.*; import a8k.app.service.appsetup.A8kSubModuleRegInitService; import a8k.app.service.background.AppEventBusService; import a8k.app.service.lowerctrl.HbotMoveCtrlService; diff --git a/src/main/java/a8k/app/service/mainctrl/AppDeviceMainFlowCtrlService.java b/src/main/java/a8k/app/service/mainctrl/AppDeviceMainFlowCtrlService.java index be82de5..4df6f14 100644 --- a/src/main/java/a8k/app/service/mainctrl/AppDeviceMainFlowCtrlService.java +++ b/src/main/java/a8k/app/service/mainctrl/AppDeviceMainFlowCtrlService.java @@ -1,7 +1,7 @@ package a8k.app.service.mainctrl; import a8k.app.service.engineer.qatest.EngineerModeActionCtrlService; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; import a8k.app.service.statemgr.AppFlagStateMgr; import a8k.app.service.statemgr.DeviceWorkStateMgrService; import a8k.app.service.statemgr.GStateMgrService; diff --git a/src/main/java/a8k/app/service/mainctrl/MainFlowCtrlScheduler.java b/src/main/java/a8k/app/service/mainctrl/MainFlowCtrlScheduler.java index 0255383..0cd6c34 100644 --- a/src/main/java/a8k/app/service/mainctrl/MainFlowCtrlScheduler.java +++ b/src/main/java/a8k/app/service/mainctrl/MainFlowCtrlScheduler.java @@ -16,7 +16,7 @@ import a8k.app.type.error.AppError; import a8k.app.type.exception.AppException; import a8k.app.type.a8k.state.enumtype.A8kWorkState; import a8k.app.factory.ZAppPromptFactory; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; import a8k.app.service.background.AppEventBusService; import a8k.app.service.utils.UISender; import a8k.app.utils.ZWorkThread; diff --git a/src/main/java/a8k/app/service/mainctrl/TubeHolderSettingMgrService.java b/src/main/java/a8k/app/service/mainctrl/TubeHolderSettingMgrService.java index 3466723..b3d113c 100644 --- a/src/main/java/a8k/app/service/mainctrl/TubeHolderSettingMgrService.java +++ b/src/main/java/a8k/app/service/mainctrl/TubeHolderSettingMgrService.java @@ -5,7 +5,7 @@ import a8k.app.service.statemgr.GStateMgrService; import a8k.app.type.exception.AppException; import a8k.app.type.ui.TubeSetting; import a8k.app.type.ui.TubeHolderSetting; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; import cn.hutool.core.util.ObjectUtil; import jakarta.annotation.Resource; import org.slf4j.Logger; diff --git a/src/main/java/a8k/app/service/module/InFeedingCtrlModule.java b/src/main/java/a8k/app/service/module/InFeedingCtrlModule.java index edb6a72..48fc36d 100644 --- a/src/main/java/a8k/app/service/module/InFeedingCtrlModule.java +++ b/src/main/java/a8k/app/service/module/InFeedingCtrlModule.java @@ -5,9 +5,9 @@ import a8k.app.dao.type.db.ReactionRecord; import a8k.app.service.engineer.state.TubeholderExSettingMgr; import a8k.app.service.engineer.type.A8kCmdRunnable; import a8k.app.factory.AppErrorFactory; -import a8k.app.channel.iflytophald.driver.InputDetectDriver; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; -import a8k.app.channel.iflytophald.type.protocol.InputIOId; +import a8k.app.iflytophald.driver.InputDetectDriver; +import a8k.app.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.InputIOId; import a8k.app.service.analyzer.A8kEcodeAnalyzer; import a8k.app.service.background.AppEventBusService; import a8k.app.service.lowerctrl.TubeFeedingCtrlService; diff --git a/src/main/java/a8k/app/service/os/OSBeepCtrlService.java b/src/main/java/a8k/app/service/os/OSBeepCtrlService.java index 9562dae..6bcff53 100644 --- a/src/main/java/a8k/app/service/os/OSBeepCtrlService.java +++ b/src/main/java/a8k/app/service/os/OSBeepCtrlService.java @@ -1,9 +1,9 @@ package a8k.app.service.os; import a8k.OS; -import a8k.app.channel.iflytophald.channel.A8kCanBusService; -import a8k.app.channel.iflytophald.driver.OutputIOCtrlDriver; -import a8k.app.channel.iflytophald.type.protocol.OutputIOId; +import a8k.app.iflytophald.driver.A8kCanBusBaseDriver; +import a8k.app.iflytophald.driver.OutputIOCtrlDriver; +import a8k.app.iflytophald.type.protocol.OutputIOId; import a8k.app.service.statemgr.GStateMgrService; import a8k.app.teststate.VirtualDevice; import a8k.app.type.exception.AppException; @@ -18,7 +18,7 @@ import org.springframework.stereotype.Component; public class OSBeepCtrlService { - private final A8kCanBusService a8kCanBusService; + private final A8kCanBusBaseDriver a8KCanBusBaseDriver; boolean beepState = false;//beep底层状态 boolean beepStateIsSync = false;//底层状态是否同步 boolean hardwareErrorFlag = false;//硬件错误标志 @@ -54,7 +54,7 @@ public class OSBeepCtrlService { OS.forceSleep(100); } - if (!a8kCanBusService.isConnect()) { + if (!a8KCanBusBaseDriver.isConnect()) { OS.forceSleep(1000); continue; } diff --git a/src/main/java/a8k/app/service/os/OSDeviceInfoMgrService.java b/src/main/java/a8k/app/service/os/OSDeviceInfoMgrService.java index 144f1ab..7c420be 100644 --- a/src/main/java/a8k/app/service/os/OSDeviceInfoMgrService.java +++ b/src/main/java/a8k/app/service/os/OSDeviceInfoMgrService.java @@ -1,10 +1,9 @@ package a8k.app.service.os; import a8k.OS; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; import a8k.app.service.statemgr.GStateMgrService; import a8k.app.type.exception.AppException; -import a8k.app.utils.ZDateUtils; import cn.hutool.core.io.FileUtil; import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; @@ -12,8 +11,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.stereotype.Component; -import java.util.Date; - @Component @Slf4j @RequiredArgsConstructor diff --git a/src/main/java/a8k/app/service/os/OSNetworkMgrService.java b/src/main/java/a8k/app/service/os/OSNetworkMgrService.java index e532138..c4b322a 100644 --- a/src/main/java/a8k/app/service/os/OSNetworkMgrService.java +++ b/src/main/java/a8k/app/service/os/OSNetworkMgrService.java @@ -1,7 +1,7 @@ package a8k.app.service.os; import a8k.OS; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; import a8k.app.dao.NetworkSettingDao; import a8k.app.dao.type.db.NetworkSetting; import a8k.app.service.statemgr.GStateMgrService; diff --git a/src/main/java/a8k/app/service/peripheral_ctrl/PrinterService.java b/src/main/java/a8k/app/service/peripheral_ctrl/PrinterService.java index 3e96fcb..7290961 100644 --- a/src/main/java/a8k/app/service/peripheral_ctrl/PrinterService.java +++ b/src/main/java/a8k/app/service/peripheral_ctrl/PrinterService.java @@ -2,7 +2,7 @@ package a8k.app.service.peripheral_ctrl; import a8k.app.dao.type.db.ProjExtInfoCard; import a8k.app.dao.type.db.ReactionRecord; -import a8k.app.channel.iflytophald.channel.PrinterUartChannel; +import a8k.app.iflytophald.channel.PrinterUartCommunicationChannel; import a8k.app.i18n.Internationalization; import a8k.app.optalgo.type.ReactionResultStatus; import a8k.app.service.data.ProjInfoMgrService; @@ -23,8 +23,8 @@ import java.util.List; @Slf4j @RequiredArgsConstructor public class PrinterService { - private final PrinterUartChannel printer; - private final ProjInfoMgrService projInfoMgrService; + private final PrinterUartCommunicationChannel printer; + private final ProjInfoMgrService projInfoMgrService; private final GStateMgrService gStateMgrService; diff --git a/src/main/java/a8k/app/service/setting/AppSettingsMgrService.java b/src/main/java/a8k/app/service/setting/AppSettingsMgrService.java index 82cd9b9..488f3a3 100644 --- a/src/main/java/a8k/app/service/setting/AppSettingsMgrService.java +++ b/src/main/java/a8k/app/service/setting/AppSettingsMgrService.java @@ -4,7 +4,7 @@ import a8k.app.dao.DeviceSettingDao; import a8k.app.dao.LISSettingDao; import a8k.app.dao.type.db.DeviceSetting; import a8k.app.dao.type.db.LISSetting; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; import a8k.app.service.data.AppUserMgrService; import a8k.app.type.exception.AppException; import a8k.app.type.lis.LISDirectionTypeEnum; diff --git a/src/main/java/a8k/app/service/statemgr/ConsumablesMgrService.java b/src/main/java/a8k/app/service/statemgr/ConsumablesMgrService.java index e0b35af..b05859b 100644 --- a/src/main/java/a8k/app/service/statemgr/ConsumablesMgrService.java +++ b/src/main/java/a8k/app/service/statemgr/ConsumablesMgrService.java @@ -18,7 +18,7 @@ import a8k.app.type.a8k.proj.A8kReactionFlowType; import a8k.app.type.exception.AppException; import a8k.app.type.a8k.ConsumableGroup; import a8k.app.type.a8k.pos.TipGroupPos; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/a8k/app/service/statemgr/GStateMgrService.java b/src/main/java/a8k/app/service/statemgr/GStateMgrService.java index 24f6ee3..0b8955a 100644 --- a/src/main/java/a8k/app/service/statemgr/GStateMgrService.java +++ b/src/main/java/a8k/app/service/statemgr/GStateMgrService.java @@ -8,7 +8,7 @@ import a8k.app.type.GState; import a8k.app.type.error.AppError; import a8k.app.type.exception.AppException; import a8k.app.type.a8k.state.SensorState; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; import jakarta.annotation.PostConstruct; import lombok.Data; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/a8k/app/service/statemgr/TubeStateMgr.java b/src/main/java/a8k/app/service/statemgr/TubeStateMgr.java index 3163a6e..7646b3a 100644 --- a/src/main/java/a8k/app/service/statemgr/TubeStateMgr.java +++ b/src/main/java/a8k/app/service/statemgr/TubeStateMgr.java @@ -12,7 +12,7 @@ import a8k.app.type.error.AEConsumeNotEnoughError; import a8k.app.dao.DeviceStatisticDao; import a8k.app.dao.SampleRecordDBDao; import a8k.app.dao.type.db.ProjExtInfoCard; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; import a8k.app.service.utils.UISender; import a8k.app.service.data.ProjInfoMgrService; import a8k.app.type.a8k.state.enumtype.TubeHolderState; diff --git a/src/main/java/a8k/app/service/statemgr/consumables_mgr/TipStateMgr.java b/src/main/java/a8k/app/service/statemgr/consumables_mgr/TipStateMgr.java index 40b9bd5..a12de79 100644 --- a/src/main/java/a8k/app/service/statemgr/consumables_mgr/TipStateMgr.java +++ b/src/main/java/a8k/app/service/statemgr/consumables_mgr/TipStateMgr.java @@ -2,7 +2,7 @@ package a8k.app.service.statemgr.consumables_mgr; import a8k.app.constant.AppConstant; import a8k.app.dao.AppStatePersistenceDao; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; import a8k.app.service.statemgr.DeviceWorkStateMgrService; import a8k.app.type.a8k.container.TipContainer; import a8k.app.type.a8k.pos.TipGroupPos; diff --git a/src/main/java/a8k/app/service/utils/UISender.java b/src/main/java/a8k/app/service/utils/UISender.java index 694182a..900e824 100644 --- a/src/main/java/a8k/app/service/utils/UISender.java +++ b/src/main/java/a8k/app/service/utils/UISender.java @@ -25,12 +25,14 @@ public class UISender { service.pushMessageBox(new MessageBox(MessageLevel.Error, String.format(msg, args))); } - public static void txErrorMsg(Logger logger, AppError e, String msg, Object... args) { - logger.error("{}", String.format(msg, args), e); + public static void txErrorMsg( String msg, Object... args) { var service = SpringBootBeanUtil.getBean(FrontEndMessageBoxAndEventMgr.class); service.pushMessageBox(new MessageBox(MessageLevel.Error, String.format(msg, args))); } - + public static void txWarnMsg( String msg, Object... args) { + var service = SpringBootBeanUtil.getBean(FrontEndMessageBoxAndEventMgr.class); + service.pushMessageBox(new MessageBox(MessageLevel.Warn, String.format(msg, args))); + } public static void txErrorPrompt(AppError error) { var ebus = SpringBootBeanUtil.getBean(AppEventBusService.class); diff --git a/src/main/java/a8k/app/service/utils/ZAppChecker.java b/src/main/java/a8k/app/service/utils/ZAppChecker.java index 2b452a1..88a92b0 100644 --- a/src/main/java/a8k/app/service/utils/ZAppChecker.java +++ b/src/main/java/a8k/app/service/utils/ZAppChecker.java @@ -1,6 +1,6 @@ package a8k.app.service.utils; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; import a8k.app.type.error.AppError; import a8k.app.type.exception.AppException; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/a8k/app/service/virtualstate/DeviceVirtualStateMgrService.java b/src/main/java/a8k/app/service/virtualstate/DeviceVirtualStateMgrService.java index b3cc44d..55aafac 100644 --- a/src/main/java/a8k/app/service/virtualstate/DeviceVirtualStateMgrService.java +++ b/src/main/java/a8k/app/service/virtualstate/DeviceVirtualStateMgrService.java @@ -1,7 +1,7 @@ package a8k.app.service.virtualstate; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; import a8k.app.constant.AppConstant; import a8k.app.factory.FakeA8kConsumableContainerFactory; import a8k.app.factory.FakeAppErrorFactory; diff --git a/src/main/java/a8k/app/type/BoardVersions.java b/src/main/java/a8k/app/type/BoardVersions.java index 74d0bd7..e9a42ae 100644 --- a/src/main/java/a8k/app/type/BoardVersions.java +++ b/src/main/java/a8k/app/type/BoardVersions.java @@ -1,6 +1,6 @@ package a8k.app.type; -import a8k.app.channel.iflytophald.type.protocol.MId; +import a8k.app.iflytophald.type.protocol.MId; import java.io.Serializable; import java.util.ArrayList; diff --git a/src/main/java/a8k/app/type/a8k/state/DeviceWorkState.java b/src/main/java/a8k/app/type/a8k/state/DeviceWorkState.java index e5848cb..0b52225 100644 --- a/src/main/java/a8k/app/type/a8k/state/DeviceWorkState.java +++ b/src/main/java/a8k/app/type/a8k/state/DeviceWorkState.java @@ -1,6 +1,6 @@ package a8k.app.type.a8k.state; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; import a8k.app.type.a8k.state.enumtype.A8kWorkState; import a8k.app.type.a8k.state.enumtype.A8kWorkTaskType; import a8k.app.type.error.AppError; diff --git a/src/main/java/a8k/app/type/appevent/A8kHardwareReport.java b/src/main/java/a8k/app/type/appevent/A8kHardwareReport.java index d1174ee..77bcf4c 100644 --- a/src/main/java/a8k/app/type/appevent/A8kHardwareReport.java +++ b/src/main/java/a8k/app/type/appevent/A8kHardwareReport.java @@ -1,6 +1,6 @@ package a8k.app.type.appevent; -import a8k.app.channel.iflytophald.type.protocol.A8kPacket; +import a8k.app.iflytophald.type.protocol.A8kPacket; import org.springframework.lang.NonNull; /** diff --git a/src/main/java/a8k/app/type/appevent/AppWarningNotifyEvent.java b/src/main/java/a8k/app/type/appevent/AppWarningNotifyEvent.java index 77aaab6..65b2af4 100644 --- a/src/main/java/a8k/app/type/appevent/AppWarningNotifyEvent.java +++ b/src/main/java/a8k/app/type/appevent/AppWarningNotifyEvent.java @@ -1,6 +1,6 @@ package a8k.app.type.appevent; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; import a8k.app.type.error.AppError; public class AppWarningNotifyEvent extends AppEvent { diff --git a/src/main/java/a8k/app/type/error/AECodeError.java b/src/main/java/a8k/app/type/error/AECodeError.java index 963b0d7..7625644 100644 --- a/src/main/java/a8k/app/type/error/AECodeError.java +++ b/src/main/java/a8k/app/type/error/AECodeError.java @@ -1,6 +1,6 @@ package a8k.app.type.error; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; import a8k.app.utils.ZJsonHelper; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/src/main/java/a8k/app/type/error/AEConsumeNotEnoughError.java b/src/main/java/a8k/app/type/error/AEConsumeNotEnoughError.java index 348115b..b15f18f 100644 --- a/src/main/java/a8k/app/type/error/AEConsumeNotEnoughError.java +++ b/src/main/java/a8k/app/type/error/AEConsumeNotEnoughError.java @@ -1,7 +1,7 @@ package a8k.app.type.error; import a8k.app.service.analyzer.ConsumableStateAnalyzerService; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; import io.swagger.v3.oas.annotations.media.Schema; import java.util.List; diff --git a/src/main/java/a8k/app/type/error/AEHardwareError.java b/src/main/java/a8k/app/type/error/AEHardwareError.java index 42d47a8..4cb978b 100644 --- a/src/main/java/a8k/app/type/error/AEHardwareError.java +++ b/src/main/java/a8k/app/type/error/AEHardwareError.java @@ -1,8 +1,8 @@ package a8k.app.type.error; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; -import a8k.app.channel.iflytophald.type.protocol.CmdId; -import a8k.app.channel.iflytophald.type.protocol.MId; +import a8k.app.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.CmdId; +import a8k.app.iflytophald.type.protocol.MId; import io.swagger.v3.oas.annotations.media.Schema; public class AEHardwareError extends AppError { diff --git a/src/main/java/a8k/app/type/error/AESimpleErrorPrompt.java b/src/main/java/a8k/app/type/error/AESimpleErrorPrompt.java index 26229a5..0e59745 100644 --- a/src/main/java/a8k/app/type/error/AESimpleErrorPrompt.java +++ b/src/main/java/a8k/app/type/error/AESimpleErrorPrompt.java @@ -1,6 +1,6 @@ package a8k.app.type.error; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; public class AESimpleErrorPrompt extends AppError { public AESimpleErrorPrompt(String exmsg) { diff --git a/src/main/java/a8k/app/type/error/AETubeError.java b/src/main/java/a8k/app/type/error/AETubeError.java index ea9fb13..70ff7a8 100644 --- a/src/main/java/a8k/app/type/error/AETubeError.java +++ b/src/main/java/a8k/app/type/error/AETubeError.java @@ -1,6 +1,6 @@ package a8k.app.type.error; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; import io.swagger.v3.oas.annotations.media.Schema; public class AETubeError extends AppError { diff --git a/src/main/java/a8k/app/type/error/AppError.java b/src/main/java/a8k/app/type/error/AppError.java index 4e87ad6..a88b839 100644 --- a/src/main/java/a8k/app/type/error/AppError.java +++ b/src/main/java/a8k/app/type/error/AppError.java @@ -1,6 +1,6 @@ package a8k.app.type.error; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; import a8k.app.utils.ZJsonHelper; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/a8k/app/type/exception/AppException.java b/src/main/java/a8k/app/type/exception/AppException.java index a9cb8a9..9dcff10 100644 --- a/src/main/java/a8k/app/type/exception/AppException.java +++ b/src/main/java/a8k/app/type/exception/AppException.java @@ -1,9 +1,9 @@ package a8k.app.type.exception; import a8k.app.type.a8k.pos.TipGroupPos; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; -import a8k.app.channel.iflytophald.type.protocol.CmdId; -import a8k.app.channel.iflytophald.type.protocol.MId; +import a8k.app.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.CmdId; +import a8k.app.iflytophald.type.protocol.MId; import a8k.app.type.error.AECodeError; import a8k.app.type.error.AESimpleErrorPrompt; import a8k.app.type.error.AppError; diff --git a/src/main/java/a8k/app/type/exception/ZAppInterruptException.java b/src/main/java/a8k/app/type/exception/ZAppInterruptException.java index 8d9eecc..ca043ea 100644 --- a/src/main/java/a8k/app/type/exception/ZAppInterruptException.java +++ b/src/main/java/a8k/app/type/exception/ZAppInterruptException.java @@ -1,6 +1,6 @@ package a8k.app.type.exception; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; import lombok.Getter; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/a8k/app/type/lisprotocol/BiLisDoubleTrackFrameBuildContext.java b/src/main/java/a8k/app/type/lisprotocol/BiLisDoubleTrackFrameBuildContext.java index c173c72..35b88c5 100644 --- a/src/main/java/a8k/app/type/lisprotocol/BiLisDoubleTrackFrameBuildContext.java +++ b/src/main/java/a8k/app/type/lisprotocol/BiLisDoubleTrackFrameBuildContext.java @@ -5,6 +5,4 @@ public class BiLisDoubleTrackFrameBuildContext { public byte[] frameBytes; public String frameContentStr; public char[] checksum; - public Boolean buildSuccess = true; - } diff --git a/src/main/java/a8k/app/type/lisprotocol/subframe/OFrame.java b/src/main/java/a8k/app/type/lisprotocol/subframe/OFrame.java index c0fcdd4..a1da3ee 100644 --- a/src/main/java/a8k/app/type/lisprotocol/subframe/OFrame.java +++ b/src/main/java/a8k/app/type/lisprotocol/subframe/OFrame.java @@ -7,7 +7,22 @@ public class OFrame { public String type = "O"; // 请求类型 public String deviceName = "A8000"; public String sampleId = "";// - public List projList = new ArrayList<>(); + public List projList = new ArrayList<>(); public Integer sampleType;//全血0,血清血浆1,尿2,粪便3,唾液4 public String samplingDate;//采样时间 YYYYMMDDhhmmss + + + public String sampleTypeToStr() { + if (sampleType == null) { + return "未知"; + } + return switch (sampleType) { + case 0 -> "全血(0)"; // 全血 + case 1 -> "血清血浆(1)"; // 血清血浆 + case 2 -> "尿(2)"; // 尿 + case 3 -> "粪便(3)"; // 粪便 + case 4 -> "唾液(4)"; // 唾液 + default -> "未知(" + sampleType + ")"; + }; + } } diff --git a/src/main/java/a8k/app/type/ui/ApiRet.java b/src/main/java/a8k/app/type/ui/ApiRet.java index d16ff4d..94e2cff 100644 --- a/src/main/java/a8k/app/type/ui/ApiRet.java +++ b/src/main/java/a8k/app/type/ui/ApiRet.java @@ -1,7 +1,7 @@ package a8k.app.type.ui; import a8k.app.factory.ZAppPromptFactory; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; import a8k.app.type.exception.AppException; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Getter; diff --git a/src/main/java/a8k/app/utils/ActionTaskPool.java b/src/main/java/a8k/app/utils/ActionTaskPool.java index 1edf364..43f21c5 100644 --- a/src/main/java/a8k/app/utils/ActionTaskPool.java +++ b/src/main/java/a8k/app/utils/ActionTaskPool.java @@ -5,7 +5,7 @@ import a8k.app.service.analyzer.A8kEcodeAnalyzer; import a8k.app.type.error.AECodeError; import a8k.app.type.error.AppError; import a8k.app.type.exception.AppException; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; import a8k.app.type.BoolCondition; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/a8k/extui/oldpage/pos_calibration/HbotTipPosCalibration.java b/src/main/java/a8k/extui/oldpage/pos_calibration/HbotTipPosCalibration.java index 0881be5..60828bf 100644 --- a/src/main/java/a8k/extui/oldpage/pos_calibration/HbotTipPosCalibration.java +++ b/src/main/java/a8k/extui/oldpage/pos_calibration/HbotTipPosCalibration.java @@ -2,13 +2,13 @@ package a8k.extui.oldpage.pos_calibration; import a8k.app.constant.AppConstant; -import a8k.app.channel.iflytophald.driver.PipetteCtrlDriverV2; +import a8k.app.iflytophald.driver.PipetteCtrlDriverV2; import a8k.app.service.ctrlmodule.TipOperationCtrlModule; import a8k.app.type.exception.AppException; import a8k.extui.mgr.ExtApiPageMgr; import a8k.app.service.lowerctrl.HbotMoveCtrlService; import a8k.app.service.param.hbotpos.HbotTipPosMgr; -import a8k.app.channel.iflytophald.driver.HbotDriver; +import a8k.app.iflytophald.driver.HbotDriver; import a8k.app.type.a8k.Pos2d; import a8k.app.type.a8k.Pos3d; import a8k.app.type.a8k.pos.TipGroupPos; diff --git a/src/main/java/a8k/extui/page/apptest/LisTestPage.java b/src/main/java/a8k/extui/page/apptest/LisTestPage.java index 5463bad..0d46ea0 100644 --- a/src/main/java/a8k/extui/page/apptest/LisTestPage.java +++ b/src/main/java/a8k/extui/page/apptest/LisTestPage.java @@ -13,8 +13,6 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -import java.util.stream.Stream; - @Component @Slf4j @RequiredArgsConstructor @@ -26,7 +24,7 @@ public class LisTestPage { @ExtApiStatu(name = "", group = "LIS协议", order = 1) public String getLisProtocol() { - return lisCommunicationService.getProtocolDetail(); + return lisCommunicationService.getChannelDescription(); } @ExtApiStatu(name = "", group = "LIS连接状态", order = 2) diff --git a/src/main/java/a8k/extui/page/apptest/PrinterDebugPage.java b/src/main/java/a8k/extui/page/apptest/PrinterDebugPage.java index d30b384..1f82510 100644 --- a/src/main/java/a8k/extui/page/apptest/PrinterDebugPage.java +++ b/src/main/java/a8k/extui/page/apptest/PrinterDebugPage.java @@ -1,7 +1,7 @@ package a8k.extui.page.apptest; import a8k.OS; -import a8k.app.channel.iflytophald.channel.PrinterUartChannel; +import a8k.app.iflytophald.channel.PrinterUartCommunicationChannel; import a8k.app.service.peripheral_ctrl.PrinterService; import a8k.extui.mgr.ExtApiPageMgr; import a8k.extui.type.ExtUIPageCfg; @@ -15,29 +15,29 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class PrinterDebugPage { - private final PrinterUartChannel printerUartChannel; - private final ExtApiPageMgr extApiPageMgr; + private final PrinterUartCommunicationChannel printerUartDriver; + private final ExtApiPageMgr extApiPageMgr; private final PrinterService printerService; public void printf(String str) { - printerUartChannel.printf(str + "\r\n"); + printerUartDriver.printf(str + "\r\n"); } public void printerTest() { - printerUartChannel.printf("ABCDEFGHIJKLMNOPQRSTUVWXYZ\r\n"); + printerUartDriver.printf("ABCDEFGHIJKLMNOPQRSTUVWXYZ\r\n"); OS.forceSleep(100); - printerUartChannel.printf("abcdefghijklmnopqrstuvwxyz\r\n"); + printerUartDriver.printf("abcdefghijklmnopqrstuvwxyz\r\n"); OS.forceSleep(100); - printerUartChannel.printf("0123456789\r\n"); + printerUartDriver.printf("0123456789\r\n"); OS.forceSleep(100); - printerUartChannel.printf("!@#$%%*()^_+\r\n"); + printerUartDriver.printf("!@#$%%*()^_+\r\n"); OS.forceSleep(100); - printerUartChannel.printf("~`!@#$%%^&*()_+|\\{}[]:\";'<>?,./\r\n"); + printerUartDriver.printf("~`!@#$%%^&*()_+|\\{}[]:\";'<>?,./\r\n"); OS.forceSleep(100); - printerUartChannel.printf("中文测试\r\n"); + printerUartDriver.printf("中文测试\r\n"); OS.forceSleep(100); - printerUartChannel.printfEnd(); + printerUartDriver.printfEnd(); } diff --git a/src/main/java/a8k/extui/page/codetest/BiLisDoubleTrackChannelTestPage.java b/src/main/java/a8k/extui/page/codetest/BiLisDoubleTrackChannelTestPage.java index 4dd3d00..76740de 100644 --- a/src/main/java/a8k/extui/page/codetest/BiLisDoubleTrackChannelTestPage.java +++ b/src/main/java/a8k/extui/page/codetest/BiLisDoubleTrackChannelTestPage.java @@ -1,6 +1,12 @@ package a8k.extui.page.codetest; +import a8k.app.dao.type.combination.ProjBuildInInfo; +import a8k.app.dao.type.db.ReactionRecord; +import a8k.app.factory.FakeReactionRecordFactory; +import a8k.app.service.data.ProjInfoMgrService; import a8k.app.service.lis.BiLisDoubleTrackChannel; +import a8k.app.type.exception.AppException; +import a8k.app.type.lisprotocol.subframe.OFrame; import a8k.extui.mgr.ExtApiPageMgr; import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; @@ -17,6 +23,7 @@ public class BiLisDoubleTrackChannelTestPage { private String serverPort = "9973"; BiLisDoubleTrackChannel biLisDoubleTrackChannel; + private final ProjInfoMgrService projInfoMgrService; synchronized public void setServeripAndPort(String serverip, String serverPort) { @@ -30,14 +37,23 @@ public class BiLisDoubleTrackChannelTestPage { log.info("新建连接: {}:{}", serverip, serverPort); } - synchronized public void execPing() { - biLisDoubleTrackChannel.ping(); + synchronized public String execPing() { + if (biLisDoubleTrackChannel.ping()) { + return "Ping成功"; + } else { + return "Ping失败"; + } } - synchronized public void execRequestSampleInfo(String sampleId) { - biLisDoubleTrackChannel.requestSampleInfo(sampleId); - log.info("请求样本信息: {}", sampleId); + synchronized public OFrame execRequestSampleInfo(String sampleId) throws AppException { + return biLisDoubleTrackChannel.requestSampleInfo0(sampleId); + } + synchronized public String reportReactionReport(Integer projectId) throws AppException { + ProjBuildInInfo buildInInfo = projInfoMgrService.getProjBuildInInfo(projectId); + ReactionRecord record = FakeReactionRecordFactory.buildRecord(buildInInfo); + biLisDoubleTrackChannel.reportReactionRecord(record); + return "报告反应上报成功"; } @PostConstruct @@ -48,6 +64,8 @@ public class BiLisDoubleTrackChannelTestPage { .setParamVal("serverPort", () -> serverPort); page.addFunction("新建连接", this::newConnect); page.addFunction("执行Ping", this::execPing); + page.addFunction("报告反应记录", this::reportReactionReport) + .setParamVal("projectId", () -> 1); page.addFunction("请求样本信息", this::execRequestSampleInfo) .setParamVal("sampleId", () -> ""); diff --git a/src/main/java/a8k/extui/page/debug/P02ConsumablesMgrDebugPage.java b/src/main/java/a8k/extui/page/debug/P02ConsumablesMgrDebugPage.java index 305548d..fbaf9cb 100644 --- a/src/main/java/a8k/extui/page/debug/P02ConsumablesMgrDebugPage.java +++ b/src/main/java/a8k/extui/page/debug/P02ConsumablesMgrDebugPage.java @@ -9,7 +9,7 @@ import a8k.app.type.a8k.container.ReactionPlateContainer; import a8k.app.type.error.ConsumablesScanReportErrorType; import a8k.app.type.exception.AppException; import a8k.app.dao.type.db.ProjExtInfoCard; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; import a8k.app.service.data.ProjIdCardInfoMgrService; import a8k.app.service.data.ProjInfoMgrService; import a8k.app.service.mainctrl.AppConsumablesScanService; diff --git a/src/main/java/a8k/extui/page/driver/CodeScannerDriverCtrlPage.java b/src/main/java/a8k/extui/page/driver/CodeScannerDriverCtrlPage.java index 76a42a6..612e1b2 100644 --- a/src/main/java/a8k/extui/page/driver/CodeScannerDriverCtrlPage.java +++ b/src/main/java/a8k/extui/page/driver/CodeScannerDriverCtrlPage.java @@ -1,7 +1,7 @@ package a8k.extui.page.driver; import a8k.app.type.exception.AppException; -import a8k.app.channel.iflytophald.driver.CodeScanerDriver; +import a8k.app.iflytophald.driver.CodeScanerDriver; import a8k.extui.mgr.ExtApiPageMgr; import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/a8k/extui/page/driver/HbotCtrlPage.java b/src/main/java/a8k/extui/page/driver/HbotCtrlPage.java index 358cf0e..b2d32d1 100644 --- a/src/main/java/a8k/extui/page/driver/HbotCtrlPage.java +++ b/src/main/java/a8k/extui/page/driver/HbotCtrlPage.java @@ -1,9 +1,9 @@ package a8k.extui.page.driver; import a8k.app.constant.GearBacklashConstant; -import a8k.app.channel.iflytophald.driver.HbotDriver; -import a8k.app.channel.iflytophald.driver.PipetteCtrlDriverV2; -import a8k.app.channel.iflytophald.type.protocol.HbotRegIndex; +import a8k.app.iflytophald.driver.HbotDriver; +import a8k.app.iflytophald.driver.PipetteCtrlDriverV2; +import a8k.app.iflytophald.type.protocol.HbotRegIndex; import a8k.app.type.a8k.Pos2d; import a8k.app.type.a8k.Pos3d; import a8k.app.type.exception.AppException; diff --git a/src/main/java/a8k/extui/page/driver/MiniServoCtrlPage.java b/src/main/java/a8k/extui/page/driver/MiniServoCtrlPage.java index 237c1e6..4b35931 100644 --- a/src/main/java/a8k/extui/page/driver/MiniServoCtrlPage.java +++ b/src/main/java/a8k/extui/page/driver/MiniServoCtrlPage.java @@ -1,9 +1,9 @@ package a8k.extui.page.driver; import a8k.app.type.exception.AppException; -import a8k.app.channel.iflytophald.driver.MiniServoDriver; -import a8k.app.channel.iflytophald.type.protocol.MiniServoMId; -import a8k.app.channel.iflytophald.type.protocol.MiniServoRegIndex; +import a8k.app.iflytophald.driver.MiniServoDriver; +import a8k.app.iflytophald.type.protocol.MiniServoMId; +import a8k.app.iflytophald.type.protocol.MiniServoRegIndex; import a8k.app.utils.ZJsonNode; import a8k.extui.mgr.ExtApiPageMgr; import com.fasterxml.jackson.databind.JsonNode; diff --git a/src/main/java/a8k/extui/page/driver/MotorCtrlPage.java b/src/main/java/a8k/extui/page/driver/MotorCtrlPage.java index 3dee261..ec74966 100644 --- a/src/main/java/a8k/extui/page/driver/MotorCtrlPage.java +++ b/src/main/java/a8k/extui/page/driver/MotorCtrlPage.java @@ -1,10 +1,10 @@ package a8k.extui.page.driver; -import a8k.app.channel.iflytophald.type.protocol.StepMotorSpeedLevel; +import a8k.app.iflytophald.type.protocol.StepMotorSpeedLevel; import a8k.app.type.exception.AppException; -import a8k.app.channel.iflytophald.driver.StepMotorCtrlDriver; -import a8k.app.channel.iflytophald.type.protocol.StepMotorMId; -import a8k.app.channel.iflytophald.type.protocol.StepMotorRegIndex; +import a8k.app.iflytophald.driver.StepMotorCtrlDriver; +import a8k.app.iflytophald.type.protocol.StepMotorMId; +import a8k.app.iflytophald.type.protocol.StepMotorRegIndex; import a8k.app.utils.ZJsonNode; import a8k.extui.mgr.ExtApiPageMgr; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/a8k/extui/page/driver/OptScannerCtrlPage.java b/src/main/java/a8k/extui/page/driver/OptScannerCtrlPage.java index 622311e..7264b6b 100644 --- a/src/main/java/a8k/extui/page/driver/OptScannerCtrlPage.java +++ b/src/main/java/a8k/extui/page/driver/OptScannerCtrlPage.java @@ -1,8 +1,8 @@ package a8k.extui.page.driver; -import a8k.app.channel.iflytophald.driver.OptModuleDriver; -import a8k.app.channel.iflytophald.type.protocol.StepMotorMId; -import a8k.app.channel.iflytophald.type.protocol.OptModuleRegIndex; +import a8k.app.iflytophald.driver.OptModuleDriver; +import a8k.app.iflytophald.type.protocol.StepMotorMId; +import a8k.app.iflytophald.type.protocol.OptModuleRegIndex; import a8k.app.type.exception.AppException; import a8k.app.utils.ZJsonNode; import a8k.extui.mgr.ExtApiPageMgr; diff --git a/src/main/java/a8k/extui/page/driver/pipette_module/PipetteGunCfgSync.java b/src/main/java/a8k/extui/page/driver/pipette_module/PipetteGunCfgSync.java index 7af8029..7558468 100644 --- a/src/main/java/a8k/extui/page/driver/pipette_module/PipetteGunCfgSync.java +++ b/src/main/java/a8k/extui/page/driver/pipette_module/PipetteGunCfgSync.java @@ -1,7 +1,7 @@ package a8k.extui.page.driver.pipette_module; -import a8k.app.channel.iflytophald.driver.PipetteCtrlDriverV2; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.PipetteConfig; +import a8k.app.iflytophald.driver.PipetteCtrlDriverV2; +import a8k.app.iflytophald.type.protocol.pipette_module.PipetteConfig; import a8k.app.service.data.FileMgrService; import a8k.app.type.exception.AppException; import a8k.app.utils.ZJsonHelper; diff --git a/src/main/java/a8k/extui/page/driver/pipette_module/PipetteGunCommonConfigPage.java b/src/main/java/a8k/extui/page/driver/pipette_module/PipetteGunCommonConfigPage.java index 55bfb93..bb022b2 100644 --- a/src/main/java/a8k/extui/page/driver/pipette_module/PipetteGunCommonConfigPage.java +++ b/src/main/java/a8k/extui/page/driver/pipette_module/PipetteGunCommonConfigPage.java @@ -1,9 +1,9 @@ package a8k.extui.page.driver.pipette_module; -import a8k.app.channel.iflytophald.driver.PipetteCtrlDriverV2; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.cfg.PipetteCommonConfigIndex; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.cpyidx.PlatInfoCpyIdx; +import a8k.app.iflytophald.driver.PipetteCtrlDriverV2; +import a8k.app.iflytophald.type.protocol.pipette_module.cfg.PipetteCommonConfigIndex; +import a8k.app.iflytophald.type.protocol.pipette_module.cpyidx.PlatInfoCpyIdx; import a8k.app.type.exception.AppException; import a8k.extui.mgr.ExtApiPageMgr; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/a8k/extui/page/driver/pipette_module/PipetteGunContainerConfigSettingPage.java b/src/main/java/a8k/extui/page/driver/pipette_module/PipetteGunContainerConfigSettingPage.java index 850cb95..9ae4b23 100644 --- a/src/main/java/a8k/extui/page/driver/pipette_module/PipetteGunContainerConfigSettingPage.java +++ b/src/main/java/a8k/extui/page/driver/pipette_module/PipetteGunContainerConfigSettingPage.java @@ -1,9 +1,9 @@ package a8k.extui.page.driver.pipette_module; -import a8k.app.channel.iflytophald.driver.PipetteCtrlDriverV2; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.cfg.ContainerInfoIndex; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.cpyidx.ContainerCpyId; +import a8k.app.iflytophald.driver.PipetteCtrlDriverV2; +import a8k.app.iflytophald.type.protocol.pipette_module.cfg.ContainerInfoIndex; +import a8k.app.iflytophald.type.protocol.pipette_module.cpyidx.ContainerCpyId; import a8k.app.type.exception.AppException; import a8k.extui.mgr.ExtApiPageMgr; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/a8k/extui/page/driver/pipette_module/PipetteGunLiquidConfigSettingPage.java b/src/main/java/a8k/extui/page/driver/pipette_module/PipetteGunLiquidConfigSettingPage.java index 41c995b..d79b7b0 100644 --- a/src/main/java/a8k/extui/page/driver/pipette_module/PipetteGunLiquidConfigSettingPage.java +++ b/src/main/java/a8k/extui/page/driver/pipette_module/PipetteGunLiquidConfigSettingPage.java @@ -1,10 +1,10 @@ package a8k.extui.page.driver.pipette_module; -import a8k.app.channel.iflytophald.driver.PipetteCtrlDriverV2; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.cfg.LiquidInfoIndex; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.cpyidx.LiquidConfigCpyIdx; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.cpyidx.PMVCpyIdx; +import a8k.app.iflytophald.driver.PipetteCtrlDriverV2; +import a8k.app.iflytophald.type.protocol.pipette_module.cfg.LiquidInfoIndex; +import a8k.app.iflytophald.type.protocol.pipette_module.cpyidx.LiquidConfigCpyIdx; +import a8k.app.iflytophald.type.protocol.pipette_module.cpyidx.PMVCpyIdx; import a8k.app.type.exception.AppException; import a8k.extui.mgr.ExtApiPageMgr; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/a8k/extui/page/driver/pipette_module/PipetteGunOperationCtrlPage.java b/src/main/java/a8k/extui/page/driver/pipette_module/PipetteGunOperationCtrlPage.java index acc76cc..5eed269 100644 --- a/src/main/java/a8k/extui/page/driver/pipette_module/PipetteGunOperationCtrlPage.java +++ b/src/main/java/a8k/extui/page/driver/pipette_module/PipetteGunOperationCtrlPage.java @@ -1,10 +1,10 @@ package a8k.extui.page.driver.pipette_module; -import a8k.app.channel.iflytophald.driver.PipetteCtrlDriverV2; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.cpyidx.ContainerCpyId; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.cpyidx.LiquidConfigCpyIdx; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.param.AspirationParam; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.param.DistribuAllParam; +import a8k.app.iflytophald.driver.PipetteCtrlDriverV2; +import a8k.app.iflytophald.type.protocol.pipette_module.cpyidx.ContainerCpyId; +import a8k.app.iflytophald.type.protocol.pipette_module.cpyidx.LiquidConfigCpyIdx; +import a8k.app.iflytophald.type.protocol.pipette_module.param.AspirationParam; +import a8k.app.iflytophald.type.protocol.pipette_module.param.DistribuAllParam; import a8k.app.type.exception.AppException; import a8k.extui.factory.CurveBuilder; import a8k.extui.mgr.ExtApiPageMgr; diff --git a/src/main/java/a8k/extui/page/driver/pipette_module/PipetteGunPMVelConfigSettingPage.java b/src/main/java/a8k/extui/page/driver/pipette_module/PipetteGunPMVelConfigSettingPage.java index ca8dd65..a42bc47 100644 --- a/src/main/java/a8k/extui/page/driver/pipette_module/PipetteGunPMVelConfigSettingPage.java +++ b/src/main/java/a8k/extui/page/driver/pipette_module/PipetteGunPMVelConfigSettingPage.java @@ -1,8 +1,8 @@ package a8k.extui.page.driver.pipette_module; -import a8k.app.channel.iflytophald.driver.PipetteCtrlDriverV2; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.cfg.PMVConfigIndex; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.cpyidx.PMVCpyIdx; +import a8k.app.iflytophald.driver.PipetteCtrlDriverV2; +import a8k.app.iflytophald.type.protocol.pipette_module.cfg.PMVConfigIndex; +import a8k.app.iflytophald.type.protocol.pipette_module.cpyidx.PMVCpyIdx; import a8k.app.type.exception.AppException; import a8k.extui.mgr.ExtApiPageMgr; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/a8k/extui/page/driver/pipette_module/PipetteGunPlatformSettingPage.java b/src/main/java/a8k/extui/page/driver/pipette_module/PipetteGunPlatformSettingPage.java index 06ad323..c0135d9 100644 --- a/src/main/java/a8k/extui/page/driver/pipette_module/PipetteGunPlatformSettingPage.java +++ b/src/main/java/a8k/extui/page/driver/pipette_module/PipetteGunPlatformSettingPage.java @@ -1,8 +1,8 @@ package a8k.extui.page.driver.pipette_module; -import a8k.app.channel.iflytophald.driver.PipetteCtrlDriverV2; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.cfg.PlatformInfoIndex; +import a8k.app.iflytophald.driver.PipetteCtrlDriverV2; +import a8k.app.iflytophald.type.protocol.pipette_module.cfg.PlatformInfoIndex; import a8k.app.type.exception.AppException; import a8k.extui.mgr.ExtApiPageMgr; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/a8k/extui/page/driver/pipette_module/PipetteGunTestCtrlPage.java b/src/main/java/a8k/extui/page/driver/pipette_module/PipetteGunTestCtrlPage.java index a9b8a6c..3b46b41 100644 --- a/src/main/java/a8k/extui/page/driver/pipette_module/PipetteGunTestCtrlPage.java +++ b/src/main/java/a8k/extui/page/driver/pipette_module/PipetteGunTestCtrlPage.java @@ -1,10 +1,10 @@ package a8k.extui.page.driver.pipette_module; import a8k.OS; -import a8k.app.channel.iflytophald.driver.PipetteCtrlDriverV2; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.cpyidx.ContainerCpyId; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.cpyidx.LiquidConfigCpyIdx; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.cpyidx.PMVCpyIdx; +import a8k.app.iflytophald.driver.PipetteCtrlDriverV2; +import a8k.app.iflytophald.type.protocol.pipette_module.cpyidx.ContainerCpyId; +import a8k.app.iflytophald.type.protocol.pipette_module.cpyidx.LiquidConfigCpyIdx; +import a8k.app.iflytophald.type.protocol.pipette_module.cpyidx.PMVCpyIdx; import a8k.app.type.exception.AppException; import a8k.extui.factory.CurveBuilder; import a8k.extui.mgr.ExtApiPageMgr; diff --git a/src/main/java/a8k/extui/page/driver/pipette_module/PipetteGunZMVelConfigSettingPage.java b/src/main/java/a8k/extui/page/driver/pipette_module/PipetteGunZMVelConfigSettingPage.java index be95c5c..3ac5013 100644 --- a/src/main/java/a8k/extui/page/driver/pipette_module/PipetteGunZMVelConfigSettingPage.java +++ b/src/main/java/a8k/extui/page/driver/pipette_module/PipetteGunZMVelConfigSettingPage.java @@ -1,8 +1,8 @@ package a8k.extui.page.driver.pipette_module; -import a8k.app.channel.iflytophald.driver.PipetteCtrlDriverV2; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.cpyidx.ZMVCpyIdx; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.cfg.ZMVConfigIndex; +import a8k.app.iflytophald.driver.PipetteCtrlDriverV2; +import a8k.app.iflytophald.type.protocol.pipette_module.cpyidx.ZMVCpyIdx; +import a8k.app.iflytophald.type.protocol.pipette_module.cfg.ZMVConfigIndex; import a8k.app.type.exception.AppException; import a8k.extui.mgr.ExtApiPageMgr; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/a8k/extui/page/driver/pipette_module/PipetteGunZMotorCtrlPage.java b/src/main/java/a8k/extui/page/driver/pipette_module/PipetteGunZMotorCtrlPage.java index f100776..cd2bc10 100644 --- a/src/main/java/a8k/extui/page/driver/pipette_module/PipetteGunZMotorCtrlPage.java +++ b/src/main/java/a8k/extui/page/driver/pipette_module/PipetteGunZMotorCtrlPage.java @@ -1,8 +1,8 @@ package a8k.extui.page.driver.pipette_module; -import a8k.app.channel.iflytophald.driver.PipetteCtrlDriverV2; -import a8k.app.channel.iflytophald.type.protocol.ModuleStatus; -import a8k.app.channel.iflytophald.type.protocol.pipette_module.cfg.ZMBasicConfigIndex; +import a8k.app.iflytophald.driver.PipetteCtrlDriverV2; +import a8k.app.iflytophald.type.protocol.ModuleStatus; +import a8k.app.iflytophald.type.protocol.pipette_module.cfg.ZMBasicConfigIndex; import a8k.app.type.exception.AppException; import a8k.app.utils.ZJsonNode; import a8k.extui.mgr.ExtApiPageMgr; diff --git a/src/main/java/a8k/extui/page/extapp/OptModuleParamCalibration.java b/src/main/java/a8k/extui/page/extapp/OptModuleParamCalibration.java index 59d85b2..b15d4e1 100644 --- a/src/main/java/a8k/extui/page/extapp/OptModuleParamCalibration.java +++ b/src/main/java/a8k/extui/page/extapp/OptModuleParamCalibration.java @@ -15,7 +15,7 @@ import a8k.app.service.lowerctrl.PlateBoxCtrlService; import a8k.app.service.param.optparam.OptModuleExtParamsMgr; import a8k.app.type.param.optpos.OptModuleExtParam; import a8k.app.type.a8k.opt.A8kOptType; -import a8k.app.channel.iflytophald.utils.OptGainConvert; +import a8k.app.iflytophald.utils.OptGainConvert; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/a8k/extui/page/extapp/TemporaryTestPage.java b/src/main/java/a8k/extui/page/extapp/TemporaryTestPage.java index 192147e..756964f 100644 --- a/src/main/java/a8k/extui/page/extapp/TemporaryTestPage.java +++ b/src/main/java/a8k/extui/page/extapp/TemporaryTestPage.java @@ -1,8 +1,8 @@ package a8k.extui.page.extapp; import a8k.app.type.exception.AppException; -import a8k.app.channel.iflytophald.driver.MiniServoDriver; -import a8k.app.channel.iflytophald.type.protocol.MiniServoMId; +import a8k.app.iflytophald.driver.MiniServoDriver; +import a8k.app.iflytophald.type.protocol.MiniServoMId; import a8k.app.service.param.pos.TubePreProcesPosParamMgr; import a8k.extui.mgr.ExtApiPageMgr; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/a8k/extui/page/extapp/profession_test/P02A8kTemperaturaVerfication.java b/src/main/java/a8k/extui/page/extapp/profession_test/P02A8kTemperaturaVerfication.java index 2b15f74..48e3fc6 100644 --- a/src/main/java/a8k/extui/page/extapp/profession_test/P02A8kTemperaturaVerfication.java +++ b/src/main/java/a8k/extui/page/extapp/profession_test/P02A8kTemperaturaVerfication.java @@ -1,6 +1,6 @@ package a8k.extui.page.extapp; -import a8k.app.channel.iflytophald.driver.WaterTemperatureControllerDriver; +import a8k.app.iflytophald.driver.WaterTemperatureControllerDriver; import a8k.app.service.background.TemperatureCtrlService; import a8k.app.service.param.misc.TemperatureCtrlParamMgr; import a8k.app.type.exception.AppException; diff --git a/src/main/java/a8k/extui/page/extapp/tools/MoterMoveUtilsPage.java b/src/main/java/a8k/extui/page/extapp/tools/MoterMoveUtilsPage.java index 501ecf2..47ca934 100644 --- a/src/main/java/a8k/extui/page/extapp/tools/MoterMoveUtilsPage.java +++ b/src/main/java/a8k/extui/page/extapp/tools/MoterMoveUtilsPage.java @@ -1,9 +1,9 @@ package a8k.extui.page.extapp.tools; import a8k.app.type.exception.AppException; -import a8k.app.channel.iflytophald.driver.MiniServoDriver; -import a8k.app.channel.iflytophald.driver.StepMotorCtrlDriver; -import a8k.app.channel.iflytophald.type.protocol.StepMotorMId; +import a8k.app.iflytophald.driver.MiniServoDriver; +import a8k.app.iflytophald.driver.StepMotorCtrlDriver; +import a8k.app.iflytophald.type.protocol.StepMotorMId; import a8k.extui.mgr.ExtApiPageMgr; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/extui/page/extsetting/db/A8kSubModuleRegAndConfigSyncPage.java b/src/main/java/a8k/extui/page/extsetting/db/A8kSubModuleRegAndConfigSyncPage.java index 9804977..f9abaec 100644 --- a/src/main/java/a8k/extui/page/extsetting/db/A8kSubModuleRegAndConfigSyncPage.java +++ b/src/main/java/a8k/extui/page/extsetting/db/A8kSubModuleRegAndConfigSyncPage.java @@ -1,7 +1,7 @@ package a8k.extui.page.extsetting.db; import a8k.app.controler.filemgr.StorageControler; -import a8k.app.channel.iflytophald.channel.A8kCanBusService; +import a8k.app.iflytophald.driver.A8kCanBusBaseDriver; import a8k.app.service.data.SubModuleConfigService; import a8k.app.service.data.SubModuleRegInitialValueMgrService; import a8k.app.type.exception.AppException; @@ -19,9 +19,9 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class A8kSubModuleRegAndConfigSyncPage { - private final ExtApiPageMgr extApiPageMgr; - private final A8kCanBusService canBus; - private final SubModuleConfigService subModuleConfigService; + private final ExtApiPageMgr extApiPageMgr; + private final A8kCanBusBaseDriver canBus; + private final SubModuleConfigService subModuleConfigService; private final SubModuleRegInitialValueMgrService subModuleRegInitialValueMgrService; diff --git a/src/main/java/a8k/extui/page/hardwaretest/HBotHardwareTestPage.java b/src/main/java/a8k/extui/page/hardwaretest/HBotHardwareTestPage.java index 0dc03a9..6e55bc4 100644 --- a/src/main/java/a8k/extui/page/hardwaretest/HBotHardwareTestPage.java +++ b/src/main/java/a8k/extui/page/hardwaretest/HBotHardwareTestPage.java @@ -1,7 +1,7 @@ package a8k.extui.page.hardwaretest; -import a8k.app.channel.iflytophald.driver.HbotDriver; -import a8k.app.channel.iflytophald.driver.PipetteCtrlDriverV2; +import a8k.app.iflytophald.driver.HbotDriver; +import a8k.app.iflytophald.driver.PipetteCtrlDriverV2; import a8k.app.type.exception.AppException; import a8k.extui.mgr.ExtApiPageMgr; import a8k.extui.type.ExtApiStatu; diff --git a/src/main/java/a8k/extui/page/hardwaretest/InputIOStateHardwareTestPage.java b/src/main/java/a8k/extui/page/hardwaretest/InputIOStateHardwareTestPage.java index 105240e..61ecb09 100644 --- a/src/main/java/a8k/extui/page/hardwaretest/InputIOStateHardwareTestPage.java +++ b/src/main/java/a8k/extui/page/hardwaretest/InputIOStateHardwareTestPage.java @@ -1,8 +1,8 @@ package a8k.extui.page.hardwaretest; import a8k.app.type.exception.AppException; -import a8k.app.channel.iflytophald.driver.InputDetectDriver; -import a8k.app.channel.iflytophald.type.protocol.InputIOId; +import a8k.app.iflytophald.driver.InputDetectDriver; +import a8k.app.iflytophald.type.protocol.InputIOId; import a8k.extui.mgr.ExtApiPageMgr; import a8k.extui.type.ExtApiStatu; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/a8k/extui/page/hardwaretest/LISUartTestPage.java b/src/main/java/a8k/extui/page/hardwaretest/LISUartTestPage.java index f4e2b9d..78c5e68 100644 --- a/src/main/java/a8k/extui/page/hardwaretest/LISUartTestPage.java +++ b/src/main/java/a8k/extui/page/hardwaretest/LISUartTestPage.java @@ -1,6 +1,6 @@ package a8k.extui.page.hardwaretest; -import a8k.app.channel.iflytophald.channel.LisUartChannel; +import a8k.app.iflytophald.channel.LisUartCommunicationChannel; import a8k.app.type.lis.LISSerialBaudrateType; import a8k.extui.mgr.ExtApiPageMgr; import a8k.extui.type.ExtApiStatu; @@ -11,30 +11,30 @@ import org.springframework.stereotype.Component; @Component @RequiredArgsConstructor public class LISUartTestPage { - final private LisUartChannel lisUartChannel; - private final ExtApiPageMgr extApiPageMgr; + final private LisUartCommunicationChannel lisUartCommunicationChannel; + private final ExtApiPageMgr extApiPageMgr; @ExtApiStatu(name = "", group = "波特率", order = 1) public Integer getBaudRate() { - return lisUartChannel.getBaudRateDirect(); + return lisUartCommunicationChannel.getBaudRateDirect(); } @ExtApiStatu(name = "", group = "回环模式", order = 1) public Boolean getLoopbackMode() { - return lisUartChannel.isInLoopbackMode(); + return lisUartCommunicationChannel.isInLoopbackMode(); } public void setBaudRate(LISSerialBaudrateType baudRate) { - lisUartChannel.setBaudRate(baudRate.baudrate); + lisUartCommunicationChannel.setBaudRate(baudRate.baudrate); } public void setInLoopbackMode(Boolean val) { - lisUartChannel.setInLoopbackMode(val); + lisUartCommunicationChannel.setInLoopbackMode(val); } public void sendCommand(String msg) { - lisUartChannel.tx(msg); + lisUartCommunicationChannel.tx(msg); } @PostConstruct diff --git a/src/main/java/a8k/extui/page/hardwaretest/MiniServoHardwareTestPage.java b/src/main/java/a8k/extui/page/hardwaretest/MiniServoHardwareTestPage.java index b4717de..6dbd747 100644 --- a/src/main/java/a8k/extui/page/hardwaretest/MiniServoHardwareTestPage.java +++ b/src/main/java/a8k/extui/page/hardwaretest/MiniServoHardwareTestPage.java @@ -1,8 +1,8 @@ package a8k.extui.page.hardwaretest; -import a8k.app.channel.iflytophald.driver.MiniServoDriver; -import a8k.app.channel.iflytophald.type.protocol.MiniServoMId; +import a8k.app.iflytophald.driver.MiniServoDriver; +import a8k.app.iflytophald.type.protocol.MiniServoMId; import a8k.app.service.mainctrl.AppDeviceInitCtrlService; import a8k.app.type.exception.AppException; import a8k.extui.mgr.ExtApiPageMgr; diff --git a/src/main/java/a8k/extui/page/hardwaretest/MiniServoPosCalibratePage.java b/src/main/java/a8k/extui/page/hardwaretest/MiniServoPosCalibratePage.java index 1b6fe35..609bbb9 100644 --- a/src/main/java/a8k/extui/page/hardwaretest/MiniServoPosCalibratePage.java +++ b/src/main/java/a8k/extui/page/hardwaretest/MiniServoPosCalibratePage.java @@ -6,8 +6,8 @@ import a8k.app.service.lowerctrl.TubePreProcessModuleCtrlService; import a8k.app.service.param.pos.TubePreProcesPosParamMgr; import a8k.app.type.exception.AppException; import a8k.extui.mgr.ExtApiPageMgr; -import a8k.app.channel.iflytophald.driver.MiniServoDriver; -import a8k.app.channel.iflytophald.type.protocol.MiniServoMId; +import a8k.app.iflytophald.driver.MiniServoDriver; +import a8k.app.iflytophald.type.protocol.MiniServoMId; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/a8k/extui/page/hardwaretest/MiscHardwareTestPage.java b/src/main/java/a8k/extui/page/hardwaretest/MiscHardwareTestPage.java index cc80ce9..78dfc2e 100644 --- a/src/main/java/a8k/extui/page/hardwaretest/MiscHardwareTestPage.java +++ b/src/main/java/a8k/extui/page/hardwaretest/MiscHardwareTestPage.java @@ -1,7 +1,7 @@ package a8k.extui.page.hardwaretest; -import a8k.app.channel.iflytophald.driver.MiniServoDriver; +import a8k.app.iflytophald.driver.MiniServoDriver; import a8k.app.service.mainctrl.AppDeviceInitCtrlService; import a8k.extui.mgr.ExtApiPageMgr; import a8k.extui.type.ExtUIPageCfg; diff --git a/src/main/java/a8k/extui/page/hardwaretest/MotorHardwareTestPage.java b/src/main/java/a8k/extui/page/hardwaretest/MotorHardwareTestPage.java index d356d6b..880d326 100644 --- a/src/main/java/a8k/extui/page/hardwaretest/MotorHardwareTestPage.java +++ b/src/main/java/a8k/extui/page/hardwaretest/MotorHardwareTestPage.java @@ -1,9 +1,8 @@ package a8k.extui.page.hardwaretest; -import a8k.app.channel.iflytophald.driver.StepMotorCtrlDriver; -import a8k.app.channel.iflytophald.type.protocol.StepMotorMId; -import a8k.app.channel.iflytophald.type.protocol.StepMotorRegIndex; -import a8k.app.channel.iflytophald.type.protocol.StepMotorSpeedLevel; +import a8k.app.iflytophald.driver.StepMotorCtrlDriver; +import a8k.app.iflytophald.type.protocol.StepMotorMId; +import a8k.app.iflytophald.type.protocol.StepMotorRegIndex; import a8k.app.type.exception.AppException; import a8k.extui.mgr.ExtApiPageMgr; import a8k.extui.type.ExtUIPageCfg; diff --git a/src/main/java/a8k/extui/page/hardwaretest/MotorPPSHardwareTestPage.java b/src/main/java/a8k/extui/page/hardwaretest/MotorPPSHardwareTestPage.java index d5903a4..6bccfcf 100644 --- a/src/main/java/a8k/extui/page/hardwaretest/MotorPPSHardwareTestPage.java +++ b/src/main/java/a8k/extui/page/hardwaretest/MotorPPSHardwareTestPage.java @@ -1,9 +1,8 @@ package a8k.extui.page.hardwaretest; -import a8k.app.channel.iflytophald.driver.PipetteCtrlDriverV2; -import a8k.app.channel.iflytophald.driver.StepMotorCtrlDriver; -import a8k.app.channel.iflytophald.type.protocol.StepMotorMId; -import a8k.app.channel.iflytophald.type.protocol.StepMotorRegIndex; +import a8k.app.iflytophald.driver.PipetteCtrlDriverV2; +import a8k.app.iflytophald.driver.StepMotorCtrlDriver; +import a8k.app.iflytophald.type.protocol.StepMotorMId; import a8k.app.type.exception.AppException; import a8k.extui.mgr.ExtApiPageMgr; import a8k.extui.type.ExtApiStatu; diff --git a/src/main/java/a8k/extui/page/hardwaretest/OutputIOCtrlTestPage.java b/src/main/java/a8k/extui/page/hardwaretest/OutputIOCtrlTestPage.java index 5edc5f9..e8fb0e3 100644 --- a/src/main/java/a8k/extui/page/hardwaretest/OutputIOCtrlTestPage.java +++ b/src/main/java/a8k/extui/page/hardwaretest/OutputIOCtrlTestPage.java @@ -1,7 +1,7 @@ package a8k.extui.page.hardwaretest; -import a8k.app.channel.iflytophald.driver.OutputIOCtrlDriver; -import a8k.app.channel.iflytophald.type.protocol.OutputIOId; +import a8k.app.iflytophald.driver.OutputIOCtrlDriver; +import a8k.app.iflytophald.type.protocol.OutputIOId; import a8k.app.type.exception.AppException; import a8k.extui.mgr.ExtApiPageMgr; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/a8k/extui/page/hardwaretest/PipetteGunHardwareTestPage.java b/src/main/java/a8k/extui/page/hardwaretest/PipetteGunHardwareTestPage.java index a986d8a..f48aa3d 100644 --- a/src/main/java/a8k/extui/page/hardwaretest/PipetteGunHardwareTestPage.java +++ b/src/main/java/a8k/extui/page/hardwaretest/PipetteGunHardwareTestPage.java @@ -1,7 +1,6 @@ package a8k.extui.page.hardwaretest; -import a8k.app.channel.iflytophald.driver.PipetteCtrlDriverV2; -import a8k.app.channel.iflytophald.type.protocol.ModuleStatus; +import a8k.app.iflytophald.driver.PipetteCtrlDriverV2; import a8k.app.type.exception.AppException; import a8k.extui.mgr.ExtApiPageMgr; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/a8k/extui/page/hardwaretest/SubBoardProberPage.java b/src/main/java/a8k/extui/page/hardwaretest/SubBoardProberPage.java index 4c20be9..935d708 100644 --- a/src/main/java/a8k/extui/page/hardwaretest/SubBoardProberPage.java +++ b/src/main/java/a8k/extui/page/hardwaretest/SubBoardProberPage.java @@ -1,7 +1,7 @@ package a8k.extui.page.hardwaretest; -import a8k.app.channel.iflytophald.channel.A8kCanBusService; -import a8k.app.channel.iflytophald.type.protocol.MId; +import a8k.app.iflytophald.driver.A8kCanBusBaseDriver; +import a8k.app.iflytophald.type.protocol.MId; import a8k.app.type.VersionInfo; import a8k.app.type.exception.AppException; import a8k.app.utils.ZList; @@ -22,7 +22,7 @@ public class SubBoardProberPage { ExtApiPageMgr extApiPageMgr; @Resource - A8kCanBusService canBus; + A8kCanBusBaseDriver canBus; Map versionInfos = new HashMap<>(); diff --git a/src/main/java/a8k/extui/page/hardwaretest/SubModuleVersionPreviewPage.java b/src/main/java/a8k/extui/page/hardwaretest/SubModuleVersionPreviewPage.java index 4c6790b..b515bc4 100644 --- a/src/main/java/a8k/extui/page/hardwaretest/SubModuleVersionPreviewPage.java +++ b/src/main/java/a8k/extui/page/hardwaretest/SubModuleVersionPreviewPage.java @@ -1,8 +1,8 @@ package a8k.extui.page.hardwaretest; import a8k.app.type.exception.AppException; -import a8k.app.channel.iflytophald.channel.A8kCanBusService; -import a8k.app.channel.iflytophald.type.protocol.MId; +import a8k.app.iflytophald.driver.A8kCanBusBaseDriver; +import a8k.app.iflytophald.type.protocol.MId; import a8k.extui.mgr.ExtApiPageMgr; import a8k.extui.type.ExtApiStatu; import jakarta.annotation.PostConstruct; @@ -20,7 +20,7 @@ public class SubModuleVersionPreviewPage { ExtApiPageMgr extApiPageMgr; @Resource - A8kCanBusService canBus; + A8kCanBusBaseDriver canBus; public static class VersionInfo { public Integer moduleId; diff --git a/src/main/java/a8k/extui/page/hardwaretest/WaterTempControllerTestPage.java b/src/main/java/a8k/extui/page/hardwaretest/WaterTempControllerTestPage.java index 5f5b275..973eaaa 100644 --- a/src/main/java/a8k/extui/page/hardwaretest/WaterTempControllerTestPage.java +++ b/src/main/java/a8k/extui/page/hardwaretest/WaterTempControllerTestPage.java @@ -1,8 +1,8 @@ package a8k.extui.page.hardwaretest; -import a8k.app.channel.iflytophald.driver.WaterTemperatureControllerDriver; -import a8k.app.channel.iflytophald.type.protocol.TemperatureControlerMid; -import a8k.app.channel.iflytophald.type.protocol.TemperatureControlerRegIndex; +import a8k.app.iflytophald.driver.WaterTemperatureControllerDriver; +import a8k.app.iflytophald.type.protocol.TemperatureControlerMid; +import a8k.app.iflytophald.type.protocol.TemperatureControlerRegIndex; import a8k.app.type.exception.AppException; import a8k.extui.mgr.ExtApiPageMgr; import a8k.extui.type.ExtApiStatu; diff --git a/src/main/java/a8k/extui/page/measurement/FeedingModMeasurePage.java b/src/main/java/a8k/extui/page/measurement/FeedingModMeasurePage.java index f205e21..1f9ff4a 100644 --- a/src/main/java/a8k/extui/page/measurement/FeedingModMeasurePage.java +++ b/src/main/java/a8k/extui/page/measurement/FeedingModMeasurePage.java @@ -1,9 +1,9 @@ package a8k.extui.page.measurement; import a8k.app.type.exception.AppException; -import a8k.app.channel.iflytophald.driver.MiniServoDriver; -import a8k.app.channel.iflytophald.driver.StepMotorCtrlDriver; -import a8k.app.channel.iflytophald.type.protocol.StepMotorMId; +import a8k.app.iflytophald.driver.MiniServoDriver; +import a8k.app.iflytophald.driver.StepMotorCtrlDriver; +import a8k.app.iflytophald.type.protocol.StepMotorMId; import a8k.extui.mgr.ExtApiPageMgr; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/extui/page/measurement/HbotFreedomPosMeasurePage.java b/src/main/java/a8k/extui/page/measurement/HbotFreedomPosMeasurePage.java index 21db082..ec3558e 100644 --- a/src/main/java/a8k/extui/page/measurement/HbotFreedomPosMeasurePage.java +++ b/src/main/java/a8k/extui/page/measurement/HbotFreedomPosMeasurePage.java @@ -1,9 +1,9 @@ package a8k.extui.page.measurement; -import a8k.app.channel.iflytophald.driver.PipetteCtrlDriverV2; +import a8k.app.iflytophald.driver.PipetteCtrlDriverV2; import a8k.app.type.a8k.Pos3d; import a8k.app.type.exception.AppException; -import a8k.app.channel.iflytophald.driver.HbotDriver; +import a8k.app.iflytophald.driver.HbotDriver; import a8k.app.service.lowerctrl.HbotMoveCtrlService; import a8k.extui.mgr.ExtApiPageMgr; import a8k.extui.type.ExtApiStatu; diff --git a/src/main/java/a8k/extui/page/measurement/HbotPosMeasurePage.java b/src/main/java/a8k/extui/page/measurement/HbotPosMeasurePage.java index 12f3bec..128eeed 100644 --- a/src/main/java/a8k/extui/page/measurement/HbotPosMeasurePage.java +++ b/src/main/java/a8k/extui/page/measurement/HbotPosMeasurePage.java @@ -1,12 +1,12 @@ package a8k.extui.page.measurement; import a8k.app.constant.GearBacklashConstant; -import a8k.app.channel.iflytophald.driver.CodeScanerDriver; -import a8k.app.channel.iflytophald.driver.PipetteCtrlDriverV2; +import a8k.app.iflytophald.driver.CodeScanerDriver; +import a8k.app.iflytophald.driver.PipetteCtrlDriverV2; import a8k.app.type.a8k.Pos2d; import a8k.app.type.a8k.Pos3d; import a8k.app.type.exception.AppException; -import a8k.app.channel.iflytophald.driver.HbotDriver; +import a8k.app.iflytophald.driver.HbotDriver; import a8k.extui.mgr.ExtApiPageMgr; import a8k.extui.type.ExtApiStatu; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/a8k/extui/page/measurement/IncubatorMeasurePage.java b/src/main/java/a8k/extui/page/measurement/IncubatorMeasurePage.java index e6c81e7..0b28f83 100644 --- a/src/main/java/a8k/extui/page/measurement/IncubatorMeasurePage.java +++ b/src/main/java/a8k/extui/page/measurement/IncubatorMeasurePage.java @@ -1,8 +1,8 @@ package a8k.extui.page.measurement; import a8k.app.type.exception.AppException; -import a8k.app.channel.iflytophald.driver.StepMotorCtrlDriver; -import a8k.app.channel.iflytophald.type.protocol.StepMotorMId; +import a8k.app.iflytophald.driver.StepMotorCtrlDriver; +import a8k.app.iflytophald.type.protocol.StepMotorMId; import a8k.extui.mgr.ExtApiPageMgr; import a8k.extui.type.ExtApiStatu; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/a8k/extui/page/measurement/OptModMeasurePage.java b/src/main/java/a8k/extui/page/measurement/OptModMeasurePage.java index ac7554b..9a0edd7 100644 --- a/src/main/java/a8k/extui/page/measurement/OptModMeasurePage.java +++ b/src/main/java/a8k/extui/page/measurement/OptModMeasurePage.java @@ -1,9 +1,9 @@ package a8k.extui.page.measurement; import a8k.app.type.exception.AppException; -import a8k.app.channel.iflytophald.driver.MiniServoDriver; -import a8k.app.channel.iflytophald.driver.StepMotorCtrlDriver; -import a8k.app.channel.iflytophald.type.protocol.StepMotorMId; +import a8k.app.iflytophald.driver.MiniServoDriver; +import a8k.app.iflytophald.driver.StepMotorCtrlDriver; +import a8k.app.iflytophald.type.protocol.StepMotorMId; import a8k.extui.mgr.ExtApiPageMgr; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/extui/page/measurement/PlatesBoxMeasurePage.java b/src/main/java/a8k/extui/page/measurement/PlatesBoxMeasurePage.java index 8a86eab..2c7e7f4 100644 --- a/src/main/java/a8k/extui/page/measurement/PlatesBoxMeasurePage.java +++ b/src/main/java/a8k/extui/page/measurement/PlatesBoxMeasurePage.java @@ -1,8 +1,8 @@ package a8k.extui.page.measurement; import a8k.app.type.exception.AppException; -import a8k.app.channel.iflytophald.driver.StepMotorCtrlDriver; -import a8k.app.channel.iflytophald.type.protocol.StepMotorMId; +import a8k.app.iflytophald.driver.StepMotorCtrlDriver; +import a8k.app.iflytophald.type.protocol.StepMotorMId; import a8k.extui.mgr.ExtApiPageMgr; import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/a8k/extui/page/measurement/ShakeModStepMotorMeasurePage.java b/src/main/java/a8k/extui/page/measurement/ShakeModStepMotorMeasurePage.java index d496e26..9753612 100644 --- a/src/main/java/a8k/extui/page/measurement/ShakeModStepMotorMeasurePage.java +++ b/src/main/java/a8k/extui/page/measurement/ShakeModStepMotorMeasurePage.java @@ -1,10 +1,10 @@ package a8k.extui.page.measurement; import a8k.app.type.exception.AppException; -import a8k.app.channel.iflytophald.driver.MiniServoDriver; -import a8k.app.channel.iflytophald.driver.StepMotorCtrlDriver; -import a8k.app.channel.iflytophald.type.protocol.MiniServoMId; -import a8k.app.channel.iflytophald.type.protocol.StepMotorMId; +import a8k.app.iflytophald.driver.MiniServoDriver; +import a8k.app.iflytophald.driver.StepMotorCtrlDriver; +import a8k.app.iflytophald.type.protocol.MiniServoMId; +import a8k.app.iflytophald.type.protocol.StepMotorMId; import a8k.app.service.param.pos.TubePreProcesPosParamMgr; import a8k.extui.mgr.ExtApiPageMgr; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/a8k/extui/page/miniservo/MiniServoScanerPage.java b/src/main/java/a8k/extui/page/miniservo/MiniServoScanerPage.java index f2b801b..7ad3065 100644 --- a/src/main/java/a8k/extui/page/miniservo/MiniServoScanerPage.java +++ b/src/main/java/a8k/extui/page/miniservo/MiniServoScanerPage.java @@ -2,8 +2,8 @@ package a8k.extui.page.miniservo; import a8k.app.type.exception.AppException; -import a8k.app.channel.iflytophald.driver.MiniServoDriver; -import a8k.app.channel.iflytophald.type.protocol.MiniServoMId; +import a8k.app.iflytophald.driver.MiniServoDriver; +import a8k.app.iflytophald.type.protocol.MiniServoMId; import a8k.extui.mgr.ExtApiPageMgr; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; diff --git a/src/main/java/a8k/extui/page/optalgotest/OptAlgoTestPage.java b/src/main/java/a8k/extui/page/optalgotest/OptAlgoTestPage.java index 8ca150d..65d0525 100644 --- a/src/main/java/a8k/extui/page/optalgotest/OptAlgoTestPage.java +++ b/src/main/java/a8k/extui/page/optalgotest/OptAlgoTestPage.java @@ -2,7 +2,7 @@ package a8k.extui.page.optalgotest; import a8k.app.dao.type.db.ProjExtInfoCard; import a8k.app.dao.type.db.ReactionRecord; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; import a8k.app.optalgo.A8kOptCurveAnalyzer; import a8k.app.optalgo.A8kPeakAnalyzer; diff --git a/src/main/java/a8k/extui/page/test/codetest/OptFormulaTestPage.java b/src/main/java/a8k/extui/page/test/codetest/OptFormulaTestPage.java index d13a9da..fbbebbb 100644 --- a/src/main/java/a8k/extui/page/test/codetest/OptFormulaTestPage.java +++ b/src/main/java/a8k/extui/page/test/codetest/OptFormulaTestPage.java @@ -7,7 +7,7 @@ import a8k.app.optalgo.type.A8kOptPeakInfo; import a8k.app.type.a8k.BloodType; import a8k.app.type.exception.AppException; import a8k.app.type.a8k.state.SampleInfo; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; import a8k.app.service.data.ProjIdCardInfoMgrService; import a8k.app.service.data.ProjInfoMgrService; import a8k.app.type.a8k.proj.ProjInfo; diff --git a/src/main/java/a8k/extui/page/test/codetest/OptFormulaTestPageV2.java b/src/main/java/a8k/extui/page/test/codetest/OptFormulaTestPageV2.java index 329dc62..acc7e1f 100644 --- a/src/main/java/a8k/extui/page/test/codetest/OptFormulaTestPageV2.java +++ b/src/main/java/a8k/extui/page/test/codetest/OptFormulaTestPageV2.java @@ -10,7 +10,7 @@ import a8k.app.type.a8k.BloodType; import a8k.app.type.exception.AppException; import a8k.app.type.a8k.opt.PeakName; import a8k.app.type.a8k.state.SampleInfo; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; import a8k.app.service.data.ProjIdCardInfoMgrService; import a8k.app.service.data.ProjInfoMgrService; import a8k.app.type.a8k.proj.ProjInfo; diff --git a/src/main/java/a8k/extui/page/test/verification/HbotCodeScanPosVerificationPage.java b/src/main/java/a8k/extui/page/test/verification/HbotCodeScanPosVerificationPage.java index 8e1b799..7856af1 100644 --- a/src/main/java/a8k/extui/page/test/verification/HbotCodeScanPosVerificationPage.java +++ b/src/main/java/a8k/extui/page/test/verification/HbotCodeScanPosVerificationPage.java @@ -1,6 +1,6 @@ package a8k.extui.page.test.verification; -import a8k.app.channel.iflytophald.driver.CodeScanerDriver; +import a8k.app.iflytophald.driver.CodeScanerDriver; import a8k.app.service.lowerctrl.HbotMoveExCtrlService; import a8k.app.type.a8k.ConsumableGroup; import a8k.app.type.exception.AppException; diff --git a/src/main/java/a8k/extui/page/test/verification/P10ProjejIDCardTestPage.java b/src/main/java/a8k/extui/page/test/verification/P10ProjejIDCardTestPage.java index 64da3eb..fad9cbf 100644 --- a/src/main/java/a8k/extui/page/test/verification/P10ProjejIDCardTestPage.java +++ b/src/main/java/a8k/extui/page/test/verification/P10ProjejIDCardTestPage.java @@ -2,7 +2,7 @@ package a8k.extui.page.test.verification; import a8k.app.type.exception.AppException; import a8k.app.dao.type.db.ProjExtInfoCard; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; import a8k.app.i18n.Internationalization; import a8k.app.service.data.ProjIdCardInfoMgrService; import a8k.app.service.mainctrl.AppDeviceInitCtrlService; diff --git a/src/main/java/a8k/extui/page/test/verification/P31ReactionPlatesTransmitPosVerificationPage.java b/src/main/java/a8k/extui/page/test/verification/P31ReactionPlatesTransmitPosVerificationPage.java index f167942..215212c 100644 --- a/src/main/java/a8k/extui/page/test/verification/P31ReactionPlatesTransmitPosVerificationPage.java +++ b/src/main/java/a8k/extui/page/test/verification/P31ReactionPlatesTransmitPosVerificationPage.java @@ -3,8 +3,8 @@ package a8k.extui.page.test.verification; import a8k.app.type.a8k.ConsumableGroup; import a8k.app.type.a8k.pos.IncubatorPos; import a8k.app.type.exception.AppException; -import a8k.app.channel.iflytophald.driver.MiniServoDriver; -import a8k.app.channel.iflytophald.driver.StepMotorCtrlDriver; +import a8k.app.iflytophald.driver.MiniServoDriver; +import a8k.app.iflytophald.driver.StepMotorCtrlDriver; import a8k.app.service.lowerctrl.*; import a8k.extui.mgr.ExtApiPageMgr; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/a8k/extui/page/test/verification/P50VerificationScriptPage.java b/src/main/java/a8k/extui/page/test/verification/P50VerificationScriptPage.java index 05844cc..8ae6722 100644 --- a/src/main/java/a8k/extui/page/test/verification/P50VerificationScriptPage.java +++ b/src/main/java/a8k/extui/page/test/verification/P50VerificationScriptPage.java @@ -1,6 +1,6 @@ package a8k.extui.page.test.verification; -import a8k.app.channel.iflytophald.driver.PipetteCtrlDriverV2; +import a8k.app.iflytophald.driver.PipetteCtrlDriverV2; import a8k.app.service.ctrlmodule.TipOperationCtrlModule; import a8k.app.type.a8k.A8kTubeHolderType; import a8k.app.type.a8k.ConsumableGroup; diff --git a/src/main/java/a8k/extui/type/ret/AppRetV1.java b/src/main/java/a8k/extui/type/ret/AppRetV1.java index 1ae9ec5..9cbf671 100644 --- a/src/main/java/a8k/extui/type/ret/AppRetV1.java +++ b/src/main/java/a8k/extui/type/ret/AppRetV1.java @@ -3,7 +3,7 @@ package a8k.extui.type.ret; import a8k.app.type.error.AECodeError; import a8k.app.type.error.AppError; import a8k.app.type.exception.AppException; -import a8k.app.channel.iflytophald.type.protocol.A8kEcode; +import a8k.app.iflytophald.type.protocol.A8kEcode; import a8k.app.i18n.Internationalization; import jakarta.validation.ValidationException; import lombok.Getter;