From 4595f1f39aa8d7cc80de1b9da9d538a32ad8dcee Mon Sep 17 00:00:00 2001 From: jay <75509151@qq.com> Date: Fri, 16 Jun 2023 19:12:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=B1=BB=E5=9E=8B=E8=BD=AC=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cc/iotkit/manager/dto/bo/channel/ChannelConfigBo.java | 2 +- .../cc/iotkit/manager/dto/vo/channel/ChannelConfigVo.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/channel/ChannelConfigBo.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/channel/ChannelConfigBo.java index 17c797ba..dacbc2e9 100644 --- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/channel/ChannelConfigBo.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/channel/ChannelConfigBo.java @@ -28,7 +28,7 @@ public class ChannelConfigBo extends BaseDto { private String title; @ApiModelProperty(value="通道配置参数") - @AutoMapping(ignore = true) + @AutoMapping(target = "param", expression = "java(cc.iotkit.common.utils.JsonUtils.parse(source.getParam(), ChannelConfig.ChannelParam.class))") private String param; @ApiModelProperty(value="创建时间") diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/vo/channel/ChannelConfigVo.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/vo/channel/ChannelConfigVo.java index bf7485e9..530e2293 100644 --- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/vo/channel/ChannelConfigVo.java +++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/vo/channel/ChannelConfigVo.java @@ -34,8 +34,8 @@ public class ChannelConfigVo implements Serializable { @ApiModelProperty(value="通道配置参数") @ExcelProperty(value = "通道配置参数") - @AutoMapping(ignore = true) - @ReverseAutoMapping(ignore = true) + @ReverseAutoMapping(target = "param", expression = "java(cc.iotkit.common.utils.JsonUtils.toJsonString(source.getParam()))") + @AutoMapping(target = "param", expression = "java(cc.iotkit.common.utils.JsonUtils.parse(source.getParam(), ChannelConfig.ChannelParam.class))") private String param; @ApiModelProperty(value="创建时间")