From e596b5622207a41e189d90a31d96480106886311 Mon Sep 17 00:00:00 2001 From: huangfeng Date: Mon, 9 Dec 2024 10:10:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20i2=E5=AF=BC=E5=87=BA=E6=8B=86=E5=88=86?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2sensorId=E5=B1=80=E9=83=A8=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xydl/cac/transform/I2DataTransformer.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/xydl/cac/transform/I2DataTransformer.java b/src/main/java/com/xydl/cac/transform/I2DataTransformer.java index ee11093..3dab3fe 100644 --- a/src/main/java/com/xydl/cac/transform/I2DataTransformer.java +++ b/src/main/java/com/xydl/cac/transform/I2DataTransformer.java @@ -96,8 +96,22 @@ public class I2DataTransformer { node.setEquipmentid(sensor.getEquipmentId()); } else { attr.setValue(""); - node.setSensorid(sensor.getSensorCode() + attach); - node.setEquipmentid(sensor.getEquipmentId() + attach); + String code = sensor.getSensorCode(); + node.setSensorid(code); + if (code != null && code.length() > attach.length() + 2) { + int len = code.length() - 2; + String tail = code.substring(len); + String first = code.substring(0, len - attach.length()); + node.setSensorid(first + attach + tail); + } + String equipmentid = sensor.getEquipmentId(); + node.setEquipmentid(equipmentid); + if (equipmentid != null && equipmentid.length() > attach.length() + 2) { + int len = equipmentid.length() - 2; + String tail = equipmentid.substring(len); + String first = equipmentid.substring(0, len - attach.length()); + node.setEquipmentid(first + attach + tail); + } } return node; }