update

pom.xml

@@ -95,7 +95,7 @@
             <!--https://hutool.cn/docs-->
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
-            <version>5.8.16</version>
+            <version>5.8.24</version>
         </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>

src/main/java/a8k/app/dao/db/ProjectBaseInfoDao.java

@@ -24,15 +24,6 @@ public class ProjectBaseInfoDao extends ZSqlite<ProjectBaseInfo> {
 	@PostConstruct
 	void init() {
 		init(jdbcTemplate, "zapp_a8k_project_info", ProjectBaseInfo.class, true);
-//		var list = ZCSVUtils.readCSVFromResource("a8k/db/zapp_a8k_project_info.csv", ProjectBaseInfo.class);
-//		for (var val : list) {
-////			log.info("{}", ZJsonHelper.objectToJson(val));
-//			val.id = val.projId;
-//			add(val);
-//			val = findByProjId(val.projId);
-//			checkVal(val);
-//		}
-
 	}
 
 	public ProjectBaseInfo findByProjId(Integer projId) {
@@ -45,19 +36,4 @@ public class ProjectBaseInfoDao extends ZSqlite<ProjectBaseInfo> {
 	}
 
 
-//	private void checkVal(ProjectBaseInfo val) {
-//		for (var field : val.getClass().getDeclaredFields()) {
-//			try {
-//				field.setAccessible(true);
-//				if (field.get(val) == null) {
-//					log.error("field {} is null,{}", field.getName(), val);
-//					System.exit(1);
-//				}
-//			} catch (IllegalAccessException e) {
-//				e.printStackTrace();
-//			}
-//		}
-//
-//	}
-
 }

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

@@ -40,7 +40,7 @@ public class PipetteCtrlDriver {
 	@Resource
 	ExtApiPageMgr extApiPageMgr;
 
-	final Integer overtime = 10000;
+	final Integer overtime = 20000;
 
 
 	public void zMotorEnable(Integer enable) throws AppException {

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

@@ -1,12 +1,16 @@
 package a8k.extui.page.extsetting.db;
 
 import a8k.app.a8ktype.exception.AppException;
+import a8k.app.controler.filemgr.StorageControler;
+import a8k.app.dao.db.ProjectBaseInfoDao;
 import a8k.app.service.data.ProjIdCardInfoMgrService;
 import a8k.app.service.data.ProjInfoMgrService;
 import a8k.app.utils.ProjBuildinInfo;
 import a8k.extui.mgr.ExtApiPageMgr;
 import a8k.extui.type.ExtUIPageCfg;
 import a8k.extui.type.ExtUiTable;
+import a8k.extui.type.param.ExtUIFile;
+import a8k.extui.type.ret.FileToBeDownload;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
@@ -24,6 +28,8 @@ public class ProjInfoMgrPage {
 	@Resource
 	ProjInfoMgrService projInfoMgrService;
 
+	@Resource
+	ProjectBaseInfoDao projectBaseInfoDao;
 	//
 	//	1. 查询设备支持的项目信息
 	//  2. 查询设备支持的单位范围
@@ -35,12 +41,15 @@ public class ProjInfoMgrPage {
 		ExtUIPageCfg page = new ExtUIPageCfg(this);
 		page.addFunction("获取项目列表", this::getProjInfoBreifList);
 		page.addFunction("获取项目详细信息", this::getProjInfoById);
+		page.newGroup("导入/导出");
+		page.addFunction("导出项目信息", this::exportDeviceActionParam);
+		page.addFunction("导入项目信息", this::importDeviceActionParam);
 		extApiPageMgr.addPage(page);
 	}
 
 	public ExtUiTable getProjInfoBreifList() throws AppException {
-		var                 allproj = projInfoMgrService.getAllProjBuildInInfo();
-		return new ExtUiTable(ProjBuildinInfo.class,allproj);
+		var allproj = projInfoMgrService.getAllProjBuildInInfo();
+		return new ExtUiTable(ProjBuildinInfo.class, allproj);
 	}
 
 
@@ -48,4 +57,15 @@ public class ProjInfoMgrPage {
 		return projInfoMgrService.getProjBuildInInfo(projId);
 	}
 
+	public FileToBeDownload exportDeviceActionParam() {
+		projectBaseInfoDao.export();
+		return new FileToBeDownload(StorageControler.getDoloadPath(projectBaseInfoDao.getExportPATH()));
+	}
+
+	public void importDeviceActionParam(ExtUIFile file) {
+		String filecontent = new String(file.bytes);
+		projectBaseInfoDao.importFromCSV(filecontent, true);
+	}
+
+
 }

src/main/java/a8k/extui/page/test/verification/P51FullFlowVerificationPage.java

@@ -229,6 +229,7 @@ public class P51FullFlowVerificationPage {
 			optScanResults.add(optScanResult);
 		}
 		reactionRecordMgrService.addRecord(cxt.sampleInfo, projInfo, optScanResults, cxt.results);
+		optScanModuleCtrlService.dropPlate();
 
 	}