fix: fix report form config json format

 package org.thingsboard.server.common.data.yunteng.dto;
-
-import com.fasterxml.jackson.databind.JsonNode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.yunteng.common.AddGroup;
+import org.thingsboard.server.common.data.yunteng.dto.request.ExecuteAttributesDTO;
 import org.thingsboard.server.common.data.yunteng.dto.request.QueryConditionDTO;
-
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 import java.util.List;
 
 @EqualsAndHashCode(callSuper = false)
@@ -19,54 +18,49 @@ public class ReportFormConfigDTO extends TenantDTO {
 
   /** 报表配置名称 */
   @ApiModelProperty(value = "报表配置名称", required = true)
-  @NotEmpty(message = "报表配置名称不能为null或空字符串", groups = AddGroup.class)
+  @NotEmpty(message = "报表配置名称不能为空或空字符串", groups = AddGroup.class)
   private String name;
 
   /** 组织ID */
   @ApiModelProperty(value = "组织ID", required = true)
-  @NotEmpty(message = "组织不能为null或空字符串", groups = AddGroup.class)
+  @NotEmpty(message = "组织不能为空或空字符串", groups = AddGroup.class)
   private String organizationId;
 
   /** 执行方式：0立即执行 1定时执行 */
   @ApiModelProperty(value = "执行方式", required = true)
-  @NotNull(message = "执行方式不能为null", groups = AddGroup.class)
+  @NotNull(message = "执行方式不能为空", groups = AddGroup.class)
   private Integer executeWay;
 
   /** cron表达式：执行方式 1 生效 */
   private String executeContent;
 
   /** 设备：json数组格式 */
-  @ApiModelProperty(value = "执行设备", required = true)
-  @NotNull(message = "执行设备不能为null", groups = AddGroup.class)
-  private List<String> devices;
+  @ApiModelProperty(value = "执行设备及属性", required = true)
+  @Size(message = "至少需要一个执行设备及属性", min = 1,groups = {AddGroup.class})
+  private List<ExecuteAttributesDTO> executeAttributes;
 
   /** 属性性质：0共有属性 1全部属性 */
   @ApiModelProperty(value = "属性性质", required = true)
-  @NotNull(message = "属性性质不能为null", groups = AddGroup.class)
+  @NotNull(message = "属性性质不能为空", groups = AddGroup.class)
   private Integer attributeNature;
 
-  /** 属性 */
-  @ApiModelProperty(value = "属性", required = true)
-  @NotNull(message = "属性不能为null", groups = AddGroup.class)
-  private List<String> attributes;
-
   /** 数据对比：0历史数据 1环比 2同比 */
   @ApiModelProperty(value = "数据对比", required = true)
-  @NotNull(message = "数据对比不能为null", groups = AddGroup.class)
+  @NotNull(message = "数据对比不能为空", groups = AddGroup.class)
   private Integer dataCompare;
 
   /** 数据周期：单位毫秒 */
   @ApiModelProperty(value = "开始时间", required = true)
-  @NotNull(message = "开始时间不能为null", groups = AddGroup.class)
+  @NotNull(message = "开始时间不能为空", groups = AddGroup.class)
   private Long startTs;
 
   /** 时间间隔：单位毫秒 */
   @ApiModelProperty(value = "结束时间", required = true)
-  @NotNull(message = "结束时间不能为null", groups = AddGroup.class)
+  @NotNull(message = "结束时间不能为空", groups = AddGroup.class)
   private Long endTs ;
 
   @ApiModelProperty(value = "查询条件", required = true)
-  @NotNull(message = "查询条件不能为null", groups = AddGroup.class)
+  @NotNull(message = "查询条件不能为空", groups = AddGroup.class)
   private QueryConditionDTO queryCondition;
 
   /** 配置状态：0禁用 1启用 */

+package org.thingsboard.server.common.data.yunteng.dto.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "执行设备及属性")
+public class ExecuteAttributesDTO {
+  @ApiModelProperty(value = "执行设备", required = true)
+  private String device;
+
+  @ApiModelProperty(value = "执行属性", required = true)
+  private String attribute;
+}

@@ -29,17 +29,13 @@ public class ReportFormConfig extends TenantBaseEntity {
   @TableField(updateStrategy = FieldStrategy.IGNORED)
   private String executeContent;
 
-  /** 设备：json数组格式 */
+  /** 执行设备及属性：json数组格式 */
   @TableField(typeHandler = JacksonTypeHandler.class)
-  private JsonNode devices;
+  private JsonNode executeAttributes;
 
   /** 属性性质：0共有属性 1全部属性 */
   private Integer attributeNature;
 
-  /** 属性 */
-  @TableField(typeHandler = JacksonTypeHandler.class)
-  private JsonNode attributes;
-
   /** 数据对比：0历史数据 1环比 2同比 */
   private Integer dataCompare;
 

@@ -22,8 +22,6 @@ import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
 import org.thingsboard.server.dao.yunteng.mapper.ReportFromConfigMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.YtReportFormConfigService;
-
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -78,20 +76,26 @@ public class YtReportFromConfigServiceImpl
   @Override
   public ReportFormConfigDTO saveOrUpdateReportFromConfig(ReportFormConfigDTO report) {
     ReportFormConfig reportFormConfig = report.getEntity(ReportFormConfig.class);
-    if (report.getExecuteWay() == FastIotConstants.MagicNumber.ONE
-        && StringUtils.isEmpty(report.getExecuteContent())) {
+    if ((report.getExecuteWay() == FastIotConstants.MagicNumber.ONE
+            && StringUtils.isEmpty(report.getExecuteContent()))
+        || null == report.getExecuteAttributes()) {
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
-    if (!report.getAttributes().isEmpty()) {
-      Map<String, Object> map = new HashMap<>();
-      map.put("value", report.getAttributes());
-      reportFormConfig.setAttributes(JacksonUtil.convertValue(map, JsonNode.class));
-    }
-    if (!report.getDevices().isEmpty()) {
-      Map<String, Object> map = new HashMap<>();
-      map.put("value", report.getDevices());
-      reportFormConfig.setDevices(JacksonUtil.convertValue(map, JsonNode.class));
+    if (null != report.getExecuteAttributes()
+        && report.getExecuteAttributes().size() > FastIotConstants.MagicNumber.ZERO) {
+      report
+          .getExecuteAttributes()
+          .forEach(
+              item -> {
+                if (StringUtils.isEmpty(item.getDevice())
+                    || StringUtils.isEmpty(item.getAttribute())) {
+                  throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+                }
+              });
     }
+
+    reportFormConfig.setExecuteAttributes(
+        JacksonUtil.convertValue(report.getExecuteAttributes(), JsonNode.class));
     reportFormConfig.setQueryCondition(
         JacksonUtil.convertValue(report.getQueryCondition(), JsonNode.class));
     if (StringUtils.isEmpty(report.getId())) {