fix: 主从设备接口

云中非
1 parent e0443b6c
Showing 6 changed files with 152 additions and 4 deletions
application/src/main/java/org/thingsboard/server/controller/yunteng/YtDeviceController.java
common/data/src/main/java/org/thingsboard/server/common/data/yunteng/dto/SelectItemDTO.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/YtDeviceServiceImpl.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/mapper/DeviceMapper.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtDeviceService.java
dao/src/main/resources/mapper/DeviceMapper.xml
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtDeviceController.java
View file @9b55bbe
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtDeviceController.java
View file @9b55bbe
@@ -30,10 +30,7 @@ import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 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.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.dto.*;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceState;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
@@ -357,6 +354,26 @@ public class YtDeviceController extends BaseController {
         return deviceService.findDevicesByDeviceTypeAndOrganizationId(deviceType,getCurrentUser().getCurrentTenantId(), organizationId);
     }
+    @GetMapping("/list/master/{organizationId}")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
+    @ApiOperation("主设备列表")
+    public List<SelectItemDTO> getMasterDevices(
+            @ApiParam(value = "组织ID") @PathVariable("organizationId") String organizationId) throws ThingsboardException {
+        return deviceService.findMasterDevices(getCurrentUser().getCurrentTenantId()
+                ,getCurrentUser().isCustomerUser()?getCurrentUser().getCurrentUserId():null
+                , organizationId);
+    }
+    @GetMapping("/list/slave/{organizationId}")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
+    @ApiOperation("从设备列表")
+    public List<SelectItemDTO> getSlaveDevices(
+            @ApiParam(value = "组织ID") @PathVariable("organizationId") String organizationId,
+            @ApiParam(value = "主设备ID") @RequestParam(value = "masterId",required = false) String masterId) throws ThingsboardException {
+        return deviceService.findSlaveDevices(masterId,getCurrentUser().getCurrentTenantId()
+                ,getCurrentUser().isCustomerUser()?getCurrentUser().getCurrentUserId():null
+                , organizationId);
+    }
+
     @GetMapping("/gateway/{tbDeviceId}")
     @ApiOperation("获取网关设备")
     public DeviceDTO findGateWayDeviceByTbDeviceId(
--- a/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/dto/SelectItemDTO.java 0 → 100644
View file @9b55bbe
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/dto/SelectItemDTO.java 0 → 100644
View file @9b55bbe
+package org.thingsboard.server.common.data.yunteng.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
+import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.util.Set;
+
+@Data
+public class SelectItemDTO {
+  @ApiModelProperty("下拉选项值")
+  private String id;
+
+  @ApiModelProperty("下拉选项名")
+  private String name;
+
+  @ApiModelProperty("设备类型")
+  private DeviceTypeEnum deviceType;
+}
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/YtDeviceServiceImpl.java
View file @9b55bbe
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/YtDeviceServiceImpl.java
View file @9b55bbe
@@ -20,6 +20,7 @@ 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.dto.RelationDeviceDTO;
+import org.thingsboard.server.common.data.yunteng.dto.SelectItemDTO;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
@@ -429,4 +430,19 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
         }
         return false;
     }
+
+
+    @Override
+    public List<SelectItemDTO> findMasterDevices(String tenantId, String customerId, String organizationId) {
+        List<String> orgIds = organizationAllIds(tenantId,organizationId);
+        List<SelectItemDTO> result = baseMapper.masterDevices(customerId,tenantId,orgIds);
+        return result;
+    }
+
+    @Override
+    public List<SelectItemDTO> findSlaveDevices(String masterId,String tenantId,String customerId, String organizationId){
+        List<String> orgIds = organizationAllIds(tenantId,organizationId);
+        List<SelectItemDTO> result = baseMapper.slaveDevices(customerId,tenantId,orgIds,masterId);
+        return result;
+    }
 }
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/mapper/DeviceMapper.java
View file @9b55bbe
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/mapper/DeviceMapper.java
View file @9b55bbe
@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param;
 import org.thingsboard.server.common.data.yunteng.dto.BaseHomePageTop;
 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.SelectItemDTO;
 import org.thingsboard.server.common.data.yunteng.dto.statistics.AggregationDTO;
 import org.thingsboard.server.dao.yunteng.entities.YtDevice;
