update

src/main/java/a8k/service/app/devicedriver/pos/Hbot2DCodeScanPos.java

@@ -30,10 +30,7 @@ public class Hbot2DCodeScanPos {
 	@PostConstruct
 	void initialize() {
 		posReader = lowerDeviceParameterDBService.getReader(this.getClass());
-		Integer paraVersion = posReader.getVersion();
-		if (!nowParaVersion.equals(paraVersion)) {
-			paramReset();
-		}
+
 	}
 
 

src/main/java/a8k/service/app/devicedriver/pos/HbotConsumablePosMgr.java

@@ -33,14 +33,11 @@ public class HbotConsumablePosMgr {
 	@PostConstruct
 	void initialize() {
 		posReader = lowerDeviceParameterDBService.getReader(this.getClass());
-		Integer paraVersion = posReader.getVersion();
 
 		for (HbotConsumablePosParam param : HbotConsumablePosParam.values()) {
 			posReader.setParamChName(param, param.chName);
 		}
-		if (!nowParaVersion.equals(paraVersion)) {
-			paramReset();
-		}
+
 	}
 
 	public void paramReset() {

src/main/java/a8k/service/app/devicedriver/pos/HbotFixPosMgr.java

@@ -50,10 +50,7 @@ public class HbotFixPosMgr {
 			posReader.setParamChName(pos, pos.chName);
 		}
 
-		Integer paraVersion = posReader.getVersion();
-		if (!nowParaVersion.equals(paraVersion)) {
-			paramReset();
-		}
+
 	}
 
 	public void paramReset() {

src/main/java/a8k/service/app/devicedriver/pos/HbotSamplePosMgr.java

@@ -37,10 +37,7 @@ public class HbotSamplePosMgr {
 		for (HbotSamplePos pos : HbotSamplePos.values()) {
 			posReader.setParamChName(pos, pos.chName);
 		}
-		Integer paraVersion = posReader.getVersion();
-		if (!nowParaVersion.equals(paraVersion)) {
-			paramReset();
-		}
+
 	}
 
 	public void paramReset() {

src/main/java/a8k/service/app/devicedriver/pos/OptModulePosMgr.java

@@ -41,10 +41,7 @@ public class OptModulePosMgr {
 	@PostConstruct
 	void initialize() {
 		posReader = lowerDeviceParameterDBService.getReader(this.getClass());
-		Integer paraVersion = posReader.getVersion();
-		if (!nowParaVersion.equals(paraVersion)) {
-			paramReset();
-		}
+
 	}
 
 	public void paramReset() {

src/main/java/a8k/service/app/devicedriver/pos/PlatesBoxPosMgr.java

@@ -48,10 +48,7 @@ public class PlatesBoxPosMgr {
 	@PostConstruct
 	void initialize() {
 		posReader = lowerDeviceParameterDBService.getReader(this.getClass());
-		Integer paraVersion = posReader.getVersion();
-		if (!nowParaVersion.equals(paraVersion)) {
-			paramReset();
-		}
+
 	}
 
 	public void paramReset() {

src/main/java/a8k/service/app/devicedriver/pos/TubeFeedingModulePosMgr.java

@@ -45,18 +45,18 @@ public class TubeFeedingModulePosMgr {
 	void initialize() {
 		posReader = lowerDeviceParameterDBService.getReader(this.getClass());
 		Integer paraVersion = posReader.getVersion();
-		if (!nowParaVersion.equals(paraVersion)) {
-			logger.info("init param");
-			posReader.setVersion(nowParaVersion);
-			posReader.setParam(POS.TubeHolderEnterXPos, -46);
-			posReader.setParam(POS.TubeHolderExitXPos, 3975);
-			posReader.setParam(POS.TubeHolderScanXPos, 2202);
-			posReader.setParam(POS.Tube0ScanXPos, 505);
-			posReader.setParam(POS.Tube0AltitJudgXPos, 505);
-			posReader.setParam(POS.Tube0ExistJudgXPos, 300);
-			posReader.setParam(POS.Tube0PreProcessXPos, 1225);
-			posReader.setParam(POS.TubeScanServoTorque, 500);
-		}
+//		if (!nowParaVersion.equals(paraVersion)) {
+//			logger.info("init param");
+//			posReader.setVersion(nowParaVersion);
+//			posReader.setParam(POS.TubeHolderEnterXPos, -46);
+//			posReader.setParam(POS.TubeHolderExitXPos, 3975);
+//			posReader.setParam(POS.TubeHolderScanXPos, 2202);
+//			posReader.setParam(POS.Tube0ScanXPos, 505);
+//			posReader.setParam(POS.Tube0AltitJudgXPos, 505);
+//			posReader.setParam(POS.Tube0ExistJudgXPos, 300);
+//			posReader.setParam(POS.Tube0PreProcessXPos, 1225);
+//			posReader.setParam(POS.TubeScanServoTorque, 500);
+//		}
 
 	}
 

src/main/java/a8k/service/app/devicedriver/pos/TubeHolderParamMgr.java

@@ -25,10 +25,7 @@ public class TubeHolderParamMgr {
 	@PostConstruct
 	void initialize() {
 		posReader = lowerDeviceParameterDBService.getReader(this.getClass());
-		Integer paraVersion = posReader.getVersion();
-		if (!nowParaVersion.equals(paraVersion)) {
-			paramReset();
-		}
+
 	}
 
 	void paramReset() {

src/main/java/a8k/service/app/devicedriver/pos/TubePreProcesPosMgr.java

@@ -45,25 +45,25 @@ public class TubePreProcesPosMgr {
 	void initialize() {
 		posReader = lowerDeviceParameterDBService.getReader(this.getClass());
 		Integer paraVersion = posReader.getVersion();
-		if (!nowParaVersion.equals(paraVersion)) {
-			logger.info("init param");
-			posReader.setVersion(nowParaVersion);
-
-			posReader.setParam(POS.GripperServoOpenPos, 1600);
-			posReader.setParam(POS.GripperServoClosePos, 1460);
-			posReader.setParam(POS.GripperServoTakeCapPos, 1515);
-
-			posReader.setParam(POS.YServoTakeTubePos, 3000);
-			posReader.setParam(POS.YServoShakePos, 2130);
-
-			posReader.setParam(POS.ZMotorTakeHTubePos, 739);
-			posReader.setParam(POS.ZMotorShakeTubePos, 835);
-
-			posReader.setParam(POS.ShakeClampMotorClampPos, 10);
-			posReader.setParam(POS.ShakeClampMotorReleasePos, 90);
-
-			posReader.setParam(POS.GripperRedundancySpacingForTubeCap, 20);
-		}
+//		if (!nowParaVersion.equals(paraVersion)) {
+//			logger.info("init param");
+//			posReader.setVersion(nowParaVersion);
+//
+//			posReader.setParam(POS.GripperServoOpenPos, 1600);
+//			posReader.setParam(POS.GripperServoClosePos, 1460);
+//			posReader.setParam(POS.GripperServoTakeCapPos, 1515);
+//
+//			posReader.setParam(POS.YServoTakeTubePos, 3000);
+//			posReader.setParam(POS.YServoShakePos, 2130);
+//
+//			posReader.setParam(POS.ZMotorTakeHTubePos, 739);
+//			posReader.setParam(POS.ZMotorShakeTubePos, 835);
+//
+//			posReader.setParam(POS.ShakeClampMotorClampPos, 10);
+//			posReader.setParam(POS.ShakeClampMotorReleasePos, 90);
+//
+//			posReader.setParam(POS.GripperRedundancySpacingForTubeCap, 20);
+//		}
 	}
 
 

src/main/java/a8k/service/app/devicedriver/pos/TurntablePosMgr.java

@@ -34,10 +34,7 @@ public class TurntablePosMgr {
 	@PostConstruct
 	void initialize() {
 		posReader = lowerDeviceParameterDBService.getReader(this.getClass());
-		Integer paraVersion = posReader.getVersion();
-		if (!nowParaVersion.equals(paraVersion)) {
-			paramReset();
-		}
+
 	}
 
 	public void paramReset() {

src/main/java/a8k/service/db/LowerDeviceParameterDBService.java

@@ -39,19 +39,30 @@ public class LowerDeviceParameterDBService {
 	}
 
 	public void setParamChName(String service, String key, String chName) {
-		Parameter parameter = getParam(service, key);
-		if (parameter == null) {
-			parameter         = new Parameter();
-			parameter.service = service;
-			parameter.key     = key;
-			parameter.chName  = chName;
-			ZSqliteJdbcHelper.addObj(jdbcTemplate, tableName, tClass, parameter);
+		Parameter old = getParam(service, key);
+		if (old == null) {
+			Parameter newobj = new Parameter();
+			newobj.service = service;
+			newobj.key     = key;
+			newobj.chName  = chName;
+			ZSqliteJdbcHelper.addObj(jdbcTemplate, tableName, tClass, newobj);
 		} else {
-			if (parameter.chName != null && parameter.chName.equals(chName)) {
-				return;
+			//			{
+			//				ZSqliteJdbcHelper.delete(jdbcTemplate, tableName, old.id);
+			//				Parameter newobj = old.deepCopy();
+			//				newobj.id = 0;
+			//				ZSqliteJdbcHelper.addObj(jdbcTemplate, tableName, tClass, newobj);
+			//			}
+
+			{
+				if (old.chName != null && old.chName.equals(chName)) {
+					return;
+				}
+				Parameter newobj = old.deepCopy();
+				newobj.chName = chName;
+				ZSqliteJdbcHelper.updateObj(jdbcTemplate, tableName, tClass, newobj);
 			}
-			parameter.chName = chName;
-			ZSqliteJdbcHelper.updateObj(jdbcTemplate, tableName, tClass, parameter);
+
 		}
 
 	}

src/main/java/a8k/service/db/type/Parameter.java

@@ -9,4 +9,18 @@ public class Parameter {
 	public String     valType;
 	public ObjectNode val;
 	public String     chName;
+
+	public Parameter() {
+	}
+
+	public Parameter deepCopy() {
+		Parameter ret = new Parameter();
+		ret.id      = id;
+		ret.service = service;
+		ret.key     = key;
+		ret.valType = valType;
+		ret.val     = val != null ? val.deepCopy() : null;
+		ret.chName  = chName;
+		return ret;
+	}
 }

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

@@ -176,6 +176,10 @@ public class ZSqliteJdbcHelper {
 		return args;
 	}
 
+	public static void delete(JdbcTemplate jdbcTemplate, String tableName,int id){
+		jdbcTemplate.update("delete from " + tableName + " where id = ?", id);
+	}
+
 	public static void addObj(JdbcTemplate jdbcTemplate, String tableName, Class<?> tClass, Object obj) {
 		StringBuilder sql    = new StringBuilder("insert into " + tableName + "(");
 		StringBuilder values = new StringBuilder(" values(");