From 41d53f6e09c11c2c6d29958c42feb6dad9bbcb02 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 20 Dec 2024 15:28:27 +0800
Subject: [PATCH] 白蚁新模块。12-20
---
skjcmanager/skjcmanager-service/skjcmanager-by/src/main/java/cn/gistack/by/waterdata/controller/DistanceRecordController.java | 24 +++++++++++++++++-------
1 files changed, 17 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..17fb1f9 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
@@ -16,11 +16,12 @@
*/
package cn.gistack.by.waterdata.controller;
+import cn.gistack.by.waterdata.pojo.entity.CsbldFlag;
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;
@@ -71,12 +72,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<IPage<DistanceRecordVO>> selectPage(SelectPageParam param) {
+ IPage<DistanceRecordVO> page = distanceRecordService.selectPage(param);
+ return R.data(page);
}
/**
@@ -97,4 +97,14 @@
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(distanceRecordService.removeByIds(Func.toLongList(ids)));
}
+
+ /**
+ * 判断水库是否有超声波雷达扩展信息
+ */
+ @GetMapping("/csbldFlag")
+ public R<CsbldFlag> csbldFlag(@RequestParam String skGuid) {
+ //IPage<DistanceRecordVO> pages = distanceRecordService.selectDistanceRecordPage(Condition.getPage(query), news);
+
+ return R.data(distanceRecordService.csbldFlag(skGuid));
+ }
}
--
Gitblit v1.9.3