update

src/main/java/a8k/service/app_basic_service/ActionReactorService.java → src/main/java/a8k/baseservice/ActionReactorService.java

@@ -1,4 +1,4 @@
-package a8k.service.app_basic_service;
+package a8k.baseservice;
 
 import a8k.controler.extapi.pagecontrol.ExtApiTabConfig;
 import a8k.controler.extapi.utils.ExtApiStatu;
@@ -6,7 +6,6 @@ import a8k.controler.extapi.utils.ExtApiFn;
 import a8k.controler.extapi.utils.ExtApiTab;
 import a8k.hardware.type.a8kcanprotocol.A8kEcode;
 import a8k.type.ZFunction;
-import a8k.type.exception.ActionBreakException;
 import a8k.type.exception.AppException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/a8k/controler/extapi/EngineerPageControler.java

@@ -2,7 +2,7 @@ package a8k.controler.extapi;
 
 import a8k.type.appret.AppRet;
 import a8k.controler.extapi.utils.*;
-import a8k.hardware.HardwareServiceSetting;
+import a8k.dbservice.HardwareServiceSetting;
 import a8k.utils.*;
 import com.iflytop.uf.UfApplication;
 import com.iflytop.uf.util.UfClassHelper;

src/main/java/a8k/controler/extapi/utils/EnginnerParamReader.java

@@ -1,6 +1,6 @@
 package a8k.controler.extapi.utils;
 
-import a8k.hardware.HardwareServiceSetting;
+import a8k.dbservice.HardwareServiceSetting;
 import a8k.type.exception.AppException;
 
 

src/main/java/a8k/hardware/HardwareServiceSetting.java → src/main/java/a8k/dbservice/HardwareServiceSetting.java

@@ -1,4 +1,4 @@
-package a8k.hardware;
+package a8k.dbservice;
 
 import a8k.hardware.type.a8kcanprotocol.A8kEcode;
 import a8k.type.exception.AppException;

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

@@ -1,43 +0,0 @@
-package a8k.service;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-
-@Component
-public class A8kDebugTaskExecutorService {
-	public static final Logger logger = LoggerFactory.getLogger(A8kDebugTaskExecutorService.class);
-
-	Thread task;
-
-	synchronized void  exec(Runnable runnable) {
-		if (task != null) {
-			task.interrupt();
-			try {
-				task.join();
-			} catch (InterruptedException ignored) {
-				return;
-			}
-		}
-
-		task = new Thread(runnable);
-		task.start();
-	}
-
-	synchronized void stop() {
-		try {
-			task.join();
-			task = null;
-		} catch (InterruptedException e) {
-			logger.error(e.getMessage());
-		}
-	}
-
-	synchronized boolean isRunning() {
-		if (task == null) {
-			return false;
-		}
-		return task.isAlive();
-	}
-
-}

src/main/java/a8k/service/app/AppConsumablesMgrService.java

@@ -2,8 +2,8 @@ package a8k.service.app;
 
 import a8k.hardware.type.a8kcanprotocol.A8kEcode;
 import a8k.service.app.app_consumables_mgr_service.ConsumablesScanRawResult;
-import a8k.service.app_basic_service.ActionReactorService;
-import a8k.service.bak_devicectrl.ctrl.HbotControlService;
+import a8k.baseservice.ActionReactorService;
+import a8k.service.devicectrl.ctrl.HbotControlService;
 import a8k.service.hardwareparam.Hbot2DCodeScanPosMgrService;
 import a8k.type.appret.AppRet;
 import a8k.controler.extapi.utils.ExtApiTab;

src/main/java/a8k/service/app/AppDeviceInitializationModule.java

@@ -8,7 +8,7 @@ import a8k.hardware.type.a8kcanprotocol.A8kEcode;
 import a8k.hardware.type.a8kcanprotocol.IOId;
 import a8k.hardware.type.a8kcanprotocol.MId;
 import a8k.service.app.appstate.AppStateMgrService;
-import a8k.service.app_basic_service.ActionReactorService;
+import a8k.baseservice.ActionReactorService;
 import a8k.service.app.app_device_initialization_module.checkpoint.CheckPointType;
 import a8k.service.app.app_device_initialization_module.checkpoint.CheckResult;
 import a8k.service.app.app_device_initialization_module.checkpoint.Checkpoint;

