fix: 修复DEFECT-1366大屏设计,公共接口管理分页查询排序会发生变化

 package org.thingsboard.server.dao.yunteng.impl;
 package org.thingsboard.server.dao.yunteng.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EntityId;
@@ -36,26 +34,9 @@ public class TkDataViewInterfaceServiceImpl
 
 
   @Override
   @Override
   public TkPageData<TkDataViewInterfaceDTO> page(Map<String, Object> queryMap) {
   public TkPageData<TkDataViewInterfaceDTO> page(Map<String, Object> queryMap) {
-    String name = null != queryMap.get("name") ? (String) queryMap.get("name") : null;
-    Integer state = null != queryMap.get("state") ? (Integer) queryMap.get("state") : null;
-    TkSystemTypeEnum interfaceType =
-        null != queryMap.get("interfaceType")
-            ? (TkSystemTypeEnum) queryMap.get("interfaceType")
-            : null;
-    String tenantId = (String) queryMap.get("tenantId");
-    IPage<TkDataViewInterfaceEntity> iPage =
+    IPage<TkDataViewInterfaceDTO> iPage =
         baseMapper.selectPage(
         baseMapper.selectPage(
-            getPage(queryMap, "create_time", false),
-            new QueryWrapper<TkDataViewInterfaceEntity>()
-                .lambda()
-                .eq(TkDataViewInterfaceEntity::getTenantId, tenantId)
-                .eq(
-                    null != interfaceType,
-                    TkDataViewInterfaceEntity::getInterfaceType,
-                    interfaceType)
-                .like(
-                    StringUtils.isNotEmpty(name), TkDataViewInterfaceEntity::getInterfaceName, name)
-                .eq(state != null, TkDataViewInterfaceEntity::getState, state));
+                getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false),queryMap);
     return getPageData(iPage, TkDataViewInterfaceDTO.class);
     return getPageData(iPage, TkDataViewInterfaceDTO.class);
   }
   }
 
 

 package org.thingsboard.server.dao.yunteng.mapper;
 package org.thingsboard.server.dao.yunteng.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 import org.thingsboard.server.common.data.yunteng.dto.TkDataViewInterfaceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkDataViewInterfaceDTO;
@@ -8,6 +9,7 @@ import org.thingsboard.server.dao.yunteng.entities.TkDataViewInterfaceEntity;
 
 
 import java.util.LinkedHashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.List;
+import java.util.Map;
 
 
 /**
 /**
  * @author tianfuLei
  * @author tianfuLei
@@ -16,6 +18,14 @@ import java.util.List;
 public interface TkDataViewInterfaceMapper extends BaseMapper<TkDataViewInterfaceEntity> {
 public interface TkDataViewInterfaceMapper extends BaseMapper<TkDataViewInterfaceEntity> {
 
 
     /**
     /**
+     * 分页查询
+     * @param page 分页信息
+     * @param queryMap 查询参数
+     * @return 分页数据
+     */
+    IPage<TkDataViewInterfaceDTO> selectPage(IPage<?> page, @Param("queryMap") Map<String, Object> queryMap);
+
+    /**
      * 根据ID获得详情
      * 根据ID获得详情
      * @param ids
      * @param ids
      * @return
      * @return

@@ -13,7 +13,7 @@
         <result property="requestUrl" column="request_url"/>
         <result property="requestUrl" column="request_url"/>
         <result property="requestParams" column="request_params"/>
         <result property="requestParams" column="request_params"/>
         <result property="state" column="state"/>
         <result property="state" column="state"/>
-
+        <result property="interfaceType" column="interface_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
         <result property="remark" column="remark"/>
         <result property="remark" column="remark"/>
         <result property="updateTime" column="update_time"/>
         <result property="updateTime" column="update_time"/>
         <result property="createTime" column="create_time"/>
         <result property="createTime" column="create_time"/>
@@ -23,7 +23,7 @@
     </resultMap>
     </resultMap>
 
 
     <sql id="columns">
     <sql id="columns">
-        id,interface_name, request_content_type, request_origin_url, request_http_type, request_url, request_params, state, creator, create_time, updater, update_time, tenant_id, remark
+        id,interface_name,interface_type, request_content_type, request_origin_url, request_http_type, request_url, request_params, state, creator, create_time, updater, update_time, tenant_id, remark
     </sql>
     </sql>
 
 
     <select id="getInterfaceDetails" resultMap="dataViewInterfaceMap">
     <select id="getInterfaceDetails" resultMap="dataViewInterfaceMap">
@@ -84,4 +84,23 @@
         #{sqlStr}
         #{sqlStr}
     </select>
     </select>
 
 
+    <select id="selectPage" resultMap="dataViewInterfaceMap">
+        SELECT
+        <include refid="columns"/>
+        FROM tk_data_view_interface
+        <where>
+            <if test="queryMap.tenantId !=null and queryMap.tenantId != ''">
+                AND tenant_id = #{queryMap.tenantId}
+            </if>
+            <if test="queryMap.interfaceType !=null">
+                AND interface_type = #{queryMap.interfaceType}
+            </if>
+            <if test="queryMap.state !=null">
+                AND state = #{queryMap.state}
+            </if>
+            <if test="queryMap.name !=null and queryMap.name !=''">
+                AND interface_name LIKE concat('%',#{queryMap.name},'%')
+            </if>
+        </where>
+    </select>
 </mapper>
 </mapper>