Merge branch '2021-01-23-bug' into 'master_dev'

2021 01 23 bug

See merge request yunteng/thingskit!320

@@ -119,16 +119,16 @@ public class TkDeviceProfileController extends BaseController {
   @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
   @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
   public ResponseEntity listDeviceProfile(
   public ResponseEntity listDeviceProfile(
           @ApiParam(value = "设备类型") @RequestParam(value = "deviceType", required = false)
           @ApiParam(value = "设备类型") @RequestParam(value = "deviceType", required = false)
-          DeviceTypeEnum deviceType)
+          DeviceTypeEnum deviceType,DeviceTransportType transportType)
           throws ThingsboardException {
           throws ThingsboardException {
     List<DeviceProfileDTO> results;
     List<DeviceProfileDTO> results;
     String tenantId = getCurrentUser().getCurrentTenantId();
     String tenantId = getCurrentUser().getCurrentTenantId();
     if (getCurrentUser().isTenantAdmin()) {
     if (getCurrentUser().isTenantAdmin()) {
-      results = tkDeviceProfileService.findDeviceProfile(tenantId, null,deviceType);
+      results = tkDeviceProfileService.findDeviceProfile(tenantId, null,deviceType,transportType);
     } else {
     } else {
       results =
       results =
               tkDeviceProfileService.findCustomerDeviceProfiles(
               tkDeviceProfileService.findCustomerDeviceProfiles(
-                      tenantId, getCurrentUser().getCustomerId(),deviceType);
+                      tenantId, getCurrentUser().getCustomerId(),deviceType,transportType);
     }
     }
 
 
     return ResponseEntity.ok(results);
     return ResponseEntity.ok(results);

 package org.thingsboard.server.dao.yunteng.entities;
 package org.thingsboard.server.dao.yunteng.entities;
 
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,6 +21,7 @@ public class TkVideoEntity extends TenantBaseEntity {
   private static final long serialVersionUID = 1498859811403607497L;
   private static final long serialVersionUID = 1498859811403607497L;
   private String name;
   private String name;
   private String additionalJson;
   private String additionalJson;
+  @TableField(fill = FieldFill.UPDATE)
   private String avatar;
   private String avatar;
   private String videoUrl;
   private String videoUrl;
   private String brand;
   private String brand;

@@ -292,13 +292,13 @@ public class TkDeviceProfileServiceImpl
 
 
   @Override
   @Override
   public List<DeviceProfileDTO> findDeviceProfile(
   public List<DeviceProfileDTO> findDeviceProfile(
-      String tenantId, String scriptId, DeviceTypeEnum deviceType) {
-    return baseMapper.profileByScriptId(tenantId, scriptId, deviceType);
+      String tenantId, String scriptId, DeviceTypeEnum deviceType,DeviceTransportType transportType) {
+    return baseMapper.profileByScriptId(tenantId, scriptId, deviceType,transportType,null);
   }
   }
 
 
   @Override
   @Override
   public List<DeviceProfileDTO> findCustomerDeviceProfiles(
   public List<DeviceProfileDTO> findCustomerDeviceProfiles(
-      String tenantId, CustomerId customerId, DeviceTypeEnum deviceType) {
+      String tenantId, CustomerId customerId, DeviceTypeEnum deviceType,DeviceTransportType transportType) {
     List<DeviceDTO> deviceDTOS =
     List<DeviceDTO> deviceDTOS =
         deviceMapper.findDeviceInfoByCustomerId(tenantId, customerId.toString());
         deviceMapper.findDeviceInfoByCustomerId(tenantId, customerId.toString());
     List<String> deviceProfileIds =
     List<String> deviceProfileIds =
@@ -312,18 +312,7 @@ public class TkDeviceProfileServiceImpl
     if (null == deviceProfileIds || deviceProfileIds.isEmpty()) {
     if (null == deviceProfileIds || deviceProfileIds.isEmpty()) {
       return null;
       return null;
     }
     }
-    List<TkDeviceProfileEntity> entities =
-        baseMapper.selectList(
-            new LambdaQueryWrapper<TkDeviceProfileEntity>()
-                .eq(TkDeviceProfileEntity::getTenantId, tenantId)
-                .eq(null != deviceType, TkDeviceProfileEntity::getDeviceType, deviceType)
-                .in(TkDeviceProfileEntity::getId, deviceProfileIds));
-    if (null != entities && !entities.isEmpty()) {
-      return entities.stream()
-          .map(obj -> obj.getDTO(DeviceProfileDTO.class))
-          .collect(Collectors.toList());
-    }
-    return null;
+    return baseMapper.profileByScriptId(tenantId, null, deviceType,transportType,deviceProfileIds);
   }
   }
 
 
   @Override
   @Override

@@ -133,7 +133,7 @@ public class TkHomePageServiceImpl implements HomePageService {
         if (StringUtils.isNotEmpty(customerId)) {
         if (StringUtils.isNotEmpty(customerId)) {
           deviceProfileDTOList =
           deviceProfileDTOList =
               tkDeviceProfileService.findCustomerDeviceProfiles(
               tkDeviceProfileService.findCustomerDeviceProfiles(
-                  tenantId, new CustomerId(UUID.fromString(customerId)), null);
+                  tenantId, new CustomerId(UUID.fromString(customerId)), null,null);
         }
         }
       }
       }
       int todayAdd = zero;
       int todayAdd = zero;

@@ -33,7 +33,9 @@ public interface TkDeviceProfileMapper extends BaseMapper<TkDeviceProfileEntity>
   List<DeviceProfileDTO> profileByScriptId(
   List<DeviceProfileDTO> profileByScriptId(
           @Param("tenantId") String tenantId,
           @Param("tenantId") String tenantId,
           @Param("scriptId") String scriptId,
           @Param("scriptId") String scriptId,
-          @Param("deviceType") DeviceTypeEnum deviceType);
+          @Param("deviceType") DeviceTypeEnum deviceType,
+          @Param("transportType")DeviceTransportType transportType,
+          @Param("deviceProfileIds")List<String> deviceProfileIds);
 
 
   List<DeviceProfileDTO> profileByTransportAndIds(
   List<DeviceProfileDTO> profileByTransportAndIds(
           @Param("tenantId") String tenantId,
           @Param("tenantId") String tenantId,

 package org.thingsboard.server.dao.yunteng.service;
 package org.thingsboard.server.dao.yunteng.service;
 
 
+import org.thingsboard.server.common.data.DeviceTransportType;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceProfileDTO;
 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.DeviceTypeEnum;
@@ -25,10 +26,10 @@ public interface TkDeviceProfileService extends BaseService<TkDeviceProfileEntit
   TkPageData<DeviceProfileDTO> page(Map<String, Object> queryMap, boolean isTenantAdmin);
   TkPageData<DeviceProfileDTO> page(Map<String, Object> queryMap, boolean isTenantAdmin);
 
 
   List<DeviceProfileDTO> findDeviceProfile(
   List<DeviceProfileDTO> findDeviceProfile(
-      String tenantId, String scriptId, DeviceTypeEnum deviceType);
+          String tenantId, String scriptId, DeviceTypeEnum deviceType, DeviceTransportType transportType);
 
 
   List<DeviceProfileDTO> findCustomerDeviceProfiles(
   List<DeviceProfileDTO> findCustomerDeviceProfiles(
-      String tenantId, CustomerId customerId, DeviceTypeEnum deviceType);
+      String tenantId, CustomerId customerId, DeviceTypeEnum deviceType,DeviceTransportType transportType);
 
 
   List<DeviceProfileDTO> findDeviceProfileByIds(String tenantId, List<String> ids, TransportTypeEnum transportType);
   List<DeviceProfileDTO> findDeviceProfileByIds(String tenantId, List<String> ids, TransportTypeEnum transportType);
 
 

@@ -85,6 +85,16 @@
             <if test="deviceType !=null">
             <if test="deviceType !=null">
                 AND iot.device_type = #{deviceType}
                 AND iot.device_type = #{deviceType}
             </if>
             </if>
+            <if test="transportType !=null">
+                AND base.transport_type = #{transportType}
+            </if>
+            <if test="deviceProfileIds != null">
+                AND base.id IN
+                <foreach collection="deviceProfileIds" item="deviceProfile_id" open="(" separator="," close=")">
+                    #{deviceProfile_id}
+                </foreach>
+            </if>
+
         </where>
         </where>
     </select>
     </select>