fix: 修复RPC分页查询，提供事件、状态过滤查询

@@ -10,6 +10,8 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.rpc.RpcStatus;
+import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.TkRpcRecordDTO;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
@@ -17,6 +19,8 @@ import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.entities.TkRpcRecordEntity;
 import org.thingsboard.server.dao.yunteng.service.TkRpcRecordService;
 
+import java.sql.Timestamp;
+
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
 /**
@@ -27,26 +31,38 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @Api(tags = {"命令下发记录"})
 @RequiredArgsConstructor
 public class TkRpcRecordController extends BaseController {
-    private final TkRpcRecordService recordService;
-
-    @GetMapping(params = {PAGE_SIZE, PAGE})
-    @ApiOperation("分页")
-    public TkPageData<TkRpcRecordDTO> pageAlarmProfile(
-            @RequestParam(PAGE_SIZE) int pageSize,
-            @RequestParam(PAGE) int page,
-            @RequestParam(value = "status", required = false) RpcStatus status,
-            @RequestParam(value = "name", required = false) String name,
-            @RequestParam(value = "tbDeviceId", required = false) String tbDeviceId,
-//            @RequestParam(value = "oneway", required = false) Boolean oneway,
-            @RequestParam(value = "organizationId", required = false) String organizationId,
-            @RequestParam(value = ORDER_FILED, required = false) String orderBy,
-            @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
-            throws ThingsboardException {
+  private final TkRpcRecordService recordService;
 
-
-        IPage<TkRpcRecordEntity> pageInfrom = recordService.getPage(page, pageSize, orderBy, orderType);
-        return recordService.pageDatas(pageInfrom, getCurrentUser().getCurrentTenantId(), tbDeviceId,null, status, organizationId, name);
+  @GetMapping(params = {PAGE_SIZE, PAGE})
+  @ApiOperation("分页")
+  public TkPageData<TkRpcRecordDTO> pageAlarmProfile(
+      @RequestParam(PAGE_SIZE) int pageSize,
+      @RequestParam(PAGE) int page,
+      @RequestParam(value = "status", required = false) RpcStatus status,
+      @RequestParam(value = "name", required = false) String name,
+      @RequestParam(value = "tbDeviceId", required = false) String tbDeviceId,
+      @RequestParam(value = "organizationId", required = false) String organizationId,
+      @RequestParam(value = "startTime", required = false) Long startTime,
+      @RequestParam(value = "endTime", required = false) Long endTime,
+      @RequestParam(value = ORDER_FILED, required = false) String orderBy,
+      @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
+      throws ThingsboardException {
+    if (null != startTime && null != endTime) {
+      if (startTime > endTime) {
+        throw new TkDataValidationException(
+            ErrorMessage.START_TIME_NOT_MORE_THAN_END_TIME.getMessage());
+      }
     }
 
-
+    IPage<TkRpcRecordEntity> pageInfo = recordService.getPage(page, pageSize, orderBy, orderType);
+    return recordService.page(
+        pageInfo,
+        getCurrentUser().getCurrentTenantId(),
+        tbDeviceId,
+        status,
+        organizationId,
+        name,
+        startTime,
+        endTime);
+  }
 }

-/**
- * Copyright © 2016-2022 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.thingsboard.server.common.data.yunteng.enums;
 
 public enum TkRpcStatus {
-    QUEUED("队列中"), SENT("已发送"), DELIVERED("处理中"), SUCCESSFUL("成功"), TIMEOUT("超时"), EXPIRED("过期"), FAILED("失败");
+  QUEUED("队列中"),
+  SENT("已发送"),
+  DELIVERED("发送成功"),
+  SUCCESSFUL("响应成功"),
+  TIMEOUT("超时"),
+  EXPIRED("已过期"),
+  FAILED("响应失败"),
+  DELETED("已删除");
+  String label;
 
-    String label;
-    TkRpcStatus(String label){
-        this.label= label;
-    }
-    public static String getLabel(String name){
-        for(TkRpcStatus type:values()){
-            if(type.name().equals(name)){
-                return type.label;
-            }
-        }
-        return null;
+  TkRpcStatus(String label) {
+    this.label = label;
+  }
+
+  public static String getLabel(String name) {
+    for (TkRpcStatus type : values()) {
+      if (type.name().equals(name)) {
+        return type.label;
+      }
     }
+    return null;
+  }
 }

@@ -24,24 +24,33 @@ import java.util.stream.Collectors;
 @Slf4j
 @Service
 @RequiredArgsConstructor
-public class TkRpcRecordServiceImpl extends AbstractBaseService<TkRpcRecordMapper, TkRpcRecordEntity>
-        implements TkRpcRecordService {
-
-
-    private final OrganizationMapper organizationMapper;
-
-    @Override
-    public TkPageData<TkRpcRecordDTO> pageDatas(IPage<TkRpcRecordEntity> pageInfrom, String tenantId, String deviceId, Boolean oneway, RpcStatus status, String organizationId, String name) {
-        List<String> organization = null;
-        if (StringUtils.isNotEmpty(organizationId)) {
-            List<String> organizationFilter = new ArrayList<>();
-            organizationFilter.add(organizationId);
-            organization = organizationMapper.findOrganizationTreeList(tenantId, organizationFilter).stream().map(org -> org.getId()).collect(Collectors.toList());
-        }
-
-        IPage<TkRpcRecordDTO> page = baseMapper.getPageDatas(pageInfrom, tenantId, deviceId,name, status, organization, null);
-        return getPageData(page, TkRpcRecordDTO.class);
+public class TkRpcRecordServiceImpl
+    extends AbstractBaseService<TkRpcRecordMapper, TkRpcRecordEntity>
+    implements TkRpcRecordService {
+
+  private final OrganizationMapper organizationMapper;
+
+  @Override
+  public TkPageData<TkRpcRecordDTO> page(
+      IPage<TkRpcRecordEntity> pageInfo,
+      String tenantId,
+      String deviceId,
+      RpcStatus status,
+      String organizationId,
+      String name,Long startTime,
+      Long endTime) {
+    List<String> organization = null;
+    if (StringUtils.isNotEmpty(organizationId)) {
+      List<String> organizationFilter = new ArrayList<>();
+      organizationFilter.add(organizationId);
+      organization =
+          organizationMapper.findOrganizationTreeList(tenantId, organizationFilter).stream()
+              .map(org -> org.getId())
+              .collect(Collectors.toList());
     }
 
-
+    IPage<TkRpcRecordDTO> page =
+        baseMapper.getPageData(pageInfo, tenantId, deviceId, name, status, organization,startTime,endTime);
+    return getPageData(page, TkRpcRecordDTO.class);
+  }
 }

@@ -15,13 +15,21 @@ import java.util.List;
  */
 @Mapper
 public interface TkRpcRecordMapper extends BaseMapper<TkRpcRecordEntity> {
-    /**
-     * @param page
-     * @param tenantId
-     * @param name
-     * @param status
-     * @param organizationId
-     * @return
-     */
-    IPage<TkRpcRecordDTO> getPageDatas(IPage<?> page, @Param("tenantId") String tenantId, @Param("tbDeviceId") String tbDeviceId, @Param("name") String name, @Param("status") RpcStatus status, @Param("organization") List<String> organizationId, @Param("oneway") String oneway);
+  /**
+   * @param page
+   * @param tenantId
+   * @param name
+   * @param status
+   * @param organizationId
+   * @return
+   */
+  IPage<TkRpcRecordDTO> getPageData(
+      IPage<?> page,
+      @Param("tenantId") String tenantId,
+      @Param("tbDeviceId") String tbDeviceId,
+      @Param("name") String name,
+      @Param("status") RpcStatus status,
+      @Param("organization") List<String> organizationId,
+      @Param("startTime")Long startTime,
+      @Param("endTime")Long endTime);
 }

 package org.thingsboard.server.dao.yunteng.service;
 
