Merge remote-tracking branch 'origin/master-v4' into master-v4

陶杰

2024-12-30 086adfdf1d5340a3503da5b5ebcae9073775450e

 src/main/java/com/mzl/flower/web/v2/sms/SmsTaskDetailController.java

@@ -1,12 +1,10 @@
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.SmsTaskDetailQueryDTO;
import com.mzl.flower.dto.request.sms.SmsTaskQueryDTO;
import com.mzl.flower.dto.response.sms.SmsPhoneResultVO;
import com.mzl.flower.dto.response.sms.SmsTaskDetailVO;
import com.mzl.flower.service.sms.SmsTaskDetailService;
@@ -15,16 +13,16 @@
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.validation.constraints.NotNull;

/**
 * @author @TaoJie
 * @since 2024-12-25
 */
@Api(value = "任务详情管理", tags = "任务详情管理")
@Api(value = "短信任务详情管理", tags = "短信任务详情管理")
@RestController
@RequestMapping("/v2/sms-task-detail")
@RequiredArgsConstructor
@@ -33,13 +31,14 @@
    private final SmsTaskDetailService smsTaskDetailService;

    @GetMapping("/list")
    @ApiOperation(value = "任务详情列表", httpMethod = "GET")
    @ApiOperation(value = "短信任务详情列表", httpMethod = "GET")
    public ResponseEntity<ReturnDataDTO<Page<SmsPhoneResultVO>>> getSmsTaskList(Page page, SmsTaskDetailQueryDTO dto) {
        return returnData(R.SUCCESS.getCode(), smsTaskDetailService.queryPage(dto, page));
    }
    @GetMapping("/taskStatistics")
    @ApiOperation(value = "任务详情列表", httpMethod = "GET")
    public ResponseEntity<ReturnDataDTO<SmsTaskDetailVO> >taskStatistics(@NotNull(message = "id不能为空") Long id ) {

    @GetMapping("/taskStatistics/{id}")
    @ApiOperation(value = "短信任务详情列表", httpMethod = "GET")
    public ResponseEntity<ReturnDataDTO<SmsTaskDetailVO>> taskStatistics(@PathVariable(name = "id") Long id) {
        return returnData(R.SUCCESS.getCode(), smsTaskDetailService.getCountBySmsTaskId(id));
    }