fix: fix ReportFormConfig and SysJob bug

@@ -55,7 +55,6 @@ public class SysJobController extends BaseController {
 
 
     HashMap<String, Object> queryMap = new HashMap<>();
     HashMap<String, Object> queryMap = new HashMap<>();
     boolean isPtAdmin = getCurrentUser().isPtAdmin();
     boolean isPtAdmin = getCurrentUser().isPtAdmin();
-    String tenantId = isPtAdmin ? null : getCurrentUser().getCurrentTenantId();
     queryMap.put(PAGE_SIZE, pageSize);
     queryMap.put(PAGE_SIZE, pageSize);
     queryMap.put(PAGE, page);
     queryMap.put(PAGE, page);
     queryMap.put(ORDER_FILED, orderBy);
     queryMap.put(ORDER_FILED, orderBy);
@@ -65,7 +64,7 @@ public class SysJobController extends BaseController {
     queryMap.put("jobName", jobName);
     queryMap.put("jobName", jobName);
     queryMap.put("jobGroup", jobGroup);
     queryMap.put("jobGroup", jobGroup);
     queryMap.put("status", status);
     queryMap.put("status", status);
-    return jobService.sysJobPage(queryMap, tenantId);
+    return jobService.sysJobPage(queryMap);
   }
   }
 
 
   @DeleteMapping
   @DeleteMapping
@@ -144,8 +143,7 @@ public class SysJobController extends BaseController {
   }
   }
 
 
   private ResponseResult<SysJobDTO> saveOrUpdate(SysJobDTO job)
   private ResponseResult<SysJobDTO> saveOrUpdate(SysJobDTO job)
