diff --git a/dao/src/main/java/cn/bunny/dao/dto/system/email/EmailUsersAddDto.java b/dao/src/main/java/cn/bunny/dao/dto/system/email/EmailUsersAddDto.java index 8e2113a..e38e0b7 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/system/email/EmailUsersAddDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/system/email/EmailUsersAddDto.java @@ -20,9 +20,6 @@ public class EmailUsersAddDto { @NotNull(message = "邮箱不能为空") private String email; - @Schema(name = "emailTemplate", title = "邮件模板") - private Long emailTemplate; - @Schema(name = "password", title = "密码") @NotBlank(message = "密码不能为空") @NotNull(message = "密码不能为空") diff --git a/dao/src/main/java/cn/bunny/dao/dto/system/email/EmailUsersUpdateDto.java b/dao/src/main/java/cn/bunny/dao/dto/system/email/EmailUsersUpdateDto.java index 7c1118a..e6867ee 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/system/email/EmailUsersUpdateDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/system/email/EmailUsersUpdateDto.java @@ -24,9 +24,6 @@ public class EmailUsersUpdateDto { @NotNull(message = "邮箱不能为空") private String email; - @Schema(name = "emailTemplate", title = "邮件模板") - private Long emailTemplate; - @Schema(name = "password", title = "密码") @NotBlank(message = "密码不能为空") @NotNull(message = "密码不能为空") diff --git a/dao/src/main/java/cn/bunny/dao/entity/system/EmailUsers.java b/dao/src/main/java/cn/bunny/dao/entity/system/EmailUsers.java index dec84a3..94b9711 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/system/EmailUsers.java +++ b/dao/src/main/java/cn/bunny/dao/entity/system/EmailUsers.java @@ -25,9 +25,6 @@ public class EmailUsers extends BaseEntity { @Schema(name = "email", title = "邮箱") private String email; - @Schema(name = "emailTemplate", title = "使用邮件模板") - private Long emailTemplate; - @Schema(name = "password", title = "密码") private String password; diff --git a/dao/src/main/java/cn/bunny/dao/vo/system/email/EmailUsersVo.java b/dao/src/main/java/cn/bunny/dao/vo/system/email/EmailUsersVo.java index a5dd529..b71d2ba 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/system/email/EmailUsersVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/system/email/EmailUsersVo.java @@ -1,9 +1,6 @@ package cn.bunny.dao.vo.system.email; import cn.bunny.dao.vo.BaseVo; -import com.alibaba.fastjson2.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; @@ -18,11 +15,6 @@ public class EmailUsersVo extends BaseVo { @Schema(name = "email", title = "邮箱") private String email; - @Schema(name = "emailTemplate", title = "使用邮件模板") - @JsonFormat(shape = JsonFormat.Shape.STRING) - @JSONField(serializeUsing = ToStringSerializer.class) - private Long emailTemplate; - @Schema(name = "password", title = "密码") private String password; diff --git a/service/src/main/java/cn/bunny/services/controller/EmailTemplateController.java b/service/src/main/java/cn/bunny/services/controller/EmailTemplateController.java index fee72be..74dc914 100644 --- a/service/src/main/java/cn/bunny/services/controller/EmailTemplateController.java +++ b/service/src/main/java/cn/bunny/services/controller/EmailTemplateController.java @@ -49,13 +49,6 @@ public class EmailTemplateController { return Mono.just(Result.success(pageResult)); } - @Operation(summary = "查询所有邮件模板", description = "查询所有邮件模板") - @GetMapping("getAllEmailTemplates") - public Mono>> getAllEmailTemplates() { - List voList = emailTemplateService.getAllEmailTemplates(); - return Mono.just(Result.success(voList)); - } - @Operation(summary = "添加邮件模板表", description = "添加邮件模板表") @PostMapping("addEmailTemplate") public Mono> addEmailTemplate(@Valid @RequestBody EmailTemplateAddDto dto) { diff --git a/service/src/main/java/cn/bunny/services/service/EmailTemplateService.java b/service/src/main/java/cn/bunny/services/service/EmailTemplateService.java index 5e1ec2e..f8fcded 100644 --- a/service/src/main/java/cn/bunny/services/service/EmailTemplateService.java +++ b/service/src/main/java/cn/bunny/services/service/EmailTemplateService.java @@ -49,11 +49,4 @@ public interface EmailTemplateService extends IService { * @param ids 删除id列表 */ void deleteEmailTemplate(List ids); - - /** - * * 查询所有邮件模板 - * - * @return 邮箱模板返回内容列表 - */ - List getAllEmailTemplates(); } diff --git a/service/src/main/java/cn/bunny/services/service/impl/EmailTemplateServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/EmailTemplateServiceImpl.java index 762e1da..004704d 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/EmailTemplateServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/EmailTemplateServiceImpl.java @@ -100,21 +100,7 @@ public class EmailTemplateServiceImpl extends ServiceImpl ids) { // 判断数据请求是否为空 if (ids.isEmpty()) throw new BunnyException(ResultCodeEnum.REQUEST_IS_EMPTY); - + baseMapper.deleteBatchIdsWithPhysics(ids); } - - /** - * * 查询所有邮件模板 - * - * @return 邮箱模板返回内容列表 - */ - @Override - public List getAllEmailTemplates() { - return list().stream().map(emailTemplate -> { - EmailTemplateVo emailTemplateVo = new EmailTemplateVo(); - BeanUtils.copyProperties(emailTemplate, emailTemplateVo); - return emailTemplateVo; - }).toList(); - } } diff --git a/service/src/main/resources/mapper/EmailUsersMapper.xml b/service/src/main/resources/mapper/EmailUsersMapper.xml index ee78089..b04c876 100644 --- a/service/src/main/resources/mapper/EmailUsersMapper.xml +++ b/service/src/main/resources/mapper/EmailUsersMapper.xml @@ -11,7 +11,6 @@ - @@ -21,7 +20,7 @@ - id, create_time, update_time, create_user, update_user, is_deleted, email, email_template, password, host, port, smtp_agreement, is_default + id, create_time, update_time, create_user, update_user, is_deleted, email, password, host, port, smtp_agreement, is_default