src/main/java/a8k/service/bak_devicectrl/calibration/PositionCalibration.java → src/main/java/a8k/service/devicectrl/calibration/PositionCalibration.java

@@ -1,4 +1,4 @@
-package a8k.service.bak_devicectrl.calibration;
+package a8k.service.devicectrl.calibration;
 
 import a8k.controler.extapi.pagecontrol.ExtApiTabConfig;
 import a8k.type.exception.AppException;
@@ -7,9 +7,9 @@ import a8k.type.cfg.Pos2d;
 import a8k.controler.extapi.utils.*;
 import a8k.hardware.A8kCanBusService;
 import a8k.hardware.type.a8kcanprotocol.MId;
-import a8k.service.bak_devicectrl.param.DebugParam;
-import a8k.service.bak_devicectrl.param.PosParam;
-import a8k.service.bak_devicectrl.param.TimeParam;
+import a8k.service.devicectrl.param.DebugParam;
+import a8k.service.devicectrl.param.PosParam;
+import a8k.service.devicectrl.param.TimeParam;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Component;
 

src/main/java/a8k/service/bak_devicectrl/commonctrl/HardwareCommonCtrl.java → src/main/java/a8k/service/devicectrl/commonctrl/HardwareCommonCtrl.java

@@ -1,4 +1,4 @@
-package a8k.service.bak_devicectrl.commonctrl;
+package a8k.service.devicectrl.commonctrl;
 
 
 import a8k.type.exception.AppException;
@@ -10,8 +10,8 @@ import a8k.hardware.A8kCanBusService;
 import a8k.hardware.type.a8kcanprotocol.A8kEcode;
 import a8k.hardware.type.a8kcanprotocol.IOId;
 import a8k.hardware.type.a8kcanprotocol.MId;
-import a8k.service.bak_devicectrl.param.PosParam;
-import a8k.service.bak_devicectrl.param.TimeParam;
+import a8k.service.devicectrl.param.PosParam;
+import a8k.service.devicectrl.param.TimeParam;
 import jakarta.annotation.Resource;
 import org.slf4j.Logger;
 import org.springframework.stereotype.Component;

src/main/java/a8k/service/bak_devicectrl/ctrl/HbotControlService.java → src/main/java/a8k/service/devicectrl/ctrl/HbotControlService.java

@@ -1,11 +1,9 @@
-package a8k.service.bak_devicectrl.ctrl;
+package a8k.service.devicectrl.ctrl;
 
 import a8k.controler.extapi.pagecontrol.ExtApiTabConfig;
 import a8k.hardware.A8kPipetteCtrlModule;
 import a8k.hardware.type.regindex.PipetteRegIndex;
-import a8k.type.ConsumableGroup;
 import a8k.type.exception.AppException;
-import a8k.type.appret.AppRet;
 import a8k.type.cfg.*;
 import a8k.controler.extapi.utils.*;
 import a8k.hardware.A8kCanBusService;
@@ -13,10 +11,6 @@ import a8k.hardware.type.a8kcanprotocol.A8kEcode;
 import a8k.hardware.type.a8kcanprotocol.IOId;
 import a8k.hardware.type.a8kcanprotocol.MId;
 import a8k.hardware.type.regindex.RegIndex;
-import a8k.service.bak_devicectrl.commonctrl.HardwareCommonCtrl;
-import a8k.service.bak_devicectrl.param.DebugParam;
-import a8k.service.bak_devicectrl.param.PosParam;
-import a8k.service.bak_devicectrl.param.TimeParam;
 import jakarta.annotation.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/a8k/service/bak_devicectrl/ctrl/PipetteGunCtrlService.java → src/main/java/a8k/service/devicectrl/ctrl/PipetteGunCtrlService.java

@@ -1,4 +1,4 @@
-package a8k.service.bak_devicectrl.ctrl;
+package a8k.service.devicectrl.ctrl;
 
 
 import jakarta.annotation.PostConstruct;

src/main/java/a8k/service/bak_devicectrl/ctrl/ReactionPlatesTransmitCtrl.java → src/main/java/a8k/service/devicectrl/ctrl/ReactionPlatesTransmitCtrl.java

