fix: 完善任务中心的命令下发

@@ -518,4 +518,13 @@ public class TkDeviceController extends BaseController {
     return ResponseEntity.ok(
         tkdeviceService.getDeviceAttributes(deviceProfileId, tenantId, dataType));
   }
+
+  @PostMapping("get/devices")
+  @ApiOperation("通过设备ID列表获取设备信息")
+  public ResponseResult<List<DeviceDTO>> findDeviceInfoByTbDeviceIds(
+      @RequestBody List<String> tbDeviceIds) throws ThingsboardException {
+    return ResponseResult.success(
+        tkdeviceService.findDeviceInfoByTbDeviceIds(
+            tbDeviceIds, getCurrentUser().getCurrentTenantId()));
+  }
 }

@@ -14,6 +14,7 @@ import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 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.task.TaskImmediateExecuteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.task.TkTaskCenterDTO;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.TargetTypeEnum;
@@ -126,6 +127,18 @@ public class TkTaskCenterController extends BaseController {
             taskId, tbDeviceId, getCurrentUser().getCurrentTenantId(), allow));
   }
 
+  @PostMapping("/immediate/execute")
+  @PreAuthorize(
+      "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:task_center:immediate:execute'})")
+  @ApiOperation(value = "立即执行任务中心任务")
+  public ResponseResult<Boolean> immediateExecute(
+      @Validated @RequestBody TaskImmediateExecuteDTO immediateExecuteDTO)
+      throws SchedulerException, ThingsboardException {
+    return ResponseResult.success(
+        tkTaskCenterService.immediateExecute(
+            immediateExecuteDTO, getCurrentUser().getCurrentTenantId()));
+  }
+
   private TkTaskCenterDTO saveOrUpdate(TkTaskCenterDTO tkTaskCenterDTO)
       throws ThingsboardException, SchedulerException {
     tkTaskCenterDTO.setTenantId(getCurrentUser().getCurrentTenantId());

 package org.thingsboard.server.utils.yunteng;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -16,13 +17,18 @@ import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.rpc.ToDeviceRpcRequestBody;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
+import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 import org.thingsboard.server.common.data.yunteng.core.cache.CacheUtils;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.task.TargetContentDTO;
+import org.thingsboard.server.common.data.yunteng.dto.task.TaskImmediateExecuteDTO;
+import org.thingsboard.server.common.data.yunteng.dto.task.TkDeviceTaskCenterDTO;
 import org.thingsboard.server.common.data.yunteng.dto.task.TkTaskCenterDTO;
+import org.thingsboard.server.common.data.yunteng.enums.CmdTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.TargetTypeEnum;
 import org.thingsboard.server.common.msg.rpc.ToDeviceRpcRequest;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceTaskCenterService;
 import org.thingsboard.server.dao.yunteng.service.TkTaskCenterService;
 import org.thingsboard.server.service.rpc.TbCoreDeviceRpcService;
 import org.thingsboard.server.service.security.model.SecurityUser;
@@ -44,6 +50,8 @@ public class RpcCommandTask {
   private final TbCoreDeviceRpcService tbCoreDeviceRpcService;
   private final TkDeviceService tkDeviceService;
   private final CacheUtils cacheUtils;
+  private final TkDeviceTaskCenterService tkDeviceTaskCenterService;
+  private static final String cacheName = FastIotConstants.CacheConfigKey.TASK_CENTER_INFOS;
 
   public void process(String taskCenterId) {
     // 通过任务中心ID查询执行命令及执行对象
@@ -59,24 +67,34 @@ public class RpcCommandTask {
               TargetContentDTO targetContent = tkTaskCenterDTO.getExecuteTarget();
               JsonNode cmdJsonNode = tkTaskCenterDTO.getExecuteContent().getPushContent();
               SecurityUser securityUser = new SecurityUser();
+              String taskCenterId = tkTaskCenterDTO.getId();
+
+              String immediateExecuteKey = FastIotConstants.CacheConfigKey.TASK_IMMEDIATE_EXECUTE + "_" + taskCenterId;
+              Optional<TaskImmediateExecuteDTO> immediateExecuteDTO = cacheUtils.get(cacheName,immediateExecuteKey);
+              List<String> data = targetContent.getData();
+              //如果从缓存里面获取了任务的立即执行,则以缓存里面的数据作为执行依据
+              if(immediateExecuteDTO.isPresent()){
+                TaskImmediateExecuteDTO immediateExecute = immediateExecuteDTO.get();
+                data = immediateExecute.getTargetIds();
+                targetType = immediateExecute.getExecuteTarget();
+              }
+
               // send cmd
-              if (targetContent.getData() != null && null != cmdJsonNode) {
+              if (data != null && null != cmdJsonNode) {
                 String tenantId = tkTaskCenterDTO.getTenantId();
-                String cacheName = FastIotConstants.CacheConfigKey.TASK_CENTER_INFOS;
                 String key =
-                    FastIotConstants.CacheConfigKey.TASK_CENTER_EXECUTE_TIME
-                        + "_"
-                        + tkTaskCenterDTO.getId();
+                    FastIotConstants.CacheConfigKey.TASK_CENTER_EXECUTE_TIME + "_" + taskCenterId;
                 cacheUtils.put(
                     cacheName,
                     key,
                     LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli());
                 if (targetType.equals(TargetTypeEnum.DEVICES)) {
-                  for (String deviceId : targetContent.getData()) {
-                    sendRpcCommand(cmdJsonNode, tenantId, deviceId, securityUser);
+                  for (String deviceId : data) {
+                    sendRpcCommand(cmdJsonNode, tenantId, deviceId, securityUser, taskCenterId);
                   }
                 } else {
-                  sendRpcCommandByProducts(targetContent, cmdJsonNode, tenantId, securityUser);
+                  sendRpcCommandByProducts(
+                      targetContent, cmdJsonNode, tenantId, securityUser, taskCenterId);
                 }
               }
             }
@@ -92,7 +110,8 @@ public class RpcCommandTask {
       TargetContentDTO targetContent,
       JsonNode cmdJsonNode,
       String tenantId,
-      SecurityUser securityUser) {
+      SecurityUser securityUser,
+      String taskCenterId) {
     for (String deviceProfileId : targetContent.getData()) {
       Futures.addCallback(
           tkDeviceService.findDeviceListByDeviceProfileId(deviceProfileId, tenantId),
@@ -112,7 +131,8 @@ public class RpcCommandTask {
                     }
                   }
                   if (needSendCommand) {
-                    sendRpcCommand(cmdJsonNode, tenantId, dto.getTbDeviceId(), securityUser);
+                    sendRpcCommand(
+                        cmdJsonNode, tenantId, dto.getTbDeviceId(), securityUser, taskCenterId);
                   }
                 }
               }
@@ -126,11 +146,18 @@ public class RpcCommandTask {
   }
 
   private void sendRpcCommand(
-      JsonNode cmdJsonNode, String tenantId, String originateId, SecurityUser securityUser) {
+      JsonNode cmdJsonNode,
+      String tenantId,
+      String originateId,
+      SecurityUser securityUser,
+      String taskCenterId) {
     JsonNode rpcCommand = cmdJsonNode.get(FastIotConstants.RPC_COMMAND);
     ToDeviceRpcRequestBody body =
         new ToDeviceRpcRequestBody("methodThingskit", JacksonUtil.toString(rpcCommand));
     DeviceId deviceId = new DeviceId(UUID.fromString(originateId));
+    ObjectNode objectNode = JacksonUtil.newObjectNode();
+    objectNode.put(
+        ModelConstants.TablePropertyMapping.COMMAND_TYPE, CmdTypeEnum.TASK_CENTER.ordinal());
     ToDeviceRpcRequest request =
         new ToDeviceRpcRequest(
             UUID.randomUUID(),
@@ -141,12 +168,26 @@ public class RpcCommandTask {
             body,
             true,
             null,
-            null);
+            JacksonUtil.toString(objectNode));
     tbCoreDeviceRpcService.processRestApiRpcRequest(
         request,
         fromDeviceRpcResponse -> {
           log.trace("Device renamed RPC with id: [{}] ", request.getId());
         },
         securityUser);
+    // 更新设备与任务中心的执行时间
+    TkDeviceTaskCenterDTO tkDeviceTaskCenterDTO =
+        tkDeviceTaskCenterService.findInfoByDeviceIdAndTaskCenterId(
+            tenantId, originateId, taskCenterId);
+    if (null != tkDeviceTaskCenterDTO) {
+      LocalDateTime localDateTime = LocalDateTime.now();
+      Long executeTime = localDateTime.toInstant(ZoneOffset.of("+8")).toEpochMilli();
+      tkDeviceTaskCenterDTO.setLastExecuteTime(localDateTime);
+      tkDeviceTaskCenterService.saveOrUpdate(tkDeviceTaskCenterDTO);
+      // 将设备执行时间存入缓存
+      String key =
+          FastIotConstants.CacheConfigKey.TASK_CENTER_DEVICE_EXECUTE_TIME + "_" + originateId;
+      cacheUtils.put(cacheName, key, executeTime);
+    }
   }
 }

@@ -20,7 +20,6 @@ public interface FastIotConstants {
   Pattern CHINA_MOBILE_PATTERN = Pattern.compile(MOBILE);
   String DEFAULT_DELIMITER = "#";
   String RPC_COMMAND = "rpcCommand";
-
   interface CacheConfigKey {
     String CACHE_CONFIG_KEY = "yunTengIotCache";
     String USER_PERMISSION_PREFIX = "userPermissionFor_";
@@ -29,6 +28,8 @@ public interface FastIotConstants {
     String PUBLIC_ID = "publicId_";
     String TASK_CENTER_INFOS = "taskCenterInfos";
     String TASK_CENTER_EXECUTE_TIME = "taskCenterExecuteTime";
+    String TASK_CENTER_DEVICE_EXECUTE_TIME = "taskCenterDeviceExecuteTime";
+    String TASK_IMMEDIATE_EXECUTE = "taskImmediateExecute";
   }
 
   interface TBCacheConfig {

+package org.thingsboard.server.common.data.yunteng.dto.task;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.thingsboard.server.common.data.yunteng.enums.TargetTypeEnum;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class TaskImmediateExecuteDTO implements Serializable {
+
+  private static final long serialVersionUID = -6249425147049039746L;
+
+  @NotEmpty(message = "任务中心ID不能为空或空字符串")
+  @ApiModelProperty(value = "任务中心任务ID")
+  private String id;
+
+  @ApiModelProperty(value = "执行类型：设备/产品")
+  private TargetTypeEnum executeTarget = TargetTypeEnum.DEVICES;
+
+  @NotEmpty(message = "任务中心ID不能为空或空字符串")
+  @ApiModelProperty(value = "corn表达式")
+  private String cronExpression;
+
+  @NotEmpty(message = "任务中心名称不能为空或空字符串")
+  @ApiModelProperty(value = "任务中心名称")
+  private String name;
+
+  @NotNull(message = "执行列表不能为空")
+  @ApiModelProperty(value = "执行列表")
+  private List<String> targetIds;
+}

@@ -2,8 +2,12 @@ package org.thingsboard.server.common.data.yunteng.dto.task;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.yunteng.dto.BaseDTO;
 
+import java.time.LocalDateTime;
+
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class TkDeviceTaskCenterDTO extends BaseDTO {
   @ApiModelProperty(value = "设备ID")
@@ -15,6 +19,9 @@ public class TkDeviceTaskCenterDTO extends BaseDTO {
   @ApiModelProperty(value = "是否允许执行：0不执行 1允许执行")
   private Integer allowState;
 
+  @ApiModelProperty(value = "最新执行时间")
+  private LocalDateTime lastExecuteTime;
+
   @ApiModelProperty(value = "租户ID")
   private String tenantId;
 }

@@ -7,5 +7,7 @@ public enum CmdTypeEnum {
     //自定义
     DIY,
     //服务
-    SERVICE
+    SERVICE,
+    //任务中心
+    TASK_CENTER
 }

@@ -5,15 +5,14 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 
+import java.time.LocalDateTime;
+
 @EqualsAndHashCode(callSuper = true)
 @Data
 @TableName(value = ModelConstants.Table.TK_DEVICE_TASK_CENTER_NAME)
 public class TkDeviceTaskCenterEntity extends TenantBaseEntity {
-
-  private static final long serialVersionUID = -5425391296429906856L;
   private String tbDeviceId;
-
   private String taskCenterId;
-
+  private LocalDateTime lastExecuteTime;
   private Integer allowState;
 }

@@ -18,6 +18,7 @@ import org.thingsboard.server.common.data.yunteng.core.cache.CacheUtils;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 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.task.TkDeviceTaskCenterDTO;
 import org.thingsboard.server.common.data.yunteng.enums.JobGroupEnum;
 import org.thingsboard.server.common.data.yunteng.enums.StatusEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
@@ -29,6 +30,7 @@ import org.thingsboard.server.dao.yunteng.mapper.SysJobMapper;
 import org.thingsboard.server.dao.yunteng.service.*;
 
 import javax.annotation.PostConstruct;
+import java.time.ZoneOffset;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -40,6 +42,8 @@ public class SysJobServiceImpl extends AbstractBaseService<SysJobMapper, SysJobE
   private final Scheduler scheduler;
   private final SysJobLogServiceImpl sysJobLogService;
   private final CacheUtils cacheUtils;
+  private final TkDeviceTaskCenterService tkDeviceTaskCenterService;
+  private static final String cacheName = FastIotConstants.CacheConfigKey.TASK_CENTER_INFOS;
   /** 项目启动时，初始化定时器 主要是防止手动修改数据库导致未同步到定时任务处理（注：不能手动修改数据库ID和任务组名，否则会导致脏数据） */
   @PostConstruct
   public void init() throws SchedulerException {
@@ -49,12 +53,13 @@ public class SysJobServiceImpl extends AbstractBaseService<SysJobMapper, SysJobE
           new ArrayList<>(baseMapper.selectList(new LambdaQueryWrapper<>()));
       List<SysJobEntity> enableJobs = new ArrayList<>();
       for (SysJobEntity job : jobList) {
-        if (Objects.equals(job.getStatus(),StatusEnum.ENABLE.getIndex())) {
+        if (Objects.equals(job.getStatus(), StatusEnum.ENABLE.getIndex())) {
           enableJobs.add(job);
         }
         if (Objects.equals(job.getJobGroup(), JobGroupEnum.TASK_CENTER.name())) {
-          // 查询任务中心的最新执行时间放在缓存里面
-          queryJobLastExecuteTime(job.getSourceId(), job.getId(), job.getJobGroup());
+          // 查询设备任务中心映射表的最新执行时间放入缓存
+          queryDeviceTaskCenterLastExecuteTime(
+              job.getTenantId(), job.getSourceId(), job.getId(), job.getJobGroup());
         }
       }
       for (SysJobEntity job : enableJobs) {
@@ -261,6 +266,7 @@ public class SysJobServiceImpl extends AbstractBaseService<SysJobMapper, SysJobE
       SysJobEntity job = jobDTO.getEntity(SysJobEntity.class);
       baseMapper.insert(job);
       ScheduleUtils.createScheduleJob(scheduler, job);
+      jobDTO.setId(job.getId());
     } else {
       SysJobEntity job = baseMapper.selectById(jobDTO.getId());
       SysJobEntity newJob = jobDTO.getEntity(SysJobEntity.class);
@@ -318,7 +324,6 @@ public class SysJobServiceImpl extends AbstractBaseService<SysJobMapper, SysJobE
         new FutureCallback<>() {
           @Override
           public void onSuccess(@Nullable Long executeTime) {
-            String cacheName = FastIotConstants.CacheConfigKey.TASK_CENTER_INFOS;
             String key = FastIotConstants.CacheConfigKey.TASK_CENTER_EXECUTE_TIME + "_" + sourceId;
             cacheUtils.put(cacheName, key, executeTime);
           }
@@ -328,4 +333,38 @@ public class SysJobServiceImpl extends AbstractBaseService<SysJobMapper, SysJobE
         },
         MoreExecutors.directExecutor());
   }
+
+  private void queryDeviceTaskCenterLastExecuteTime(
+      String tenantId, String sourceId, String jobId, String JobGroup) {
+    Futures.addCallback(
+        tkDeviceTaskCenterService.findInfosByTaskCenterId(tenantId, sourceId),
+        new FutureCallback<>() {
+          @Override
+          public void onSuccess(@Nullable List<TkDeviceTaskCenterDTO> tkDeviceTaskCenterDTOS) {
+            if (null != tkDeviceTaskCenterDTOS && !tkDeviceTaskCenterDTOS.isEmpty()) {
+              // 任务还存在,才查询任务中心的最新执行时间放入缓存
+              queryJobLastExecuteTime(sourceId, jobId, JobGroup);
+              for (TkDeviceTaskCenterDTO tkDeviceTaskCenterDTO : tkDeviceTaskCenterDTOS) {
+                String key =
+                    FastIotConstants.CacheConfigKey.TASK_CENTER_DEVICE_EXECUTE_TIME
+                        + "_"
+                        + tkDeviceTaskCenterDTO.getTbDeviceId();
+                if (null != tkDeviceTaskCenterDTO.getLastExecuteTime()) {
+                  cacheUtils.put(
+                      cacheName,
+                      key,
+                      tkDeviceTaskCenterDTO
+                          .getLastExecuteTime()
+                          .toInstant(ZoneOffset.of("+8"))
+                          .toEpochMilli());
+                }
+              }
+            }
+          }
+
+          @Override
+          public void onFailure(@NotNull Throwable throwable) {}
+        },
+        MoreExecutors.directExecutor());
+  }
 }

@@ -723,4 +723,19 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
         .map(list -> list.stream().map(TkDeviceEntity::getTbDeviceId).collect(Collectors.toList()))
         .orElse(null);
   }
+
+  @Override
+  public List<DeviceDTO> findDeviceInfoByTbDeviceIds(List<String> tbDeviceIds, String tenantId) {
+    if (StringUtils.isEmpty(tenantId) || null == tbDeviceIds || tbDeviceIds.isEmpty()) {
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    return baseMapper
+        .selectList(
+            new LambdaQueryWrapper<TkDeviceEntity>()
+                .eq(TkDeviceEntity::getTenantId, tenantId)
+                .in(TkDeviceEntity::getTbDeviceId, tbDeviceIds))
+        .stream()
+        .map(entity -> entity.getDTO(DeviceDTO.class))
+        .collect(Collectors.toList());
+  }
 }

 package org.thingsboard.server.dao.yunteng.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
-import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
+import org.thingsboard.server.common.data.yunteng.core.cache.CacheUtils;
+import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.task.TkDeviceTaskCenterDTO;
 import org.thingsboard.server.dao.yunteng.entities.TkDeviceTaskCenterEntity;
 import org.thingsboard.server.dao.yunteng.mapper.TkDeviceTaskCenterMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceTaskCenterService;
+
 import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
+@Slf4j
 public class TkDeviceTaskCenterServiceImpl
     extends AbstractBaseService<TkDeviceTaskCenterMapper, TkDeviceTaskCenterEntity>
     implements TkDeviceTaskCenterService {
+  private final CacheUtils cacheUtils;
+
   @Override
   @Transactional
   public TkDeviceTaskCenterDTO saveOrUpdate(TkDeviceTaskCenterDTO tkDeviceTaskCenterDTO) {
@@ -34,11 +45,6 @@ public class TkDeviceTaskCenterServiceImpl
 
   @Override
   @Transactional
-  public boolean delete(DeleteDTO delete) {
-    return baseMapper.deleteBatchIds(delete.getIds()) > FastIotConstants.MagicNumber.ZERO;
-  }
-
-  @Override
   public boolean updateStateByTbDeviceIdAndTaskCenterId(
       String tenantId, String taskCenterId, String tbDeviceId, Integer state) {
     TkDeviceTaskCenterEntity entity =
@@ -55,7 +61,19 @@ public class TkDeviceTaskCenterServiceImpl
   }
 
   @Override
+  @Transactional
   public boolean deleteByTaskCenterId(String tenantId, String taskCenterId) {
+    List<TkDeviceTaskCenterDTO> list = getInfosByTaskCenterId(tenantId, taskCenterId);
+    if (null != list && !list.isEmpty()) {
+      for (TkDeviceTaskCenterDTO tkDeviceTaskCenterDTO : list) {
+        String cacheName = FastIotConstants.CacheConfigKey.TASK_CENTER_INFOS;
+        String key =
+            FastIotConstants.CacheConfigKey.TASK_CENTER_DEVICE_EXECUTE_TIME
+                + "_"
+                + tkDeviceTaskCenterDTO.getTbDeviceId();
+        cacheUtils.invalidate(cacheName, key);
+      }
+    }
     return baseMapper.delete(
             new LambdaQueryWrapper<TkDeviceTaskCenterEntity>()
                 .eq(TkDeviceTaskCenterEntity::getTenantId, tenantId)
@@ -68,4 +86,47 @@ public class TkDeviceTaskCenterServiceImpl
   public boolean insertBatch(List<TkDeviceTaskCenterEntity> list) {
     return insertBatch(list, list.size());
   }
+
+  @Override
+  public TkDeviceTaskCenterDTO findInfoByDeviceIdAndTaskCenterId(
+      String tenantId, String tbDeviceId, String taskCenterId) {
+    if (StringUtils.isEmpty(taskCenterId)
+        || StringUtils.isEmpty(tbDeviceId)
+        || StringUtils.isEmpty(tenantId)) {
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    TkDeviceTaskCenterEntity entity =
+        baseMapper.selectOne(
+            new LambdaQueryWrapper<TkDeviceTaskCenterEntity>()
+                .eq(TkDeviceTaskCenterEntity::getTenantId, tenantId)
+                .eq(TkDeviceTaskCenterEntity::getTbDeviceId, tbDeviceId)
+                .eq(TkDeviceTaskCenterEntity::getTaskCenterId, taskCenterId));
+    return Optional.ofNullable(entity)
+        .map(obj -> obj.getDTO(TkDeviceTaskCenterDTO.class))
+        .orElse(null);
+  }
+
+  @Override
+  public ListenableFuture<List<TkDeviceTaskCenterDTO>> findInfosByTaskCenterId(
+      String tenantId, String taskCenterId) {
+    return Futures.immediateFuture(getInfosByTaskCenterId(tenantId, taskCenterId));
+  }
+
+  @Override
+  public List<TkDeviceTaskCenterDTO> getInfosByTaskCenterId(String tenantId, String taskCenterId) {
+    if (StringUtils.isEmpty(taskCenterId) || StringUtils.isEmpty(tenantId)) {
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    List<TkDeviceTaskCenterEntity> entityList =
+        baseMapper.selectList(
+            new LambdaQueryWrapper<TkDeviceTaskCenterEntity>()
+                .eq(TkDeviceTaskCenterEntity::getTenantId, tenantId)
+                .eq(TkDeviceTaskCenterEntity::getTaskCenterId, taskCenterId));
+    if (null != entityList && !entityList.isEmpty()) {
+      return entityList.stream()
+          .map(entity -> entity.getDTO(TkDeviceTaskCenterDTO.class))
+          .collect(Collectors.toList());
+    }
+    return null;
+  }
 }

@@ -42,6 +42,7 @@ public class TkTaskCenterServiceImpl
   private final TkDeviceService tkDeviceService;
   private final CacheUtils cacheUtils;
   private final TkDeviceTaskCenterService tkDeviceTaskCenterService;
+  private static final String cacheName = FastIotConstants.CacheConfigKey.TASK_CENTER_INFOS;
 
   @Override
   public TkPageData<TkTaskCenterDTO> taskCenterPage(Map<String, Object> queryMap, String tenantId) {
@@ -50,17 +51,29 @@ public class TkTaskCenterServiceImpl
         getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false);
     IPage<TkTaskCenterDTO> iPage = baseMapper.getPageData(page, queryMap);
     if (!iPage.getRecords().isEmpty()) {
-      iPage.setRecords(iPage.getRecords().stream()
-          .map(
-              obj -> {
-                String cacheName = FastIotConstants.CacheConfigKey.TASK_CENTER_INFOS;
-                String key =
-                    FastIotConstants.CacheConfigKey.TASK_CENTER_EXECUTE_TIME + "_" + obj.getId();
-                Optional<Long> lastExecuteTime = cacheUtils.get(cacheName, key);
-                lastExecuteTime.ifPresent(obj::setLastExecuteTime);
-                return obj;
-              })
-          .collect(Collectors.toList()));
+      iPage.setRecords(
+          iPage.getRecords().stream()
+              .map(
+                  obj -> {
+                    // 任务执行时间
+                    String key =
+                        FastIotConstants.CacheConfigKey.TASK_CENTER_EXECUTE_TIME
+                            + "_"
+                            + obj.getId();
+
+                    // 如果通过设备查询分页,以设备执行时间为准
+                    String tbDeviceId = (String) queryMap.get("tbDeviceId");
+                    if (null != tbDeviceId) {
+                      key =
+                          FastIotConstants.CacheConfigKey.TASK_CENTER_DEVICE_EXECUTE_TIME
+                              + "_"
+                              + tbDeviceId;
+                    }
+                    Optional<Long> lastExecuteTime = cacheUtils.get(cacheName, key);
+                    lastExecuteTime.ifPresent(obj::setLastExecuteTime);
+                    return obj;
+                  })
+              .collect(Collectors.toList()));
     }
     return new TkPageData<>(iPage.getRecords(), iPage.getTotal());
   }
@@ -85,7 +98,8 @@ public class TkTaskCenterServiceImpl
         JacksonUtil.convertValue(tkTaskCenterDTO.getExecuteTarget(), JsonNode.class));
     entity.setExecuteTime(
         JacksonUtil.convertValue(tkTaskCenterDTO.getExecuteTime(), JsonNode.class));
-    if (StringUtils.isEmpty(tkTaskCenterDTO.getId())) {
+    boolean isUpdate = !StringUtils.isEmpty(tkTaskCenterDTO.getId());
+    if (!isUpdate) {
       entity.setState(FastIotConstants.StateValue.DISABLE);
       baseMapper.insert(entity);
     } else {
@@ -99,7 +113,7 @@ public class TkTaskCenterServiceImpl
       baseMapper.updateById(entity);
       updateTaskCenterCache(entity);
     }
-    saveOrUpdateDeviceTaskCenter(tkTaskCenterDTO);
+    saveOrUpdateDeviceTaskCenter(entity, isUpdate);
     return tkTaskCenterDTO;
   }
 
@@ -125,18 +139,20 @@ public class TkTaskCenterServiceImpl
       }
       sourceIds.add(entity.getId());
     }
+    for (String taskCenterId : sourceIds) {
+      tkDeviceTaskCenterService.deleteByTaskCenterId(tenantId, taskCenterId);
+    }
     int result = baseMapper.deleteBatchIds(sourceIds);
     if (result > FastIotConstants.MagicNumber.ZERO) {
+      // 移除任务中心缓存
       for (String taskCenterId : sourceIds) {
-        tkDeviceTaskCenterService.deleteByTaskCenterId(tenantId, taskCenterId);
+        String cacheName = FastIotConstants.CacheConfigKey.TASK_CENTER_INFOS;
+        cacheUtils.invalidate(
+            cacheName,
+            FastIotConstants.CacheConfigKey.TASK_CENTER_EXECUTE_TIME + "_" + taskCenterId);
       }
       return tkSysJobService.deleteJobs(sourceIds, JobGroupEnum.TASK_CENTER.name(), tenantId);
     }
-    // 移除任务中心缓存
-    for (String taskCenterId : sourceIds) {
-      String cacheName = FastIotConstants.CacheConfigKey.TASK_CENTER_INFOS;
-      cacheUtils.invalidate(cacheName, taskCenterId);
-    }
     return false;
   }
 
@@ -211,7 +227,7 @@ public class TkTaskCenterServiceImpl
       String sourceId = entity.getId();
       SysJobDTO queryJob = tkSysJobService.findSysJobBySourceId(sourceId);
       TaskExecuteTimeDTO executeTime =
-              JacksonUtil.convertValue(entity.getExecuteTime(), TaskExecuteTimeDTO.class);
+          JacksonUtil.convertValue(entity.getExecuteTime(), TaskExecuteTimeDTO.class);
       if (null == executeTime || StringUtils.isEmpty(executeTime.getCron())) {
         throw new TkDataValidationException(ErrorMessage.CRON_INVALID.getMessage());
       }
@@ -276,6 +292,29 @@ public class TkTaskCenterServiceImpl
     return result;
   }
 
+  @Override
+  public boolean immediateExecute(TaskImmediateExecuteDTO immediateExecuteDTO, String tenantId)
+      throws SchedulerException {
+    // 放入缓存
+    String taskCenterId = immediateExecuteDTO.getId();
+    String key = FastIotConstants.CacheConfigKey.TASK_IMMEDIATE_EXECUTE + "_" + taskCenterId;
+    cacheUtils.put(cacheName, key, immediateExecuteDTO);
+    // 直接调用任务中心任务执行
+    SysJobDTO sysJobDTO = tkSysJobService.findSysJobBySourceId(taskCenterId);
+    if (null == sysJobDTO) {
+      sysJobDTO = new SysJobDTO();
+      sysJobDTO.setSourceId(taskCenterId);
+      sysJobDTO.setInvokeTarget("rpcCommandTask.process('" + taskCenterId + "')");
+      sysJobDTO.setJobGroup(JobGroupEnum.TASK_CENTER.name());
+      sysJobDTO.setTenantId(tenantId);
+      sysJobDTO.setCronExpression(immediateExecuteDTO.getCronExpression());
+      sysJobDTO.setJobName(immediateExecuteDTO.getName());
+      sysJobDTO.setStatus(StatusEnum.DISABLE.getIndex());
+      tkSysJobService.saveOrUpdateJob(sysJobDTO);
+    }
+    return tkSysJobService.run(sysJobDTO);
+  }
+
   private void updateTaskCenterCache(TkTaskCenterEntity entity) {
     String cacheName = FastIotConstants.CacheConfigKey.TASK_CENTER_INFOS;
     Optional<TkTaskCenterEntity> entityCache = cacheUtils.get(cacheName, entity.getId());
@@ -284,13 +323,15 @@ public class TkTaskCenterServiceImpl
     }
   }
 
-  private void saveOrUpdateDeviceTaskCenter(TkTaskCenterDTO tkTaskCenter) {
-    String taskCenterId = tkTaskCenter.getId();
-    String tenantId = tkTaskCenter.getTenantId();
+  private void saveOrUpdateDeviceTaskCenter(TkTaskCenterEntity entity, boolean isUpdate) {
+    String taskCenterId = entity.getId();
+    String tenantId = entity.getTenantId();
     // 判断是按产品执行还是按设备执行
-    List<String> data = tkTaskCenter.getExecuteTarget().getData();
-    boolean isUpdate = !StringUtils.isEmpty(taskCenterId);
-    if (Objects.equals(tkTaskCenter.getTargetType(), TargetTypeEnum.DEVICES)) {
+    List<String> data =
+        Objects.requireNonNull(
+                JacksonUtil.convertValue(entity.getExecuteTarget(), TargetContentDTO.class))
+            .getData();
+    if (Objects.equals(entity.getTargetType(), TargetTypeEnum.DEVICES)) {
       processDeviceTaskCenterMapping(isUpdate, tenantId, taskCenterId, data);
     } else {
       for (String key : data) {

@@ -88,13 +88,14 @@ public interface TkDeviceService extends BaseService<TkDeviceEntity> {
    *
    * @param tbDeviceId TB设备主键
    * @param created 告警状态:0正常,1告警
+   * @return true成功 false失败
    */
   boolean freshAlarmStatus(EntityId tbDeviceId, Integer created);
 
   /**
    * 自动生成设备SN
    *
-   * @return
+   * @return 设备SN
    */
   String generateSn();
 
@@ -103,7 +104,7 @@ public interface TkDeviceService extends BaseService<TkDeviceEntity> {
    *
    * @param deviceId 平台设备ID
    * @param tenantId 租户ID
-   * @return
+   * @return 场景联动ID
    */
   String otherUsing(String deviceId, String tenantId);
 
@@ -134,7 +135,7 @@ public interface TkDeviceService extends BaseService<TkDeviceEntity> {
    * @param tenantId 租户ID
    * @param masterId 网关设备的TB_ID
    * @param deviceCode 网关子设备的标识符，例如：485协议的从设备地址码
-   * @return
+   * @return 从设备信息
    */
   DeviceDTO findSlaveDevice(String tenantId, String masterId, String deviceCode);
 
@@ -145,7 +146,7 @@ public interface TkDeviceService extends BaseService<TkDeviceEntity> {
    * @param customerId 客户ID
    * @param organizationId 组织ID
    * @param deviceIds 设备ID
-   * @return
+   * @return 遥测属性列表
    */
   List<String> findDeviceKeys(
       String tenantId, String customerId, String organizationId, List<String> deviceIds);
@@ -156,7 +157,7 @@ public interface TkDeviceService extends BaseService<TkDeviceEntity> {
    * @param slaveId 网关子设备TB平台的ID
    * @param slaveName 网关子设备TB平台的名称
    * @param gatewayId 网关设备TB平台的ID
-   * @return
+   * @return true成功 false失败
    */
   boolean saveSlaveDevice(
       String slaveId, String slaveName, String tbProfileId, String gatewayId, Long createTime);
@@ -212,4 +213,12 @@ public interface TkDeviceService extends BaseService<TkDeviceEntity> {
    * @return id集合
    */
   List<String> findTbDeviceIdsByDeviceProfileId(String deviceProfileId,String tenantId);
+
+  /**
+   * 根据TB设备ID列表获取设备信息
+   * @param tbDeviceIds id列表
+   * @param tenantId 租户ID
+   * @return 设备列表
+   */
+  List<DeviceDTO> findDeviceInfoByTbDeviceIds(List<String> tbDeviceIds,String tenantId);
 }

 package org.thingsboard.server.dao.yunteng.service;
 
-import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
+import com.google.common.util.concurrent.ListenableFuture;
 import org.thingsboard.server.common.data.yunteng.dto.task.TkDeviceTaskCenterDTO;
 import org.thingsboard.server.dao.yunteng.entities.TkDeviceTaskCenterEntity;
 import java.util.List;
@@ -15,30 +15,25 @@ public interface TkDeviceTaskCenterService {
   TkDeviceTaskCenterDTO saveOrUpdate(TkDeviceTaskCenterDTO tkDeviceTaskCenterDTO);
 
   /**
-   * 删除设备与任务中心的映射关系
-   *
-   * @param delete 删除参数
-   * @return true成功 false失败
-   */
-  boolean delete(DeleteDTO delete);
-
-  /**
    * 根据任务中心ID和设备ID更新状态
+   *
    * @param tenantId 租户ID
    * @param taskCenterId 任务重ID
    * @param tbDeviceId 设备ID
    * @param state 状态
    * @return true成功 false失败
    */
-  boolean updateStateByTbDeviceIdAndTaskCenterId(String tenantId,String taskCenterId,String tbDeviceId,Integer state);
+  boolean updateStateByTbDeviceIdAndTaskCenterId(
+      String tenantId, String taskCenterId, String tbDeviceId, Integer state);
 
   /**
    * 通过任务ID删除所有的映射关系
+   *
    * @param tenantId 租户ID
    * @param taskCenterId 任务ID
    * @return true成功 false失败
    */
-  boolean deleteByTaskCenterId(String tenantId,String taskCenterId);
+  boolean deleteByTaskCenterId(String tenantId, String taskCenterId);
 
   /**
    * 批量插入
@@ -47,4 +42,27 @@ public interface TkDeviceTaskCenterService {
    * @return true成功 false失败
    */
   boolean insertBatch(List<TkDeviceTaskCenterEntity> list);
+
+  /**
+   * 根据任务中心ID和设备ID查询设备与任务中心映射关系
+   *
+   * @param tenantId 租户ID
+   * @param tbDeviceId 设备ID
+   * @param taskCenterId 任务中心ID
+   * @return 设备与任务中心映射关系
+   */
+  TkDeviceTaskCenterDTO findInfoByDeviceIdAndTaskCenterId(
+      String tenantId, String tbDeviceId, String taskCenterId);
+
+  /**
+   * 根据任务中心的ID查询设备与任务中心的映射列表
+   *
+   * @param tenantId 租户ID
+   * @param taskCenterId 任务中心ID
+   * @return 设备与任务中心映射关系列表
+   */
+  ListenableFuture<List<TkDeviceTaskCenterDTO>> findInfosByTaskCenterId(
+      String tenantId, String taskCenterId);
+
+  List<TkDeviceTaskCenterDTO> getInfosByTaskCenterId(String tenantId,String taskCenterId);
 }

@@ -3,6 +3,7 @@ package org.thingsboard.server.dao.yunteng.service;
 import com.google.common.util.concurrent.ListenableFuture;
 import org.quartz.SchedulerException;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
+import org.thingsboard.server.common.data.yunteng.dto.task.TaskImmediateExecuteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.task.TkTaskCenterDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import java.util.Map;
@@ -67,4 +68,14 @@ public interface TkTaskCenterService {
    * @return true成功 false失败
    */
   boolean cancelOrAllowExecute(String id, String tbDeviceId, String tenantId, boolean isAllow);
+
+  /**
+   * 立即执行任务
+   *
+   * @param immediateExecuteDTO 执行信息
+   * @param tenantId 租户ID
+   * @return ture成功 false失败
+   */
+  boolean immediateExecute(TaskImmediateExecuteDTO immediateExecuteDTO, String tenantId)
+      throws SchedulerException;
 }