From f73dbcd6c21d28ab1e98840eee73c6d09bd0f929 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Tue, 27 Aug 2024 17:31:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsRecordController.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsRecordController.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsRecordController.java
index 1ebe2b1..9185291 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsRecordController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsRecordController.java
@@ -8,7 +8,6 @@
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
@@ -26,7 +25,7 @@
@RestController
@RequestMapping("/smsRecord/smsRecord")
@AllArgsConstructor
-public class SmsRecordController extends BladeController {
+public class SmsRecordController{
private ISmsRecordService smsRecordService;
@@ -109,4 +108,17 @@
return R.data(SmsRecord);
}
+
+ /**
+ * 自定义分页列表查询
+ * @param query 分页查询对象
+ * @param smsRecord
+ * @return
+ */
+ @ApiOperation(value="短信发送记录-自定义分页列表查询", notes="短信发送记录-自定义分页列表查询")
+ @GetMapping(value = "/msgPage")
+ public R msgPage(SmsRecordVO smsRecord, Query query) {
+ return R.data(smsRecordService.msgPage(Condition.getPage(query), smsRecord));
+ }
+
}
--
Gitblit v1.9.3