From 3fc76949d9ea42be4e5b3633c412c85dc765998f Mon Sep 17 00:00:00 2001 From: ZOUZDC Date: Fri, 17 May 2024 00:10:27 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20modbus=E7=82=B9=E4=BD=8D=E6=A8=A1?= =?UTF-8?q?=E7=89=88=E5=90=8C=E6=AD=A5=E5=88=B0=E4=BA=A7=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 同步属性错误修改 --- .../cc/iotkit/modbus/service/impl/ModbusInfoServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/iot-module/iot-modbus/src/main/java/cc/iotkit/modbus/service/impl/ModbusInfoServiceImpl.java b/iot-module/iot-modbus/src/main/java/cc/iotkit/modbus/service/impl/ModbusInfoServiceImpl.java index bea55634..6242721e 100644 --- a/iot-module/iot-modbus/src/main/java/cc/iotkit/modbus/service/impl/ModbusInfoServiceImpl.java +++ b/iot-module/iot-modbus/src/main/java/cc/iotkit/modbus/service/impl/ModbusInfoServiceImpl.java @@ -23,6 +23,7 @@ import cc.iotkit.model.modbus.ModbusInfo; import cc.iotkit.model.modbus.ModbusThingModel; import cc.iotkit.model.product.Product; import cc.iotkit.model.product.ThingModel; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.json.JSONUtil; import com.alibaba.excel.EasyExcel; @@ -208,8 +209,8 @@ public class ModbusInfoServiceImpl implements IModbusInfoService { if(CollectionUtil.isNotEmpty(modbusThingModel.getModel().getProperties())){ properties = modbusThingModel.getModel().getProperties().stream().map(p -> { - ThingModel.Property property = MapstructUtils.convert(p, ThingModel.Property.class); - property.setProData(JSONUtil.toJsonStr(MapstructUtils.convert(p, ModbusThingModel.Property.class))); + ThingModel.Property property = BeanUtil.copyProperties(p, ThingModel.Property.class); + property.setProData(JSONUtil.toJsonStr(BeanUtil.copyProperties(p, ModbusThingModel.ProData.class))); return property; }).collect(Collectors.toList()); }