refactor: TCP协议设备传输接口调整

芯火源
1 parent ca65e3fb
Showing 6 changed files with 49 additions and 24 deletions
application/src/main/java/org/thingsboard/server/controller/yunteng/TkDeviceScriptController.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceProfileServiceImpl.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceScriptServiceImpl.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/mapper/TkDeviceProfileMapper.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkDeviceProfileService.java
dao/src/main/resources/mapper/TkDeviceProfileMapper.xml
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDeviceScriptController.java
View file @6961419
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDeviceScriptController.java
View file @6961419
@@ -93,7 +93,7 @@ public class TkDeviceScriptController extends BaseController {
     }
     /**脚本引擎启用/禁用时,刷新规则引擎中缓存的脚本ID对应的脚本内容,禁用时为默认脚本*/
-    List<DeviceProfileDTO> usedProfiles = ytDeviceProfileService.findDeviceProfile(tenantId, id,null);
+//    List<DeviceProfileDTO> usedProfiles = ytDeviceProfileService.findDeviceProfile(tenantId, id,null);
 //    for (DeviceProfileDTO profile : usedProfiles) {
 //      DeviceProfile tbDeviceProfile =
 //              buildTbDeviceProfileFromDeviceProfileDTO(
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceProfileServiceImpl.java
View file @6961419
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceProfileServiceImpl.java
View file @6961419
@@ -19,6 +19,7 @@ import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidatio
 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.DeviceTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.TransportTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.*;
 import org.thingsboard.server.dao.yunteng.jpa.dao.TkJpaDeviceProfileDao;
@@ -244,22 +245,11 @@ public class TkDeviceProfileServiceImpl
   }
   @Override
-  public List<DeviceProfileDTO> findDeviceProfileByIds(String tenantId, List<String> ids) {
+  public List<DeviceProfileDTO> findDeviceProfileByIds(String tenantId, List<String> ids, TransportTypeEnum transportType) {
     if (StringUtils.isEmpty(tenantId) || null == ids) {
       throw new TkDataValidationException(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());
+    return baseMapper.profileByTransportAndIds(tenantId,ids,transportType);
   }
   @Override
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceScriptServiceImpl.java
View file @6961419
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkDeviceScriptServiceImpl.java
View file @6961419
@@ -8,6 +8,7 @@ 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.device.profile.TkTcpDeviceProfileTransportConfiguration;
 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;
@@ -17,6 +18,7 @@ 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.TransportTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkDeviceProfileEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkDeviceScriptEntity;
@@ -264,13 +266,19 @@ public class TkDeviceScriptServiceImpl
                               .map(DeviceDTO::getDeviceProfileId)
                               .collect(Collectors.toList());
                       List<DeviceProfileDTO> deviceProfileDTOList =
-                          tkDeviceProfileService.findDeviceProfileByIds(tenantId, deviceProfiles);
+                          tkDeviceProfileService.findDeviceProfileByIds(tenantId, deviceProfiles, TransportTypeEnum.TCP);
                       return Optional.ofNullable(deviceProfileDTOList)
                           .map(
-                              deviceProfileDTOS ->
-                                  deviceProfileDTOS.stream()
-                                      .map(DeviceProfileDTO::getScriptId)
-                                      .collect(Collectors.toSet()))
+                              deviceProfileDTOS ->{
+                                Set<String> tcpScriptes = new HashSet<>();
+                                deviceProfileDTOS.forEach(p->{
+                                  TkTcpDeviceProfileTransportConfiguration config = (TkTcpDeviceProfileTransportConfiguration) p.getProfileData().getTransportConfiguration();
+                                  tcpScriptes.add(config.getUpScriptId());
+                                  tcpScriptes.add(config.getUpScriptId());
+                                  tcpScriptes.add(config.getUpScriptId());
+                                });
+                                return tcpScriptes;
+                              })
                           .orElse(null);
                     }
                     return null;
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/mapper/TkDeviceProfileMapper.java
View file @6961419
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/mapper/TkDeviceProfileMapper.java
View file @6961419
@@ -7,6 +7,7 @@ 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.common.data.yunteng.enums.TransportTypeEnum;
 import org.thingsboard.server.dao.yunteng.entities.TkDeviceProfileEntity;
 import java.util.List;
@@ -28,10 +29,17 @@ public interface TkDeviceProfileMapper extends BaseMapper<TkDeviceProfileEntity>
       @Param("transportType") String transportType,
       @Param("deviceProfileIds") List<String> deviceProfileIds);
+  @Deprecated
   List<DeviceProfileDTO> profileByScriptId(
-      @Param("tenantId") String tenantId,
-      @Param("scriptId") String scriptId,
-      @Param("deviceType") DeviceTypeEnum deviceType);
+          @Param("tenantId") String tenantId,
+          @Param("scriptId") String scriptId,
+          @Param("deviceType") DeviceTypeEnum deviceType);
+
+  List<DeviceProfileDTO> profileByTransportAndIds(
+          @Param("tenantId") String tenantId,
+          @Param("projectIds") List<String> projectIds,
+          @Param("deviceType") TransportTypeEnum transportType);
+
   List<String> getDeviceProfileIds(
       @Param("tenantId") String tenantId,
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkDeviceProfileService.java
View file @6961419
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkDeviceProfileService.java
View file @6961419
@@ -3,6 +3,7 @@ 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.DeviceTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.TransportTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkDeviceProfileEntity;
@@ -29,7 +30,7 @@ public interface TkDeviceProfileService extends BaseService<TkDeviceProfileEntit
   List<DeviceProfileDTO> findCustomerDeviceProfiles(
       String tenantId, CustomerId customerId, DeviceTypeEnum deviceType);
-  List<DeviceProfileDTO> findDeviceProfileByIds(String tenantId, List<String> ids);
+  List<DeviceProfileDTO> findDeviceProfileByIds(String tenantId, List<String> ids, TransportTypeEnum transportType);
   List<DeviceProfileDTO> findDeviceProfile(String tenantId);
   /** 验证表单数据有效性 */
--- a/dao/src/main/resources/mapper/TkDeviceProfileMapper.xml
View file @6961419
+++ b/dao/src/main/resources/mapper/TkDeviceProfileMapper.xml
View file @6961419
@@ -12,7 +12,6 @@
         <result property="image" column="image"/>
         <result property="description" column="description"/>
         <result property="tenantId" column="tenant_id"/>
-        <result property="scriptId" column="script_id"/>
         <result property="transportType" column="transport_type"/>
         <result property="provisionType" column="provision_type"/>
         <result property="deviceType" column="device_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
@@ -86,6 +85,25 @@
         </where>
     </select>
+    <select id="profileByTransportAndIds" resultMap="detail">
+        SELECT
+        <include refid="basicColumns"/>
+        FROM device_profile base
+        LEFT JOIN tk_device_profile iot ON iot.tb_profile_id = base.id::TEXT
+        <where>
+            iot.tenant_id = #{tenantId}
+            <if test="projectIds != null">
+                AND iot.id IN
+                <foreach collection="projectIds" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            <if test="transportType !=null">
+                AND iot.transport_type = #{transportType}
+            </if>
+        </where>
+    </select>
+
     <select id="getDeviceProfileIds" resultType="java.lang.String">
         SELECT iot.id
         FROM device_profile base