feat: add report form config

+package org.thingsboard.server.controller.yunteng;
+
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.StringUtils;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.common.AddGroup;
+import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
+import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
+import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
+import org.thingsboard.server.common.data.yunteng.dto.ReportFormConfigDTO;
+import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
+import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
+import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
+import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.yunteng.service.YtReportFormConfigService;
+
+import java.util.HashMap;
+
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE;
+
+@RestController
+@RequestMapping("api/yt/report_form/config")
+@Api(tags = "报表配置信息")
+@RequiredArgsConstructor
+@PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
+public class YtReportFormConfigController extends BaseController {
+
+  private final YtReportFormConfigService reportFormConfigService;
+
+  @GetMapping(params = {PAGE_SIZE, PAGE})
+  public YtPageData<ReportFormConfigDTO> page(
+      @RequestParam(PAGE_SIZE) int pageSize,
+      @RequestParam(PAGE) int page,
+      @RequestParam(value = "name", required = false) String name,
+      @RequestParam(value = "organizationId", required = false) String organizationId,
+      @RequestParam(value = "status", required = false) Integer status,
+      @RequestParam(value = ORDER_FILED, required = false) String orderBy,
+      @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
+      throws ThingsboardException {
+
+    HashMap<String, Object> queryMap = new HashMap<>();
+    queryMap.put(PAGE_SIZE, pageSize);
+    queryMap.put(PAGE, page);
+    queryMap.put(ORDER_FILED, orderBy);
+    queryMap.put("name", name);
+    queryMap.put("organizationId", organizationId);
+    queryMap.put("status", status);
+    queryMap.put("tenantId", getCurrentUser().getCurrentTenantId());
+    if (orderType != null) {
+      queryMap.put(ORDER_TYPE, orderType.name());
+    }
+    return reportFormConfigService.page(queryMap);
+  }
+
+  @PostMapping
+  public ResponseResult<ReportFormConfigDTO> saveReportFromConfig(
+      @Validated({AddGroup.class}) @RequestBody ReportFormConfigDTO configDTO)
+      throws ThingsboardException {
+    if (StringUtils.isNotEmpty(configDTO.getId())) {
+      throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    return saveOrUpdate(configDTO);
+  }
+
+  @PutMapping
+  public ResponseResult<ReportFormConfigDTO> updateReportFromConfig(
+      @Validated({UpdateGroup.class}) @RequestBody ReportFormConfigDTO configDTO)
+      throws ThingsboardException {
+    return saveOrUpdate(configDTO);
+  }
+
+  @PutMapping("/{id}/{status}")
+  public ResponseResult<ReportFormConfigDTO> updateStatusById(
+      @PathVariable String id, @PathVariable Integer status) throws ThingsboardException {
+    return ResponseResult.success(
+        reportFormConfigService.updateStatusById(
+            getCurrentUser().getCurrentTenantId(), status, id));
+  }
+
+  @DeleteMapping
+  public ResponseResult<Boolean> deleteMessageConfig(
+      @Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO) {
+    return reportFormConfigService.deleteReportFromConfig(deleteDTO)
+        ? ResponseResult.success(FastIotConstants.StateValue.DELETE_SUCCESS)
+        : ResponseResult.failed(FastIotConstants.StateValue.DELETE_FAILED);
+  }
+
+  private ResponseResult<ReportFormConfigDTO> saveOrUpdate(ReportFormConfigDTO configDTO)
+      throws ThingsboardException {
+    configDTO.setTenantId(getCurrentUser().getCurrentTenantId());
+    ReportFormConfigDTO newDTO = reportFormConfigService.saveOrUpdateReportFromConfig(configDTO);
+    return ResponseResult.success(newDTO);
+  }
+}

@@ -89,6 +89,8 @@ public final class ModelConstants {
     public static final String IOTFS_THIRD_USER_TABLE_NAME = "iotfs_third_user";
     public static final String IOTFS_THIRD_USER_TABLE_NAME = "iotfs_third_user";
     /** frp内网穿透信息表 */
     /** frp内网穿透信息表 */
     public static final String IOTFS_FRP_INFO_NAME = "iotfs_frp_info";
     public static final String IOTFS_FRP_INFO_NAME = "iotfs_frp_info";
+    /** 报表配置表 */
+    public static final String IOTFS_REPORT_FORM_CONFIG_NAME = "iotfs_report_form_config";
   }
   }
 
 
   public static class TableFields {
   public static class TableFields {

@@ -55,7 +55,7 @@ public enum ErrorMessage {
   NOT_EXITED_OR_PERMISSION(400036,"【%s】没有修改权限或不存在"),
   NOT_EXITED_OR_PERMISSION(400036,"【%s】没有修改权限或不存在"),
   FILE_NOT_FOUND(400036,"文件未找到"),
   FILE_NOT_FOUND(400036,"文件未找到"),
   STORE_FILE_FAILED(400037,"文件存储失败"),
   STORE_FILE_FAILED(400037,"文件存储失败"),
-  NOT_BELONG_CURRENT_TENANT(400038,"不属于当前租户"),
+  NOT_BELONG_CURRENT_TENANT(400038,"该数据不属于当前租户"),
   DEVICE_LOSED(400039,"设备相关参数丢失"),
   DEVICE_LOSED(400039,"设备相关参数丢失"),
   SCENE_REACT_NOT_EXTIED(400040,"场景联动不存在"),
   SCENE_REACT_NOT_EXTIED(400040,"场景联动不存在"),
   DEVICE_USED_SCENE_REACT(400041,"场景联动【%s】正在使用该设备"),
   DEVICE_USED_SCENE_REACT(400041,"场景联动【%s】正在使用该设备"),

+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.QueryConditionDTO;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@EqualsAndHashCode(callSuper = false)
+@Data
+@ApiModel("报表配置")
+public class ReportFormConfigDTO extends TenantDTO {
+
+  /** 报表配置名称 */
+  @ApiModelProperty(value = "报表配置名称", required = true)
+  @NotEmpty(message = "报表配置名称不能为null或空字符串", groups = AddGroup.class)
+  private String name;
+
+  /** 组织ID */
+  @ApiModelProperty(value = "组织ID", required = true)
+  @NotEmpty(message = "组织不能为null或空字符串", groups = AddGroup.class)
+  private String organizationId;
+
+  /** 执行方式：0立即执行 1定时执行 */
+  @ApiModelProperty(value = "执行方式", required = true)
+  @NotNull(message = "执行方式不能为null", 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;
+
+  /** 属性性质：0共有属性 1全部属性 */
+  @ApiModelProperty(value = "属性性质", required = true)
+  @NotNull(message = "属性性质不能为null", 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)
+  private Integer dataCompare;
+
+  /** 数据周期：单位毫秒 */
+  @ApiModelProperty(value = "开始时间", required = true)
+  @NotNull(message = "开始时间不能为null", groups = AddGroup.class)
+  private Long startTs;
+
+  /** 时间间隔：单位毫秒 */
+  @ApiModelProperty(value = "结束时间", required = true)
+  @NotNull(message = "结束时间不能为null", groups = AddGroup.class)
+  private Long endTs ;
+
+  @ApiModelProperty(value = "查询条件", required = true)
+  @NotNull(message = "查询条件不能为null", groups = AddGroup.class)
+  private QueryConditionDTO queryCondition;
+
+  /** 配置状态：0禁用 1启用 */
+  @ApiModelProperty(value = "配置状态:0禁用 1启用")
+  private Integer status;
+
+  /** 备注 */
+  private String remark;
+}

+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 QueryConditionDTO {
+  @ApiModelProperty("聚合间隔:单位毫秒")
+  private Long interval;
+
+  @ApiModelProperty("查询的最大数量：该参数仅在'agg'参数设置为'NONE'的情况下使用")
+  private Integer limit;
+
+  @ApiModelProperty("聚合条件：AVG, COUNT, MAX, MIN, NONE, SUM")
+  private String agg;
+
+  @ApiModelProperty("排序：ASC, DESC")
+  private String orderBy;
+
+  @ApiModelProperty("启用/禁用遥测值到字符串的转换。默认情况下启用转换。设置参数为'true'以禁用转换")
+  private boolean useStrictDataTypes;
+}

@@ -4,19 +4,16 @@ import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 
 public enum StatusEnum {
 public enum StatusEnum {
-    OFFLINE("离线",0),
-    ONLINE("在线",1);
+  OFFLINE("离线", 0),
+  ONLINE("在线", 1),
+  ENABLE("启用", 1),
+  DISABLE("禁用", 0);
 
 
-    @Getter
-    @Setter
-    private String name;
-    @Getter
-    @Setter
-    private Integer index;
-
-    StatusEnum(String name, Integer index) {
-        this.name = name;
-        this.index = index;
-    }
+  @Getter @Setter private String name;
+  @Getter @Setter private Integer index;
 
 
+  StatusEnum(String name, Integer index) {
+    this.name = name;
+    this.index = index;
+  }
 }
 }

+package org.thingsboard.server.dao.yunteng.entities;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import com.fasterxml.jackson.databind.JsonNode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName(value = ModelConstants.Table.IOTFS_REPORT_FORM_CONFIG_NAME, autoResultMap = true)
+public class ReportFormConfig extends TenantBaseEntity {
+
+  private static final long serialVersionUID = -1678849271872511953L;
+
+  /** 报表配置名称 */
+  private String name;
+
+  /** 组织ID */
+  private String organizationId;
+
+  /** 执行方式：0立即执行 1定时执行 */
+  private Integer executeWay;
+
+  /** cron表达式：执行方式 1 生效  修改时允许设置为null*/
+  @TableField(updateStrategy = FieldStrategy.IGNORED)
+  private String executeContent;
+
+  /** 设备：json数组格式 */
+  @TableField(typeHandler = JacksonTypeHandler.class)
+  private JsonNode devices;
+
+  /** 属性性质：0共有属性 1全部属性 */
+  private Integer attributeNature;
+
+  /** 属性 */
+  @TableField(typeHandler = JacksonTypeHandler.class)
+  private JsonNode attributes;
+
+  /** 数据对比：0历史数据 1环比 2同比 */
+  private Integer dataCompare;
+
+  /** 查询开始时间：单位毫秒 */
+  private Long startTs;
+
+  /** 查询结束时间：单位毫秒 */
+  private Long endTs ;
+
+  @TableField(typeHandler = JacksonTypeHandler.class)
+  private JsonNode queryCondition;
+
+  /** 配置状态：0禁用 1启用 */
+  private Integer status;
+
+  /** 备注 */
+  private String remark;
+}

@@ -3,8 +3,8 @@ package org.thingsboard.server.dao.yunteng.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
@@ -24,10 +24,11 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.Optional;
 
 
 @Service
 @Service
+@RequiredArgsConstructor
 public class YtFrpInfoServiceImpl extends AbstractBaseService<FrpInfoMapper, FrpInfo>
 public class YtFrpInfoServiceImpl extends AbstractBaseService<FrpInfoMapper, FrpInfo>
     implements YtFrpInfoService {
     implements YtFrpInfoService {
 
 
-  @Autowired private FrpServerProperties frpServerProperties;
+  private final FrpServerProperties frpServerProperties;
 
 
   @Override
   @Override
   public YtPageData<FrpInfoDTO> page(Map<String, Object> queryMap) {
   public YtPageData<FrpInfoDTO> page(Map<String, Object> queryMap) {

+package org.thingsboard.server.dao.yunteng.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.fasterxml.jackson.databind.JsonNode;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
+import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+import org.thingsboard.server.common.data.yunteng.dto.BaseDTO;
+import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
+import org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO;
+import org.thingsboard.server.common.data.yunteng.dto.ReportFormConfigDTO;
+import org.thingsboard.server.common.data.yunteng.enums.StatusEnum;
+import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
+import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
+import org.thingsboard.server.dao.yunteng.entities.ReportFormConfig;
+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;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class YtReportFromConfigServiceImpl
+    extends AbstractBaseService<ReportFromConfigMapper, ReportFormConfig>
+    implements YtReportFormConfigService {
+  private final OrganizationMapper organizationMapper;
+
+  @Override
+  public YtPageData<ReportFormConfigDTO> page(Map<String, Object> queryMap) {
+    String tenantId =
+        Optional.ofNullable(queryMap.get("tenantId")).map(Object::toString).orElse(null);
+    String name = Optional.ofNullable(queryMap.get("name")).map(Object::toString).orElse(null);
+    Integer status =
+        Optional.ofNullable(queryMap.get("status"))
+            .map(value -> Integer.valueOf(value.toString()))
+            .orElse(null);
+    List<String> organizationIds =
+        Optional.ofNullable(queryMap.get("organizationId"))
+            .map(
+                value -> {
+                  String organizationId = value.toString();
+                  List<OrganizationDTO> list =
+                      organizationMapper.findOrganizationTreeList(
+                          tenantId, List.of(organizationId));
+                  // 查询组织及其子组织
+                  if (list.size() > 0) {
+                    return list.stream().map(BaseDTO::getId).collect(Collectors.toList());
+                  }
+                  return null;
+                })
+            .orElse(null);
+    IPage<ReportFormConfig> page =
+        baseMapper.selectPage(
+            getPage(queryMap, "create_time", false),
+            new LambdaQueryWrapper<ReportFormConfig>()
+                .eq(StringUtils.isNotEmpty(tenantId), ReportFormConfig::getTenantId, tenantId)
+                .eq(null != status, ReportFormConfig::getStatus, status)
+                .like(null != name, ReportFormConfig::getName, name)
+                .in(
+                    null != organizationIds && organizationIds.size() > 0,
+                    ReportFormConfig::getOrganizationId,
+                    organizationIds));
+    return getPageData(page, ReportFormConfigDTO.class);
+  }
+
+  @Override
+  public ReportFormConfigDTO saveOrUpdateReportFromConfig(ReportFormConfigDTO report) {
+    ReportFormConfig reportFormConfig = report.getEntity(ReportFormConfig.class);
+    if (report.getExecuteWay() == FastIotConstants.MagicNumber.ONE
+        && StringUtils.isEmpty(report.getExecuteContent())) {
+      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));
+    }
+    reportFormConfig.setQueryCondition(
+        JacksonUtil.convertValue(report.getQueryCondition(), JsonNode.class));
+    if (StringUtils.isEmpty(report.getId())) {
+      reportFormConfig.setStatus(StatusEnum.DISABLE.getIndex());
+      baseMapper.insert(reportFormConfig);
+    } else {
+      ReportFormConfig queryEntity = baseMapper.selectById(report.getId());
+      if (!report.getTenantId().equals(queryEntity.getTenantId())) {
+        throw new YtDataValidationException(ErrorMessage.NOT_BELONG_CURRENT_TENANT.getMessage());
+      }
+      // 需要调用修改转台接口修改状态
+      reportFormConfig.setStatus(null);
+      baseMapper.updateById(reportFormConfig);
+    }
+    return report;
+  }
+
+  @Override
+  public boolean deleteReportFromConfig(DeleteDTO deleteDTO) {
+    if (deleteDTO.getIds().isEmpty()) {
+      throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    return baseMapper.deleteBatchIds(deleteDTO.getIds()) > 0;
+  }
+
+  @Override
+  public ReportFormConfigDTO updateStatusById(String tenantId, Integer status, String id) {
+    if (StringUtils.isEmpty(tenantId) || status == null || StringUtils.isEmpty(id)) {
+      throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    ReportFormConfig queryEntity =
+        baseMapper.selectOne(
+            new LambdaQueryWrapper<ReportFormConfig>()
+                .eq(ReportFormConfig::getId, id)
+                .eq(ReportFormConfig::getTenantId, tenantId));
+    return Optional.ofNullable(queryEntity)
+        .map(
+            entity -> {
+              entity.setStatus(status);
+              baseMapper.updateById(entity);
+              return entity.getDTO(ReportFormConfigDTO.class);
+            })
+        .orElse(null);
+  }
+}

+package org.thingsboard.server.dao.yunteng.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.thingsboard.server.dao.yunteng.entities.FrpInfo;
+import org.thingsboard.server.dao.yunteng.entities.ReportFormConfig;
+
+@Mapper
+public interface ReportFromConfigMapper extends BaseMapper<ReportFormConfig> {
+
+}

+package org.thingsboard.server.dao.yunteng.service;
+
+import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
+import org.thingsboard.server.common.data.yunteng.dto.ReportFormConfigDTO;
+import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
+
+import java.util.Map;
+
+public interface YtReportFormConfigService {
+  YtPageData<ReportFormConfigDTO> page(Map<String, Object> queryMap);
+
+  ReportFormConfigDTO saveOrUpdateReportFromConfig(ReportFormConfigDTO report);
+
+  boolean deleteReportFromConfig(DeleteDTO deleteDTO);
+
+  ReportFormConfigDTO updateStatusById(String tenantId,Integer status,String id);
+}