From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送

---
 src/main/java/org/springblade/modules/system/controller/LogApiController.java |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/controller/LogApiController.java b/src/main/java/org/springblade/modules/system/controller/LogApiController.java
index b675f20..4f73838 100644
--- a/src/main/java/org/springblade/modules/system/controller/LogApiController.java
+++ b/src/main/java/org/springblade/modules/system/controller/LogApiController.java
@@ -26,6 +26,7 @@
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
 import org.springblade.modules.system.service.ILogApiService;
+import org.springblade.modules.system.entity.LogApiExt;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -52,7 +53,7 @@
 	 * 查询单条
 	 */
 	@GetMapping("/detail")
-	public R<LogApi> detail(LogApi log) {
+	public R<LogApi> detail(LogApiExt log) {
 		return R.data(logService.getOne(Condition.getQueryWrapper(log)));
 	}
 
@@ -60,8 +61,20 @@
 	 * 查询多条(分页)
 	 */
 	@GetMapping("/list")
-	public R<IPage<LogApi>> list(@ApiIgnore @RequestParam Map<String, Object> log, Query query) {
-		IPage<LogApi> pages = logService.page(Condition.getPage(query.setDescs("create_time")), Condition.getQueryWrapper(log, LogApi.class));
+	public R<IPage<LogApiExt>> list(@ApiIgnore @RequestParam Map<String, Object> log, Query query) {
+		IPage<LogApiExt> pages = logService.page(Condition.getPage(query.setDescs("create_time")), Condition.getQueryWrapper(log, LogApiExt.class));
+		return R.data(pages);
+	}
+
+	/**
+	 * 查询多条(自定义分页)
+	 * @param logApi
+	 * @param query
+	 * @return
+	 */
+	@GetMapping("/page")
+	public R<IPage<LogApiExt>> selectLogApiExtPage(LogApiExt logApi, Query query) {
+		IPage<LogApiExt> pages = logService.selectLogApiExtPage(Condition.getPage(query), logApi);
 		return R.data(pages);
 	}
 

--
Gitblit v1.9.3