feat: 网关设备查询关联网关子设备分页

@@ -32,6 +32,7 @@ import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidatio
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
+import org.thingsboard.server.common.data.yunteng.dto.RelationDeviceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.YtCredentialsDto;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceState;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
@@ -266,6 +267,40 @@ public class YtDeviceController extends BaseController {
     }
     return deviceService.page(getCurrentUser().getCurrentTenantId(), queryMap);
   }
+  @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
+  @GetMapping(path = {"/relation"},params = {PAGE_SIZE, PAGE})
+  @ApiOperation("子设备查询")
+  public YtPageData<RelationDeviceDTO> pageRelationDevice(
+          @RequestParam(PAGE_SIZE) int pageSize,
+          @RequestParam(PAGE) int page,
+          @RequestParam(value = "name", required = false) String name,
+          @RequestParam(value = "deviceState", required = false) DeviceState deviceState,
+          @RequestParam(value = "fromId") String fromId,
+          @RequestParam(value = ORDER_FILED, required = false) String orderBy,
+          @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("fromId", fromId);
+    queryMap.put("tenantId", getCurrentUser().getCurrentTenantId());
+    if (deviceState != null) {
+      if(deviceState != DeviceState.INACTIVE){
+        queryMap.put("deviceState", deviceState == DeviceState.ONLINE);
+      }else{
+        queryMap.put("activeState",DeviceState.INACTIVE);
+      }
+    }
+    if (orderType != null) {
+      queryMap.put(ORDER_TYPE, orderType.name());
+    }
+    // 如果当前用户是客户
+    if (getCurrentUser().isCustomerUser()) {
+      queryMap.put("customerId", getCurrentUser().getCustomerId().toString());
+    }
+    return deviceService.pageRelation(queryMap);
+  }
 
   @PostMapping("/import")
   @ApiOperation("导入配置")

+package org.thingsboard.server.common.data.yunteng.dto;
+import lombok.Data;
+import org.thingsboard.server.common.data.yunteng.enums.DeviceState;
+
+@Data
+public class RelationDeviceDTO {
+    private String tbDeviceId;
+    private String tbDeviceName;
+    private String label;
+    private DeviceState deviceState;
+    private Long createdTime;
+    private Long lastOnlineTime;
+
+    public void setDeviceState(boolean deviceState) {
+        if (deviceState) {
+            this.deviceState = DeviceState.ONLINE;
+        } else {
+            this.deviceState = DeviceState.OFFLINE;
+        }
+    }
+
+    public DeviceState getDeviceState() {
+        if (lastOnlineTime == null) {
+            return DeviceState.INACTIVE;
+        }
+        return deviceState;
+    }
+}

@@ -3,7 +3,6 @@ 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.fasterxml.jackson.databind.JsonNode;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -12,18 +11,16 @@ import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.security.DeviceCredentials;
 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.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.OrganizationDTO;
-import org.thingsboard.server.common.data.yunteng.enums.DeviceState;
+import org.thingsboard.server.common.data.yunteng.dto.RelationDeviceDTO;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
-import org.thingsboard.server.dao.device.DeviceCredentialsDao;
 import org.thingsboard.server.dao.device.DeviceProfileDao;
 import org.thingsboard.server.dao.yunteng.entities.Organization;
 import org.thingsboard.server.dao.yunteng.entities.YtDevice;
@@ -42,7 +39,6 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
         implements YtDeviceService {
 
     private final DeviceProfileDao deviceProfileDao;
-    private final DeviceCredentialsDao deviceCredentialsDao;
 
     private final OrganizationMapper ytOrganizationMapper;
 
@@ -258,6 +254,14 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
     }
 
     @Override
