Merge branch 'master' into 20221202

@@ -2,6 +2,7 @@ package org.thingsboard.server.controller.yunteng;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.ResponseEntity;
@@ -27,6 +28,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.DeviceProfileDTO;
+import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.common.msg.queue.ServiceQueue;
@@ -158,15 +160,18 @@ public class TkDeviceProfileController extends BaseController {
   @GetMapping("/me/list")
   @ApiOperation("选项列表")
   @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
-  public ResponseEntity listDeviceProfile() throws ThingsboardException {
+  public ResponseEntity listDeviceProfile(
+      @ApiParam(value = "设备类型") @RequestParam(value = "deviceType", required = false)
+          DeviceTypeEnum deviceType)
+      throws ThingsboardException {
     List<DeviceProfileDTO> results;
     String tenantId = getCurrentUser().getCurrentTenantId();
     if (getCurrentUser().isTenantAdmin()) {
-      results = ytDeviceProfileService.findDeviceProfile(tenantId, null);
+      results = ytDeviceProfileService.findDeviceProfile(tenantId, null,deviceType);
     } else {
       results =
           ytDeviceProfileService.findCustomerDeviceProfiles(
-              tenantId, getCurrentUser().getCustomerId());
+              tenantId, getCurrentUser().getCustomerId(),deviceType);
     }
 
     return ResponseEntity.ok(results);

@@ -103,7 +103,7 @@ public class TkDeviceScriptController extends BaseController {
         convertJs = scriptDTO.getConvertJs();
       }
     }
-    List<DeviceProfileDTO> usedProfiles = ytDeviceProfileService.findDeviceProfile(tenantId, id);
+    List<DeviceProfileDTO> usedProfiles = ytDeviceProfileService.findDeviceProfile(tenantId, id,null);
     for (DeviceProfileDTO profile : usedProfiles) {
       DeviceProfile tbDeviceProfile =
               buildTbDeviceProfileFromDeviceProfileDTO(

@@ -18,6 +18,7 @@ import org.thingsboard.server.common.data.yunteng.constant.QueryConstant;
 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.*;
+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.*;
 import org.thingsboard.server.dao.yunteng.jpa.dao.YtJpaDeviceProfileDao;
@@ -198,19 +199,23 @@ public class TkDeviceProfileServiceImpl
   }
 
   @Override
-  public List<DeviceProfileDTO> findDeviceProfile(String tenantId, String scriptId) {
-    return baseMapper.profileByScriptId(tenantId, scriptId);
+  public List<DeviceProfileDTO> findDeviceProfile(
+      String tenantId, String scriptId, DeviceTypeEnum deviceType) {
+    return baseMapper.profileByScriptId(tenantId, scriptId, deviceType);
   }
 
   @Override
-  public List<DeviceProfileDTO> findCustomerDeviceProfiles(String tenantId, CustomerId customerId) {
+  public List<DeviceProfileDTO> findCustomerDeviceProfiles(
+      String tenantId, CustomerId customerId, DeviceTypeEnum deviceType) {
     List<DeviceDTO> deviceDTOS =
         deviceMapper.findDeviceInfoByCustomerId(tenantId, customerId.toString());
     List<String> deviceProfileIds =
         Optional.ofNullable(deviceDTOS)
             .map(
                 devices ->
-                    devices.stream().map(DeviceDTO::getDeviceProfileId).collect(Collectors.toList()))
+                    devices.stream()
+                        .map(DeviceDTO::getDeviceProfileId)
+                        .collect(Collectors.toList()))
             .orElse(null);
     if (null == deviceProfileIds || deviceProfileIds.isEmpty()) {
       return null;
@@ -219,6 +224,7 @@ public class TkDeviceProfileServiceImpl
         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()

@@ -5,6 +5,7 @@ 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.yunteng.dto.*;
+import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.dao.yunteng.entities.TkDeviceProfileEntity;
 
 import java.util.List;
@@ -27,5 +28,7 @@ public interface TkDeviceProfileMapper extends BaseMapper<TkDeviceProfileEntity>
       @Param("deviceProfileIds") List<String> deviceProfileIds);
 
   List<DeviceProfileDTO> profileByScriptId(
-      @Param("tenantId") String tenantId, @Param("scriptId") String scriptId);
+      @Param("tenantId") String tenantId,
+      @Param("scriptId") String scriptId,
+      @Param("deviceType") DeviceTypeEnum deviceType);
 }

@@ -2,6 +2,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.utils.tools.YtPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkDeviceProfileEntity;
 
@@ -10,43 +11,44 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 
-public interface TkDeviceProfileService extends BaseService<TkDeviceProfileEntity>{
+public interface TkDeviceProfileService extends BaseService<TkDeviceProfileEntity> {
 
-    DeviceProfileDTO insertOrUpdate(DeviceProfileDTO deviceDTO);
+  DeviceProfileDTO insertOrUpdate(DeviceProfileDTO deviceDTO);
 
-    void deleteDeviceProfiles(String tenantId, Set<String> ids);
+  void deleteDeviceProfiles(String tenantId, Set<String> ids);
 
-    void checkDeviceProfiles(String tenantId, Set<String> ids);
+  void checkDeviceProfiles(String tenantId, Set<String> ids);
 
-    Optional<DeviceProfileDTO> getDeviceProfile(String tenantId, String id);
+  Optional<DeviceProfileDTO> getDeviceProfile(String tenantId, String id);
 
-    YtPageData<DeviceProfileDTO> page(Map<String,Object> queryMap,boolean isTenantAdmin);
+  YtPageData<DeviceProfileDTO> page(Map<String, Object> queryMap, boolean isTenantAdmin);
 
-    List<DeviceProfileDTO> findDeviceProfile(String tenantId,String scriptId);
+  List<DeviceProfileDTO> findDeviceProfile(
+      String tenantId, String scriptId, DeviceTypeEnum deviceType);
 
-    List<DeviceProfileDTO> findCustomerDeviceProfiles(String tenantId, CustomerId customerId);
+  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);
 
-    /**
-     * 验证表单数据有效性
-     *
-     */
-    boolean validateFormData(DeviceProfileDTO ytDeviceProfileDTO);
+  /** 验证表单数据有效性 */
+  boolean validateFormData(DeviceProfileDTO ytDeviceProfileDTO);
 
-    /**
-     * 根据设备配置ID获取设备配置信息
-     * @param tenantId 租户ID
-     * @param id 设备配置ID
-     * @return 设备配置信息
-     */
-    DeviceProfileDTO findDeviceProfileById(String tenantId, String id);
+  /**
+   * 根据设备配置ID获取设备配置信息
+   *
+   * @param tenantId 租户ID
+   * @param id 设备配置ID
+   * @return 设备配置信息
+   */
+  DeviceProfileDTO findDeviceProfileById(String tenantId, String id);
 
-    /**
-     * *根据tb设备ID获取设备配置信息
-     * @param tenantId 租户ID
-     * @param tbProfileId tb设备配置ID
-     * @return 设备配置信息
-     */
-    DeviceProfileDTO findByTbDeviceProfileId(String tenantId,String tbProfileId);
+  /**
+   * *根据tb设备ID获取设备配置信息
+   *
+   * @param tenantId 租户ID
+   * @param tbProfileId tb设备配置ID
+   * @return 设备配置信息
+   */
+  DeviceProfileDTO findByTbDeviceProfileId(String tenantId, String tbProfileId);
 }

@@ -80,6 +80,9 @@
             <if test="scriptId !=null and scriptId !=''">
                 AND iot.script_id = #{scriptId}
             </if>
+            <if test="deviceType !=null">
+                AND iot.device_type = #{deviceType}
+            </if>
         </where>
     </select>
 </mapper>