feat: add query gateway devices api

黄 x
1 parent 3e456bf3
Showing 5 changed files with 73 additions and 6 deletions
application/src/main/java/org/thingsboard/server/controller/yunteng/TkDeviceController.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceServiceImpl.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/mapper/TkDeviceProfileMapper.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkDeviceService.java
dao/src/main/resources/mapper/TkDeviceProfileMapper.xml
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDeviceController.java
View file @1d88e16
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDeviceController.java
View file @1d88e16
@@ -15,6 +15,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.thingsboard.rule.engine.api.msg.DeviceCredentialsUpdateNotificationMsg;
 import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.common.data.DeviceTransportType;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
@@ -347,10 +348,27 @@ public class TkDeviceController extends BaseController {
       @ApiParam(value = "设备标签") @RequestParam(value = "deviceLabel", required = false)
           String deviceLabel,
       @ApiParam(value = "设备配置ID") @RequestParam(value = "deviceProfileId", required = false)
-              String deviceProfileId)
+          String deviceProfileId)
       throws ThingsboardException {
     return tkdeviceService.findDevicesByDeviceTypeAndOrganizationId(
-        deviceType, getCurrentUser().getCurrentTenantId(), organizationId, deviceLabel,deviceProfileId);
+        deviceType,
+        getCurrentUser().getCurrentTenantId(),
+        organizationId,
+        deviceLabel,
+        deviceProfileId);
+  }
+
+  @GetMapping("/gateway/list")
+  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
+  @ApiOperation("获取满足条件的所有设备")
+  public List<DeviceDTO> getGatewayDevices(
+      @ApiParam(value = "组织ID") @RequestParam(value = "organizationId", required = false)
+          String organizationId,
+      @ApiParam(value = "传输类型") @RequestParam(value = "transportType", required = false)
+          DeviceTransportType transportType)
+      throws ThingsboardException {
+    return tkdeviceService.findDevicesByTransportTypeAndOrganizationId(
+        getCurrentUser().getCurrentTenantId(), organizationId, transportType);
   }
   @GetMapping("/list/master/{organizationId}")
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceServiceImpl.java
View file @1d88e16
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceServiceImpl.java
View file @1d88e16
@@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.DeviceProfile;
+import org.thingsboard.server.common.data.DeviceTransportType;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
@@ -271,6 +272,38 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
   }
   @Override
+  public List<DeviceDTO> findDevicesByTransportTypeAndOrganizationId(
+      String tenantId, String organizationId, DeviceTransportType transportType) {
+    List<String> orgIds = organizationAllIds(tenantId, organizationId);
+    if (orgIds.isEmpty()) {
+      throw new YtDataValidationException(ErrorMessage.ORGANIZATION_NOT_EXTIED.getMessage());
+    }
+    List<String> deviceProfileIds = null;
+    if (null != transportType) {
+      deviceProfileIds = tkProfileMapper.getDeviceProfileIds(tenantId, transportType);
+    }
+    List<TkDeviceEntity> entities =
+        baseMapper.selectList(
+            new LambdaQueryWrapper<TkDeviceEntity>()
+                .eq(TkDeviceEntity::getTenantId, tenantId)
+                .eq(TkDeviceEntity::getDeviceType,DeviceTypeEnum.GATEWAY)
+                .in(TkDeviceEntity::getOrganizationId, orgIds));
+    if(null != deviceProfileIds && !deviceProfileIds.isEmpty()){
+      List<TkDeviceEntity> result = new ArrayList<>();
+      for (TkDeviceEntity entity :entities){
+        if(deviceProfileIds.contains(entity.getDeviceProfileId())){
+          result.add(entity);
+        }
+      }
+      return result.stream().map(obj -> obj.getDTO(DeviceDTO.class)).collect(Collectors.toList());
+    }
+    if (null != entities && !entities.isEmpty()) {
+      return entities.stream().map(obj -> obj.getDTO(DeviceDTO.class)).collect(Collectors.toList());
+    }
+    return null;
+  }
+
+  @Override
   public DeviceDTO checkDeviceByTenantIdAndDeviceId(String tenantId, String deviceId) {
     if (StringUtils.isEmpty(tenantId) || StringUtils.isEmpty(deviceId)) {
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
@@ -351,6 +384,9 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
   @NotNull
   private List<String> organizationAllIds(String tenantId, String organizationId) {
     List<String> organizationIds = new ArrayList<>();
+    if (StringUtils.isEmpty(organizationId)) {
+      return organizationIds;
+    }
     if (!StringUtils.isEmpty(organizationId)) {
       organizationIds.add(organizationId);
     }
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/mapper/TkDeviceProfileMapper.java
View file @1d88e16
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/mapper/TkDeviceProfileMapper.java
View file @1d88e16
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.thingsboard.server.common.data.DeviceTransportType;
 import org.thingsboard.server.common.data.yunteng.dto.*;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.dao.yunteng.entities.TkDeviceProfileEntity;
@@ -31,4 +32,8 @@ public interface TkDeviceProfileMapper extends BaseMapper<TkDeviceProfileEntity>
       @Param("tenantId") String tenantId,
       @Param("scriptId") String scriptId,
       @Param("deviceType") DeviceTypeEnum deviceType);
+
+  List<String> getDeviceProfileIds(
+      @Param("tenantId") String tenantId,
+      @Param("transportType") DeviceTransportType transportType);
 }
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkDeviceService.java
View file @1d88e16
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkDeviceService.java
View file @1d88e16
 package org.thingsboard.server.dao.yunteng.service;
 import com.fasterxml.jackson.databind.JsonNode;
+import org.thingsboard.server.common.data.DeviceTransportType;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.RelationDeviceDTO;
@@ -26,10 +27,7 @@ public interface TkDeviceService extends BaseService<TkDeviceEntity> {
   YtPageData<RelationDeviceDTO> pageRelation(Map<String, Object> queryMap);
-  /**
-   * 验证表单数据有效性
-   *
-   */
+  /** 验证表单数据有效性 */
   void validateFormData(String currentTenantId, DeviceDTO ytDevice);
   /**
@@ -55,6 +53,8 @@ public interface TkDeviceService extends BaseService<TkDeviceEntity> {
       String deviceLabel,
       String deviceProfileId);
+  List<DeviceDTO> findDevicesByTransportTypeAndOrganizationId(
+      String tenantId, String organizationId, DeviceTransportType transportType);
   /**
    * 通过设备ID和租户ID判断该设备是否存在
    *
--- a/dao/src/main/resources/mapper/TkDeviceProfileMapper.xml
View file @1d88e16
+++ b/dao/src/main/resources/mapper/TkDeviceProfileMapper.xml
View file @1d88e16
@@ -85,4 +85,12 @@
             </if>
         </where>
     </select>
+
+    <select id="getDeviceProfileIds" resultType="java.lang.String">
+        SELECT iot.id
+        FROM device_profile base
+        LEFT JOIN tk_device_profile iot ON iot.tb_profile_id = base.id::TEXT
+        WHERE iot.tenant_id = #{tenantId}
+        AND base.transport_type = #{transportType}
+    </select>
 </mapper>