From b9903ead016b8b1aa68eb04b48fca3b53fdab0d3 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 30 十二月 2024 10:42:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/java/com/mzl/flower/web/v2/sms/SmsTemplateController.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/mzl/flower/web/v2/sms/SmsTemplateController.java b/src/main/java/com/mzl/flower/web/v2/sms/SmsTemplateController.java
index b0adbdf..5f9aaf0 100644
--- a/src/main/java/com/mzl/flower/web/v2/sms/SmsTemplateController.java
+++ b/src/main/java/com/mzl/flower/web/v2/sms/SmsTemplateController.java
@@ -13,6 +13,7 @@
import com.mzl.flower.base.ReturnDataDTO;
import com.mzl.flower.dto.request.sms.SmsTemplateDTO;
import com.mzl.flower.dto.request.sms.SmsTemplateQueryDTO;
+import com.mzl.flower.dto.response.sms.SmsTemplateListVO;
import com.mzl.flower.entity.SmsTemplateDO;
import com.mzl.flower.service.sms.SmsTemplateService;
import io.swagger.annotations.Api;
@@ -25,16 +26,16 @@
import java.util.List;
/**
-* @author @TaoJie
-* @since 2024-12-25
-*/
+ * @author @TaoJie
+ * @since 2024-12-25
+ */
@Api(value = "短信模板管理", tags = "短信模板管理")
@RestController
@RequestMapping("/v2/sms-template")
@RequiredArgsConstructor
public class SmsTemplateController extends BaseController {
- private final SmsTemplateService smsTemplateService;
+ private final SmsTemplateService smsTemplateService;
@PostMapping("/new")
@ApiOperation(value = "保存短信模板", httpMethod = "POST")
@@ -63,7 +64,7 @@
return returnData(R.SUCCESS.getCode(), smsTemplateService.queryPage(dto, page));
}
- @GetMapping("/template/list")
+ @GetMapping("/aliyun/list")
@ApiOperation(value = "短信模板列表", httpMethod = "GET")
public ResponseEntity<ReturnDataDTO<Page<SmsTemplateDO>>> getALSmsTemplateList(Page page, SmsTemplateQueryDTO dto) throws Exception {
Client client = createClient();
@@ -87,4 +88,11 @@
return new Client(config);
}
+ @GetMapping("/templateName/all")
+ @ApiOperation(value = "短信模板下拉列表", httpMethod = "GET")
+ public ResponseEntity<ReturnDataDTO> getSmsTemplateNameList() {
+ List<SmsTemplateListVO> allTemplateName = smsTemplateService.getAllTemplateName();
+ return returnData(R.SUCCESS.getCode(), allTemplateName);
+ }
+
}
--
Gitblit v1.9.3