fix：openapi部分bug修复

@@ -7,6 +7,7 @@ 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.exception.ThingsboardException;
+import org.thingsboard.server.common.data.id.EntityId;
 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;
@@ -21,6 +22,7 @@ import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.OpenApiService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
@@ -42,14 +44,17 @@ public class TkOpenApiController extends BaseController {
       @RequestParam(value = "name", required = false) String name,
       @RequestParam(value = "classify", required = false) String classify,
       @RequestParam(value = ORDER_FILED, required = false) String orderBy,
-      @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType) {
-
+      @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("classify", classify);
+    List<String> tenantIds = new ArrayList<>();
+    tenantIds.add(EntityId.NULL_UUID.toString());
+    tenantIds.add(getCurrentUser().getTenantId().toString());
+    queryMap.put("tenantIds",tenantIds);
     if (orderType != null) {
       queryMap.put(ORDER_TYPE, orderType.name());
     }
@@ -69,8 +74,8 @@ public class TkOpenApiController extends BaseController {
   @DeleteMapping
   @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{})")
   public ResponseResult<String> delete(
-      @Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO) {
-    return apiService.delete(deleteDTO.getIds())
+      @Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO) throws ThingsboardException {
+    return apiService.delete(deleteDTO.getIds(), getCurrentUser().getCurrentTenantId())
         ? ResponseResult.success(FastIotConstants.StateValue.DELETE_SUCCESS)
         : ResponseResult.failed(FastIotConstants.StateValue.DELETE_FAILED);
   }

@@ -13,6 +13,7 @@ import org.thingsboard.server.dao.yunteng.entities.TkApplicationApiEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkApplicationEntity;
 import org.thingsboard.server.dao.yunteng.mapper.ApplicationApiMapper;
 import org.thingsboard.server.dao.yunteng.mapper.ApplicationMapper;
+import org.thingsboard.server.dao.yunteng.mapper.OpenApiRecordMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.ApplicationService;
 
@@ -30,7 +31,7 @@ public class ApplicationServiceImpl extends AbstractBaseService<ApplicationMappe
   private static final int KEY_LENGTH = 32;  // 32位字符
   private static final SecureRandom secureRandom = new SecureRandom();
   private static final Base64.Encoder base64Encoder = Base64.getUrlEncoder().withoutPadding();
-
+  private final OpenApiRecordMapper openApiRecordMapper;
 
   @Override
   public ApplicationDTO getDto(String id) {
@@ -90,6 +91,7 @@ public class ApplicationServiceImpl extends AbstractBaseService<ApplicationMappe
   @Transactional
   public boolean delete(Set<String> applicationIds) {
     applicationApiMapper.deleteByAppIds(applicationIds);
+    openApiRecordMapper.deleteByAppIds(applicationIds);
     return baseMapper.deleteBatchIds(applicationIds) > 0;
   }
 

@@ -7,6 +7,7 @@ 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.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.OpenApiContrlooerDTO;
 import org.thingsboard.server.common.data.yunteng.dto.OpenApiDTO;
@@ -42,18 +43,22 @@ public class OpenApiImpl extends AbstractBaseService<OpenApiMapper, TkOpenApiEnt
   @Override
   public TkPageData<OpenApiDTO> page(Map<String, Object> queryMap) {
     IPage<TkOpenApiEntity> iPage =
-        baseMapper.selectPage(
-            getPage(queryMap, "create_time", false),
-            new QueryWrapper<TkOpenApiEntity>()
-                .lambda()
-                .like(
-                    queryMap.get("name") != null,
-                    TkOpenApiEntity::getName,
-                    String.valueOf(queryMap.get("name")))
-                .like(
-                    queryMap.get("classify") != null,
-                    TkOpenApiEntity::getClassify,
-                    String.valueOf(queryMap.get("classify"))));
+            baseMapper.selectPage(
+                    getPage(queryMap, "create_time", false),
+                    new QueryWrapper<TkOpenApiEntity>()
+                            .lambda()
+                            .like(
+                                    queryMap.get("name") != null,
+                                    TkOpenApiEntity::getName,
+                                    String.valueOf(queryMap.get("name")))
+                            .like(
+                                    queryMap.get("classify") != null,
+                                    TkOpenApiEntity::getClassify,
+                                    String.valueOf(queryMap.get("classify")))
+                            .in(
+                                    queryMap.get("tenantIds") != null,
+                                    TkOpenApiEntity::getTenantId,
+                                    (List<String>)queryMap.get("tenantIds")));
     return getPageData(iPage, OpenApiDTO.class);
   }
 
@@ -69,7 +74,14 @@ public class OpenApiImpl extends AbstractBaseService<OpenApiMapper, TkOpenApiEnt
 
   @Override
   @Transactional
-  public boolean delete(Set<String> apiIds) {
+  public boolean delete(Set<String> apiIds ,String tenantId) {
+    List<TkOpenApiEntity> list  = baseMapper.selectList(new LambdaQueryWrapper<TkOpenApiEntity>()
+            .in(TkOpenApiEntity::getId,apiIds));
+    list.stream().forEach(entity ->{
+      if(!entity.getTenantId().equals(tenantId)){
+        throw new TkDataValidationException("没有权限删除");
+      }
+    });
     return baseMapper.deleteBatchIds(apiIds) > 0;
   }
 
@@ -77,6 +89,9 @@ public class OpenApiImpl extends AbstractBaseService<OpenApiMapper, TkOpenApiEnt
   @Transactional
   public OpenApiDTO update(OpenApiDTO dto, String tenantId) {
     TkOpenApiEntity openApi = baseMapper.selectById(dto.getId());
+    if(!openApi.getTenantId().equals(tenantId)){
+      throw new TkDataValidationException("没有权限删除");
+    }
     dto.copyToEntity(openApi);
     baseMapper.updateById(openApi);
     return dto;

@@ -7,6 +7,7 @@ import org.thingsboard.server.common.data.yunteng.dto.OpenApiRecordClassifyDTO;
 import org.thingsboard.server.common.data.yunteng.dto.OpenApiRecordTopDTO;
 import org.thingsboard.server.dao.yunteng.entities.TkOpenApiRecordEntity;
 
+import java.util.Collection;
 import java.util.List;
 
 @Mapper
@@ -16,4 +17,6 @@ public interface OpenApiRecordMapper extends BaseMapper<TkOpenApiRecordEntity> {
 
     List<OpenApiRecordClassifyDTO> getClassify(@Param("tenantId") String tenantId,
                                                @Param("type") String type);
+
+    int deleteByAppIds(@Param("applicationIds") Collection<String> applicationId);
 }

@@ -18,7 +18,7 @@ public interface OpenApiService extends BaseService<TkOpenApiEntity>{
 
     OpenApiDTO save(OpenApiDTO dto, String tenantId);
 
-    boolean delete(Set<String> applicationIds);
+    boolean delete(Set<String> applicationIds, String tenantId);
 
     OpenApiDTO update(OpenApiDTO dto, String tenantId);
 

@@ -64,5 +64,11 @@
         time_period
     </select>
 
+    <delete id="deleteByAppIds">
+        DELETE FROM tk_open_api_record WHERE application_id IN
+        <foreach collection="applicationIds" item="applicationId" open="(" separator="," close=")">
+            #{applicationId}
+        </foreach>
+    </delete>
 
 </mapper>