Merge branch 'master_dev' into 20230426

@@ -181,11 +181,12 @@ public class TkDeviceProfileController extends BaseController {
   @DeleteMapping
   @ApiOperation("删除")
   @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:deviceProfile:delete'})")
-  public void deleteDevices(@Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO)
+  public void deleteDeviceProfiles(@Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO)
       throws ThingsboardException {
     String tenantId = getCurrentUser().getCurrentTenantId();
     ytDeviceProfileService.checkDeviceProfiles(tenantId, deleteDTO.getIds());
 
+
     for (String id : deleteDTO.getIds()) {
       deleteTbDeviceProfile(id);
     }

 package org.thingsboard.server.controller.yunteng;
 
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.thingsboard.server.common.data.TenantProfile;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
+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.TenantDTO;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
+import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.yunteng.service.TkTenantService;
 
 import java.util.List;
 import java.util.UUID;
@@ -25,6 +28,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @RequestMapping("/api/yt/tenant_profiles")
 @RequiredArgsConstructor
 public class TkTenantProfilesController extends BaseController {
+  private final TkTenantService tkTenantService;
 
   @PreAuthorize("@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{})")
   @GetMapping(
@@ -47,7 +51,7 @@ public class TkTenantProfilesController extends BaseController {
               orderBy,
               null == orderType ? OrderTypeEnum.DESC.name() : orderType.name());
       TenantId tenantId = getTenantId();
-      if(getCurrentUser().isPtAdmin()){
+      if (getCurrentUser().isPtAdmin()) {
         tenantId = new TenantId(UUID.fromString(getCurrentUser().getCurrentTenantId()));
       }
       PageData<TenantProfile> tenantProfilePageData =
@@ -59,4 +63,23 @@ public class TkTenantProfilesController extends BaseController {
       throw handleException(e);
     }
   }
+
+  @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'PLATFORM_ADMIN')")
+  @GetMapping("/allow/{tenantProfileId}/delete")
+  public ResponseResult<Boolean> deleteCheck(
+      @PathVariable("tenantProfileId") String tenantProfileId) {
+    if (StringUtils.isEmpty(tenantProfileId)) {
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    List<TenantDTO> dtoList = tkTenantService.checkTenantProfileIdUsedByTenants(tenantProfileId);
+    boolean result = null == dtoList || dtoList.isEmpty();
+    String message = "OK";
+    if (!result) {
+      message =
+          String.format(
+              ErrorMessage.TENANT_USED_THIS_TENANT_PROFILE_ID.getMessage(),
+              dtoList.get(0).getName());
+    }
+    return ResponseResult.success(result, message);
+  }
 }

@@ -95,6 +95,9 @@ public enum ErrorMessage {
   DATA_STATE_ENABLE_NOT_DELETE(400071,"【%s】数据为启用状态不能删除！！"),
   EXECUTE_COMMAND_IS_NULL(400072,"执行命令不能为空"),
   DEVICE_NAME_ALREADY_EXISTS(400073,"别名或设备名称已被使用"),
+  TENANT_USED_THIS_TENANT_PROFILE_ID(400074,"【%s】正在使用该租户配置"),
+  DEVICE_PROFILE_USED_BY_DEVICE(400075,"有设备使用待删除配置，请先删除设备或者修改设备配置"),
+  TASK_CENTER_IS_DISABLED(400076,"【%s】任务是禁用状态，不能执行"),
   HAVE_NO_PERMISSION(500002,"没有修改权限");
   private final int code;
   private String message;

@@ -146,9 +146,9 @@ public class TkDeviceProfileServiceImpl
     // check if ids bind to device
     int count =
         deviceMapper.selectCount(
-            new QueryWrapper<TkDeviceEntity>().lambda().in(TkDeviceEntity::getProfileId, ids));
+            new QueryWrapper<TkDeviceEntity>().lambda().in(TkDeviceEntity::getDeviceProfileId, ids));
     if (count > 0) {
-      throw new TkDataValidationException("有设备使用待删除配置，请先删除设备或者修改设备配置");
+      throw new TkDataValidationException(ErrorMessage.DEVICE_PROFILE_USED_BY_DEVICE.getMessage());
     }
   }
 

@@ -310,24 +310,22 @@ public class TkTaskCenterServiceImpl
   @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);
+    boolean result = false;
     // 直接调用任务中心任务执行
     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);
+    if (null != sysJobDTO) {
+      if (Objects.equals(sysJobDTO.getStatus(), StatusEnum.DISABLE.getIndex())) {
+        throw new TkDataValidationException(
+            String.format(
+                ErrorMessage.TASK_CENTER_IS_DISABLED.getMessage(), sysJobDTO.getJobName()));
+      }
+      result = tkSysJobService.run(sysJobDTO);
+      // 放入缓存
+      String key = FastIotConstants.CacheConfigKey.TASK_IMMEDIATE_EXECUTE + "_" + taskCenterId;
+      cacheUtils.put(cacheName, key, immediateExecuteDTO);
     }
-    return tkSysJobService.run(sysJobDTO);
+    return result;
   }
 
   private void updateTaskCenterCache(TkTaskCenterEntity entity) {

@@ -334,6 +334,21 @@ public class TkTenantServiceImpl extends AbstractBaseService<TenantMapper, SysTe
     return CompletableFuture.supplyAsync(() -> new TsValue(ts, String.valueOf(tenants.size())));
   }
 
+  @Override
+  public List<TenantDTO> checkTenantProfileIdUsedByTenants(String tenantProfileId) {
+    List<SysTenantEntity> entities =
+        baseMapper.selectList(
+            new LambdaQueryWrapper<SysTenantEntity>()
+                .eq(SysTenantEntity::getTenantProfileId, tenantProfileId));
+    return Optional.ofNullable(entities)
+        .map(
+            list ->
+                list.stream()
+                    .map(entity -> entity.getDTO(TenantDTO.class))
+                    .collect(Collectors.toList()))
+        .orElse(null);
+  }
+
   /**
    * 保存租户与菜单、角色的映射关系
    *

@@ -34,4 +34,6 @@ public interface TkTenantService {
   List<TenantDTO> getAllTenant();
 
   CompletableFuture<TsValue> findTenantsByTs(LocalDateTime startTs, LocalDateTime endTs,long ts);
+
+  List<TenantDTO> checkTenantProfileIdUsedByTenants(String tenantProfileId);
 }