@@ -1,4 +1,4 @@
-package a8k.service.bak_devicectrl.ctrl;
+package a8k.service.devicectrl.ctrl;
 
 import a8k.controler.extapi.pagecontrol.ExtApiTabConfig;
 import a8k.type.exception.AppException;
@@ -11,9 +11,9 @@ import a8k.hardware.type.a8kcanprotocol.A8kEcode;
 import a8k.hardware.type.a8kcanprotocol.IOId;
 import a8k.hardware.type.a8kcanprotocol.MId;
 import a8k.hardware.type.regindex.RegIndex;
-import a8k.service.bak_devicectrl.param.DebugParam;
-import a8k.service.bak_devicectrl.param.PosParam;
-import a8k.service.bak_devicectrl.param.TimeParam;
+import a8k.service.devicectrl.param.DebugParam;
+import a8k.service.devicectrl.param.PosParam;
+import a8k.service.devicectrl.param.TimeParam;
 import jakarta.annotation.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/a8k/service/bak_devicectrl/ctrl/SamplesPreProcesCtrl.java → src/main/java/a8k/service/devicectrl/ctrl/SamplesPreProcesCtrl.java

@@ -1,4 +1,4 @@
-package a8k.service.bak_devicectrl.ctrl;
+package a8k.service.devicectrl.ctrl;
 
 import a8k.controler.extapi.pagecontrol.ExtApiTabConfig;
 import a8k.type.exception.AppException;
@@ -7,9 +7,9 @@ import a8k.controler.extapi.utils.*;
 import a8k.hardware.A8kCanBusService;
 import a8k.hardware.type.a8kcanprotocol.A8kEcode;
 import a8k.hardware.type.a8kcanprotocol.MId;
-import a8k.service.bak_devicectrl.param.DebugParam;
-import a8k.service.bak_devicectrl.param.TimeParam;
-import a8k.service.bak_devicectrl.param.PosParam;
+import a8k.service.devicectrl.param.DebugParam;
+import a8k.service.devicectrl.param.TimeParam;
+import a8k.service.devicectrl.param.PosParam;
 import a8k.utils.ZEQ;
 import jakarta.annotation.Resource;
 import org.slf4j.Logger;

src/main/java/a8k/service/bak_devicectrl/ctrl/TubeRackMoveCtrl.java → src/main/java/a8k/service/devicectrl/ctrl/TubeRackMoveCtrl.java

@@ -1,4 +1,4 @@
-package a8k.service.bak_devicectrl.ctrl;
+package a8k.service.devicectrl.ctrl;
 
 import a8k.controler.extapi.pagecontrol.ExtApiTabConfig;
 import a8k.type.exception.AppException;
@@ -9,9 +9,9 @@ import a8k.hardware.A8kCanBusService;
 import a8k.hardware.type.a8kcanprotocol.A8kEcode;
 import a8k.hardware.type.a8kcanprotocol.IOId;
 import a8k.hardware.type.a8kcanprotocol.MId;
-import a8k.service.bak_devicectrl.param.DebugParam;
-import a8k.service.bak_devicectrl.param.PosParam;
-import a8k.service.bak_devicectrl.param.TimeParam;
+import a8k.service.devicectrl.param.DebugParam;
+import a8k.service.devicectrl.param.PosParam;
+import a8k.service.devicectrl.param.TimeParam;
 import jakarta.annotation.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/a8k/service/bak_devicectrl/param/DebugParam.java → src/main/java/a8k/service/devicectrl/param/DebugParam.java

@@ -1,4 +1,4 @@
-package a8k.service.bak_devicectrl.param;
+package a8k.service.devicectrl.param;
 
 import a8k.controler.extapi.utils.ExtApiTab;
 import a8k.controler.extapi.utils.ExtApiFn;

src/main/java/a8k/service/bak_devicectrl/param/PosParam.java → src/main/java/a8k/service/devicectrl/param/PosParam.java

@@ -1,4 +1,4 @@
-package a8k.service.bak_devicectrl.param;
+package a8k.service.devicectrl.param;
 
 import a8k.controler.extapi.pagecontrol.ExtApiTabConfig;
 import a8k.type.cfg.*;

