fix: thingsModel page query bug

@@ -43,12 +43,17 @@ public class ThingsModelController extends BaseController {
       params = {PAGE_SIZE, PAGE})
   @ApiOperation(value = "分页")
   public YtPageData<ThingsModelDTO> page(
+      @RequestParam("deviceProfileId") String deviceProfileId,
       @RequestParam(PAGE_SIZE) int pageSize,
       @RequestParam(PAGE) int page,
       @RequestParam(value = "nameOrIdentifier", required = false) String nameOrIdentifier,
+      @RequestParam(value = "functionType", required = false) FunctionTypeEnum functionType,
       @RequestParam(value = ORDER_FILED, required = false) String orderBy,
       @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
       throws ThingsboardException {
+    if(StringUtils.isEmpty(deviceProfileId)){
+      throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
     HashMap<String, Object> queryMap = new HashMap<>();
     queryMap.put("nameOrIdentifier", nameOrIdentifier);
     queryMap.put(PAGE_SIZE, pageSize);
@@ -57,7 +62,11 @@ public class ThingsModelController extends BaseController {
     if (orderType != null) {
       queryMap.put(ORDER_TYPE, orderType.name());
     }
-    return thingsModelService.page(queryMap, getCurrentUser().getCurrentTenantId());
+    if (functionType != null) {
+      queryMap.put("functionType", functionType);
+    }
+    return thingsModelService.page(
+        queryMap, getCurrentUser().getCurrentTenantId(), deviceProfileId);
   }
 
   @PostMapping()

@@ -37,23 +37,28 @@ public class ThingsModelServiceImpl
   private final YtDeviceProfileService ytDeviceProfileService;
 
   @Override
-  public YtPageData<ThingsModelDTO> page(Map<String, Object> queryMap, String tenantId) {
+  public YtPageData<ThingsModelDTO> page(
+      Map<String, Object> queryMap, String tenantId, String deviceProfileId) {
     String nameOrIdentifier =
         null != queryMap.get("nameOrIdentifier") ? (String) queryMap.get("nameOrIdentifier") : null;
+    String functionType =
+        null != queryMap.get("functionType") ? queryMap.get("functionType").toString() : null;
     IPage<TkThingsModelEntity> iPage =
         baseMapper.selectPage(
             getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false),
             new LambdaQueryWrapper<TkThingsModelEntity>()
                 .eq(TkThingsModelEntity::getTenantId, tenantId)
-                .like(
-                    StringUtils.isNotEmpty(nameOrIdentifier),
-                    TkThingsModelEntity::getFunctionName,
-                    nameOrIdentifier)
-                .or()
-                .like(
+                .eq(TkThingsModelEntity::getDeviceProfileId, deviceProfileId)
+                .eq(
+                    StringUtils.isNotEmpty(functionType),
+                    TkThingsModelEntity::getFunctionType,
+                    functionType)
+                .and(
                     StringUtils.isNotEmpty(nameOrIdentifier),
-                    TkThingsModelEntity::getIdentifier,
-                    nameOrIdentifier));
+                    qr ->
+                        qr.like(TkThingsModelEntity::getFunctionName, nameOrIdentifier)
+                            .or()
+                            .like(TkThingsModelEntity::getIdentifier, nameOrIdentifier)));
     return getPageData(iPage, ThingsModelDTO.class);
   }
 

@@ -10,7 +10,8 @@ import java.util.List;
 import java.util.Map;
 
 public interface ThingsModelService {
-  YtPageData<ThingsModelDTO> page(Map<String, Object> queryMap, String tenantId);
+  YtPageData<ThingsModelDTO> page(
+      Map<String, Object> queryMap, String tenantId, String deviceProfileId);
 
   ThingsModelDTO saveOrUpdate(ThingsModelDTO thingsModelDTO);
 
@@ -25,5 +26,5 @@ public interface ThingsModelService {
 
   JsonNode getTingsModelTSL(FunctionTypeEnum typeEnum, String tenantId, String deviceProfileId);
 
-  boolean changeTSLStatus(String deviceProfileId,String tenantId,Integer status);
+  boolean changeTSLStatus(String deviceProfileId, String tenantId, Integer status);
 }