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/SmsTaskController.java | 48 +++++++++++++++++++++++++++++++++---------------
1 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/mzl/flower/web/v2/sms/SmsTaskController.java b/src/main/java/com/mzl/flower/web/v2/sms/SmsTaskController.java
index b43b2fb..776f82f 100644
--- a/src/main/java/com/mzl/flower/web/v2/sms/SmsTaskController.java
+++ b/src/main/java/com/mzl/flower/web/v2/sms/SmsTaskController.java
@@ -1,29 +1,26 @@
package com.mzl.flower.web.v2.sms;
-
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.mzl.flower.base.BaseController;
import com.mzl.flower.base.R;
import com.mzl.flower.base.ReturnDataDTO;
import com.mzl.flower.dto.request.sms.SmsTaskDTO;
import com.mzl.flower.dto.request.sms.SmsTaskQueryDTO;
-import com.mzl.flower.dto.request.sms.SmsTemplateDTO;
-import com.mzl.flower.dto.request.sms.SmsTemplateQueryDTO;
+import com.mzl.flower.dto.response.coupon.CouponTemplateUserVO;
+import com.mzl.flower.dto.response.coupon.CouponTemplateVO;
+import com.mzl.flower.dto.response.sms.SmsSelectVO;
import com.mzl.flower.dto.response.sms.SmsTaskVO;
-import com.mzl.flower.entity.SmsTemplateDO;
import com.mzl.flower.service.sms.SmsTaskService;
-import com.mzl.flower.service.sms.SmsTemplateService;
+import com.mzl.flower.utils.ConverterUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
-import com.mzl.flower.entity.SmsTaskDO;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Positive;
+import java.io.IOException;
+
/**
* @author @TaoJie
@@ -36,32 +33,53 @@
public class SmsTaskController extends BaseController {
private final SmsTaskService smsTaskService;
+
@PostMapping("/new")
- @ApiOperation(value = "保存短信任务模板", httpMethod = "POST")
- public ResponseEntity<ReturnDataDTO> create(@RequestBody SmsTaskDTO smsTaskDTO) {
+ @ApiOperation(value = "保存短信任务", httpMethod = "POST")
+ public ResponseEntity<ReturnDataDTO> create(@RequestBody SmsTaskDTO smsTaskDTO) throws IOException {
smsTaskService.saveSmsTask(smsTaskDTO);
return returnData(R.SUCCESS.getCode(), null);
}
@PostMapping(value = "/edit")
- @ApiOperation(value = "更新短信任务模板", httpMethod = "POST")
- public ResponseEntity<ReturnDataDTO> update(@RequestBody SmsTaskDTO smsTaskDTO) {
+ @ApiOperation(value = "更新短信任务", httpMethod = "POST")
+ public ResponseEntity<ReturnDataDTO> update(@RequestBody SmsTaskDTO smsTaskDTO) throws IOException {
smsTaskService.updateSmsTask(smsTaskDTO);
return returnData(R.SUCCESS.getCode(), null);
}
@GetMapping(value = "/delete")
- @ApiOperation(value = "删除短信任务模板 ", httpMethod = "GET", notes = "ID")
+ @ApiOperation(value = "删除短信任务 ", httpMethod = "GET", notes = "ID")
public ResponseEntity<ReturnDataDTO> delete(@NotNull(message = "id不能为空") Long id) {
smsTaskService.deleteSmsTask(id);
return returnData(R.SUCCESS.getCode(), null);
}
@GetMapping("/list")
- @ApiOperation(value = "短信模板任务列表", httpMethod = "GET")
+ @ApiOperation(value = "短信任务列表", httpMethod = "GET")
public ResponseEntity<ReturnDataDTO<Page<SmsTaskVO>>> getSmsTaskList(Page page, SmsTaskQueryDTO dto) {
return returnData(R.SUCCESS.getCode(), smsTaskService.queryPage(dto, page));
}
+ @PostMapping("/publish")
+ @ApiOperation(value = "发布短信任务", httpMethod = "POST")
+ public ResponseEntity<ReturnDataDTO> publish(@RequestBody SmsTaskDTO smsTaskDTO) {
+ smsTaskService.publishSmsTask(smsTaskDTO);
+ return returnData(R.SUCCESS.getCode(), null);
+ }
+
+ @GetMapping("/select/{id}")
+ @ApiOperation(value = "任务筛选详情列表", httpMethod = "GET")
+ public ResponseEntity<ReturnDataDTO<SmsSelectVO>> selectList(@PathVariable(name = "id") Long id) {
+ return returnData(R.SUCCESS.getCode(), smsTaskService.getSelectList(id));
+ }
+
+
+ @GetMapping("/{id}")
+ @ApiOperation(value = "详情", notes = "详情")
+ public ResponseEntity<ReturnDataDTO> get(@PathVariable Long id) {
+ SmsTaskVO smsTaskVO = smsTaskService.getDetailById(id);
+ return returnData(R.SUCCESS.getCode(), smsTaskVO);
+ }
}
--
Gitblit v1.9.3