重构部分代码

src/main/java/a8k/app/a8ktype/state/SensorState.java

@@ -10,8 +10,6 @@ public class SensorState {
 	Integer incubateBoxTemperature = 25;
 	@Schema(description = "废液桶满标志")
 	Boolean wasteBinFullFlag       = false;
-	@Schema(description = "A8K项目卡状态")
-	Boolean A8kProjCardState = false;
 
 	public synchronized Integer getPboxTemperature() {
 		return pboxTemperature;

src/main/java/a8k/app/config/IflytophaldConnectionConfig.java

@@ -1,6 +1,6 @@
 package a8k.app.config;
 
-import a8k.app.hardware.basedriver.A8kCanBusConnection;
+import a8k.app.hardware.channel.A8kCanBusConnection;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/main/java/a8k/app/controler/api/v1/app/data/A8kProjectCardControler.java

@@ -6,7 +6,7 @@ import a8k.app.service.data.ProjIdCardInfoMgrService;
 import a8k.app.service.statemgr.GStateMgrService;
 import a8k.app.dao.type.A8kProjInfoCardBreif;
 import a8k.app.a8ktype.ui.ApiRet;
-import a8k.app.a8ktype.db.CommonPage;
+import a8k.app.dao.type.CommonPage;
 import a8k.app.a8ktype.exception.AppException;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

src/main/java/a8k/app/controler/api/v1/app/data/ReactionResultControler.java

@@ -4,7 +4,7 @@ import a8k.app.service.data.ReactionRecordMgrService;
 import a8k.app.service.statemgr.GStateMgrService;
 import a8k.app.dao.type.ReactionReport;
 import a8k.app.a8ktype.ui.ApiRet;
-import a8k.app.a8ktype.db.CommonPage;
+import a8k.app.dao.type.CommonPage;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;

src/main/java/a8k/app/dao/A8kProjExtInfoCardDao.java

@@ -1,6 +1,6 @@
 package a8k.app.dao;
 
-import a8k.app.a8ktype.db.CommonPage;
+import a8k.app.dao.type.CommonPage;
 import a8k.app.a8ktype.exception.AppException;
 import a8k.app.dao.type.ProjExtInfoCard;
 import a8k.app.hardware.type.a8kcanprotocol.A8kEcode;

src/main/java/a8k/app/a8ktype/db/CommonPage.java → src/main/java/a8k/app/dao/type/CommonPage.java

@@ -1,4 +1,4 @@
-package a8k.app.a8ktype.db;
+package a8k.app.dao.type;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/a8k/app/factory/AppExceptionFactory.java

@@ -1,23 +0,0 @@
-package a8k.app.factory;
-
-import a8k.app.hardware.type.a8kcanprotocol.A8kEcode;
-import a8k.app.a8ktype.error.AppError;
-import a8k.app.a8ktype.error.AEConsumeNotEnoughError;
-import a8k.app.a8ktype.exception.AppException;
-import jakarta.annotation.Resource;
-import org.slf4j.Logger;
-import org.springframework.stereotype.Component;
-import a8k.app.service.data.ProjInfoMgrService;
-
-@Component
-public class AppExceptionFactory {
-	static Logger logger = org.slf4j.LoggerFactory.getLogger(AppExceptionFactory.class);
-
-	@Resource
-	ProjInfoMgrService projConfigMgrService;
-
-
-	public AppException buildAppException(A8kEcode code) {
-		return new AppException(new AppError(code));
-	}
-}

src/main/java/a8k/app/factory/ZAppPromoptFactory.java

@@ -103,22 +103,6 @@ public class ZAppPromoptFactory {
 	public static AppPromptEvent buildAppPromoptEvent(Exception e) {
 		return new AppPromptEvent(buildAppPromopt(e));
 	}
-	//
-	//	public static List<AppPromptEvent> buildAppPromptEvents(A8kEcodeContextListPromptEvent e) {
-	//		List<AppPromptEvent> ret = new ArrayList<>();
-	//		for (AppActionErrorContext ecode : e.ecodeList) {
-	//			ret.add(new AppPromptEvent(ZAppPromoptFactory.buildAppPromopt(ecode.ecode)));
-	//		}
-	//		return ret;
-	//	}
-	//
-	//	public static  List<AppPromptEvent>  buildAppPromptEvents(A8kErrorsPromptEvent e) {
-	//		List<AppPromptEvent> prompts = new java.util.ArrayList<>();
-	//		for (AppError error : e.errors) {
-	//			prompts.add(new AppPromptEvent(ZAppPromoptFactory.buildAppPromopt(error)));
-	//		}
-	//		return prompts;
-	//
-	//	}
+
 
 }

src/main/java/a8k/app/hardware/basedriver/A8kCanBusConnection.java → src/main/java/a8k/app/hardware/channel/A8kCanBusConnection.java

@@ -1,4 +1,4 @@
-package a8k.app.hardware.basedriver;
+package a8k.app.hardware.channel;
 
 import a8k.OS;
 import a8k.app.a8ktype.appevent.A8kCanBusOnConnectEvent;

src/main/java/a8k/app/hardware/basedriver/A8kCanBusService.java → src/main/java/a8k/app/hardware/channel/A8kCanBusService.java

@@ -1,4 +1,4 @@
-package a8k.app.hardware.basedriver;
+package a8k.app.hardware.channel;
 
 import a8k.app.hardware.type.regindex.RegIndex;
 import a8k.app.hardware.type.a8kcanprotocol.*;

src/main/java/a8k/app/hardware/basedriver/LisUartChannelConnection.java → src/main/java/a8k/app/hardware/channel/LisUartChannelConnection.java

@@ -1,4 +1,4 @@
-package a8k.app.hardware.basedriver;
+package a8k.app.hardware.channel;
 import lombok.extern.slf4j.Slf4j;
 import org.java_websocket.client.WebSocketClient;
 import org.java_websocket.enums.ReadyState;

src/main/java/a8k/app/hardware/driver/CodeScanerDriver.java

@@ -1,7 +1,7 @@
 package a8k.app.hardware.driver;
 
 import a8k.OS;
-import a8k.app.hardware.basedriver.A8kCanBusService;
+import a8k.app.hardware.channel.A8kCanBusService;
 import a8k.app.hardware.type.a8kcanprotocol.A8kPacket;
 import a8k.app.hardware.type.a8kcanprotocol.CmdId;
 import a8k.app.hardware.type.a8kcanprotocol.MId;

src/main/java/a8k/app/hardware/driver/HbotDriver.java

@@ -1,6 +1,6 @@
 package a8k.app.hardware.driver;
 
-import a8k.app.hardware.basedriver.A8kCanBusService;
+import a8k.app.hardware.channel.A8kCanBusService;
 import a8k.app.hardware.type.a8kcanprotocol.CmdId;
 import a8k.app.hardware.type.a8kcanprotocol.MId;
 import a8k.app.hardware.driver.type.HbotRegIndex;

src/main/java/a8k/app/hardware/driver/InputDetectDriver.java

@@ -2,7 +2,7 @@ package a8k.app.hardware.driver;
 
 import a8k.app.a8ktype.error.AECodeError;
 import a8k.app.a8ktype.exception.AppException;
-import a8k.app.hardware.basedriver.A8kCanBusService;
+import a8k.app.hardware.channel.A8kCanBusService;
 import a8k.app.hardware.type.a8kcanprotocol.CmdId;
 import a8k.app.hardware.type.a8kcanprotocol.InputIOId;
 import a8k.app.hardware.type.a8kcanprotocol.ModuleType;

src/main/java/a8k/app/hardware/driver/MiniServoDriver.java

@@ -1,7 +1,7 @@
 package a8k.app.hardware.driver;
 
 import a8k.app.constant.MiniServoConstant;
-import a8k.app.hardware.basedriver.A8kCanBusService;
+import a8k.app.hardware.channel.A8kCanBusService;
 import a8k.app.hardware.driver.type.MiniServoRegIndex;
 import a8k.app.hardware.type.a8kcanprotocol.A8kEcode;
 import a8k.app.hardware.type.a8kcanprotocol.CmdId;
@@ -9,10 +9,8 @@ import a8k.app.hardware.type.regindex.RegIndex;
 import a8k.app.hardware.driver.type.MiniServoMId;
 import a8k.app.a8ktype.error.AEHardwareError;
 import a8k.app.a8ktype.exception.AppException;
-import jakarta.annotation.Resource;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
 import org.springframework.stereotype.Component;
 
 

src/main/java/a8k/app/hardware/extdriver/ModuleEnableCtrlDriver.java → src/main/java/a8k/app/hardware/driver/ModuleEnableCtrlDriver.java

@@ -1,10 +1,6 @@
-package a8k.app.hardware.extdriver;
+package a8k.app.hardware.driver;
 
-import a8k.app.hardware.basedriver.A8kCanBusService;
-import a8k.app.hardware.driver.HbotDriver;
-import a8k.app.hardware.driver.MiniServoDriver;
-import a8k.app.hardware.driver.PipetteCtrlDriver;
-import a8k.app.hardware.driver.StepMotorCtrlDriver;
+import a8k.app.hardware.channel.A8kCanBusService;
 import a8k.app.hardware.driver.type.MiniServoMId;
 import a8k.app.hardware.driver.type.StepMotorMId;
 import a8k.app.a8ktype.exception.AppException;

src/main/java/a8k/app/hardware/driver/OptModuleDriver.java

@@ -2,7 +2,7 @@ package a8k.app.hardware.driver;
 
 import a8k.OS;
 import a8k.app.factory.A8kPacketFactory;
-import a8k.app.hardware.basedriver.A8kCanBusService;
+import a8k.app.hardware.channel.A8kCanBusService;
 import a8k.app.hardware.type.a8kcanprotocol.A8kEcode;
 import a8k.app.hardware.type.a8kcanprotocol.CmdId;
 import a8k.app.hardware.type.a8kcanprotocol.MId;

src/main/java/a8k/app/hardware/driver/OutputIOCtrlDriver.java

@@ -2,7 +2,7 @@ package a8k.app.hardware.driver;
 
 import a8k.app.a8ktype.error.AECodeError;
 import a8k.app.a8ktype.exception.AppException;
-import a8k.app.hardware.basedriver.A8kCanBusService;
+import a8k.app.hardware.channel.A8kCanBusService;
 import a8k.app.hardware.type.a8kcanprotocol.CmdId;
 import a8k.app.hardware.type.a8kcanprotocol.ModuleType;
 import a8k.app.hardware.type.a8kcanprotocol.OutputIOId;

src/main/java/a8k/app/hardware/driver/PipetteCtrlDriver.java

@@ -1,8 +1,7 @@
 package a8k.app.hardware.driver;
 
 import a8k.extui.mgr.ExtApiPageMgr;
-import a8k.extui.type.ExtUIPageCfg;
-import a8k.app.hardware.basedriver.A8kCanBusService;
+import a8k.app.hardware.channel.A8kCanBusService;
 import a8k.app.hardware.type.LldType;
 import a8k.app.hardware.type.a8kcanprotocol.CmdId;
 import a8k.app.hardware.type.a8kcanprotocol.MId;
@@ -11,7 +10,6 @@ import a8k.app.hardware.type.regindex.RegIndex;
 import a8k.app.a8ktype.exception.AppException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;
 import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;

src/main/java/a8k/app/hardware/driver/StepMotorCtrlDriver.java

@@ -1,7 +1,7 @@
 package a8k.app.hardware.driver;
 
 import a8k.app.constant.ActionOvertimeConstant;
-import a8k.app.hardware.basedriver.A8kCanBusService;
+import a8k.app.hardware.channel.A8kCanBusService;
 import a8k.app.hardware.type.a8kcanprotocol.A8kPacket;
 import a8k.app.hardware.type.a8kcanprotocol.CmdId;
 import a8k.app.hardware.type.regindex.RegIndex;

src/main/java/a8k/app/hardware/driver/TemperatureControlDriver.java

@@ -1,6 +1,6 @@
 package a8k.app.hardware.driver;
 
-import a8k.app.hardware.basedriver.A8kCanBusService;
+import a8k.app.hardware.channel.A8kCanBusService;
 import a8k.app.hardware.type.a8kcanprotocol.CmdId;
 import a8k.app.hardware.driver.type.TemperatureControlerMid;
 import a8k.app.hardware.driver.type.TemperatureControlerRegIndex;

src/main/java/a8k/app/hardware/utils/OptGainConvert.java

@@ -0,0 +1,75 @@
+package a8k.app.hardware.utils;
+
+import a8k.app.dao.type.a8kidcard.zenum.A8kOptType;
+
+public class OptGainConvert {
+
+	static public class FOptGainConvert {
+		public double scanerToRealGain(int gain) {
+			double scanGain = 0;
+			scanGain = (((100. / 256.) * (double) gain) + 0.125) / 2.15 + 1.; //和硬件电路有关
+			return scanGain;
+		}
+
+		public int scanerToRawGain(double scanGain) {
+			int scan_gain_raw = 0;
+			scan_gain_raw = (int) (((scanGain - 1.0) * 2.15 - 0.125) * 255. / 100. + 0.5);  //和硬件电路有关
+			if (scan_gain_raw < 1)
+				scan_gain_raw = 1;
+			if (scan_gain_raw > 255)
+				scan_gain_raw = 255;
+			return scan_gain_raw;
+		}
+
+
+	}
+
+	static public class TOptGainConvert {
+		public int scanerToRawGain(double scanGain) {
+			// opamp_gain = (((100.0 * (float) scan_gain_raw) / 255) + 2.4) / 4.7;
+			int scan_gain_raw = 0;
+			scan_gain_raw = (int) ((scanGain * 4.7 - 2.4) * 256. / 100. + 0.5);  //和硬件电路有关
+			if (scan_gain_raw < 1)
+				scan_gain_raw = 1;
+			if (scan_gain_raw > 255)
+				scan_gain_raw = 255;
+			return scan_gain_raw;
+		}
+
+		public double scanerToRealGain(int gain) {
+			double scanGain = 0;
+			scanGain = (((100.0 * (double) gain) / 256) + 2.4) / 4.7;  //和硬件电路有关
+			return scanGain;
+		}
+
+
+	}
+
+
+	public static double scanerToRealGain(A8kOptType type, int gain) {
+		if (type == A8kOptType.FOPT) {
+			return new FOptGainConvert().scanerToRealGain(gain);
+		} else if (type == A8kOptType.TOPT) {
+			return new TOptGainConvert().scanerToRealGain(gain);
+		}
+		return 0;
+	}
+
+	public static int scanerToRawGain(A8kOptType type, double scanGain) {
+		if (type == A8kOptType.FOPT) {
+			return new FOptGainConvert().scanerToRawGain(scanGain);
+		} else if (type == A8kOptType.TOPT) {
+			return new TOptGainConvert().scanerToRawGain(scanGain);
+		}
+		return 0;
+	}
+
+	public static void main(String[] args) {
+		TOptGainConvert tgc = new TOptGainConvert();
+		System.out.printf("t gain range %f->%f%n", tgc.scanerToRealGain(0), tgc.scanerToRealGain(255));
+
+		FOptGainConvert fgc = new FOptGainConvert();
+		System.out.printf("f gain range %f->%f%n", fgc.scanerToRealGain(0), fgc.scanerToRealGain(255));
+
+	}
+}

src/main/java/a8k/app/service/appsetup/A8kSubModuleRegInitService.java

@@ -5,17 +5,15 @@ import a8k.app.a8ktype.appevent.A8kCanBusOnConnectEvent;
 import a8k.app.a8ktype.appevent.AppEvent;
 import a8k.app.a8ktype.exception.AppException;
 import a8k.app.config.A8kSubModuleInitRegConfig;
-import a8k.app.dao.SubModuleRegInitialValueDao;
 import a8k.app.dao.type.SubModuleRegInitialValue;
-import a8k.app.hardware.basedriver.A8kCanBusService;
-import a8k.app.hardware.extdriver.ModuleEnableCtrlDriver;
+import a8k.app.hardware.channel.A8kCanBusService;
+import a8k.app.hardware.driver.ModuleEnableCtrlDriver;
 import a8k.app.hardware.type.a8kcanprotocol.MId;
 import a8k.app.hardware.type.a8kcanprotocol.ModuleType;
 import a8k.app.hardware.type.regindex.RegIndex;
 import a8k.app.service.bases.AppEventBusService;
 import a8k.app.service.data.SubModuleRegInitialValueMgrService;
 import a8k.app.service.statemgr.GStateMgrService;
-import a8k.app.utils.ZList;
 import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

src/main/java/a8k/app/service/background/SensorDataUpdateService.java

@@ -3,7 +3,7 @@ package a8k.app.service.background;
 import a8k.OS;
 import a8k.app.a8ktype.DeviceRunMode;
 import a8k.app.a8ktype.error.AppError;
-import a8k.app.hardware.basedriver.A8kCanBusService;
+import a8k.app.hardware.channel.A8kCanBusService;
 import a8k.app.service.bases.AppEventBusService;
 import a8k.app.service.statemgr.GStateMgrService;
 import a8k.app.service.statemgr.OptScanModuleStateMgrService;
@@ -11,7 +11,6 @@ import a8k.app.a8ktype.state.enumtype.OptScanModuleState;
 import a8k.app.hardware.driver.TemperatureControlDriver;
 import a8k.app.a8ktype.exception.AppException;
 import jakarta.annotation.PostConstruct;
-import jakarta.annotation.Resource;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;

src/main/java/a8k/app/service/data/ProjIdCardInfoMgrService.java

@@ -15,7 +15,7 @@ import a8k.app.service.lowerctrl.ProjIDCardCtrlAndMonitorService;
 import a8k.app.service.statemgr.GStateMgrService;
 import a8k.app.dao.type.A8kProjInfoCardBreif;
 import a8k.app.dao.type.ProjExtInfoCard;
-import a8k.app.a8ktype.db.CommonPage;
+import a8k.app.dao.type.CommonPage;
 import a8k.app.utils.ProjBuildinInfo;
 import a8k.app.utils.ZAppChecker;
 import a8k.app.utils.DoubleUtils;

src/main/java/a8k/app/service/data/ReactionRecordMgrService.java

@@ -7,7 +7,7 @@ import a8k.app.dao.type.ReactionReport;
 import a8k.app.service.statemgr.GStateMgrService;
 import a8k.app.a8ktype.state.ProjectTaskContext;
 import a8k.app.a8ktype.type.ReactionResult;
-import a8k.app.a8ktype.db.CommonPage;
+import a8k.app.dao.type.CommonPage;
 import a8k.app.utils.ProjInfo;
 import a8k.app.utils.ZJsonHelper;
 import jakarta.annotation.PostConstruct;

src/main/java/a8k/app/service/data/SubModuleRegInitialValueMgrService.java

@@ -1,21 +1,14 @@
 package a8k.app.service.data;
 
-import a8k.OS;
-import a8k.app.a8ktype.appevent.A8kCanBusOnConnectEvent;
-import a8k.app.a8ktype.appevent.AppEvent;
 import a8k.app.a8ktype.exception.AppException;
 import a8k.app.config.A8kSubModuleInitRegConfig;
 import a8k.app.dao.SubModuleRegInitialValueDao;
 import a8k.app.dao.type.SubModuleRegInitialValue;
-import a8k.app.hardware.basedriver.A8kCanBusService;
-import a8k.app.hardware.extdriver.ModuleEnableCtrlDriver;
+import a8k.app.hardware.channel.A8kCanBusService;
 import a8k.app.hardware.type.a8kcanprotocol.MId;
 import a8k.app.hardware.type.a8kcanprotocol.ModuleType;
 import a8k.app.hardware.type.regindex.RegIndex;
-import a8k.app.service.bases.AppEventBusService;
-import a8k.app.service.statemgr.GStateMgrService;
 import a8k.app.utils.ZList;
-import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;

src/main/java/a8k/app/service/lis/LISService.java

@@ -1,11 +0,0 @@
-package a8k.app.service.lis;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-@Component
-@Slf4j
-@RequiredArgsConstructor
-public class LISService {
-}

src/main/java/a8k/app/service/lowerctrl/DeviceMoveToZeroCtrlService.java

@@ -4,9 +4,9 @@ import a8k.app.a8ktype.ui.ZAppPromopt;
 import a8k.app.a8ktype.ui.ZAppPromoptFormsItem;
 import a8k.app.a8ktype.ui.MessageLevel;
 import a8k.app.factory.ZAppPromoptFactory;
-import a8k.app.hardware.basedriver.A8kCanBusService;
+import a8k.app.hardware.channel.A8kCanBusService;
 import a8k.app.hardware.driver.InputDetectDriver;
-import a8k.app.hardware.extdriver.ModuleEnableCtrlDriver;
+import a8k.app.hardware.driver.ModuleEnableCtrlDriver;
 import a8k.app.hardware.type.a8kcanprotocol.A8kEcode;
 import a8k.app.hardware.type.a8kcanprotocol.InputIOId;
 import a8k.app.hardware.driver.MiniServoDriver;

src/main/java/a8k/app/service/lowerctrl/HbotMoveCtrlService.java

@@ -7,7 +7,7 @@ import a8k.app.hardware.driver.type.PipetteRegIndex;
 import a8k.app.hardware.driver.HbotDriver;
 import a8k.app.hardware.driver.PipetteCtrlDriver;
 import a8k.app.a8ktype.exception.AppException;
-import a8k.app.hardware.basedriver.A8kCanBusService;
+import a8k.app.hardware.channel.A8kCanBusService;
 import a8k.app.hardware.type.a8kcanprotocol.A8kEcode;
 import a8k.app.hardware.type.a8kcanprotocol.InputIOId;
 import a8k.app.hardware.type.a8kcanprotocol.MId;

src/main/java/a8k/app/service/lowerctrl/OptScanModuleCtrlService.java

@@ -18,7 +18,7 @@ import a8k.app.a8ktype.device.IncubatorPos;
 import a8k.app.a8ktype.opttype.OptScanDirection;
 import a8k.app.a8ktype.exception.AppException;
 import a8k.app.utils.ProjBuildinInfo;
-import a8k.app.utils.opt_gain_convert.OptGainConvert;
+import a8k.app.hardware.utils.OptGainConvert;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;

src/main/java/a8k/app/service/lowerctrl/ProjIDCardCtrlAndMonitorService.java

@@ -9,7 +9,7 @@ import a8k.app.hardware.type.regindex.RegIndex;
 import a8k.app.dao.type.ProjExtInfoCard;
 import a8k.app.a8ktype.exception.AppException;
 import a8k.app.service.bases.AppEventBusService;
-import a8k.app.hardware.basedriver.A8kCanBusService;
+import a8k.app.hardware.channel.A8kCanBusService;
 import a8k.app.hardware.type.a8kcanprotocol.*;
 import a8k.app.a8kproj.A8kIdCardDataParseService;
 import a8k.app.utils.ProjBuildinInfo;

src/main/java/a8k/app/service/lowerctrl/TubeFeedingCtrlService.java

@@ -15,14 +15,12 @@ import a8k.app.a8ktype.type.TubeHolderScanResult;
 import a8k.app.a8ktype.type.TubesScanResult;
 import a8k.app.a8ktype.exception.AppException;
 import a8k.app.a8ktype.type.TargetPosMeasureDirection;
-import a8k.app.hardware.basedriver.A8kCanBusService;
+import a8k.app.hardware.channel.A8kCanBusService;
 import a8k.app.hardware.type.a8kcanprotocol.A8kEcode;
 import a8k.app.hardware.type.a8kcanprotocol.InputIOId;
 import a8k.app.hardware.type.a8kcanprotocol.MId;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 @Component

src/main/java/a8k/app/service/lowerctrl/TubeFeedingExCtrlService.java

@@ -1,7 +1,7 @@
 package a8k.app.service.lowerctrl;
 
 import a8k.app.constant.MiniServoConstant;
-import a8k.app.hardware.basedriver.A8kCanBusService;
+import a8k.app.hardware.channel.A8kCanBusService;
 import a8k.app.constant.ActionOvertimeConstant;
 import a8k.app.hardware.type.a8kcanprotocol.CmdId;
 import a8k.app.hardware.type.a8kcanprotocol.MId;

src/main/java/a8k/app/service/lowerctrl/TurnableMoveCtrlService.java

@@ -6,7 +6,7 @@ import a8k.app.hardware.driver.type.StepMotorMId;
 import a8k.app.service.param.pos.TurntablePosParamMgr;
 import a8k.app.a8ktype.device.IncubatorPos;
 import a8k.app.a8ktype.exception.AppException;
-import a8k.app.hardware.basedriver.A8kCanBusService;
+import a8k.app.hardware.channel.A8kCanBusService;
 import a8k.app.hardware.type.a8kcanprotocol.A8kEcode;
 import a8k.app.hardware.type.a8kcanprotocol.InputIOId;
 

src/main/java/a8k/app/service/mainctrl/AppConsumablesScanService.java

@@ -268,28 +268,6 @@ public class AppConsumablesScanService {
 		return new ConsumablesScanResultPacket(scanReport, scanRawResults);
 	}
 
-//	public ConsumablesOneChannelScanResultPacket scanOneGroupConsumables(ConsumableGroup group) throws AppException {
-//		if (!gstate.isDeviceInited()) {
-//			throw new AppException(A8kEcode.APPE_DEVICE_NOT_INITED);
-//		}
-//
-//		Integer                  chNum = group.off;
-//		ConsumableOneChRawResult scanResult;
-//
-//		scanResult = scanCtrlService.doScanOneCh(chNum);
-//
-//		var scanReport = parseScanResult(chNum, scanResult);
-//		if (scanReport.state != ConsumablesScanReportErrorType.PASS) {
-//			loadingConsumables(chNum, scanReport);
-//		}
-//
-//		ConsumablesOneChannelScanResultPacket ret = new ConsumablesOneChannelScanResultPacket();
-//		ret.scanRawResult   = scanResult;
-//		ret.scanReport      = scanReport;
-//		ret.consumableState = consumablesMgrService.getState();
-//
-//		return ret;
-//	}
 
 	// For Test Only
 	public void loadingConsumablesDirectly(ConsumablesScanReport result) {

src/main/java/a8k/app/service/mainctrl/mainflowctrl/MainFlowCtrlScheduler.java

@@ -11,7 +11,7 @@ import a8k.app.a8ktype.error.AppError;
 import a8k.app.a8ktype.exception.AppException;
 import a8k.app.a8ktype.state.enumtype.A8kWorkState;
 import a8k.app.factory.ZAppPromoptFactory;
-import a8k.app.hardware.extdriver.ModuleEnableCtrlDriver;
+import a8k.app.hardware.driver.ModuleEnableCtrlDriver;
 import a8k.app.hardware.type.a8kcanprotocol.A8kEcode;
 import a8k.app.service.bases.AppEventBusService;
 import a8k.app.service.bases.UIMessage;

src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/AC30ScanTubeHolderTask.java

@@ -1,7 +1,7 @@
 package a8k.app.service.mainctrl.mainflowctrl.action;
 
 import a8k.app.a8ktype.DeviceRunMode;
-import a8k.app.hardware.basedriver.A8kCanBusService;
+import a8k.app.hardware.channel.A8kCanBusService;
 import a8k.app.hardware.driver.InputDetectDriver;
 import a8k.app.hardware.type.a8kcanprotocol.A8kEcode;
 import a8k.app.hardware.type.a8kcanprotocol.InputIOId;

src/main/java/a8k/app/service/mainctrl/mainflowctrl/base/A8kPublicAreaResourcePacket.java

@@ -1,17 +0,0 @@
-package a8k.app.service.mainctrl.mainflowctrl.base;
-
-import java.util.List;
-
-public class A8kPublicAreaResourcePacket implements AutoCloseable {
-	List<PublicAreaResource> areas;
-
-	public A8kPublicAreaResourcePacket(List<PublicAreaResource> areas) {
-		this.areas = areas;
-	}
-
-	@Override public void close() {
-		for (PublicAreaResource area : areas) {
-			area.close();
-		}
-	}
-}

src/main/java/a8k/app/service/mainctrl/mainflowctrl/base/ActionDoUtils.java

@@ -1,23 +0,0 @@
-package a8k.app.service.mainctrl.mainflowctrl.base;
-
-import a8k.app.a8ktype.error.AppError;
-import a8k.app.a8ktype.exception.AppException;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-public class ActionDoUtils {
-	@FunctionalInterface
-	public interface Function {
-		void doFunction() throws AppException;
-	}
-
-	public static AppError doAction(Function function) {
-		try {
-			function.doFunction();
-		} catch (AppException e) {
-			log.error("doAction error: {}", e.getError(), e);
-			return e.getError();
-		}
-		return null;
-	}
-}

src/main/java/a8k/app/utils/ZAppChecker.java

@@ -1,12 +1,8 @@
 package a8k.app.utils;
 
-import a8k.app.a8ktype.DeviceRunMode;
-import a8k.app.factory.AppExceptionFactory;
 import a8k.app.hardware.type.a8kcanprotocol.A8kEcode;
-import a8k.app.service.statemgr.GStateMgrService;
 import a8k.app.a8ktype.error.AppError;
 import a8k.app.a8ktype.exception.AppException;
-import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
@@ -15,12 +11,6 @@ import java.util.List;
 @Component
 @Slf4j
 public class ZAppChecker {
-	@Resource
-	AppExceptionFactory ebuilder;
-
-	@Resource
-	GStateMgrService gstate;
-
 	static public void check(Boolean conditon, A8kEcode ecode, String fmt, Object... args) throws AppException {
 		if (!conditon) {
 			throw new AppException(new AppError(ecode, fmt, args));

src/main/java/a8k/app/utils/ZSqlite.java

@@ -1,7 +1,7 @@
 package a8k.app.utils;
 
 import a8k.app.constant.FilePathConstant;
-import a8k.app.a8ktype.db.CommonPage;
+import a8k.app.dao.type.CommonPage;
 import jakarta.annotation.Nullable;
 import lombok.SneakyThrows;
 import org.slf4j.Logger;

src/main/java/a8k/app/utils/opt_gain_convert/FOptGainConvert.java

@@ -1,21 +0,0 @@
-package a8k.app.utils.opt_gain_convert;
-
-public class FOptGainConvert {
-	public double scanerToRealGain(int gain) {
-		double scanGain = 0;
-		scanGain = (((100. / 256.) * (double) gain) + 0.125) / 2.15 + 1.; //和硬件电路有关
-		return scanGain;
-	}
-
-	public int scanerToRawGain(double scanGain) {
-		int scan_gain_raw = 0;
-		scan_gain_raw = (int) (((scanGain - 1.0) * 2.15 - 0.125) * 255. / 100. + 0.5);  //和硬件电路有关
-		if (scan_gain_raw < 1)
-			scan_gain_raw = 1;
-		if (scan_gain_raw > 255)
-			scan_gain_raw = 255;
-		return scan_gain_raw;
-	}
-
-
-}

src/main/java/a8k/app/utils/opt_gain_convert/OptGainConvert.java

@@ -1,32 +0,0 @@
-package a8k.app.utils.opt_gain_convert;
-
-import a8k.app.dao.type.a8kidcard.zenum.A8kOptType;
-
-public class OptGainConvert {
-	public static double scanerToRealGain(A8kOptType type, int gain) {
-		if (type == A8kOptType.FOPT) {
-			return new FOptGainConvert().scanerToRealGain(gain);
-		} else if (type == A8kOptType.TOPT) {
-			return new TOptGainConvert().scanerToRealGain(gain);
-		}
-		return 0;
-	}
-
-	public static int scanerToRawGain(A8kOptType type, double scanGain) {
-		if (type == A8kOptType.FOPT) {
-			return new FOptGainConvert().scanerToRawGain(scanGain);
-		} else if (type == A8kOptType.TOPT) {
-			return new TOptGainConvert().scanerToRawGain(scanGain);
-		}
-		return 0;
-	}
-
-	public static void main(String[] args) {
-		TOptGainConvert tgc = new TOptGainConvert();
-		System.out.printf("t gain range %f->%f%n", tgc.scanerToRealGain(0), tgc.scanerToRealGain(255));
-
-		FOptGainConvert fgc = new FOptGainConvert();
-		System.out.printf("f gain range %f->%f%n", fgc.scanerToRealGain(0), fgc.scanerToRealGain(255));
-
-	}
-}

src/main/java/a8k/app/utils/opt_gain_convert/TOptGainConvert.java

@@ -1,23 +0,0 @@
-package a8k.app.utils.opt_gain_convert;
-
-public class TOptGainConvert {
-
-	public int scanerToRawGain(double scanGain) {
-		// opamp_gain = (((100.0 * (float) scan_gain_raw) / 255) + 2.4) / 4.7;
-		int scan_gain_raw = 0;
-		scan_gain_raw = (int) ((scanGain * 4.7 - 2.4) * 256. / 100. + 0.5);  //和硬件电路有关
-		if (scan_gain_raw < 1)
-			scan_gain_raw = 1;
-		if (scan_gain_raw > 255)
-			scan_gain_raw = 255;
-		return scan_gain_raw;
-	}
-
-	public double scanerToRealGain(int gain) {
-		double scanGain = 0;
-		scanGain = (((100.0 * (double) gain) / 256) + 2.4) / 4.7;  //和硬件电路有关
-		return scanGain;
-	}
-
-
-}

src/main/java/a8k/app/factory/FakeOptScanResultFactory.java → src/main/java/a8k/extui/factory/FakeOptScanResultFactory.java

@@ -1,4 +1,4 @@
-package a8k.app.factory;
+package a8k.extui.factory;
 
 import a8k.app.a8kproj.optalgo.type.A8kOptPeak;
 import a8k.app.a8kproj.optalgo.type.OptAlgoAnalysResult;

src/main/java/a8k/app/factory/ProjExtInfoCardFactory.java → src/main/java/a8k/extui/factory/ProjExtInfoCardFactory.java

@@ -1,4 +1,4 @@
-package a8k.app.factory;
+package a8k.extui.factory;
 
 import a8k.SpringBootBeanUtil;
 import a8k.app.a8ktype.exception.AppException;

src/main/java/a8k/extui/mgr/ExtApiPageGroupCfgMgr.java

@@ -169,7 +169,7 @@ public class ExtApiPageGroupCfgMgr {
 						new Menu(VirtualEventGeneratorPage.class, "虚拟事件生成"),
 						new Menu(IDCardDataGeneratorPage.class, "ID卡数据生成器")
 				)),
-				new Menu(UsrOperationSimulation.class, "用户行为模拟器"),
+				new Menu(UsrOperationSimulationPage.class, "用户行为模拟器"),
 				new Menu(CodeGeneratorPage.class, "条码字符生成工具")
 		)));
 

src/main/java/a8k/extui/oldpage/pos_calibration/PosMeasureUtilsPage.java

@@ -4,7 +4,7 @@ import a8k.extui.mgr.ExtApiPageMgr;
 import a8k.extui.type.ExtUIPageCfg;
 import a8k.app.hardware.driver.HbotDriver;
 import a8k.app.hardware.driver.PipetteCtrlDriver;
-import a8k.app.hardware.extdriver.ModuleEnableCtrlDriver;
+import a8k.app.hardware.driver.ModuleEnableCtrlDriver;
 import a8k.app.a8ktype.device.Pos2d;
 import a8k.app.a8ktype.exception.AppException;
 import jakarta.annotation.PostConstruct;

src/main/java/a8k/extui/page/debug/P01ProjInfoDebugPage.java

@@ -3,7 +3,7 @@ package a8k.extui.page.debug;
 import a8k.app.a8ktype.exception.AppException;
 import a8k.app.dao.type.A8kProjInfoCardBreif;
 import a8k.app.dao.type.ProjExtInfoCard;
-import a8k.app.factory.ProjExtInfoCardFactory;
+import a8k.extui.factory.ProjExtInfoCardFactory;
 import a8k.app.service.data.ProjIdCardInfoMgrService;
 import a8k.app.service.data.ProjInfoMgrService;
 import a8k.app.service.statemgr.GStateMgrService;

src/main/java/a8k/extui/page/extapp/OptModuleParamCalibration.java

@@ -13,7 +13,7 @@ import a8k.app.service.param.optparam.OptModuleExtParamsMgr;
 import a8k.app.a8ktype.param.optpos.OptModuleExtParam;
 import a8k.app.dao.type.a8kidcard.zenum.A8kOptType;
 import a8k.app.a8ktype.exception.AppException;
-import a8k.app.utils.opt_gain_convert.OptGainConvert;
+import a8k.app.hardware.utils.OptGainConvert;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;
 import org.slf4j.Logger;

src/main/java/a8k/extui/page/extapp/UsrOperationSimulation.java → src/main/java/a8k/extui/page/extapp/UsrOperationSimulationPage.java

@@ -6,7 +6,7 @@ import a8k.app.a8ktype.exception.AppException;
 import a8k.app.a8ktype.type.TubeHolderScanResult;
 import a8k.app.a8ktype.type.TubesScanResult;
 import a8k.app.dao.type.ProjExtInfoCard;
-import a8k.app.factory.ProjExtInfoCardFactory;
+import a8k.extui.factory.ProjExtInfoCardFactory;
 import a8k.app.service.data.ProjIdCardInfoMgrService;
 import a8k.app.service.data.ProjInfoMgrService;
 import a8k.app.service.lowerctrl.ProjIDCardCtrlAndMonitorService;
@@ -20,7 +20,7 @@ import jakarta.annotation.Resource;
 import org.springframework.stereotype.Component;
 
 @Component
-public class UsrOperationSimulation {
+public class UsrOperationSimulationPage {
 	@Resource
 	ConsumablesMgrService consumablesMgrService;
 

src/main/java/a8k/extui/page/extapp/debug_assistant/FakeReactionRecordGeneratorPage.java

@@ -9,8 +9,8 @@ import a8k.app.a8ktype.type.ReactionResult;
 import a8k.app.dao.type.a8kidcard.A8kResultBuilderFn;
 import a8k.app.dao.type.a8kidcard.zenum.A8kOptType;
 import a8k.app.dao.type.a8kidcard.zenum.A8kResultUnit;
-import a8k.app.factory.FakeOptScanResultFactory;
-import a8k.app.factory.ProjExtInfoCardFactory;
+import a8k.extui.factory.FakeOptScanResultFactory;
+import a8k.extui.factory.ProjExtInfoCardFactory;
 import a8k.app.service.data.ProjInfoMgrService;
 import a8k.app.service.data.ReactionRecordMgrService;
 import a8k.app.service.statemgr.GStateMgrService;

src/main/java/a8k/extui/page/extapp/debug_assistant/IDCardDataGeneratorPage.java

@@ -2,7 +2,7 @@ package a8k.extui.page.extapp.debug_assistant;
 
 import a8k.app.a8ktype.exception.AppException;
 import a8k.app.dao.type.ProjExtInfoCard;
-import a8k.app.factory.ProjExtInfoCardFactory;
+import a8k.extui.factory.ProjExtInfoCardFactory;
 import a8k.app.service.data.ProjIdCardInfoMgrService;
 import a8k.app.service.data.ProjInfoMgrService;
 import a8k.app.service.statemgr.GStateMgrService;

src/main/java/a8k/extui/page/extsetting/db/A8kSubModuleParameterInitDebugPage.java

@@ -3,7 +3,7 @@ package a8k.extui.page.extsetting.db;
 import a8k.app.a8ktype.exception.AppException;
 import a8k.app.controler.filemgr.StorageControler;
 import a8k.app.dao.type.SubModuleRegInitialValue;
-import a8k.app.hardware.basedriver.A8kCanBusService;
+import a8k.app.hardware.channel.A8kCanBusService;
 import a8k.app.hardware.type.a8kcanprotocol.MId;
 import a8k.app.service.data.SubModuleRegInitialValueMgrService;
 import a8k.extui.mgr.ExtApiPageMgr;

src/main/java/a8k/extui/page/test/driver/LowLevelBoardVersionPreviewPage.java

@@ -1,7 +1,7 @@
 package a8k.extui.page.test.driver;
 
 import a8k.app.a8ktype.exception.AppException;
-import a8k.app.hardware.basedriver.A8kCanBusService;
+import a8k.app.hardware.channel.A8kCanBusService;
 import a8k.app.hardware.type.a8kcanprotocol.MId;
 import a8k.extui.mgr.ExtApiPageMgr;
 import a8k.extui.type.ExtApiStatu;