-      throws SchedulerException, ThingsboardException {
-    job.setTenantId(getCurrentUser().getCurrentTenantId());
+      throws SchedulerException{
     String message = StringUtils.isEmpty(job.getId()) ? "新增任务'" : "修改任务'";
     String message = StringUtils.isEmpty(job.getId()) ? "新增任务'" : "修改任务'";
     if (!CronUtils.isValid(job.getCronExpression())) {
     if (!CronUtils.isValid(job.getCronExpression())) {
       throw new YtDataValidationException(message + job.getJobName() + "'失败，Cron表达式不正确");
       throw new YtDataValidationException(message + job.getJobName() + "'失败，Cron表达式不正确");

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.yunteng.common.AddGroup;
 import org.thingsboard.server.common.data.yunteng.common.AddGroup;
+import org.thingsboard.server.common.data.yunteng.dto.report.CycleParameterDTO;
 import org.thingsboard.server.common.data.yunteng.dto.request.ExecuteAttributesDTO;
 import org.thingsboard.server.common.data.yunteng.dto.request.ExecuteAttributesDTO;
 import org.thingsboard.server.common.data.yunteng.dto.request.QueryConditionDTO;
 import org.thingsboard.server.common.data.yunteng.dto.request.QueryConditionDTO;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotEmpty;
@@ -34,6 +35,9 @@ public class ReportFormConfigDTO extends TenantDTO {
   @NotNull(message = "执行方式不能为空", groups = AddGroup.class)
   @NotNull(message = "执行方式不能为空", groups = AddGroup.class)
   private Integer executeWay;
   private Integer executeWay;
 
 
+  @ApiModelProperty(value = "周期参数", required = true)
+  private CycleParameterDTO cycle;
+
   /** cron表达式：执行方式 1 生效 */
   /** cron表达式：执行方式 1 生效 */
   private String executeContent;
   private String executeContent;
 
 

+package org.thingsboard.server.common.data.yunteng.dto.report;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/** 报表配置：周期参数 */
+@Data
+public class CycleParameterDTO {
+    @ApiModelProperty(value = "周期类型：0每日 1每周 2每月",required = true)
+    private Integer cycleType;
+
+    @ApiModelProperty(value = "当前周期")
+    private String currentCycle;
+
+    @ApiModelProperty(value = "时间",required = true)
+    private String cycleTime;
+}

@@ -29,6 +29,10 @@ public class ReportFormConfig extends TenantBaseEntity {
   @TableField(updateStrategy = FieldStrategy.IGNORED)
   @TableField(updateStrategy = FieldStrategy.IGNORED)
   private String executeContent;
   private String executeContent;
 
 
+  /** 周期参数：json数组格式 */
+  @TableField(typeHandler = JacksonTypeHandler.class)
+  private JsonNode cycle;
+
   /** 执行设备及属性：json数组格式 */
   /** 执行设备及属性：json数组格式 */
   @TableField(typeHandler = JacksonTypeHandler.class)
   @TableField(typeHandler = JacksonTypeHandler.class)
   private JsonNode executeAttributes;
   private JsonNode executeAttributes;

@@ -42,7 +42,7 @@ public class SysJobServiceImpl extends AbstractBaseService<SysJobMapper, SysJob>
   }
   }
 
 
   @Override
   @Override
-  public YtPageData<SysJobDTO> sysJobPage(Map<String, Object> queryMap, String tenantId) {
+  public YtPageData<SysJobDTO> sysJobPage(Map<String, Object> queryMap) {
     String jobGroup = queryMap.get("jobGroup") != null ? queryMap.get("jobGroup").toString() : null;
     String jobGroup = queryMap.get("jobGroup") != null ? queryMap.get("jobGroup").toString() : null;
     String jobName = queryMap.get("jobName") != null ? queryMap.get("jobName").toString() : null;
     String jobName = queryMap.get("jobName") != null ? queryMap.get("jobName").toString() : null;
     Integer status =
     Integer status =
@@ -51,7 +51,6 @@ public class SysJobServiceImpl extends AbstractBaseService<SysJobMapper, SysJob>
         baseMapper.selectPage(
         baseMapper.selectPage(
             getPage(queryMap, "create_time", false),
             getPage(queryMap, "create_time", false),
             new LambdaQueryWrapper<SysJob>()
             new LambdaQueryWrapper<SysJob>()
-                .eq(SysJob::getTenantId, tenantId)
                 .like(StringUtils.isNotEmpty(jobName), SysJob::getJobName, jobName)
                 .like(StringUtils.isNotEmpty(jobName), SysJob::getJobName, jobName)
                 .eq(StringUtils.isNotEmpty(jobGroup), SysJob::getJobGroup, jobGroup)
                 .eq(StringUtils.isNotEmpty(jobGroup), SysJob::getJobGroup, jobGroup)
                 .eq(null != status, SysJob::getStatus, status));
                 .eq(null != status, SysJob::getStatus, status));
@@ -204,6 +203,7 @@ public class SysJobServiceImpl extends AbstractBaseService<SysJobMapper, SysJob>
         throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
         throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
       }
       }
       newJob.setSourceId(job.getSourceId());
       newJob.setSourceId(job.getSourceId());
+      newJob.setTenantId(job.getTenantId());
       baseMapper.updateById(newJob);
       baseMapper.updateById(newJob);
       updateSchedulerJob(newJob, job.getJobGroup());
       updateSchedulerJob(newJob, job.getJobGroup());
     }
     }

@@ -13,6 +13,7 @@ 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.exception.YtDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.*;
 import org.thingsboard.server.common.data.yunteng.dto.*;
+import org.thingsboard.server.common.data.yunteng.dto.report.CycleParameterDTO;
 import org.thingsboard.server.common.data.yunteng.dto.request.ExecuteAttributesDTO;
 import org.thingsboard.server.common.data.yunteng.dto.request.ExecuteAttributesDTO;
 import org.thingsboard.server.common.data.yunteng.dto.request.QueryConditionDTO;
 import org.thingsboard.server.common.data.yunteng.dto.request.QueryConditionDTO;
 import org.thingsboard.server.common.data.yunteng.enums.JobGroupEnum;
 import org.thingsboard.server.common.data.yunteng.enums.JobGroupEnum;
@@ -37,8 +38,9 @@ public class YtReportFromConfigServiceImpl
   private final YtSysJobService ytSysJobService;
   private final YtSysJobService ytSysJobService;
   private final YtReportGenerateRecordService ytReportGenerateRecordService;
   private final YtReportGenerateRecordService ytReportGenerateRecordService;
   private final UserOrganizationMappingService userOrganizationMappingService;
   private final UserOrganizationMappingService userOrganizationMappingService;
+
   @Override
   @Override
-  public YtPageData<ReportFormConfigDTO> page(Map<String, Object> queryMap,boolean tenantAdmin) {
+  public YtPageData<ReportFormConfigDTO> page(Map<String, Object> queryMap, boolean tenantAdmin) {
     String tenantId =
     String tenantId =
         Optional.ofNullable(queryMap.get("tenantId")).map(Object::toString).orElse(null);
         Optional.ofNullable(queryMap.get("tenantId")).map(Object::toString).orElse(null);
     List<String> organizationIds =
     List<String> organizationIds =
@@ -56,9 +58,11 @@ public class YtReportFromConfigServiceImpl
                   return null;
                   return null;
                 })
                 })
             .orElse(null);
             .orElse(null);
