|
@@ -3,10 +3,12 @@ package com.citu.module.system.controller.admin.mail;
|
|
import com.citu.framework.common.pojo.CommonResult;
|
|
import com.citu.framework.common.pojo.CommonResult;
|
|
import com.citu.framework.common.pojo.PageResult;
|
|
import com.citu.framework.common.pojo.PageResult;
|
|
import com.citu.framework.common.util.object.BeanUtils;
|
|
import com.citu.framework.common.util.object.BeanUtils;
|
|
|
|
+import com.citu.framework.common.util.string.StrUtils;
|
|
import com.citu.module.system.controller.admin.mail.vo.log.MailLogPageReqVO;
|
|
import com.citu.module.system.controller.admin.mail.vo.log.MailLogPageReqVO;
|
|
import com.citu.module.system.controller.admin.mail.vo.log.MailLogRespVO;
|
|
import com.citu.module.system.controller.admin.mail.vo.log.MailLogRespVO;
|
|
import com.citu.module.system.dal.dataobject.mail.MailLogDO;
|
|
import com.citu.module.system.dal.dataobject.mail.MailLogDO;
|
|
import com.citu.module.system.service.mail.MailLogService;
|
|
import com.citu.module.system.service.mail.MailLogService;
|
|
|
|
+import com.citu.module.system.service.mail.MailSendService;
|
|
import io.swagger.v3.oas.annotations.Operation;
|
|
import io.swagger.v3.oas.annotations.Operation;
|
|
import io.swagger.v3.oas.annotations.Parameter;
|
|
import io.swagger.v3.oas.annotations.Parameter;
|
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
|
@@ -18,6 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
import javax.validation.Valid;
|
|
import javax.validation.Valid;
|
|
|
|
+import java.util.List;
|
|
|
|
|
|
import static com.citu.framework.common.pojo.CommonResult.success;
|
|
import static com.citu.framework.common.pojo.CommonResult.success;
|
|
|
|
|
|
@@ -29,6 +32,9 @@ public class MailLogController {
|
|
@Resource
|
|
@Resource
|
|
private MailLogService mailLogService;
|
|
private MailLogService mailLogService;
|
|
|
|
|
|
|
|
+ @Resource
|
|
|
|
+ private MailSendService mailSendService;
|
|
|
|
+
|
|
@GetMapping("/page")
|
|
@GetMapping("/page")
|
|
@Operation(summary = "获得邮箱日志分页")
|
|
@Operation(summary = "获得邮箱日志分页")
|
|
@PreAuthorize("@ss.hasPermission('system:mail-log:query')")
|
|
@PreAuthorize("@ss.hasPermission('system:mail-log:query')")
|
|
@@ -46,4 +52,20 @@ public class MailLogController {
|
|
return success(BeanUtils.toBean(log, MailLogRespVO.class));
|
|
return success(BeanUtils.toBean(log, MailLogRespVO.class));
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @GetMapping("/retry ")
|
|
|
|
+ @Operation(summary = "重新发送邮件")
|
|
|
|
+ @Parameter(name = "ids", description = "编号", required = true, example = "1024,1")
|
|
|
|
+ @PreAuthorize("@ss.hasPermission('system:mail-log:query')")
|
|
|
|
+ public CommonResult<Boolean> retry(@RequestParam("ids") String ids) {
|
|
|
|
+ List<Long> idList = StrUtils.splitToLong(ids);
|
|
|
|
+ for (Long id : idList) {
|
|
|
|
+ MailLogDO log = mailLogService.getMailLog(id);
|
|
|
|
+ if (null != log) {
|
|
|
|
+ mailSendService.sendSingleMailToAdmin(log.getToMail(), log.getUserId(),
|
|
|
|
+ log.getTemplateCode(), log.getTemplateParams());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ return success(true);
|
|
|
|
+ }
|
|
|
|
+
|
|
}
|
|
}
|