+    public YtPageData<RelationDeviceDTO> pageRelation(Map<String, Object> queryMap) {
+        IPage<YtDevice> page = getPage(queryMap, "last_online_time", false);
+        IPage<RelationDeviceDTO> deviceIPage = baseMapper.getRelationDevicePage(page, queryMap);
+        List<RelationDeviceDTO> records = deviceIPage.getRecords();
+        return new YtPageData<>(records, deviceIPage.getTotal());
+    }
+
+    @Override
     public List<DeviceDTO> findTbDeviceId(String tenantId, DeviceDTO deviceDTO) {
         List<YtDevice> deviceList =
                 baseMapper.selectList(

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
+import org.thingsboard.server.common.data.yunteng.dto.RelationDeviceDTO;
 import org.thingsboard.server.dao.yunteng.entities.YtDevice;
 
 import java.util.List;
@@ -21,7 +22,8 @@ public interface DeviceMapper extends BaseMapper<YtDevice> {
 
     /**
      * 通过网关子设备的TB设备ID查询网关设备信息
-     * @param tbDeviceId  网关子设备的TB设备ID
+     *
+     * @param tbDeviceId 网关子设备的TB设备ID
      * @return 网关设备信息
      */
     List<DeviceDTO> findGateWayDeviceByTbDeviceId(@Param("tbDeviceId") String tbDeviceId);
@@ -31,14 +33,23 @@ public interface DeviceMapper extends BaseMapper<YtDevice> {
      *
      * @param tbDeviceId TB设备主键
      * @param created    告警状态:0正常,1告警
-     * @return
+     * @return true or false
      */
-    boolean freshAlarmStatus(@Param("tbDeviceId") String tbDeviceId,@Param("created") Integer created);
+    boolean freshAlarmStatus(@Param("tbDeviceId") String tbDeviceId, @Param("created") Integer created);
 
     /**
      * 用于统计设备相关信息
+     *
      * @param queryMap 查询条件
      * @return 查询的设备信息
      */
-    List<DeviceDTO> findDevices(@Param("queryMap") Map<String,Object> queryMap);
+    List<DeviceDTO> findDevices(@Param("queryMap") Map<String, Object> queryMap);
+
+    /**
+     * 获取关联设备的子设备分页列表
+     * @param page 分页
+     * @param queryMap 查询条件
+     * @return 分页数据
+     */
+    IPage<RelationDeviceDTO> getRelationDevicePage(IPage<?> page, @Param("queryMap") Map<String, Object> queryMap);
 }

 package org.thingsboard.server.dao.yunteng.service;
 
-import org.thingsboard.server.common.data.id.DeviceId;
 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;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 
@@ -12,74 +12,77 @@ import java.util.Optional;
 import java.util.Set;
 
 public interface YtDeviceService {
-    DeviceDTO insertOrUpdate(String tenantId, DeviceDTO deviceDTO);
+  DeviceDTO insertOrUpdate(String tenantId, DeviceDTO deviceDTO);
 
-    void deleteDevices(String tenantId, Set<String> ids);
+  void deleteDevices(String tenantId, Set<String> ids);
 
-    Optional<DeviceDTO> getDevice(String tenantId, String id);
+  Optional<DeviceDTO> getDevice(String tenantId, String id);
 
-    YtPageData<DeviceDTO> page(String tenantId, Map<String, Object> queryMap);
+  YtPageData<DeviceDTO> page(String tenantId, Map<String, Object> queryMap);
 
-    /**
-     * 验证表单数据有效性
-     *
-     * @param ytDevice
-     */
-    boolean validateFormdata(String currentTenantId, DeviceDTO ytDevice);
+  YtPageData<RelationDeviceDTO> pageRelation(Map<String, Object> queryMap);
 
-    /**
-     * 查询所有的设备信息
-     *
-     * @param deviceDTO 过滤参数
-     * @return List<DeviceDTO>
-     */
-    List<DeviceDTO> findTbDeviceId(String tenantId, DeviceDTO deviceDTO);
+  /**
+   * 验证表单数据有效性
+   *
+   * @param ytDevice
+   */
+  boolean validateFormdata(String currentTenantId, DeviceDTO ytDevice);
 
-    List<String> findTbDeviceId(String tenantId, Set<String> ids);
+  /**
+   * 查询所有的设备信息
+   *
+   * @param deviceDTO 过滤参数
+   * @return List<DeviceDTO>
+   */
+  List<DeviceDTO> findTbDeviceId(String tenantId, DeviceDTO deviceDTO);
 
-    /**
-     * 通过设备类型和组织ID查询所有的设备
-     *
-     * @param deviceType     设备类型
-     * @param organizationId 组织ID
-     * @return 设备列表
-     */
-    List<DeviceDTO> findDevicesByDeviceTypeAndOrganizationId(DeviceTypeEnum deviceType, String organizationId);
+  List<String> findTbDeviceId(String tenantId, Set<String> ids);
 
-    /**
-     * 通过设备ID和租户ID判断该设备是否存在
-     *
-     * @param tenantId 租户ID
-     * @param deviceId 设备ID
-     * @return 设备
-     */
-    DeviceDTO checkDeviceByTenantIdAndDeviceId(String tenantId, String deviceId);
+  /**
+   * 通过设备类型和组织ID查询所有的设备
+   *
+   * @param deviceType 设备类型
+   * @param organizationId 组织ID
+   * @return 设备列表
+   */
+  List<DeviceDTO> findDevicesByDeviceTypeAndOrganizationId(
+      DeviceTypeEnum deviceType, String organizationId);
 
-    /**
-     * 通过网关子设备的TB设备ID查询网关设备信息
-     *
-     * @param tbDeviceId 网关子设备的TB设备ID
-     * @param tenantId   租户ID
-     * @return 网关设备信息
-     */
-    List<DeviceDTO> findGateWayDeviceByTbDeviceId(String tenantId, String tbDeviceId);
+  /**
+   * 通过设备ID和租户ID判断该设备是否存在
+   *
+   * @param tenantId 租户ID
+   * @param deviceId 设备ID
+   * @return 设备
+   */
+  DeviceDTO checkDeviceByTenantIdAndDeviceId(String tenantId, String deviceId);
 
-    /**
-     * 通过设备ID和租户ID检查设备是否存在
-     *
-     * @param tenantId     租户ID
-     * @param deviceId     设备ID
-     * @param isTbDeviceId 是TB设备ID
-     * @return 设备信息
-     */
-    DeviceDTO checkDeviceByTenantIdAndId(String tenantId, String deviceId, boolean isTbDeviceId);
+  /**
+   * 通过网关子设备的TB设备ID查询网关设备信息
+   *
+   * @param tbDeviceId 网关子设备的TB设备ID
+   * @param tenantId 租户ID
+   * @return 网关设备信息
+   */
+  List<DeviceDTO> findGateWayDeviceByTbDeviceId(String tenantId, String tbDeviceId);
 
-    /**
-     * 更新设备告警状态
-     *
-     * @param tbDeviceId TB设备主键
-     * @param created    告警状态:0正常,1告警
-     * @return
-     */
-    boolean freshAlarmStatus(EntityId tbDeviceId, Integer created);
+  /**
+   * 通过设备ID和租户ID检查设备是否存在
+   *
+   * @param tenantId 租户ID
+   * @param deviceId 设备ID
+   * @param isTbDeviceId 是TB设备ID
+   * @return 设备信息
+   */
+  DeviceDTO checkDeviceByTenantIdAndId(String tenantId, String deviceId, boolean isTbDeviceId);
+
+  /**
+   * 更新设备告警状态
+   *
+   * @param tbDeviceId TB设备主键
+   * @param created 告警状态:0正常,1告警
+   * @return
+   */
+  boolean freshAlarmStatus(EntityId tbDeviceId, Integer created);
 }

@@ -33,6 +33,14 @@
             <result property="name" column="organization_name"/>
         </association>
     </resultMap>
+    <resultMap id="relationDeviceMap" type="org.thingsboard.server.common.data.yunteng.dto.RelationDeviceDTO">
+        <result property="tbDeviceId" column="id"/>
+        <result property="tbDeviceName" column="name"/>
+        <result property="label" column="label"/>
+        <result property="deviceState" column="status" />
+        <result property="createdTime" column="created_time"/>
+        <result property="lastOnlineTime" column="last_online_time"/>
+    </resultMap>
     <sql id="basicColumns">
         ifd.id,ifd.name,ifd.device_info,ifd.profile_id,ifd.active_time,ifd.tenant_id,ifd.description
         ,ifd.tb_device_id,ifd.label,ifd.last_connect_time,ifd.device_type,ifd.device_state,ifd.create_time,ifd.update_time,ifd.creator,
@@ -163,4 +171,39 @@
             </if>
         </where>
     </select>
+    <select id="getRelationDevicePage" resultMap="relationDeviceMap">
+        SELECT
+        de.id,
+        de.name,
+        de.label,
+        de.created_time,
+        A.bool_v AS status,
+        b.long_v AS last_online_time
+        FROM
+        device de
+        LEFT JOIN relation rt ON de."id" = rt.to_id
+        LEFT JOIN attribute_kv A ON de."id" = A.entity_id
+        AND A.entity_type = 'DEVICE'
+        AND A.attribute_key = 'active'
+        LEFT JOIN attribute_kv b ON de."id" = b.entity_id
+        AND b.entity_type = 'DEVICE'
+        AND b.attribute_key = 'lastActivityTime'
+        <where>
+           rt.from_id ::TEXT = #{queryMap.fromId}
+           AND de.tenant_id ::TEXT = #{queryMap.tenantId}
+           <if test="queryMap.customerId !=null and queryMap.customerId !=''">
+               AND de.customer_id ::TEXT = #{queryMap.customerId}
+           </if>
+            <if test="queryMap.name !=null and queryMap.name !=''">
+                AND de.name LIKE concat('%',#{queryMap.name}::TEXT,'%')
+            </if>
+            <if test="queryMap.deviceState !=null">
+                AND A.bool_v = #{queryMap.deviceState}
+                AND b.long_v IS NOT NULL
+            </if>
+            <if test="queryMap.activeState !=null">
+                AND b.long_v IS NULL
+            </if>
+        </where>
+    </select>
 </mapper>