Merge branch '20230704' into 'master_dev'

fix(DEFECT-1365): 微服务模式下定时任务执行问题修复。

See merge request yunteng/thingskit!202

 package org.thingsboard.server.config.yunteng;
 
+import java.util.Properties;
+import javax.sql.DataSource;
 import lombok.AllArgsConstructor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.quartz.SchedulerFactoryBean;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 
-import javax.sql.DataSource;
-import java.util.Properties;
-
-/**
- * 定时任务配置（单机部署建议默认走内存，如需集群需要创建qrtz数据库表/打开类注释）
- */
+/** 定时任务配置（单机部署建议默认走内存，如需集群需要创建qrtz数据库表/打开类注释） */
 @Configuration
 @AllArgsConstructor
-public class ScheduleConfig
-{
+@TbCoreComponent
+public class ScheduleConfig {
   private final DataSource dataSource;
+
   @Bean
-  public SchedulerFactoryBean schedulerFactoryBean()
-  {
+  public SchedulerFactoryBean schedulerFactoryBean() {
     SchedulerFactoryBean factory = new SchedulerFactoryBean();
     factory.setDataSource(dataSource);
 
@@ -31,16 +29,21 @@ public class ScheduleConfig
     prop.put("org.quartz.threadPool.threadCount", "50");
     prop.put("org.quartz.threadPool.threadPriority", "5");
     // JobStore配置
-    prop.put("org.quartz.jobStore.class", "org.springframework.scheduling.quartz.LocalDataSourceJobStore");
+    prop.put(
+        "org.quartz.jobStore.class",
+        "org.springframework.scheduling.quartz.LocalDataSourceJobStore");
     // 集群配置
     prop.put("org.quartz.jobStore.isClustered", "true");
     prop.put("org.quartz.jobStore.clusterCheckinInterval", "15000");
     prop.put("org.quartz.jobStore.maxMisfiresToHandleAtATime", "1");
 
     // sqlserver 启用
-    // prop.put("org.quartz.jobStore.selectWithLockSQL", "SELECT * FROM {0}LOCKS UPDLOCK WHERE LOCK_NAME = ?");
+    // prop.put("org.quartz.jobStore.selectWithLockSQL", "SELECT * FROM {0}LOCKS UPDLOCK WHERE
+    // LOCK_NAME = ?");
     // PostgreSQL 启用
-    prop.put("org.quartz.jobStore.driverDelegateClass", "org.quartz.impl.jdbcjobstore.PostgreSQLDelegate");
+    prop.put(
+        "org.quartz.jobStore.driverDelegateClass",
+        "org.quartz.impl.jdbcjobstore.PostgreSQLDelegate");
     prop.put("org.quartz.jobStore.misfireThreshold", "12000");
     prop.put("org.quartz.jobStore.tablePrefix", "QRTZ_");
     factory.setQuartzProperties(prop);

 package org.thingsboard.server.controller.yunteng;
 
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import java.util.HashMap;
+import java.util.List;
+import javax.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.quartz.SchedulerException;
@@ -19,16 +25,12 @@ import org.thingsboard.server.common.data.yunteng.dto.SysJobDTO;
 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.TkPageData;
+import org.thingsboard.server.common.msg.queue.ServiceType;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.util.yunteng.CronUtils;
 import org.thingsboard.server.dao.util.yunteng.ScheduleUtils;
 import org.thingsboard.server.dao.yunteng.service.TkSysJobService;
-
-import java.util.HashMap;
-import java.util.List;
-
-import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
-import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE;
+import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
 
 /** 调度任务信息操作处理 */
 @RestController
@@ -38,6 +40,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @PreAuthorize("@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{})")
 public class SysJobController extends BaseController {
   private final TkSysJobService jobService;
+  private final TbServiceInfoProvider serviceInfoProvider;
 
   @GetMapping(
       path = "/page",
@@ -90,7 +93,7 @@ public class SysJobController extends BaseController {
   @ApiOperation(value = "任务调度立即执行一次")
   public ResponseResult<Boolean> run(@PathVariable("id") String id) throws SchedulerException {
     SysJobDTO jobDTO = jobService.selectJobById(id);
-    if(null == jobDTO){
+    if (null == jobDTO) {
       throw new TkDataValidationException(ErrorMessage.INTERNAL_ERROR.getMessage());
     }
     boolean result = jobService.run(jobDTO);
@@ -142,8 +145,7 @@ public class SysJobController extends BaseController {
     return ResponseResult.success(dateList);
   }
 
-  private ResponseResult<SysJobDTO> saveOrUpdate(SysJobDTO job)
-      throws SchedulerException{
+  private ResponseResult<SysJobDTO> saveOrUpdate(SysJobDTO job) throws SchedulerException {
     String message = StringUtils.isEmpty(job.getId()) ? "新增任务'" : "修改任务'";
     if (!CronUtils.isValid(job.getCronExpression())) {
       throw new TkDataValidationException(message + job.getJobName() + "'失败，Cron表达式不正确");
@@ -171,4 +173,13 @@ public class SysJobController extends BaseController {
     }
     return ResponseResult.success(jobService.saveOrUpdateJob(job));
   }
+
+  /** 项目启动时，初始化定时器 主要是防止手动修改数据库导致未同步到定时任务处理（注：不能手动修改数据库ID和任务组名，否则会导致脏数据） */
+  @PostConstruct
+  public void init() throws SchedulerException {
+    if (!serviceInfoProvider.isService(ServiceType.TB_CORE)) {
+      return;
+    }
+    jobService.init();
+  }
 }

@@ -44,8 +44,8 @@ public class SysJobServiceImpl extends AbstractBaseService<SysJobMapper, SysJobE
   private final CacheUtils cacheUtils;
   private final TkDeviceTaskCenterService tkDeviceTaskCenterService;
   private static final String cacheName = FastIotConstants.CacheConfigKey.TASK_CENTER_INFOS;
-  /** 项目启动时，初始化定时器 主要是防止手动修改数据库导致未同步到定时任务处理（注：不能手动修改数据库ID和任务组名，否则会导致脏数据） */
-  @PostConstruct
+
+  @Override
   public void init() throws SchedulerException {
     scheduler.clear();
     try {

@@ -114,4 +114,6 @@ public interface TkSysJobService {
    * @return 定时任务信息
    */
   SysJobDTO findSysJobBySourceId(String sourceId);
+
+  void init() throws SchedulerException;
 }