From c919cb6e83a6ed5378005d03bbb2f98942fad1bb Mon Sep 17 00:00:00 2001
From: shankai <shankai1995@qq.com>
Date: Thu, 12 Dec 2024 14:56:58 +0800
Subject: [PATCH] by: 通过guid查询毫米波雷达设备的controller接口和distance表的条件查询分页接口
---
skjcmanager/skjcmanager-service/skjcmanager-by/src/main/java/cn/gistack/by/waterdata/controller/DistanceRecordController.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-by/src/main/java/cn/gistack/by/waterdata/controller/DistanceRecordController.java b/skjcmanager/skjcmanager-service/skjcmanager-by/src/main/java/cn/gistack/by/waterdata/controller/DistanceRecordController.java
index 55854bb..ea31bd0 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-by/src/main/java/cn/gistack/by/waterdata/controller/DistanceRecordController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-by/src/main/java/cn/gistack/by/waterdata/controller/DistanceRecordController.java
@@ -17,10 +17,10 @@
package cn.gistack.by.waterdata.controller;
import cn.gistack.by.waterdata.pojo.entity.DistanceRecord;
+import cn.gistack.by.waterdata.pojo.entity.SelectPageParam;
import cn.gistack.by.waterdata.pojo.vo.DistanceRecordVO;
import cn.gistack.by.waterdata.pojo.wrapper.DistanceRecordWrapper;
import cn.gistack.by.waterdata.service.api.IDistanceRecordService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
@@ -37,6 +37,8 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
/**
* E0功能码数据controller.
@@ -71,12 +73,11 @@
/**
* DistanceRecord 分页
*/
- @GetMapping("/list")
- @ApiOperation(value = "分页", notes = "传入DistanceRecord实体对象")
- public R<IPage<DistanceRecordVO>> list(DistanceRecord distanceRecord, Query query) {
- QueryWrapper<DistanceRecord> queryWrapper = Condition.getQueryWrapper(distanceRecord);
- IPage<DistanceRecord> pages = distanceRecordService.page(Condition.getPage(query), queryWrapper);
- return R.data(DistanceRecordWrapper.build().pageVO(pages));
+ @GetMapping("/selectpage")
+ @ApiOperation(value = "自定义分页", notes = "传入SelectPageParam对象")
+ public R<List<DistanceRecordVO>> selectPage(SelectPageParam param) {
+ List<DistanceRecordVO> recordVOList = distanceRecordService.selectPage(param);
+ return R.data(recordVOList);
}
/**
--
Gitblit v1.9.3