From 7c28f0f8a8339c52834c7d13dba63edd9bedec1d Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Thu, 17 Oct 2024 21:25:06 +0800
Subject: [PATCH] update

---
 app.db                                             | Bin 225280 -> 225280 bytes
 .../app/devicedriver/pos/Hbot2DCodeScanPos.java    |   5 +--
 .../app/devicedriver/pos/HbotConsumablePosMgr.java |   5 +--
 .../app/devicedriver/pos/HbotFixPosMgr.java        |   5 +--
 .../app/devicedriver/pos/HbotSamplePosMgr.java     |   5 +--
 .../app/devicedriver/pos/OptModulePosMgr.java      |   5 +--
 .../app/devicedriver/pos/PlatesBoxPosMgr.java      |   5 +--
 .../devicedriver/pos/TubeFeedingModulePosMgr.java  |  24 ++++++-------
 .../app/devicedriver/pos/TubeHolderParamMgr.java   |   5 +--
 .../app/devicedriver/pos/TubePreProcesPosMgr.java  |  38 ++++++++++-----------
 .../app/devicedriver/pos/TurntablePosMgr.java      |   5 +--
 .../service/db/LowerDeviceParameterDBService.java  |  33 ++++++++++++------
 src/main/java/a8k/service/db/type/Parameter.java   |  14 ++++++++
 src/main/java/a8k/utils/ZSqliteJdbcHelper.java     |   4 +++
 14 files changed, 79 insertions(+), 74 deletions(-)

