fix: [DEFECT-878] customer query device profile

黄 x
1 parent e98ba3e1
Showing 3 changed files with 63 additions and 25 deletions
application/src/main/java/org/thingsboard/server/controller/yunteng/TkDeviceProfileController.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceProfileServiceImpl.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkDeviceProfileService.java
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDeviceProfileController.java
View file @2ef7cd7
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDeviceProfileController.java
View file @2ef7cd7
@@ -124,7 +124,8 @@ public class TkDeviceProfileController extends BaseController {
   @GetMapping("{id}")
   @ApiOperation("详情")
-  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'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(
@@ -142,23 +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 {
-    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());
+    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);
     }
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceProfileServiceImpl.java
View file @2ef7cd7
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceProfileServiceImpl.java
View file @2ef7cd7
@@ -10,6 +10,7 @@ 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;
@@ -178,24 +179,21 @@ public class TkDeviceProfileServiceImpl
     IPage<DeviceProfileDTO> result = new Page<>();
     if (!isTenantAdmin) {
       List<DeviceDTO> deviceDTOS = deviceMapper.findDeviceInfoByCustomerId(tenantIdStr, customerId);
-      if(null == deviceDTOS || deviceDTOS.isEmpty()){
+      if (null == deviceDTOS || deviceDTOS.isEmpty()) {
         return getPageData(result, DeviceProfileDTO.class);
       }
       deviceProfileIds =
-          Optional.ofNullable(deviceDTOS)
+          Optional.of(deviceDTOS)
               .map(
                   devices ->
-                      devices.stream().map(obj -> obj.getProfileId()).collect(Collectors.toList()))
+                      devices.stream().map(DeviceDTO::getDeviceProfileId).collect(Collectors.toList()))
               .orElse(null);
     }
     IPage<TkDeviceProfileEntity> currentPage =
         getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false);
     result =
         baseMapper.getProfilePage(
-            currentPage,
-            tenantIdStr,
-            profileName,
-            transportType,deviceProfileIds);
+            currentPage, tenantIdStr, profileName, transportType, deviceProfileIds);
     return getPageData(result, DeviceProfileDTO.class);
   }
@@ -205,6 +203,32 @@ public class TkDeviceProfileServiceImpl
   }
   @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());
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkDeviceProfileService.java
View file @2ef7cd7
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkDeviceProfileService.java
View file @2ef7cd7
 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;
@@ -24,6 +24,8 @@ public interface TkDeviceProfileService extends BaseService<TkDeviceProfileEntit
     List<DeviceProfileDTO> findDeviceProfile(String tenantId,String scriptId);
+    List<DeviceProfileDTO> findCustomerDeviceProfiles(String tenantId, CustomerId customerId);
+
     List<DeviceProfileDTO> findDeviceProfileByIds(String tenantId,List<String> ids);
     /**