Merge remote-tracking branch 'origin/dev-V0.4.5' into dev-V0.4.5

iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/bo/channel/ChannelConfigBo.java

@@ -19,7 +19,7 @@ public class ChannelConfigBo extends BaseDto  {
 	private static final long serialVersionUID = -1L;
 
 	@ApiModelProperty(value="id")
-	private String id;
+	private Long id;
 
 	@ApiModelProperty(value="通道id")
 	private Long channelId;
@@ -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="创建时间")

iot-module/iot-manager/src/main/java/cc/iotkit/manager/dto/vo/channel/ChannelConfigVo.java

@@ -22,7 +22,7 @@ public class ChannelConfigVo implements Serializable {
 
     @ApiModelProperty(value="通道配置id")
     @ExcelProperty(value = "通道配置id")
-    private String id;
+    private Long id;
 
     @ApiModelProperty(value="通道id")
     @ExcelProperty(value = "通道id")
@@ -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="创建时间")