-
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.dao.yunteng.entities.BaseEntity;
@@ -10,9 +8,12 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 
-public interface BaseService<T extends BaseEntity>{
-    List<T> findAllByTenant(String tenantId);
-    boolean deleteDataByTenantIds(Set<String> tenantIds);
-    boolean insertBatch(Collection<T> entityList, int batchSize);
-    IPage<T> getPage(Integer pageNum, Integer pageSize, String orderField, OrderTypeEnum orderType);
+public interface BaseService<T extends BaseEntity> {
+  List<T> findAllByTenant(String tenantId);
+
+  boolean deleteDataByTenantIds(Set<String> tenantIds);
+
+  boolean insertBatch(Collection<T> entityList, int batchSize);
+
+  IPage<T> getPage(Integer pageNum, Integer pageSize, String orderField, OrderTypeEnum orderType);
 }

@@ -7,24 +7,29 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkRpcRecordEntity;
 
 /**
- * 第三方平台用户管理相关接口
- * 例如：微信小程序、钉钉等。
+ * 第三方平台用户管理相关接口 例如：微信小程序、钉钉等。
+ *
  * @author Administrator
  */
 public interface TkRpcRecordService extends BaseService<TkRpcRecordEntity> {
 
-    /**
-     *
-     * RPC记录分页数据
-     * @param pageInfrom       分页信息
-     * @param tenantId         租户ID
-     * @param oneway           响应方式：是否单向
-     * @param status           RPC状态
-     * @param organizationId   组织ID
-     * @param name             名称，例如：设备、命令、组织、租户
-     * @return
-     */
-    TkPageData<TkRpcRecordDTO> pageDatas(IPage<TkRpcRecordEntity> pageInfrom, String tenantId, String deviceId, Boolean oneway, RpcStatus status, String organizationId, String name);
-
-
+  /**
+   * RPC记录分页数据
+   *
+   * @param pageInfo 分页信息
+   * @param tenantId 租户ID
+   * @param status RPC状态
+   * @param organizationId 组织ID
+   * @param name 名称，例如：设备、命令、组织、租户
+   * @return
+   */
+  TkPageData<TkRpcRecordDTO> page(
+      IPage<TkRpcRecordEntity> pageInfo,
+      String tenantId,
+      String deviceId,
+      RpcStatus status,
+      String organizationId,
+      String name,
+      Long startTime,
+      Long endTime);
 }

@@ -22,12 +22,6 @@
         <result property="organizationName" column="organization_name"/>
         <result column="tenant_name" property="tenantName"/>
         <result column="tenant_id" property="tenantId"/>
-<!--        <association property="request" javaType="org.thingsboard.server.common.data.yunteng.dto.YtRpcRequestDTO">-->
-<!--            <result column="deviceId" property="deviceId" typeHandler="org.thingsboard.server.dao.yunteng.mapper.UUIDTypeHandler"/>-->
-<!--            <result column="oneway" property="oneway"/>-->
-<!--            <result column="tenant_enabled" property="retries"/>-->
-<!--            <result column="tenant_expire_time" property="body" />-->
-<!--        </association>-->
     </resultMap>
 
 
@@ -42,20 +36,22 @@
         ,dev.name AS device_name,dev.tb_device_id,dev.device_type,dev.sn,dev.tenant_id,dev.id AS device_id
         ,ten.title AS tenant_name
     </sql>
-    <select id="getPageDatas" resultMap="dataMap">
+    <select id="getPageData" resultMap="dataMap">
         SELECT  <include refid="detailColumns"/>
         FROM rpc base
         LEFT JOIN tk_device dev ON base.device_id =dev.tb_device_id::uuid
         LEFT JOIN tk_organization org ON dev.organization_id = org.id
         LEFT JOIN tenant ten ON base.tenant_id = ten.id
         <where>
-            1=1
             <if test="tenantId !=null and tenantId !=''">
                 AND base.tenant_id = #{tenantId}::uuid
             </if>
             <if test="tbDeviceId !=null ">
                 AND base.device_id = #{tbDeviceId}::uuid
             </if>
+            <if test="endTime !=null and startTime !=null">
+                AND base.created_time &gt;= #{startTime} AND base.created_time &lt; #{endTime}
+            </if>
             <if test="name !=null and name !=''">
                 AND  (
                         dev.name LIKE concat('%',#{name}::TEXT,'%')
@@ -67,17 +63,8 @@
                     base.request LIKE concat('%',#{name}::TEXT,'%')
                 )
             </if>
-            <if test="oneway !=null and name !=''">
-                AND base.request LIKE concat('%',#{oneway}::TEXT,'%')
-            </if>
             <if test="status !=null">
-                AND base.status
-                <if test="status.toString() == 'SUCCESSFUL'">
-                     = #{status}
-                </if>
-                <if test="status.toString() != 'SUCCESSFUL'">
-                     != 'SUCCESSFUL'
-                </if>
+                AND base.status = #{status}
             </if>
             <if test="organization !=null">
                 AND dev.organization_id IN