src/main/java/a8k/service/bak_devicectrl/param/TimeParam.java → src/main/java/a8k/service/devicectrl/param/TimeParam.java

@@ -1,4 +1,4 @@
-package a8k.service.bak_devicectrl.param;
+package a8k.service.devicectrl.param;
 
 
 import a8k.controler.extapi.pagecontrol.ExtApiTabConfig;

src/main/java/a8k/service/bak_devicectrl/status/DeviceStatus.java → src/main/java/a8k/service/devicectrl/status/DeviceStatus.java

@@ -1,4 +1,4 @@
-package a8k.service.bak_devicectrl.status;
+package a8k.service.devicectrl.status;
 
 import a8k.type.exception.AppException;
 import a8k.controler.extapi.utils.ExtApiTab;

src/main/java/a8k/service/bak_devicectrl/testscript/TestScript.java → src/main/java/a8k/service/devicectrl/testscript/TestScript.java

@@ -1,34 +1,26 @@
-package a8k.service.bak_devicectrl.testscript;
+package a8k.service.devicectrl.testscript;
 
 import a8k.controler.extapi.pagecontrol.ExtApiTabConfig;
 import a8k.type.ConsumableGroup;
 import a8k.type.exception.AppException;
 import a8k.type.IncubatorPos;
 import a8k.type.appret.AppRet;
-import a8k.type.cfg.BottleGroupsPosInfo;
-import a8k.type.cfg.BottlesPosInfo;
-import a8k.type.cfg.TipPickUpPosInfo;
 import a8k.controler.extapi.utils.*;
-import a8k.service.bak_devicectrl.ctrl.SamplesPreProcesCtrl;
-import a8k.service.bak_devicectrl.ctrl.TubeRackMoveCtrl;
+import a8k.service.devicectrl.ctrl.SamplesPreProcesCtrl;
+import a8k.service.devicectrl.ctrl.TubeRackMoveCtrl;
 import a8k.hardware.A8kCanBusService;
 import a8k.hardware.type.a8kcanprotocol.A8kEcode;
-import a8k.hardware.type.a8kcanprotocol.MId;
-import a8k.hardware.type.regindex.RegIndex;
-import a8k.service.bak_devicectrl.ctrl.HbotControlService;
-import a8k.service.bak_devicectrl.ctrl.ReactionPlatesTransmitCtrl;
-import a8k.service.bak_devicectrl.param.DebugParam;
-import a8k.service.bak_devicectrl.param.PosParam;
-import a8k.service.bak_devicectrl.param.TimeParam;
+import a8k.service.devicectrl.ctrl.HbotControlService;
+import a8k.service.devicectrl.ctrl.ReactionPlatesTransmitCtrl;
+import a8k.service.devicectrl.param.DebugParam;
+import a8k.service.devicectrl.param.PosParam;
+import a8k.service.devicectrl.param.TimeParam;
 import jakarta.annotation.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Component;
 
-import java.util.HashMap;
-import java.util.Map;
-
 @Component
 @ExtApiTab(cfg = ExtApiTabConfig.TestScript)
 public class TestScript {

src/main/java/a8k/utils/ZSqliteJdbcHelper.java

@@ -6,6 +6,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.Date;
 import java.util.List;
 
 public class ZSqliteJdbcHelper {
@@ -30,6 +31,10 @@ public class ZSqliteJdbcHelper {
 				sql.append("integer,");
 			} else if (field.getType().equals(String.class)) {
 				sql.append("text,");
+			} else if (field.getType().equals(Date.class)) {
+				sql.append("text,");
+			} else if (field.getType().isEnum()) {
+				sql.append("text,");
 			} else {
 				sql.append("text,");
 			}
@@ -49,6 +54,8 @@ public class ZSqliteJdbcHelper {
 				field.set(obj, rs.getBoolean(field.getName()));
 			} else if (field.getType().equals(String.class)) {
 				field.set(obj, rs.getString(field.getName()));
+			} else if (field.getType().equals(Date.class)) {
+				field.set(obj, rs.getDate(field.getName()));
 			} else if (field.getType().isEnum()) {
 				Method methodValueOf = null;
 				try {