Merge branch 'master' into 20221129

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.ResponseEntity;
+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;
@@ -72,7 +73,7 @@ public class ThingsModelController extends BaseController {
 
   @PostMapping()
   @ApiOperation("保存物模型")
-  //  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:things_model:post'})")
+    @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:things_model:post'})")
   public ResponseEntity<ThingsModelDTO> save(
       @Validated(AddGroup.class) @RequestBody ThingsModelDTO thingsModelDTO)
       throws ThingsboardException {
@@ -81,7 +82,7 @@ public class ThingsModelController extends BaseController {
 
   @PutMapping()
   @ApiOperation("修改物模型")
-  //  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:things_model:put'})")
+    @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:things_model:put'})")
   public ResponseEntity<ThingsModelDTO> update(
       @Validated(UpdateGroup.class) @RequestBody ThingsModelDTO thingsModelDTO)
       throws ThingsboardException {
@@ -90,7 +91,7 @@ public class ThingsModelController extends BaseController {
 
   @DeleteMapping
   @ApiOperation("删除")
-  //  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:things_model:delete'})")
+    @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:things_model:delete'})")
   public boolean delete(@Validated(DeleteGroup.class) @RequestBody DeleteDTO deleteDTO)
       throws ThingsboardException {
     deleteDTO.setTenantId(getCurrentUser().getCurrentTenantId());
@@ -99,7 +100,6 @@ public class ThingsModelController extends BaseController {
 
   @GetMapping("/{functionType}/{deviceProfileId}")
   @ApiOperation("获取物模型TSL")
-  //  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:things_model:json:view'})")
   public ResponseEntity<JsonNode> getTSL(
       @PathVariable("functionType") FunctionTypeEnum functionType,
       @PathVariable("deviceProfileId") String deviceProfileId)
@@ -110,7 +110,7 @@ public class ThingsModelController extends BaseController {
   }
 
   @PutMapping("/{deviceProfileId}")
-  //  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:things_model:release'})")
+    @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:things_model:release'})")
   @ApiOperation("物模型发布")
   public ResponseEntity<Boolean> releaseTSL(@PathVariable("deviceProfileId") String deviceProfileId)
       throws ThingsboardException {

@@ -37,9 +37,7 @@ import org.thingsboard.server.service.security.permission.Operation;
 
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
-import java.util.List;
-import java.util.Objects;
-import java.util.UUID;
+import java.util.*;
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
@@ -126,16 +124,17 @@ public class TkDeviceProfileController extends BaseController {
 
   @GetMapping("{id}")
   @ApiOperation("详情")
-  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:deviceProfile:get'})")
+  @PreAuthorize(
+      "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:deviceProfile:get'})")
   public ResponseEntity<DeviceProfileDTO> getDevice(@PathVariable("id") String id)
       throws ThingsboardException {
     return ResponseEntity.of(
         ytDeviceProfileService.getDeviceProfile(getCurrentUser().getCurrentTenantId(), id));
   }
 
-  @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
   @GetMapping(params = {PAGE_SIZE, PAGE})
   @ApiOperation("查询")
+  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
   public YtPageData<DeviceProfileDTO> pageDeviceProfile(
       @RequestParam(PAGE_SIZE) int pageSize,
       @RequestParam(PAGE) int page,
@@ -144,21 +143,32 @@ public class TkDeviceProfileController extends BaseController {
       @RequestParam(value = ORDER_FILED, required = false) String orderBy,
       @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
       throws ThingsboardException {
-    return ytDeviceProfileService.page(
-        page,
-        pageSize,
-        orderBy,
-        orderType,
-        getCurrentUser().getCurrentTenantId(),
-        name,
-        transportType);
+    Map<String, Object> queryMap = new HashMap<>();
+    queryMap.put(PAGE, page);
+    queryMap.put(PAGE_SIZE, pageSize);
+    queryMap.put(ORDER_FILED, orderBy);
+    queryMap.put(ORDER_TYPE, orderType);
+    queryMap.put("name", name);
+    queryMap.put("transportType", transportType);
+    queryMap.put(TENANT_ID, getCurrentUser().getCurrentTenantId());
+    queryMap.put(CUSTOMER_ID, getCurrentUser().getCustomerId().toString());
+    return ytDeviceProfileService.page(queryMap, getCurrentUser().isTenantAdmin());
   }
 
   @GetMapping("/me/list")
   @ApiOperation("选项列表")
+  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
   public ResponseEntity listDeviceProfile() throws ThingsboardException {
-    List<DeviceProfileDTO> results =
-        ytDeviceProfileService.findDeviceProfile(getCurrentUser().getCurrentTenantId(), null);
+    List<DeviceProfileDTO> results;
+    String tenantId = getCurrentUser().getCurrentTenantId();
+    if (getCurrentUser().isTenantAdmin()) {
+      results = ytDeviceProfileService.findDeviceProfile(tenantId, null);
+    } else {
+      results =
+          ytDeviceProfileService.findCustomerDeviceProfiles(
+              tenantId, getCurrentUser().getCustomerId());
+    }
+
     return ResponseEntity.ok(results);
   }
 
@@ -177,18 +187,20 @@ public class TkDeviceProfileController extends BaseController {
   }
 
   private void deleteTbDeviceProfile(String profileId) throws ThingsboardException {
-    DeviceProfileDTO dto = ytDeviceProfileService.findDeviceProfileById(getCurrentUser().getCurrentTenantId(), profileId);
-    if(null != dto){
+    DeviceProfileDTO dto =
+        ytDeviceProfileService.findDeviceProfileById(
+            getCurrentUser().getCurrentTenantId(), profileId);
+    if (null != dto) {
       DeviceProfileId deviceProfileId = new DeviceProfileId(toUUID(dto.getTbProfileId()));
       DeviceProfile deviceProfile = checkDeviceProfileId(deviceProfileId, Operation.DELETE);
       deviceProfileService.deleteDeviceProfile(getTenantId(), deviceProfileId);
 
       tbClusterService.onDeviceProfileDelete(deviceProfile, null);
       tbClusterService.broadcastEntityStateChangeEvent(
-              deviceProfile.getTenantId(), deviceProfile.getId(), ComponentLifecycleEvent.DELETED);
+          deviceProfile.getTenantId(), deviceProfile.getId(), ComponentLifecycleEvent.DELETED);
 
       logEntityAction(
-              deviceProfileId, deviceProfile, null, ActionType.DELETED, null, deviceProfileId);
+          deviceProfileId, deviceProfile, null, ActionType.DELETED, null, deviceProfileId);
 
       sendEntityNotificationMsg(getTenantId(), deviceProfile.getId(), EdgeEventActionType.DELETED);
     }

@@ -46,9 +46,7 @@ import org.thingsboard.server.dao.yunteng.service.TkDeviceScriptService;
 
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
-import java.util.List;
-import java.util.Objects;
-import java.util.UUID;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
@@ -133,33 +131,37 @@ public class TkDeviceScriptController extends BaseController {
 
   @GetMapping("{id}")
   @ApiOperation("详情")
-  //    @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:deviceProfile:get'})")
+  @PreAuthorize(
+      "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:js:get'})")
   public ResponseEntity<TkDeviceScriptDTO> getDevice(@PathVariable("id") String id)
       throws ThingsboardException {
     return ResponseEntity.of(
         scriptService.getDeviceScript(getCurrentUser().getCurrentTenantId(), id));
   }
 
-  @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
   @GetMapping(params = {PAGE_SIZE, PAGE})
   @ApiOperation("分页查询")
-  public YtPageData<TkDeviceScriptDTO> pageDeviceProfile(
+  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
+  public YtPageData<TkDeviceScriptDTO> pageDeviceScript(
       @RequestParam(PAGE_SIZE) int pageSize,
       @RequestParam(PAGE) int page,
-      @RequestParam(value = "name", required = false) String name,
-      @RequestParam(value = "transportType", required = false) String transportType,
       @RequestParam(value = ORDER_FILED, required = false) String orderFiled,
       @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
       throws ThingsboardException {
-
-    return scriptService.page(
-        page, pageSize, orderFiled, orderType, getCurrentUser().getCurrentTenantId());
+    Map<String, Object> queryMap = new HashMap<>();
+    queryMap.put(PAGE_SIZE, pageSize);
+    queryMap.put(PAGE, page);
+    queryMap.put(ORDER_FILED, orderFiled);
+    queryMap.put(ORDER_TYPE, orderType);
+    queryMap.put(CUSTOMER_ID, getCurrentUser().getCustomerId().toString());
+    queryMap.put(TENANT_ID, getCurrentUser().getCurrentTenantId());
+    return scriptService.page(queryMap, getCurrentUser().isTenantAdmin());
   }
 
   @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
   @GetMapping("/me/list")
   @ApiOperation("选项列表")
-  public ResponseEntity listDeviceProfile() throws ThingsboardException {
+  public ResponseEntity listDeviceScript() throws ThingsboardException {
     List<TkDeviceScriptDTO> results =
         scriptService.findDeviceScript(getCurrentUser().getCurrentTenantId());
     return ResponseEntity.ok(results);
@@ -167,7 +169,7 @@ public class TkDeviceScriptController extends BaseController {
 
   @DeleteMapping
   @ApiOperation("删除")
-  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:deviceProfile:delete'})")
+  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:js:delete'})")
   public void deleteDevices(@Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO)
       throws ThingsboardException {
     scriptService.deleteScriptes(getCurrentUser().getCurrentTenantId(), deleteDTO.getIds());

@@ -7,4 +7,5 @@ public class QueryConstant {
   public static final String ORDER_TYPE = "orderType";
   public static final String CREATE_TIME="createTime";
   public static final String TENANT_ID = "tenantId";
+  public static final String CUSTOMER_ID = "customerId";
 }

@@ -3,18 +3,21 @@ package org.thingsboard.server.dao.yunteng.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.server.common.data.DeviceProfile;
+import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.TenantId;
+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.constant.QueryConstant;
 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.dto.*;
-import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.dao.yunteng.entities.*;
 import org.thingsboard.server.dao.yunteng.jpa.dao.YtJpaDeviceProfileDao;
@@ -24,6 +27,7 @@ import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileService;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
@@ -152,26 +156,94 @@ public class TkDeviceProfileServiceImpl
   }
 
   @Override
-  public YtPageData<DeviceProfileDTO> page(
-      Integer page,
-      Integer pageSize,
-      String orderField,
-      OrderTypeEnum orderType,
-      String tenantIdStr,
-      String profileName,
-      String transportType) {
-
+  public YtPageData<DeviceProfileDTO> page(Map<String, Object> queryMap, boolean isTenantAdmin) {
+    String tenantIdStr =
+        Optional.ofNullable(queryMap.get(QueryConstant.TENANT_ID))
+            .map(Object::toString)
+            .orElse(null);
+    String profileName =
+        Optional.ofNullable(queryMap.get("name")).map(Object::toString).orElse(null);
+    String transportType =
+        Optional.ofNullable(queryMap.get("transportType")).map(Object::toString).orElse(null);
+    String customerId =
+        Optional.ofNullable(queryMap.get("customerId"))
+            .map(
+                obj -> {
+                  if (isTenantAdmin) {
+                    return null;
+                  }
+                  return obj.toString();
+                })
+            .orElse(null);
+    List<String> deviceProfileIds = null;
+    IPage<DeviceProfileDTO> result = new Page<>();
+    if (!isTenantAdmin) {
+      List<DeviceDTO> deviceDTOS = deviceMapper.findDeviceInfoByCustomerId(tenantIdStr, customerId);
+      if (null == deviceDTOS || deviceDTOS.isEmpty()) {
+        return getPageData(result, DeviceProfileDTO.class);
+      }
+      deviceProfileIds =
+          Optional.of(deviceDTOS)
+              .map(
+                  devices ->
+                      devices.stream().map(DeviceDTO::getDeviceProfileId).collect(Collectors.toList()))
+              .orElse(null);
+    }
     IPage<TkDeviceProfileEntity> currentPage =
-        getCurrentPage(page, pageSize, orderField, orderType);
-    IPage<DeviceProfileDTO> result =
-        baseMapper.getProfilePage(currentPage, tenantIdStr, profileName, transportType);
-
+        getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false);
+    result =
+        baseMapper.getProfilePage(
+            currentPage, tenantIdStr, profileName, transportType, deviceProfileIds);
     return getPageData(result, DeviceProfileDTO.class);
   }
 
   @Override
   public List<DeviceProfileDTO> findDeviceProfile(String tenantId, String scriptId) {
-    List<DeviceProfileDTO> results = baseMapper.profileByScriptId(tenantId, scriptId);
-    return results;
+    return baseMapper.profileByScriptId(tenantId, scriptId);
+  }
+
+  @Override
+  public List<DeviceProfileDTO> findCustomerDeviceProfiles(String tenantId, CustomerId customerId) {
+    List<DeviceDTO> deviceDTOS =
+        deviceMapper.findDeviceInfoByCustomerId(tenantId, customerId.toString());
+    List<String> deviceProfileIds =
+        Optional.ofNullable(deviceDTOS)
+            .map(
+                devices ->
+                    devices.stream().map(DeviceDTO::getDeviceProfileId).collect(Collectors.toList()))
+            .orElse(null);
+    if (null == deviceProfileIds || deviceProfileIds.isEmpty()) {
+      return null;
+    }
+    List<TkDeviceProfileEntity> entities =
+        baseMapper.selectList(
+            new LambdaQueryWrapper<TkDeviceProfileEntity>()
+                .eq(TkDeviceProfileEntity::getTenantId, tenantId)
+                .in(TkDeviceProfileEntity::getId, deviceProfileIds));
+    if (null != entities && !entities.isEmpty()) {
+      return entities.stream()
+          .map(obj -> obj.getDTO(DeviceProfileDTO.class))
+          .collect(Collectors.toList());
+    }
+    return null;
+  }
+
+  @Override
+  public List<DeviceProfileDTO> findDeviceProfileByIds(String tenantId, List<String> ids) {
+    if (StringUtils.isEmpty(tenantId) || null == ids) {
+      throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    List<TkDeviceProfileEntity> entities =
+        baseMapper.selectList(
+            new LambdaQueryWrapper<TkDeviceProfileEntity>()
+                .eq(TkDeviceProfileEntity::getTenantId, tenantId)
+                .in(TkDeviceProfileEntity::getId, ids));
+
+    if (null == entities || entities.isEmpty()) {
+      return null;
+    }
+    return entities.stream()
+        .map(obj -> obj.getDTO(DeviceProfileDTO.class))
+        .collect(Collectors.toList());
   }
 }

@@ -8,33 +8,36 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+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.constant.QueryConstant;
 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.dto.DeviceDTO;
+import org.thingsboard.server.common.data.yunteng.dto.DeviceProfileDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TkCustomerDeviceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkDeviceScriptDTO;
-import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkDeviceProfileEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkDeviceScriptEntity;
 import org.thingsboard.server.dao.yunteng.mapper.TkDeviceProfileMapper;
 import org.thingsboard.server.dao.yunteng.mapper.TkDeviceScriptMapper;
-import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
-import org.thingsboard.server.dao.yunteng.service.TkDeviceScriptService;
+import org.thingsboard.server.dao.yunteng.service.*;
 
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
 @Slf4j
-public class TkDeviceScriptServiceImpl extends AbstractBaseService<TkDeviceScriptMapper, TkDeviceScriptEntity>
-        implements TkDeviceScriptService {
-
+public class TkDeviceScriptServiceImpl
+    extends AbstractBaseService<TkDeviceScriptMapper, TkDeviceScriptEntity>
+    implements TkDeviceScriptService {
 
   private final TkDeviceProfileMapper profileMapper;
-
+  private final TkCustomerDevice tkCustomerDevice;
+  private final TkDeviceProfileService tkDeviceProfileService;
+  private final TkDeviceService tkDeviceService;
 
   @Override
   public boolean validateFormdata(TkDeviceScriptDTO scriptDTO, boolean created) {
@@ -42,32 +45,32 @@ public class TkDeviceScriptServiceImpl extends AbstractBaseService<TkDeviceScrip
     if (created) {
       // 判断数据库是否已存在名字相同的设备配置
       LambdaQueryWrapper<TkDeviceScriptEntity> queryWrapper =
-              new QueryWrapper<TkDeviceScriptEntity>()
-                      .lambda()
-                      .eq(TkDeviceScriptEntity::getTenantId, tenantId)
-                      .eq(TkDeviceScriptEntity::getName, scriptDTO.getName());
+          new QueryWrapper<TkDeviceScriptEntity>()
+              .lambda()
+              .eq(TkDeviceScriptEntity::getTenantId, tenantId)
+              .eq(TkDeviceScriptEntity::getName, scriptDTO.getName());
       int results = baseMapper.selectCount(queryWrapper);
       if (results > 0) {
         throw new YtDataValidationException(ErrorMessage.NAME_ALREADY_EXISTS.getMessage());
       }
     } else {
       LambdaQueryWrapper<TkDeviceScriptEntity> queryWrapper =
-              new QueryWrapper<TkDeviceScriptEntity>()
-                      .lambda()
-                      .eq(TkDeviceScriptEntity::getTenantId, tenantId)
-                      .and(
-                              second ->
-                                      second
-                                              .eq(TkDeviceScriptEntity::getId, scriptDTO.getId())
-                                              .or(f -> f.eq(TkDeviceScriptEntity::getName, scriptDTO.getName())));
-
+          new QueryWrapper<TkDeviceScriptEntity>()
+              .lambda()
+              .eq(TkDeviceScriptEntity::getTenantId, tenantId)
+              .and(
+                  second ->
+                      second
+                          .eq(TkDeviceScriptEntity::getId, scriptDTO.getId())
+                          .or(f -> f.eq(TkDeviceScriptEntity::getName, scriptDTO.getName())));
 
       List<TkDeviceScriptEntity> results = baseMapper.selectList(queryWrapper);
-      for(TkDeviceScriptEntity item:results){
-        if(item.getId().equals(scriptDTO.getId()) && !item.getTenantId().equals(scriptDTO.getTenantId())){
+      for (TkDeviceScriptEntity item : results) {
+        if (item.getId().equals(scriptDTO.getId())
+            && !item.getTenantId().equals(scriptDTO.getTenantId())) {
           throw new YtDataValidationException(ErrorMessage.TENANT_MISMATCHING.getMessage());
         }
-        if(!item.getId().equals(scriptDTO.getId()) && item.getName().equals(scriptDTO.getName())){
+        if (!item.getId().equals(scriptDTO.getId()) && item.getName().equals(scriptDTO.getName())) {
           throw new YtDataValidationException(ErrorMessage.NAME_ALREADY_EXISTS.getMessage());
         }
       }
@@ -79,12 +82,12 @@ public class TkDeviceScriptServiceImpl extends AbstractBaseService<TkDeviceScrip
   @Override
   public String getScriptText(String tenantId, String scriptId) {
     LambdaQueryWrapper<TkDeviceScriptEntity> queryWrapper =
-            new QueryWrapper<TkDeviceScriptEntity>()
-                    .lambda()
-                    .eq(TkDeviceScriptEntity::getTenantId, tenantId)
-                    .eq(TkDeviceScriptEntity::getId, scriptId);
+        new QueryWrapper<TkDeviceScriptEntity>()
+            .lambda()
+            .eq(TkDeviceScriptEntity::getTenantId, tenantId)
+            .eq(TkDeviceScriptEntity::getId, scriptId);
     TkDeviceScriptEntity result = baseMapper.selectOne(queryWrapper);
-    return result ==null? null : result.getConvertJs();
+    return result == null ? null : result.getConvertJs();
   }
 
   @Override
@@ -100,39 +103,40 @@ public class TkDeviceScriptServiceImpl extends AbstractBaseService<TkDeviceScrip
   public void checkDeviceScriptes(String tenantId, Set<String> ids) {
     // check if ids bind to device
     List<TkDeviceProfileEntity> usedList =
-            profileMapper.selectList(
-                    new QueryWrapper<TkDeviceProfileEntity>().lambda().in(TkDeviceProfileEntity::getScriptId, ids));
-    if (usedList !=null &&usedList.size() > 0) {
-      List<String> names = usedList.stream()
-              .map(i -> i.getName())
-              .collect(Collectors.toList());
-      throw new YtDataValidationException(String.format(ErrorMessage.PROJECT_USED_SCRIPT.getMessage(),names));
+        profileMapper.selectList(
+            new QueryWrapper<TkDeviceProfileEntity>()
+                .lambda()
+                .in(TkDeviceProfileEntity::getScriptId, ids));
+    if (usedList != null && usedList.size() > 0) {
+      List<String> names = usedList.stream().map(i -> i.getName()).collect(Collectors.toList());
+      throw new YtDataValidationException(
+          String.format(ErrorMessage.PROJECT_USED_SCRIPT.getMessage(), names));
     }
   }
+
   @Override
   @Transactional
   public void deleteScriptes(String tenantId, Set<String> ids) {
     checkDeviceScriptes(tenantId, ids);
     LambdaQueryWrapper<TkDeviceScriptEntity> queryWrapper =
-            new QueryWrapper<TkDeviceScriptEntity>()
-                    .lambda()
-                    .eq(TkDeviceScriptEntity::getTenantId, tenantId)
-                    .in(TkDeviceScriptEntity::getId, ids);
+        new QueryWrapper<TkDeviceScriptEntity>()
+            .lambda()
+            .eq(TkDeviceScriptEntity::getTenantId, tenantId)
+            .in(TkDeviceScriptEntity::getId, ids);
 
     baseMapper.delete(queryWrapper);
-
   }
 
   private TkDeviceScriptDTO insert(TkDeviceScriptDTO deviceDTO) {
 
     TkDeviceScriptEntity profile = new TkDeviceScriptEntity();
     deviceDTO.copyToEntity(
-            profile,
-            ModelConstants.TablePropertyMapping.ACTIVE_TIME,
-            ModelConstants.TablePropertyMapping.DEVICE_STATE,
-            ModelConstants.TablePropertyMapping.UPDATER,
-            ModelConstants.TablePropertyMapping.CREATE_TIME,
-            ModelConstants.TablePropertyMapping.UPDATE_TIME);
+        profile,
+        ModelConstants.TablePropertyMapping.ACTIVE_TIME,
+        ModelConstants.TablePropertyMapping.DEVICE_STATE,
+        ModelConstants.TablePropertyMapping.UPDATER,
+        ModelConstants.TablePropertyMapping.CREATE_TIME,
+        ModelConstants.TablePropertyMapping.UPDATE_TIME);
 
     baseMapper.insert(profile);
     return profile.getDTO(TkDeviceScriptDTO.class);
@@ -141,30 +145,27 @@ public class TkDeviceScriptServiceImpl extends AbstractBaseService<TkDeviceScrip
   private TkDeviceScriptDTO update(TkDeviceScriptDTO deviceDTO) {
     TkDeviceScriptEntity device = new TkDeviceScriptEntity();
     deviceDTO.copyToEntity(
-            device,
-            ModelConstants.TablePropertyMapping.ACTIVE_TIME,
-            ModelConstants.TablePropertyMapping.DEVICE_STATE,
-            ModelConstants.TablePropertyMapping.TB_DEVICE_ID,
-            ModelConstants.TablePropertyMapping.TENANT_CODE,
-            ModelConstants.TablePropertyMapping.CREATOR,
-            ModelConstants.TablePropertyMapping.UPDATER,
-            ModelConstants.TablePropertyMapping.CREATE_TIME,
-            ModelConstants.TablePropertyMapping.UPDATE,
-            ModelConstants.TablePropertyMapping.UPDATE_TIME);
+        device,
+        ModelConstants.TablePropertyMapping.ACTIVE_TIME,
+        ModelConstants.TablePropertyMapping.DEVICE_STATE,
+        ModelConstants.TablePropertyMapping.TB_DEVICE_ID,
+        ModelConstants.TablePropertyMapping.TENANT_CODE,
+        ModelConstants.TablePropertyMapping.CREATOR,
+        ModelConstants.TablePropertyMapping.UPDATER,
+        ModelConstants.TablePropertyMapping.CREATE_TIME,
+        ModelConstants.TablePropertyMapping.UPDATE,
+        ModelConstants.TablePropertyMapping.UPDATE_TIME);
     baseMapper.updateById(device);
     return device.getDTO(TkDeviceScriptDTO.class);
   }
 
-
-
-
   @Override
   public Optional<TkDeviceScriptDTO> getDeviceScript(String tenantId, String id) {
     LambdaQueryWrapper<TkDeviceScriptEntity> queryWrapper =
-            new QueryWrapper<TkDeviceScriptEntity>()
-                    .lambda()
-                    .eq(TkDeviceScriptEntity::getTenantId, tenantId)
-                    .eq(TkDeviceScriptEntity::getId, id);
+        new QueryWrapper<TkDeviceScriptEntity>()
+            .lambda()
+            .eq(TkDeviceScriptEntity::getTenantId, tenantId)
+            .eq(TkDeviceScriptEntity::getId, id);
     TkDeviceScriptEntity profile = baseMapper.selectOne(queryWrapper);
     return Optional.ofNullable(profile)
         .map(
@@ -175,35 +176,83 @@ public class TkDeviceScriptServiceImpl extends AbstractBaseService<TkDeviceScrip
   }
 
   @Override
-  public YtPageData<TkDeviceScriptDTO> page(Integer page, Integer pageSize, String orderField, OrderTypeEnum orderType, String tenantId) {
-    IPage<TkDeviceScriptEntity> currentPage = getCurrentPage(page,pageSize,orderField,orderType);
-
+  public YtPageData<TkDeviceScriptDTO> page(Map<String, Object> queryMap, boolean isTenantAdmin) {
+
+    String tenantId =
+        Optional.ofNullable(queryMap.get(QueryConstant.TENANT_ID))
+            .map(Object::toString)
+            .orElse(null);
+    IPage<TkDeviceScriptEntity> currentPage =
+        getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false);
+    String customerId =
+        Optional.ofNullable(queryMap.get(QueryConstant.CUSTOMER_ID))
+            .map(Object::toString)
+            .orElse(null);
+    Set<String> scriptIds = null;
+    if (!isTenantAdmin && StringUtils.isNotEmpty(customerId)) {
+      scriptIds = getCustomerScripts(customerId, tenantId);
+    }
+    if (!isTenantAdmin && (null == scriptIds || scriptIds.isEmpty())) {
+      return new YtPageData<>(new ArrayList<>(), 0);
+    }
     LambdaQueryWrapper<TkDeviceScriptEntity> queryWrapper =
-            new QueryWrapper<TkDeviceScriptEntity>()
-                    .lambda()
-                    .eq(TkDeviceScriptEntity::getTenantId, tenantId);
-
-
-
-
-    IPage<TkDeviceScriptEntity> scriptes = baseMapper.selectPage(currentPage, queryWrapper);
-    List<TkDeviceScriptDTO> records = scriptes.getRecords().stream()
+        new QueryWrapper<TkDeviceScriptEntity>()
+            .lambda()
+            .eq(TkDeviceScriptEntity::getTenantId, tenantId)
+            .in(!isTenantAdmin, TkDeviceScriptEntity::getId, scriptIds);
+
+    IPage<TkDeviceScriptEntity> scripts = baseMapper.selectPage(currentPage, queryWrapper);
+    List<TkDeviceScriptDTO> records =
+        scripts.getRecords().stream()
             .map(entity -> entity.getDTO(TkDeviceScriptDTO.class))
             .collect(Collectors.toList());
-    return new YtPageData<>(records, scriptes.getTotal());
+    return new YtPageData<>(records, scripts.getTotal());
   }
 
   @Override
   public List<TkDeviceScriptDTO> findDeviceScript(String tenantId) {
     LambdaQueryWrapper<TkDeviceScriptEntity> queryWrapper =
-            new QueryWrapper<TkDeviceScriptEntity>()
-                    .lambda()
-                    .eq(TkDeviceScriptEntity::getTenantId, tenantId);
-    List<TkDeviceScriptDTO> results = baseMapper.selectList(queryWrapper).stream()
+        new QueryWrapper<TkDeviceScriptEntity>()
+            .lambda()
+            .eq(TkDeviceScriptEntity::getTenantId, tenantId);
+    List<TkDeviceScriptDTO> results =
+        baseMapper.selectList(queryWrapper).stream()
             .map(item -> item.getDTO(TkDeviceScriptDTO.class))
             .collect(Collectors.toList());
     return results;
   }
 
-
+  private Set<String> getCustomerScripts(String customerId, String tenantId) {
+    Set<String> scriptIds = null;
+    List<TkCustomerDeviceDTO> list = tkCustomerDevice.getMappingByCustomerId(customerId);
+    if (null != list && !list.isEmpty()) {
+      Set<String> deviceIds =
+          list.stream().map(obj -> obj.getDeviceId()).collect(Collectors.toSet());
+      scriptIds =
+          Optional.ofNullable(deviceIds)
+              .map(
+                  ids -> {
+                    List<DeviceDTO> deviceDTOS =
+                        tkDeviceService.findDevicesInfoByIds(tenantId, ids);
+                    if (null != deviceDTOS && !deviceDTOS.isEmpty()) {
+                      List<String> deviceProfiles =
+                          deviceDTOS.stream()
+                              .map(obj -> obj.getDeviceProfileId())
+                              .collect(Collectors.toList());
+                      List<DeviceProfileDTO> deviceProfileDTOList =
+                          tkDeviceProfileService.findDeviceProfileByIds(tenantId, deviceProfiles);
+                      return Optional.ofNullable(deviceProfileDTOList)
+                          .map(
+                              deviceProfileDTOS ->
+                                  deviceProfileDTOS.stream()
+                                      .map(obj -> obj.getScriptId())
+                                      .collect(Collectors.toSet()))
+                          .orElse(null);
+                    }
+                    return null;
+                  })
+              .orElse(null);
+    }
+    return scriptIds;
+  }
 }

@@ -128,7 +128,7 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
     DeviceProfile deviceProfile =
         deviceProfileDao.findById(id, UUID.fromString(deviceDTO.getProfileId()));
     TkOrganizationEntity organization =
-            tkOrganizationMapper.selectById(deviceDTO.getOrganizationId());
+        tkOrganizationMapper.selectById(deviceDTO.getOrganizationId());
     if (null == deviceProfile || null == organization) {
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     } else if (!organization.getTenantId().equals(deviceTenantId)) {
@@ -347,7 +347,7 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
     }
     // 查询该组织的所有子类
     List<OrganizationDTO> organizationDTOS =
-            tkOrganizationMapper.findOrganizationTreeList(tenantId, organizationIds);
+        tkOrganizationMapper.findOrganizationTreeList(tenantId, organizationIds);
     List<String> queryOrganizationIds = new ArrayList<>();
     organizationDTOS.forEach(item -> queryOrganizationIds.add(item.getId()));
     return queryOrganizationIds;
@@ -516,8 +516,20 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
   }
 
   @Override
-  public List<DeviceDTO> findNumberAttributeDevicesByIds(String tenantId, List<String> ids) {
-    return null;
+  public List<DeviceDTO> findDevicesInfoByIds(String tenantId, Set<String> ids) {
+    if (StringUtils.isEmpty(tenantId) || null == ids) {
+      throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    List<TkDeviceEntity> entities =
+        baseMapper.selectList(
+            new LambdaQueryWrapper<TkDeviceEntity>()
+                .eq(TkDeviceEntity::getTenantId, tenantId)
+                .in(TkDeviceEntity::getTbDeviceId, ids));
+    return Optional.ofNullable(entities)
+        .map(
+            list ->
+                list.stream().map(obj -> obj.getDTO(DeviceDTO.class)).collect(Collectors.toList()))
+        .orElse(null);
   }
 
   @Override
@@ -537,22 +549,22 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
 
   @Override
   public JsonNode getDeviceAttributes(
-      String deviceProfileId,String tenantId, DataTypeEnum dataType) {
+      String deviceProfileId, String tenantId, DataTypeEnum dataType) {
 
     JsonNode jsonNode = JacksonUtil.newObjectNode();
     List<ThingsModelDTO> thingsModel =
-            thingsModelService.selectByDeviceProfileId(
-                    FunctionTypeEnum.properties, tenantId, deviceProfileId);
+        thingsModelService.selectByDeviceProfileId(
+            FunctionTypeEnum.properties, tenantId, deviceProfileId);
     if (null != thingsModel && !thingsModel.isEmpty()) {
       List<Map<String, Object>> attributes = new ArrayList<>();
       for (ThingsModelDTO dto : thingsModel) {
         JsonNode functionJson = dto.getFunctionJson();
         String dataTypeKey = "dataType";
         if (null != functionJson
-                && null != functionJson.get(dataTypeKey)
-                && null != functionJson.get(dataTypeKey).get("type")) {
+            && null != functionJson.get(dataTypeKey)
+            && null != functionJson.get(dataTypeKey).get("type")) {
           DataTypeEnum queryDataType =
-                  DataTypeEnum.valueOf(functionJson.get(dataTypeKey).get("type").asText());
+              DataTypeEnum.valueOf(functionJson.get(dataTypeKey).get("type").asText());
           if (null == dataType || queryDataType.equals(dataType)) {
             Map<String, Object> attribute = new HashMap<>();
             attribute.put("name", dto.getFunctionName());

@@ -64,6 +64,8 @@ public interface DeviceMapper extends BaseMapper<TkDeviceEntity> {
    */
   List<String> findDeviceIdsByCustomerId(@Param("customerId") String customerId);
 
+  List<DeviceDTO> findDeviceInfoByCustomerId(@Param("tenantId") String tenantId,@Param("customerId") String customerId);
+
   List<BaseHomePageTop> findDeviceMessageInfo(
       @Param("todayTime") Long todayTime, @Param("customerId") String customerId);
 

@@ -12,14 +12,20 @@ import java.util.List;
 @Mapper
 public interface TkDeviceProfileMapper extends BaseMapper<TkDeviceProfileEntity> {
 
-    /**
-     * 获取产品(设备配置)详情
-     * @return
-     */
-    DeviceProfileDTO selectDetail( @Param("tenantId") String tenantId, @Param("id") String id);
+  /**
+   * 获取产品(设备配置)详情
+   *
+   * @return
+   */
+  DeviceProfileDTO selectDetail(@Param("tenantId") String tenantId, @Param("id") String id);
 
-    IPage<DeviceProfileDTO> getProfilePage(IPage<?> page, @Param("tenantId") String tenantId, @Param("profileName") String profileName, @Param("transportType") String transportType);
+  IPage<DeviceProfileDTO> getProfilePage(
+      IPage<?> page,
+      @Param("tenantId") String tenantId,
+      @Param("profileName") String profileName,
+      @Param("transportType") String transportType,
+      @Param("deviceProfileIds") List<String> deviceProfileIds);
 
-
-    List<DeviceProfileDTO> profileByScriptId( @Param("tenantId") String tenantId, @Param("scriptId") String scriptId);
+  List<DeviceProfileDTO> profileByScriptId(
+      @Param("tenantId") String tenantId, @Param("scriptId") String scriptId);
 }

 package org.thingsboard.server.dao.yunteng.service;
 
+import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceProfileDTO;
-import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkDeviceProfileEntity;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 
@@ -19,11 +20,13 @@ public interface TkDeviceProfileService extends BaseService<TkDeviceProfileEntit
 
     Optional<DeviceProfileDTO> getDeviceProfile(String tenantId, String id);
 
-    YtPageData<DeviceProfileDTO> page(Integer page, Integer pageSize, String orderField, OrderTypeEnum orderType
-            ,String tenantIdStr, String profileName, String transportType);
+    YtPageData<DeviceProfileDTO> page(Map<String,Object> queryMap,boolean isTenantAdmin);
 
     List<DeviceProfileDTO> findDeviceProfile(String tenantId,String scriptId);
 
+    List<DeviceProfileDTO> findCustomerDeviceProfiles(String tenantId, CustomerId customerId);
+
+    List<DeviceProfileDTO> findDeviceProfileByIds(String tenantId,List<String> ids);
 
     /**
      * 验证表单数据有效性

@@ -6,6 +6,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkDeviceScriptEntity;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 
@@ -27,7 +28,7 @@ public interface TkDeviceScriptService extends BaseService<TkDeviceScriptEntity>
 
     Optional<TkDeviceScriptDTO> getDeviceScript(String tenantId, String id);
 
-    YtPageData<TkDeviceScriptDTO> page(Integer page, Integer pageSize, String orderField, OrderTypeEnum orderType, String tenantId);
+    YtPageData<TkDeviceScriptDTO> page(Map<String, Object> queryMap, boolean isTenantAdmin);
 
     List<TkDeviceScriptDTO> findDeviceScript(String tenantId);
 

@@ -36,7 +36,6 @@ public interface TkDeviceService extends BaseService<TkDeviceEntity> {
   /**
    * 查询所有的设备信息
    *
-   * @param deviceDTO 过滤参数
    * @return List<DeviceDTO>
    */
   boolean deviceNameUsed(String tenantId, String deviceName, String deviceId);
@@ -160,13 +159,13 @@ public interface TkDeviceService extends BaseService<TkDeviceEntity> {
   boolean saveSlaveDevice(String slaveId, String slaveName, String gatewayId, Long createTime);
 
   /**
-   * 通过设备ids查询拥有数值型属性的设备
+   * 通过设备ids查询设备信息列表
    *
    * @param tenantId 租户ID
-   * @param ids
-   * @return 数值型设备列表
+   * @param ids 设备IDS
+   * @return 设备信息列表
    */
-  List<DeviceDTO> findNumberAttributeDevicesByIds(String tenantId, List<String> ids);
+  List<DeviceDTO> findDevicesInfoByIds(String tenantId, Set<String> ids);
 
   /**
    * 通过tb设备ID获取平台设备信息

@@ -245,7 +245,12 @@
                  LEFT JOIN device d ON d.id::TEXT = idi.tb_device_id
         WHERE customer_id::TEXT = #{customerId}
     </select>
-
+    <select id="findDeviceInfoByCustomerId" resultMap="deviceMap">
+        SELECT <include refid="basicColumns"/>
+        FROM tk_device ifd
+        LEFT JOIN device d ON ifd.tb_device_id = d.id::TEXT
+        WHERE ifd.tenant_id = #{tenantId} AND d.customer_id::TEXT = #{customerId}
+    </select>
     <select id="findDeviceMessageInfo" resultMap="baseHomePageTop">
         SELECT COUNT(ts.ts)                                           AS sum_count,
                SUM(CASE WHEN ts.ts >= #{todayTime} THEN 1 ELSE 0 END) AS today_add

@@ -37,14 +37,21 @@
         LEFT JOIN tk_device_profile iot ON iot.tb_profile_id = base.id::TEXT
         <where>
             <if test="tenantId !=null and tenantId !=''">
-                AND base.tenant_id::TEXT = #{tenantId}
+                AND iot.tenant_id = #{tenantId}
             </if>
             <if test="profileName !=null and profileName !=''">
-                AND base.name = #{profileName}
+                AND base.name LIKE CONCAT('%',#{profileName},'%')
             </if>
             <if test="transportType !=null and transportType !=''">
                 AND base.transport_type = #{transportType}
             </if>
+            <if test="deviceProfileIds != null">
+                AND base.id::TEXT IN
+                <foreach collection="deviceProfileIds" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+
         </where>
     </select>