diff --git a/app.db b/app.db
index a1f158b265e1e8157af2cbd56a716053370aa2ee..efb5a734e4039564d1b7b84f3ea239408ff50446 100644
GIT binary patch
delta 1850
zcmbtUeN0qG5Z|4*@9VhZ9dL-0k3-N33dnJQinVH$fK<w1fht5n6somR#EM#Lb!*aS
zf?wPplbAHdCT*I~r0O-HK@_cN+SE3&Mh^-K2xzNvN<Y#jZ6n>s5o^SxO?of;=6=7K
zH`$%}&F<~D?d`W6i3uAegv=HzN30}5tmJ5_TOK9pjr&ind#@_Y_>F)uB77v<_|q6M
zMttGby+*viP97@Wa-(=@IW}QuNtMKCHeNAez4mHnUY_NlrPb1C$<XiW@9ULXKs%t7
zX>saFb*q}C{I0YqrAoX!Ah*bwEWkcw>)14DP&y%1KK}R`>Y2=x10>rUW_Nj8YI~VF
zOk4t_`P%9-Dbw16$Q!r*IMb((gTVS+7ScqrL|lfia)S$)@hzDvP&VX5ct<zJ`Gz*$
zk(k)J+ei0~7JC!y8K*BlPoXK&xA41F!a97%ufzZ}MflpU{vmL<?=yeDuwna-b+sPr
zqOYoD%t7MeB2l~51IldqN9jvxml~pcVfoe4Vp(ai>*w?uJyL7aHW@XB9(p3Qz;@f_
zwYjZ5)_vBbkV{e$T%7n|c|WZKxvBMBKb1jR#Y3_BK25^L0G$Wih8-qIy-zK;;Co1h
z!bY_JKnwA#ABvcAkX}XF1?!m7L0`wT0s1nN-zBAZz6(6CYAxO$q_Nm{liDz9h&u4K
zL7E^!Nevzvq^rGCwtT?U3NlBODGQeD!1g{^0!7>L!fjf_v_vvXIA$uvb5!Ck@vd1r
z$=h4An}sYU%e+-<3oJ`HRY{sqQoh%<#({_ZkZxJQiQrsO?s;R}o_;zXUfhEneu%+^
z*B}Eb-o`_>Xa#t7<LXX`#pF)Ng8a8|MjzyZXO~HO^!ztP61PZ<Ki#5{c(@N{LeWk<
z*(r`}d`<S_$RMpWdzoVXo1%I))HalH>!VV+frpqyTn*e}lI6g4)23lcfJR}(0~!uo
z3zqrF1DY#&xQY$ez#~<01*?W=l~m4UjP-*PGj38Hhp$1pRLdEjAELFwCz-x-!GOs)
zah@M^EWSnOo14lJ0?V|23iR@9F(Z>n1Cgg2ZJKOsQGG_Tx`thnKWFu9s?@HWkxG>s
z_*pTa8FJ|WeTU8<S4hLrMUHTx1C?Z_MY$Ih)NFoZ@#ali1^aL6kp5Q{#t&Z&!GqSp
zgya3^o(J1pNyoLMI)rAT8wwuRf(wF0FM%gZJqyMQ%(PNcgctl!NdJ*bHXTz*2^|*%
zA<ETOF#`sDy5N7ohl4bt_2X{X&FGlW3bYCON~JqmP4!ndC$Q&YSt&6-GCZOF&`Mjs
zt<HMST5k;tIUO?B(qYNdztNX#U0Q=?RZpn-N<cZNq{&_KHaU)+Wu?9_yMsw}d<Kqo
zLY?SW%F||0FXPFgyNd}y*8nY+s`+$m8l=^h<@{N}i<v4xS2rYL%K%LgNv4@egqo+C
zHVMU9#MO|5i+Ug#?LA_wc%lhbXne|;Xcm}hBeC};Rq#v?6zDv`<fHTEnrR*Aybeos
z?tGFn(0d(nfyd*iUP#Bku0tX4xFFbe!vwK-{swFZ9up+%dQI{f6Kt0nd9>+G$Jjem
zWS=auyQ61{t#pgwKX+GLV9j@^OXpD&9V5a4d=ehMM^o{oyR-<n7<&_ZC4kNy;*$kY
z^H)BW>xFxC8Sn@*YA5jUV08Ad867q;`jcTZ+8(?ioB^?yz5q=DZaiW#tzvY|U!qtE
QX!S_@XnN}rk5upc8@|U^9{>OV

delta 961
zcmZ{iZAep57{||f?(Xi(c6TQ&q!uYILo2npEFx-^t28&AnS)+dW-fcBX(5$`MjxUV
z$-2}NgD|L1()$e-VWxd3h!Rb+7phHyUQDG=eJFy?Er=reaGvL!|M~GhJkNQWlS*?^
zX?3PJ2qAOWn$4Dr5KGU=86Mt2avP3buQ|6~Wh$s&SR}dXH}#8Vi>B#$Ro&{u-I3Zz
zeIwJ;Dp?Rc3X2|7CQ%=2Vl-3BtMcoO(QhWbA+k@_+BexR^fd)<^e&)qY`?y+FU)eI
z-uA=^aBQF6G4Pe0_v*I>lPvE!6nh?zJ*TxoCFvj;q?(BB;$|^JcqtqaRtq-sU2}_h
z4*!8aPOAA#Q>Q7cK2*1<4%;2uI-8(eQ_8Jhtp}}wrN!cqV{*E5PpT0|xalwe&5%vI
zF_fg6fRK1+lJbC;d|V1t)?m*knu8T@X%>VxVwaB#<NX)VZ(d(0kes>LHvr?#jL{;9
zEXKS2kcKmd=oF0ggNrUQgb1wm;^P5Wqh-`x)W$aCLtq{%?`c3AU+>qo>QfXNDzWP|
z<l@#6u2@_tkOI$y>0Wfd1Si@9oQy*yoLj8;S6}Go+;jzw`MDX`=H~*m+}Q6GgADbi
z&R_M1#pwX&r)9rTwUnWyxUQ6;fqzlHjG=y`Y8UpDarsiXgh4r}o<)YA16zBckS_my
zFJp5VmraWeAtV<4g`V$Y=rVjW!WyWL&}_QY*oVX=e^J+-z+!2Zk7-V)i~M{<6RJ}o
z{{R~e`%R#|g=~Z-^Dbh$YMZTeDod=7thH9KoV9r6ck*F5OS&)BN_MeBj0oS=+iIPf
zC0r5K3bOf*x!ydHzsE;;m!4uzn52?j?9&Pe325#O4oo}+w^+{<FH`XID66<@lum_E
z9d-`>`br5~1|g3|4Iu=@JF)HqtM$QK8i3#q?D|N95ZrF$Nq8aw7JT&#rt#YhOT0cz
z$6@dtRWO+VGp4hK#=D0o(Em?XoK4n7o^Hj<!_2Vh88eI}K*lu*NTpj0bs6|J$2$_>
atJ0HAf}PJ`ttmijkUK=v<E=q1n)U-rf-@ul

diff --git a/src/main/java/a8k/service/app/devicedriver/pos/Hbot2DCodeScanPos.java b/src/main/java/a8k/service/app/devicedriver/pos/Hbot2DCodeScanPos.java
index 5a28e86..5d4f90e 100644
--- a/src/main/java/a8k/service/app/devicedriver/pos/Hbot2DCodeScanPos.java
+++ b/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();
-		}
+
 	}
 
 
diff --git a/src/main/java/a8k/service/app/devicedriver/pos/HbotConsumablePosMgr.java b/src/main/java/a8k/service/app/devicedriver/pos/HbotConsumablePosMgr.java
index 31a6c55..69b32aa 100644
--- a/src/main/java/a8k/service/app/devicedriver/pos/HbotConsumablePosMgr.java
+++ b/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() {
diff --git a/src/main/java/a8k/service/app/devicedriver/pos/HbotFixPosMgr.java b/src/main/java/a8k/service/app/devicedriver/pos/HbotFixPosMgr.java
index 061a99e..8ebd245 100644
--- a/src/main/java/a8k/service/app/devicedriver/pos/HbotFixPosMgr.java
+++ b/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() {
diff --git a/src/main/java/a8k/service/app/devicedriver/pos/HbotSamplePosMgr.java b/src/main/java/a8k/service/app/devicedriver/pos/HbotSamplePosMgr.java
index 28ae0bd..da7c1fd 100644
--- a/src/main/java/a8k/service/app/devicedriver/pos/HbotSamplePosMgr.java
+++ b/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() {
diff --git a/src/main/java/a8k/service/app/devicedriver/pos/OptModulePosMgr.java b/src/main/java/a8k/service/app/devicedriver/pos/OptModulePosMgr.java
index 583fc3c..d6fa145 100644
--- a/src/main/java/a8k/service/app/devicedriver/pos/OptModulePosMgr.java
+++ b/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() {
diff --git a/src/main/java/a8k/service/app/devicedriver/pos/PlatesBoxPosMgr.java b/src/main/java/a8k/service/app/devicedriver/pos/PlatesBoxPosMgr.java
index 268282a..91866dc 100644
--- a/src/main/java/a8k/service/app/devicedriver/pos/PlatesBoxPosMgr.java
+++ b/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() {
diff --git a/src/main/java/a8k/service/app/devicedriver/pos/TubeFeedingModulePosMgr.java b/src/main/java/a8k/service/app/devicedriver/pos/TubeFeedingModulePosMgr.java
index 5a9538e..dd9888c 100644
--- a/src/main/java/a8k/service/app/devicedriver/pos/TubeFeedingModulePosMgr.java
+++ b/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);
+//		}
 
 	}
 
diff --git a/src/main/java/a8k/service/app/devicedriver/pos/TubeHolderParamMgr.java b/src/main/java/a8k/service/app/devicedriver/pos/TubeHolderParamMgr.java
index 1c9bdb9..7670155 100644
--- a/src/main/java/a8k/service/app/devicedriver/pos/TubeHolderParamMgr.java
+++ b/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() {
diff --git a/src/main/java/a8k/service/app/devicedriver/pos/TubePreProcesPosMgr.java b/src/main/java/a8k/service/app/devicedriver/pos/TubePreProcesPosMgr.java
index 59abfe6..dc270a7 100644
--- a/src/main/java/a8k/service/app/devicedriver/pos/TubePreProcesPosMgr.java
+++ b/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);
+//		}
 	}
 
 
diff --git a/src/main/java/a8k/service/app/devicedriver/pos/TurntablePosMgr.java b/src/main/java/a8k/service/app/devicedriver/pos/TurntablePosMgr.java
index 3edb909..5d25c2c 100644
--- a/src/main/java/a8k/service/app/devicedriver/pos/TurntablePosMgr.java
+++ b/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() {
diff --git a/src/main/java/a8k/service/db/LowerDeviceParameterDBService.java b/src/main/java/a8k/service/db/LowerDeviceParameterDBService.java
index 4dc06ff..8374c13 100644
--- a/src/main/java/a8k/service/db/LowerDeviceParameterDBService.java
+++ b/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);
+
 		}
 
 	}
diff --git a/src/main/java/a8k/service/db/type/Parameter.java b/src/main/java/a8k/service/db/type/Parameter.java
index 3bac380..a0625ee 100644
--- a/src/main/java/a8k/service/db/type/Parameter.java
+++ b/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;
+	}
 }
diff --git a/src/main/java/a8k/utils/ZSqliteJdbcHelper.java b/src/main/java/a8k/utils/ZSqliteJdbcHelper.java
index 797cbae..2a37621 100644
--- a/src/main/java/a8k/utils/ZSqliteJdbcHelper.java
+++ b/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(");