From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog
---
src/main/java/org/springblade/modules/sms/controller/SmsSendController.java | 45 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/sms/controller/SmsSendController.java b/src/main/java/org/springblade/modules/sms/controller/SmsSendController.java
index 37f0288..eaa5b85 100644
--- a/src/main/java/org/springblade/modules/sms/controller/SmsSendController.java
+++ b/src/main/java/org/springblade/modules/sms/controller/SmsSendController.java
@@ -20,6 +20,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.api.R;
import org.springblade.modules.sms.service.ISmsSendService;
@@ -52,8 +53,31 @@
}
/**
+ * 短信模版表 详情
+ */
+ @GetMapping("/loginSend")
+ @ApiOperationSupport(order = 1)
+ @ApiOperation(value = "登录发送短信验证码")
+ public R<SmsTemplateVO> loginSend(@RequestParam String phone) {
+ Boolean aBoolean = iSmsSendService.loginSendVerificationCode(phone);
+ return R.status(aBoolean);
+ }
+
+ /**
+ * 短信模版表 详情
+ */
+ @GetMapping("/checkCode")
+ @ApiOperationSupport(order = 1)
+ @ApiOperation(value = "校验验证")
+ public R<Boolean> checkCode(@RequestParam String phone, @RequestParam String code) {
+ String result = iSmsSendService.checkCode(phone, code);
+ return R.data(StringUtils.isNotBlank(result) ? false : true, result);
+ }
+
+ /**
* 发送居住申请通知
- * @param templateId 模版id
+ *
+ * @param templateId 模版id
* @param residenceId 居住证申请记录id
* @return
*/
@@ -61,13 +85,12 @@
@ApiOperationSupport(order = 1)
@ApiOperation(value = "发送居住申请通知")
public R<SmsTemplateVO> sendNotice(@RequestParam("templateId") Long templateId,
- @RequestParam(value = "residenceId",required = false) Long residenceId) {
- Boolean aBoolean = iSmsSendService.sendNotice(templateId,residenceId);
+ @RequestParam(value = "residenceId", required = false) Long residenceId) {
+ Boolean aBoolean = iSmsSendService.sendNotice(templateId, residenceId);
return R.status(aBoolean);
}
/**
- *
* @param templateId
* @param placeSelfCheckId
* @return
@@ -76,10 +99,20 @@
@ApiOperationSupport(order = 1)
@ApiOperation(value = "发送整改完成通知")
public R<SmsTemplateVO> sendRectificationNotice(@RequestParam("templateId") Long templateId,
- @RequestParam(value = "placeSelfCheckId",required = false) Long placeSelfCheckId) {
- Boolean aBoolean = iSmsSendService.sendRectificationNotice(templateId,placeSelfCheckId);
+ @RequestParam(value = "placeSelfCheckId", required = false) Long placeSelfCheckId) {
+ Boolean aBoolean = iSmsSendService.sendRectificationNotice(templateId, placeSelfCheckId);
return R.status(aBoolean);
}
+
+ @GetMapping("/batchSendNotice")
+ @ApiOperationSupport(order = 1)
+ @ApiOperation(value = "批量发送通知")
+ public void batchSendNotice(@RequestParam("smsTaskId") Long smsTaskId) {
+ Boolean aBoolean = iSmsSendService.batchSendNotice( smsTaskId);
+ // return R.status(aBoolean);
+ }
+
+
}
--
Gitblit v1.9.3