From 1b2b5bb36c2f721d324187dba7ef7c3c16d1f18f Mon Sep 17 00:00:00 2001 From: zhaohe Date: Thu, 17 Oct 2024 17:31:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A2=E6=B5=8B=E7=89=A9=E8=B4=A8=E5=92=8C?= =?UTF-8?q?=E5=B0=8F=E7=93=B6=E7=BC=93=E5=86=B2=E6=B6=B2=E5=9D=90=E6=A0=87?= =?UTF-8?q?=E6=A0=A1=E5=87=86=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.db | Bin 225280 -> 225280 bytes .../java/a8k/hardware/A8kModParamInitializer.java | 4 +- .../HbotLittleBottleConsumableCalibration.java | 31 ++++++--- .../app/devicedriver/pos/HbotConsumablePosMgr.java | 33 +++++----- .../service/db/LowerDeviceParameterDBService.java | 69 ++++++++++++++------- src/main/java/a8k/service/db/type/Parameter.java | 13 ++-- .../a8k/service/db/utils/PosParameterReader.java | 20 ++++++ src/main/java/a8k/type/HbotConsumablePosParam.java | 2 +- src/main/java/a8k/utils/ZJsonHelper.java | 42 +++++++++++++ src/main/java/a8k/utils/ZSqliteJdbcHelper.java | 11 ++++ 10 files changed, 169 insertions(+), 56 deletions(-) diff --git a/app.db b/app.db index da2892a4277c31c711e4b175368683fc071ac54b..a2b79c9d6ddd449a47137cb88d2a784fcd6f034e 100644 GIT binary patch delta 6475 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 littleBottleConsumableRefPoint = new java.util.ArrayList<>(); - LittleBottleConsumablePosInfo littleBottleConsumablePosInfo; @ExtApiFn(name = "开始标定小瓶坐标", group = "标定小瓶XY坐标", order = 30) public void startCalibrateLittleBottleGroup(LittleBottleConsumableType type) throws AppException { - littleBottleConsumablePosInfo = null; littleBottleConsumableRefPoint = new java.util.ArrayList<>(); littleBottleConsumableType = type; moveToZero(); @@ -104,9 +102,9 @@ public class HbotLittleBottleConsumableCalibration { public Object addLittleBottleGroupRefPoint(ConsumableGroup group, Integer off0To24) throws AppException { enableModule(); Pos2d xypos = hbotModule.readPos(); - pipetteCtrlModule.zMotorMeasureDistance(); - Integer z = pipetteCtrlModule.zMotorReadMeasureDistanceResult(); - LittleBottleConsumableRefPoint littleBufferRefPoint = new LittleBottleConsumableRefPoint(group, off0To24, new Pos3d(xypos.x, xypos.y, z)); +// pipetteCtrlModule.zMotorMeasureDistance(); +// Integer z = pipetteCtrlModule.zMotorReadMeasureDistanceResult(); + LittleBottleConsumableRefPoint littleBufferRefPoint = new LittleBottleConsumableRefPoint(group, off0To24, new Pos3d(xypos.x, xypos.y, 0)); this.littleBottleConsumableRefPoint.add(littleBufferRefPoint); disableModule(); ObjectNode node = ZJsonHelper.createObjectNode(); @@ -115,8 +113,15 @@ public class HbotLittleBottleConsumableCalibration { return node; } + @ExtApiFn(name = "移除最后一个参考点", group = "标定小瓶XY坐标", order = 32) + public void removeTheLastLittleBottleGroupRefPoint() { + if (!littleBottleConsumableRefPoint.isEmpty()) { + littleBottleConsumableRefPoint.remove(littleBottleConsumableRefPoint.size() - 1); + } + } - @ExtApiFn(name = "计算坐标", group = "标定小瓶XY坐标", order = 32) + + @ExtApiFn(name = "读取坐标计算结果", group = "标定小瓶XY坐标", order = 33) public LittleBottleConsumablePosInfo computeLittleBottlePosInfo() { //计算y0,所有group==0,1,2,同时0<=off<5的点，求平均 Double[] y = new Double[2]; @@ -191,7 +196,7 @@ public class HbotLittleBottleConsumableCalibration { var oldposInfo = hbotConsumablePosMgr.getLittleBottleConsumablePosInfo(littleBottleConsumableType); - littleBottleConsumablePosInfo = new LittleBottleConsumablePosInfo(); + var littleBottleConsumablePosInfo = new LittleBottleConsumablePosInfo(); littleBottleConsumablePosInfo.g0_000 = new Pos3d(x[0].intValue(), y[0].intValue(), oldposInfo.g0_000.z); littleBottleConsumablePosInfo.g1_000 = new Pos3d(x[1].intValue(), y[0].intValue(), oldposInfo.g1_000.z); littleBottleConsumablePosInfo.g2_000 = new Pos3d(x[2].intValue(), y[0].intValue(), oldposInfo.g2_000.z); @@ -203,12 +208,12 @@ public class HbotLittleBottleConsumableCalibration { return littleBottleConsumablePosInfo; } - @ExtApiFn(name = "保存计算结果", group = "标定小瓶XY坐标", order = 33) + @ExtApiFn(name = "保存计算结果", group = "标定小瓶XY坐标", order = 34) public void saveLittleBottleConsumablePosInfo() throws AppException { - hbotConsumablePosMgr.setLittleBottleConsumablePosInfo(littleBottleConsumableType, littleBottleConsumablePosInfo); + hbotConsumablePosMgr.setLittleBottleConsumablePosInfo(littleBottleConsumableType, computeLittleBottlePosInfo()); } - @ExtApiFn(name = "读取所有参考点", group = "标定小瓶XY坐标", order = 33) + @ExtApiFn(name = "读取所有参考点", group = "标定小瓶XY坐标", order = 35) public Object readAllRefPoint() throws AppException { return littleBottleConsumableRefPoint; } @@ -220,20 +225,26 @@ public class HbotLittleBottleConsumableCalibration { @ExtApiFn(name = "校准.小瓶穿孔Z轴位置", group = "标定Z轴", order = 101) public void setLittleBSPierceZPos() throws AppException { + enableModule(); pipetteCtrlModule.zMotorMeasureDistance(); hbotConsumablePosMgr.setParam(HbotConsumablePosParam.LittleBSPierceZPos, pipetteCtrlModule.zMotorReadMeasureDistanceResult()); + disableModule(); } @ExtApiFn(name = "校准.小瓶取样Z轴位置", group = "标定Z轴", order = 102) public void setLittleBSSampleZPos() throws AppException { + enableModule(); pipetteCtrlModule.zMotorMeasureDistance(); hbotConsumablePosMgr.setParam(HbotConsumablePosParam.LittleBSSampleZPos, pipetteCtrlModule.zMotorReadMeasureDistanceResult()); + disableModule(); } @ExtApiFn(name = "校准.探测物质取样Z轴位置", group = "标定Z轴", order = 103) public void setProbeSubstanceSampleZPos() throws AppException { + enableModule(); pipetteCtrlModule.zMotorMeasureDistance(); hbotConsumablePosMgr.setParam(HbotConsumablePosParam.ProbeSubstanceSampleZPos, pipetteCtrlModule.zMotorReadMeasureDistanceResult()); + disableModule(); } 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 15aa554..1b3a947 100644 --- a/src/main/java/a8k/service/app/devicedriver/pos/HbotConsumablePosMgr.java +++ b/src/main/java/a8k/service/app/devicedriver/pos/HbotConsumablePosMgr.java @@ -35,12 +35,16 @@ public class HbotConsumablePosMgr { LowerDeviceParameterDBService lowerDeviceParameterDBService; PosParameterReader posReader = null; - static Integer nowParaVersion = 3; + static Integer nowParaVersion = 2; @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(); } @@ -57,7 +61,7 @@ public class HbotConsumablePosMgr { posReader.updatePos(HbotConsumablePosParam.TipGroup1_000Pos, new Pos3d()); posReader.updatePos(HbotConsumablePosParam.TipGroup1_SpaceingX, 0.0); - posReader.updatePos(HbotConsumablePosParam.TipGroup2_SpaceingY, 0.0); + posReader.updatePos(HbotConsumablePosParam.TipGroup1_SpaceingY, 0.0); posReader.updatePos(HbotConsumablePosParam.TipGroup2_000Pos, new Pos3d()); posReader.updatePos(HbotConsumablePosParam.TipGroup2_SpaceingX, 0.0); @@ -88,19 +92,15 @@ public class HbotConsumablePosMgr { posReader.updatePos(HbotConsumablePosParam.LargeBuffer_DX, 0.0); posReader.updatePos(HbotConsumablePosParam.LargeBuffer_DY, 0.0); + posReader.updatePos(HbotConsumablePosParam.LittleBSPierceZPos, 0.0); + posReader.updatePos(HbotConsumablePosParam.LittleBSSampleZPos, 0.0); + posReader.updatePos(HbotConsumablePosParam.ProbeSubstanceSampleZPos, 0.0); + posReader.updatePos(HbotConsumablePosParam.LargeBSSSampleZPos, 0.0); } - public List getParams() { - List list = new java.util.ArrayList<>(); - for (HbotConsumablePosParam param : HbotConsumablePosParam.values()) { - ObjectNode posNode = ZJsonHelper.createObjectNode(); - posNode.put("pos", ZJsonHelper.createObjectNode(posReader.getPos(param.name(), Pos3d.class))); - posNode.put("name", param.name()); - posNode.put("chName", param.chName); - list.add(posNode); - } - return list; + public Object getParams() { + return posReader.getParams(); } @@ -127,13 +127,14 @@ public class HbotConsumablePosMgr { tipDyPos = HbotConsumablePosParam.TipGroup2_SpaceingY; } - Assert.isTrue(tip000Pos != null,"tip000Pos != null"); + Assert.isTrue(tip000Pos != null, "tip000Pos != null"); posReader.updatePos(tip000Pos, tip000); posReader.updatePos(tipDxPos, dx); posReader.updatePos(tipDyPos, dy); } + public LittleBottleConsumablePosInfo getLittleBufferGroupPosInfo() { LittleBottleConsumablePosInfo info = new LittleBottleConsumablePosInfo(); info.g0_000 = posReader.getPos(HbotConsumablePosParam.LittleBufferGroup0_000Pos, Pos3d.class); @@ -227,9 +228,9 @@ public class HbotConsumablePosMgr { dx = posReader.getPos(HbotConsumablePosParam.TipGroup2_SpaceingX, Double.class); dy = posReader.getPos(HbotConsumablePosParam.TipGroup2_SpaceingY, Double.class); } - Assert.isTrue(tip000 != null,"tip000 != null"); - Assert.isTrue(dx != null,"dx != null"); - Assert.isTrue(dy != null,"dy != null"); + Assert.isTrue(tip000 != null, "tip000 != null"); + Assert.isTrue(dx != null, "dx != null"); + Assert.isTrue(dy != null, "dy != null"); int xoff = tipoff % 12; int yoff = tipoff / 12; diff --git a/src/main/java/a8k/service/db/LowerDeviceParameterDBService.java b/src/main/java/a8k/service/db/LowerDeviceParameterDBService.java index f4376be..24a9a93 100644 --- a/src/main/java/a8k/service/db/LowerDeviceParameterDBService.java +++ b/src/main/java/a8k/service/db/LowerDeviceParameterDBService.java @@ -2,6 +2,7 @@ package a8k.service.db; import a8k.service.db.type.Parameter; import a8k.service.db.utils.PosParameterReader; +import a8k.utils.ZJsonHelper; import a8k.utils.ZSqliteJdbcHelper; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -37,6 +38,23 @@ public class LowerDeviceParameterDBService { return (Parameter) ZSqliteJdbcHelper.rowMapper(rs, tClass); } + 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); + } else { + if (parameter.chName.equals(chName)) { + return; + } + parameter.chName = chName; + ZSqliteJdbcHelper.updateObj(jdbcTemplate, tableName, tClass, parameter); + } + + } public T getParam(String service, String key, Class tClass) { List list = jdbcTemplate.query("select * from " + tableName + " where service = ? and key = ?;", this::rowMapper, service, key); @@ -45,38 +63,43 @@ public class LowerDeviceParameterDBService { } Parameter parameter = list.get(0); - try { - return new ObjectMapper().readValue(parameter.val, tClass); - } catch (JsonProcessingException e) { - throw new RuntimeException(e); + return ZJsonHelper.objectFromJson(parameter.val, tClass); + } + + public Parameter getParam(String service, String key) { + List list = jdbcTemplate.query("select * from " + tableName + " where service = ? and key = ?;", this::rowMapper, service, key); + if (list.isEmpty()) { + return null; } + + return list.get(0); + } + + public List getParams(String service) { + return jdbcTemplate.query("select * from " + tableName + " where service = ?;", this::rowMapper, service); } public void updateParam(String service, String key, Object pos) { logger.info("updateParam: service={}, key={}, pos={}", service, key, pos); - try { - ObjectMapper objectMapper = new ObjectMapper(); - List list = jdbcTemplate.query("select * from " + tableName + " where service = ? and key = ?;", this::rowMapper, service, key); - if (list.isEmpty()) { - Parameter parameter = new Parameter(); - parameter.service = service; - parameter.key = key; - parameter.val = objectMapper.writeValueAsString(pos); - parameter.valType = pos.getClass().getSimpleName(); - ZSqliteJdbcHelper.addObj(jdbcTemplate, tableName, tClass, parameter); - return; - } - - Parameter parameter = list.get(0); - parameter.val = objectMapper.writeValueAsString(pos); + ObjectMapper objectMapper = new ObjectMapper(); + List list = jdbcTemplate.query("select * from " + tableName + " where service = ? and key = ?;", this::rowMapper, service, key); + if (list.isEmpty()) { + Parameter parameter = new Parameter(); parameter.service = service; parameter.key = key; + parameter.val = ZJsonHelper.createObjectNode(pos); parameter.valType = pos.getClass().getSimpleName(); - ZSqliteJdbcHelper.updateObj(jdbcTemplate, tableName, tClass, parameter); - - } catch (JsonProcessingException e) { - throw new RuntimeException(e); + ZSqliteJdbcHelper.addObj(jdbcTemplate, tableName, tClass, parameter); + return; } + + Parameter parameter = list.get(0); + parameter.val = ZJsonHelper.createObjectNode(pos); + parameter.service = service; + parameter.key = key; + parameter.valType = pos.getClass().getSimpleName(); + ZSqliteJdbcHelper.updateObj(jdbcTemplate, tableName, tClass, parameter); + } public void tryInitParam(String service, String key, Object pos) { diff --git a/src/main/java/a8k/service/db/type/Parameter.java b/src/main/java/a8k/service/db/type/Parameter.java index 12a0af0..3bac380 100644 --- a/src/main/java/a8k/service/db/type/Parameter.java +++ b/src/main/java/a8k/service/db/type/Parameter.java @@ -1,9 +1,12 @@ package a8k.service.db.type; +import com.fasterxml.jackson.databind.node.ObjectNode; + public class Parameter { - public int id; - public String service; - public String key; - public String valType; - public String val; + public int id; + public String service; + public String key; + public String valType; + public ObjectNode val; + public String chName; } diff --git a/src/main/java/a8k/service/db/utils/PosParameterReader.java b/src/main/java/a8k/service/db/utils/PosParameterReader.java index a256417..2b039ff 100644 --- a/src/main/java/a8k/service/db/utils/PosParameterReader.java +++ b/src/main/java/a8k/service/db/utils/PosParameterReader.java @@ -1,6 +1,9 @@ package a8k.service.db.utils; import a8k.service.db.LowerDeviceParameterDBService; +import a8k.service.db.type.Parameter; + +import java.util.List; public class PosParameterReader { Class service; @@ -19,6 +22,19 @@ public class PosParameterReader { return lowerDeviceParameterDBService.getParam(this.service.getSimpleName(), key.name(), tClass); } + public Parameter getParamer(String key) { + return lowerDeviceParameterDBService.getParam(this.service.getSimpleName(), key); + } + + public Parameter getParamer(Enum key) { + return lowerDeviceParameterDBService.getParam(this.service.getSimpleName(), key.name()); + } + + public void setParamChName(Enum key, String chName) { + lowerDeviceParameterDBService.setParamChName(service.getSimpleName(), key.name(), chName); + } + + public void updatePos(String key, Object pos) { lowerDeviceParameterDBService.updateParam(service.getSimpleName(), key, pos); } @@ -38,4 +54,8 @@ public class PosParameterReader { public void setVersion(Integer version) { lowerDeviceParameterDBService.setParamVersion(service.getSimpleName(), version); } + + public List getParams() { + return lowerDeviceParameterDBService.getParams(service.getSimpleName()); + } } diff --git a/src/main/java/a8k/type/HbotConsumablePosParam.java b/src/main/java/a8k/type/HbotConsumablePosParam.java index 7368d39..1ae446f 100644 --- a/src/main/java/a8k/type/HbotConsumablePosParam.java +++ b/src/main/java/a8k/type/HbotConsumablePosParam.java @@ -37,7 +37,7 @@ public enum HbotConsumablePosParam { LargeBuffer_DY("大瓶缓冲液的Y间距"), LittleBSPierceZPos("小瓶缓冲液刺破Z坐标"), - LittleBSSampleZPos("小瓶缓冲液刺破取样Z坐标"), + LittleBSSampleZPos("小瓶缓冲液取样Z坐标"), ProbeSubstanceSampleZPos("探测物质取样Z坐标"), LargeBSSSampleZPos("大瓶缓冲液取样Z坐标"), diff --git a/src/main/java/a8k/utils/ZJsonHelper.java b/src/main/java/a8k/utils/ZJsonHelper.java index 8dfe5c6..73a4b94 100644 --- a/src/main/java/a8k/utils/ZJsonHelper.java +++ b/src/main/java/a8k/utils/ZJsonHelper.java @@ -20,9 +20,51 @@ public class ZJsonHelper { return new ObjectMapper().createObjectNode(); } + public static T objectFromJson(ObjectNode node, Class tClass) { + ObjectMapper mapper = new ObjectMapper(); + + if (tClass.getTypeName().equals(Integer.class.getTypeName())) { + return (T) Integer.valueOf(node.get("value").asInt()); + } + if (tClass.getTypeName().equals(String.class.getTypeName())) { + return (T) node.get("value").asText(); + } + if (tClass.getTypeName().equals(Boolean.class.getTypeName())) { + return (T) Boolean.valueOf(node.get("value").asBoolean()); + } + if (tClass.getTypeName().equals(Double.class.getTypeName())) { + return (T) Double.valueOf(node.get("value").asDouble()); + } + if (tClass.getTypeName().equals(Float.class.getTypeName())) { + return (T) Float.valueOf(node.get("value").floatValue()); + } + + + try { + return (T) mapper.treeToValue(node, tClass); + } catch (Exception e) { + throw new RuntimeException(e); + } + } public static ObjectNode createObjectNode(Object obj) { ObjectMapper ObjectMapper = new ObjectMapper(); + if (obj instanceof Integer) { + return ObjectMapper.createObjectNode().put("value", (Integer) obj); + } + if (obj instanceof String) { + return ObjectMapper.createObjectNode().put("value", (String) obj); + } + if (obj instanceof Boolean) { + return ObjectMapper.createObjectNode().put("value", (Boolean) obj); + } + if (obj instanceof Double) { + return ObjectMapper.createObjectNode().put("value", (Double) obj); + } + if (obj instanceof Float) { + return ObjectMapper.createObjectNode().put("value", (Float) obj); + } return ObjectMapper.valueToTree(obj); } + } diff --git a/src/main/java/a8k/utils/ZSqliteJdbcHelper.java b/src/main/java/a8k/utils/ZSqliteJdbcHelper.java index 8102246..613a949 100644 --- a/src/main/java/a8k/utils/ZSqliteJdbcHelper.java +++ b/src/main/java/a8k/utils/ZSqliteJdbcHelper.java @@ -2,6 +2,7 @@ package a8k.utils; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; import org.springframework.jdbc.core.JdbcTemplate; import java.lang.reflect.InvocationTargetException; @@ -90,6 +91,13 @@ public class ZSqliteJdbcHelper { field.set(obj, null); else field.set(obj, new Date(rs.getLong(field.getName()))); + } else if (field.getType().equals(ObjectNode.class)) { + ObjectMapper objectMapper = new ObjectMapper(); + try { + field.set(obj, objectMapper.readTree(rs.getString(field.getName()))); + } catch (JsonProcessingException e) { + throw new RuntimeException(e); + } } else if (field.getType().isEnum()) { Method methodValueOf = null; try { @@ -139,6 +147,9 @@ public class ZSqliteJdbcHelper { args.add(date.getTime()); } else if (field.getType().isEnum()) { args.add(field.get(obj).toString()); + } else if (field.getType().equals(ObjectNode.class)) { + ObjectMapper objectMapper = new ObjectMapper(); + args.add(objectMapper.writeValueAsString(field.get(obj))); } else { ObjectMapper objectMapper = new ObjectMapper(); args.add(objectMapper.writeValueAsString(field.get(obj)));