@@ -84,4 +85,24 @@ public interface DeviceMapper extends BaseMapper<YtDevice> {
   Integer countMsgs(@Param("queryMap") Map<String, Object> queryMap);
   Integer countDataPoints(@Param("queryMap") Map<String, Object> queryMap);
+
+  /**
+   * 主设备列表
+   * @param customerId       客户ID
+   * @param tenantId         租户ID
+   * @param organizationIds  组织ID
+   * @return
+   */
+  List<SelectItemDTO> masterDevices(@Param("customerId") String customerId,@Param("tenantId") String tenantId,@Param("organizationIds") List<String> organizationIds);
+
+  /**
+   * 从设备列表
+   * @param customerId       客户ID
+   * @param tenantId         租户ID
+   * @param organizationIds  组织ID
+   * @param masterId         主设备ID
+   * @return
+   */
+  List<SelectItemDTO> slaveDevices(@Param("customerId") String customerId,@Param("tenantId") String tenantId
+          ,@Param("organizationIds") List<String> organizationIds,@Param("masterId") String masterId);
 }
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtDeviceService.java
View file @9b55bbe
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtDeviceService.java
View file @9b55bbe
@@ -3,6 +3,7 @@ package org.thingsboard.server.dao.yunteng.service;
 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.dto.SelectItemDTO;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.dao.yunteng.entities.YtDevice;
@@ -103,4 +104,21 @@ public interface YtDeviceService extends BaseService<YtDevice> {
      * @return
      */
     Boolean otherUsing(String deviceId,String tenantId);
+
+    /**
+     * 主设备信息
+     * @param tenantId        租户ID
+     * @param organizationId  组织ID
+     * @return   设备列表
+     */
+    List<SelectItemDTO> findMasterDevices(String tenantId, String customerId, String organizationId);
+
+    /**
+     * 从设备信息
+     * @param masterId        主设备ID
+     * @param tenantId        租户ID
+     * @param organizationId  组织ID
+     * @return   设备列表
+     */
+    List<SelectItemDTO> findSlaveDevices(String masterId,String tenantId,String customerId, String organizationId);
 }
--- a/dao/src/main/resources/mapper/DeviceMapper.xml
View file @9b55bbe
+++ b/dao/src/main/resources/mapper/DeviceMapper.xml
View file @9b55bbe
@@ -2,6 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.thingsboard.server.dao.yunteng.mapper.DeviceMapper">
+    <resultMap type="org.thingsboard.server.common.data.yunteng.dto.SelectItemDTO" id="listInform">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="deviceType" column="device_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
+    </resultMap>
     <resultMap type="org.thingsboard.server.common.data.yunteng.dto.DeviceDTO" id="deviceMap">
         <result property="id" column="id"/>
         <result property="name" column="name"/>
@@ -325,4 +330,53 @@
             </if>
         </where>
     </select>
+
+    <select id="masterDevices" resultMap="listInform">
+        SELECT
+        base.tb_device_id as id,base.name,base.device_type
+        FROM  iotfs_device base
+        LEFT JOIN device tde ON tde.ID :: TEXT = base.tb_device_id
+        <where>
+            base.device_type  != 'SENSOR'
+            <if test="tenantId !=null and tenantId !=''">
+                AND base.tenant_id = #{tenantId}
+            </if>
+            <if test="customerId !=null and customerId !=''">
+                AND tde.customer_id :: TEXT = #{customerId}
+            </if>
+            <if test="organizationIds !=null">
+                AND base.organization_id IN
+                <foreach collection="organizationIds" item="orgId" open="(" separator="," close=")">
+                    #{orgId}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+    <select id="slaveDevices" resultMap="listInform">
+        SELECT
+        ide.tb_device_id as id,ide.name,ide.device_type
+        FROM  (select * from relation where relation_type_group = 'COMMON' AND relation_type = 'Created' AND from_type = 'DEVICE' AND to_type = 'DEVICE'
+            <if test="masterId !=null and masterId !=''">
+                AND from_id = #{masterId}
+            </if>
+        ) base
+        LEFT JOIN device tde ON base.to_id = tde.id
+        LEFT JOIN iotfs_device ide ON tde.ID :: TEXT = ide.tb_device_id
+        <where>
+            ide.device_type  = 'SENSOR'
+            <if test="tenantId !=null and tenantId !=''">
+                AND ide.tenant_id = #{tenantId}
+            </if>
+            <if test="organizationIds !=null">
+                AND ide.organization_id IN
+                <foreach collection="organizationIds" item="orgId" open="(" separator="," close=")">
+                    #{orgId}
+                </foreach>
+            </if>
+            <if test="customerId !=null and customerId !=''">
+                AND tde.customer_id :: TEXT = #{customerId}
+            </if>
+        </where>
+    </select>
 </mapper>