-    if(!tenantAdmin &&  null != queryMap.get("userId")){
+    if (!tenantAdmin && null != queryMap.get("userId")) {
       String userId = queryMap.get("userId").toString();
       String userId = queryMap.get("userId").toString();
-      organizationIds = userOrganizationMappingService.compareOrganizationIdsByCustomerId(organizationIds,userId);
+      organizationIds =
+          userOrganizationMappingService.compareOrganizationIdsByCustomerId(
+              organizationIds, userId);
     }
     }
     queryMap.put("organizationIds", organizationIds);
     queryMap.put("organizationIds", organizationIds);
     IPage<ReportFormConfigDTO> page =
     IPage<ReportFormConfigDTO> page =
@@ -88,7 +92,9 @@ public class YtReportFromConfigServiceImpl
                 }
                 }
               });
               });
     }
     }
-
+    if (null != report.getCycle()) {
+      reportFormConfig.setCycle(JacksonUtil.convertValue(report.getCycle(), JsonNode.class));
+    }
     reportFormConfig.setExecuteAttributes(
     reportFormConfig.setExecuteAttributes(
         JacksonUtil.convertValue(report.getExecuteAttributes(), JsonNode.class));
         JacksonUtil.convertValue(report.getExecuteAttributes(), JsonNode.class));
     reportFormConfig.setQueryCondition(
     reportFormConfig.setQueryCondition(
@@ -280,6 +286,8 @@ public class YtReportFromConfigServiceImpl
     getExecuteConditionAndAttribute(jsonNode, list);
     getExecuteConditionAndAttribute(jsonNode, list);
     QueryConditionDTO queryCondition =
     QueryConditionDTO queryCondition =
         JacksonUtil.convertValue(obj.getQueryCondition(), QueryConditionDTO.class);
         JacksonUtil.convertValue(obj.getQueryCondition(), QueryConditionDTO.class);
+    CycleParameterDTO cycle = JacksonUtil.convertValue(obj.getCycle(), CycleParameterDTO.class);
+    dto.setCycle(cycle);
     dto.setExecuteAttributes(list);
     dto.setExecuteAttributes(list);
     dto.setQueryCondition(queryCondition);
     dto.setQueryCondition(queryCondition);
     return dto;
     return dto;

@@ -14,10 +14,9 @@ public interface YtSysJobService
      * 获取quartz调度器的计划任务
      * 获取quartz调度器的计划任务
      * 
      * 
      * @param queryMap 查询参数
      * @param queryMap 查询参数
-     * @param tenantId 租户ID
      * @return 分页数据
      * @return 分页数据
      */
      */
-    YtPageData<SysJobDTO> sysJobPage(Map<String, Object> queryMap, String tenantId);
+    YtPageData<SysJobDTO> sysJobPage(Map<String, Object> queryMap);
 
 
     /**
     /**
      * 通过调度任务ID查询调度信息
      * 通过调度任务ID查询调度信息