From 36a2d9a19b0b9ca2209555f6479ae1ef0198efd3 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期三, 02 十一月 2022 09:35:12 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/controller/epuipment/LoudspeakerController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/epuipment/LoudspeakerController.java b/ycl-platform/src/main/java/com/ycl/controller/epuipment/LoudspeakerController.java
index 68b6cee..5283fc6 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/epuipment/LoudspeakerController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/epuipment/LoudspeakerController.java
@@ -3,6 +3,7 @@
import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
@@ -50,10 +51,10 @@
@GetMapping("/query")
@ApiOperation("鏌ヨ")
@LogSave
- public CommonResult search(@RequestParam(required = false) Integer size,
- @RequestParam(required = false) Integer current,
- @RequestParam(required = false) Short state) {
- return null;
+ public CommonResult<IPage<Loudspeaker>> search(@RequestParam(required = true) Integer currentPage,
+ @RequestParam(required = true) Integer pageSize,
+ @RequestParam(required = false) Short state) {
+ return CommonResult.success(loudspeakerService.search(pageSize, currentPage, state));
}
@PostMapping("/add")
--
Gitblit v1.8.0