diff --git a/auth-api/src/main/java/cn/bunny/services/controller/message/MessageController.java b/auth-api/src/main/java/cn/bunny/services/controller/message/MessageController.java index 9ecffc7..7289037 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/message/MessageController.java +++ b/auth-api/src/main/java/cn/bunny/services/controller/message/MessageController.java @@ -1,12 +1,11 @@ package cn.bunny.services.controller.message; import cn.bunny.services.aop.annotation.PermissionTag; +import cn.bunny.services.domain.common.ValidationGroups; import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.message.dto.MessageAddDto; import cn.bunny.services.domain.message.dto.MessageDto; -import cn.bunny.services.domain.message.dto.MessageUpdateDto; import cn.bunny.services.domain.message.entity.Message; import cn.bunny.services.domain.message.vo.MessageDetailVo; import cn.bunny.services.domain.message.vo.MessageReceivedWithUserVo; @@ -17,7 +16,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; -import jakarta.validation.Valid; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -55,14 +54,14 @@ public class MessageController { @Operation(summary = "添加系统消息", description = "添加系统消息") @PostMapping() - public Result addMessage(@Valid @RequestBody MessageAddDto dto) { - messageService.addMessage(dto); + public Result createMessage(@Validated(ValidationGroups.Add.class) @RequestBody MessageDto dto) { + messageService.createMessage(dto); return Result.success(ResultCodeEnum.CREATE_SUCCESS); } @Operation(summary = "更系统消息", description = "更新系统消息") @PutMapping() - public Result updateMessage(@Valid @RequestBody MessageUpdateDto dto) { + public Result updateMessage(@Validated(ValidationGroups.Update.class) @RequestBody MessageDto dto) { messageService.updateMessage(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } diff --git a/auth-api/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java b/auth-api/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java index 78ab30a..610536a 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java +++ b/auth-api/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java @@ -83,7 +83,7 @@ public class MessageReceivedController { @Operation(summary = "用户将消息标为已读", description = "用户将消息标为已读") @PutMapping("private/user/messages/read-status") - public Result markAsReadByUser(@Valid @RequestBody List ids) { + public Result markAsReadByUser(@RequestBody List ids) { messageReceivedService.markAsReadByUser(ids); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } diff --git a/auth-api/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java b/auth-api/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java index 4f55aba..9464bb0 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java +++ b/auth-api/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java @@ -1,12 +1,11 @@ package cn.bunny.services.controller.message; import cn.bunny.services.aop.annotation.PermissionTag; +import cn.bunny.services.domain.common.ValidationGroups; import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.message.dto.MessageTypeAddDto; import cn.bunny.services.domain.message.dto.MessageTypeDto; -import cn.bunny.services.domain.message.dto.MessageTypeUpdateDto; import cn.bunny.services.domain.message.entity.MessageType; import cn.bunny.services.domain.message.vo.MessageTypeVo; import cn.bunny.services.service.message.MessageTypeService; @@ -15,7 +14,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; -import jakarta.validation.Valid; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -54,15 +53,15 @@ public class MessageTypeController { @Operation(summary = "添加消息类型", description = "添加系统消息类型") @PermissionTag(permission = "messageType:add") @PostMapping() - public Result addMessageType(@Valid @RequestBody MessageTypeAddDto dto) { - messageTypeService.addMessageType(dto); + public Result createMessageType(@Validated(ValidationGroups.Add.class) @RequestBody MessageTypeDto dto) { + messageTypeService.createMessageType(dto); return Result.success(ResultCodeEnum.CREATE_SUCCESS); } @Operation(summary = "更新消息类型", description = "更新系统消息类型") @PermissionTag(permission = "messageType:update") @PutMapping() - public Result updateMessageType(@Valid @RequestBody MessageTypeUpdateDto dto) { + public Result updateMessageType(@Validated(ValidationGroups.Update.class) @RequestBody MessageTypeDto dto) { messageTypeService.updateMessageType(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } diff --git a/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageAddDto.java b/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageAddDto.java deleted file mode 100644 index 9adaf1e..0000000 --- a/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageAddDto.java +++ /dev/null @@ -1,57 +0,0 @@ -package cn.bunny.services.domain.message.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.ArrayList; -import java.util.List; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Schema(name = "MessageAddDto对象", title = "添加系统消息", description = "添加系统消息") -public class MessageAddDto { - - @Schema(name = "title", title = "消息标题") - @NotBlank(message = "消息标题 不能为空") - private String title; - - @Schema(name = "receivedUserIds", title = "接收人用户ID") - private List receivedUserIds = new ArrayList<>(); - - @Schema(name = "sendUserId", title = "发送人用户ID") - private Long sendUserId; - - @Schema(name = "messageTypeId", title = "消息类型") - @NotNull(message = "消息类型 不能为空") - private Long messageTypeId; - - @Schema(name = "cover", title = "封面") - private String cover; - - @Schema(name = "summary", title = "消息简介") - @NotBlank(message = "消息简介 不能为空") - private String summary; - - @Schema(name = "content", title = "消息内容") - @NotBlank(message = "消息内容 不能为空") - private String content; - - @Schema(name = "editorType", title = "编辑器类型") - @NotBlank(message = "编辑器类型 不能为空") - private String editorType; - - @Schema(name = "status", title = "0:未读 1:已读") - private Boolean status = false; - - @Schema(name = "level", title = "消息等级") - private String level; - - @Schema(name = "extra", title = "消息等级详情") - private String extra; - -} \ No newline at end of file diff --git a/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageDto.java b/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageDto.java index 43bfdbf..08d4cce 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageDto.java @@ -1,11 +1,17 @@ package cn.bunny.services.domain.message.dto; +import cn.bunny.services.domain.common.ValidationGroups; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.ArrayList; +import java.util.List; + @Data @AllArgsConstructor @NoArgsConstructor @@ -13,14 +19,42 @@ import lombok.NoArgsConstructor; @Schema(name = "MessageDto对象", title = "消息分页查询", description = "消息分页查询") public class MessageDto { + @Schema(name = "id", title = "主键") + @NotNull(message = "id不能为空", groups = {ValidationGroups.Update.class}) + private Long id; + @Schema(name = "title", title = "消息标题") + @NotBlank(message = "消息标题 不能为空", groups = {ValidationGroups.Add.class, ValidationGroups.Update.class}) private String title; - @Schema(name = "sendNickname", title = "发送人用户昵称") - private String sendNickname; + @Schema(name = "receivedUserIds", title = "接收人用户ID") + private List receivedUserIds = new ArrayList<>(); - @Schema(name = "messageType", title = "消息类型") - private String messageType; + @Schema(name = "sendUserId", title = "发送人用户ID") + @NotNull(message = "发送人用户ID 不能为空", groups = {ValidationGroups.Update.class}) + private Long sendUserId; + + @Schema(name = "messageTypeId", title = "消息类型") + @NotNull(message = "消息类型 不能为空", groups = {ValidationGroups.Add.class, ValidationGroups.Update.class}) + private Long messageTypeId; + + @Schema(name = "cover", title = "封面") + private String cover; + + @Schema(name = "summary", title = "消息简介") + @NotBlank(message = "消息简介 不能为空", groups = {ValidationGroups.Add.class, ValidationGroups.Update.class}) + private String summary; + + @Schema(name = "content", title = "消息内容") + @NotBlank(message = "消息内容 不能为空", groups = {ValidationGroups.Add.class, ValidationGroups.Update.class}) + private String content; + + @Schema(name = "editorType", title = "编辑器类型") + @NotBlank(message = "编辑器类型 不能为空", groups = {ValidationGroups.Add.class, ValidationGroups.Update.class}) + private String editorType; + + @Schema(name = "status", title = "0:未读 1:已读") + private Boolean status = false; @Schema(name = "level", title = "消息等级") private String level; @@ -28,7 +62,10 @@ public class MessageDto { @Schema(name = "extra", title = "消息等级详情") private String extra; - @Schema(name = "editorType", title = "编辑器类型") - private String editorType; + @Schema(name = "sendNickname", title = "发送人用户昵称") + private String sendNickname; + + @Schema(name = "messageType", title = "消息类型") + private String messageType; } diff --git a/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageTypeAddDto.java b/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageTypeAddDto.java deleted file mode 100644 index 5909127..0000000 --- a/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageTypeAddDto.java +++ /dev/null @@ -1,29 +0,0 @@ -package cn.bunny.services.domain.message.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Schema(name = "MessageTypeAddDto对象", title = "添加系统消息类型", description = "添加系统消息类型") -public class MessageTypeAddDto { - - @Schema(name = "messageName", title = "消息名称") - @NotBlank(message = "消息名称 不能为空") - private String messageName; - - @Schema(name = "messageType", title = "sys:系统消息,user用户消息") - @NotBlank(message = "消息类型 不能为空") - private String messageType; - - @Schema(name = "summary", title = "消息备注") - private String summary; - - @Schema(name = "status", title = "消息类型") - private Boolean status = true; - -} \ No newline at end of file diff --git a/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageTypeDto.java b/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageTypeDto.java index 249a9db..c10bcd4 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageTypeDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageTypeDto.java @@ -1,6 +1,9 @@ package cn.bunny.services.domain.message.dto; +import cn.bunny.services.domain.common.ValidationGroups; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -13,18 +16,24 @@ import lombok.NoArgsConstructor; @Schema(name = "MessageType对象", title = "系统消息类型分页查询", description = "系统消息类型分页查询") public class MessageTypeDto { - @Schema(name = "status", title = "1:启用 0:禁用") - private Boolean status; + @Schema(name = "id", title = "主键") + @NotNull(message = "id不能为空", groups = {ValidationGroups.Update.class}) + private Long id; @Schema(name = "messageName", title = "消息名称") + @NotBlank(message = "消息名称 不能为空", groups = {ValidationGroups.Add.class}) private String messageName; @Schema(name = "messageType", title = "sys:系统消息,user用户消息") + @NotBlank(message = "消息类型 不能为空", groups = {ValidationGroups.Add.class}) private String messageType; @Schema(name = "summary", title = "消息备注") private String summary; + @Schema(name = "status", title = "消息类型") + private Boolean status; + } diff --git a/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageTypeUpdateDto.java b/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageTypeUpdateDto.java deleted file mode 100644 index b14cb8b..0000000 --- a/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageTypeUpdateDto.java +++ /dev/null @@ -1,33 +0,0 @@ -package cn.bunny.services.domain.message.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -@Schema(name = "MessageTypeUpdateDto对象", title = "更新系统消息类型", description = "更新系统消息类型") -public class MessageTypeUpdateDto { - - @Schema(name = "id", title = "主键") - @NotNull(message = "id不能为空") - private Long id; - - @Schema(name = "status", title = "1:启用 0:禁用") - private Boolean status; - - @Schema(name = "messageName", title = "消息名称") - private String messageName; - - @Schema(name = "messageType", title = "sys:系统消息,user用户消息") - private String messageType; - - @Schema(name = "summary", title = "消息备注") - private String summary; - -} \ No newline at end of file diff --git a/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageUpdateDto.java b/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageUpdateDto.java deleted file mode 100644 index 5a49bef..0000000 --- a/auth-core/src/main/java/cn/bunny/services/domain/message/dto/MessageUpdateDto.java +++ /dev/null @@ -1,65 +0,0 @@ -package cn.bunny.services.domain.message.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.List; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -@Schema(name = "MessageUpdateDto对象", title = "更新系统消息", description = "系统消息") -public class MessageUpdateDto { - - @Schema(name = "id", title = "主键") - @NotNull(message = "id不能为空") - private Long id; - - @Schema(name = "title", title = "消息标题") - @NotNull(message = "消息标题 不能为空") - @NotBlank(message = "消息标题 不能为空") - private String title; - - @Schema(name = "receivedUserIds", title = "接收人用户ID列表") - private List receivedUserIds; - - @Schema(name = "sendUserId", title = "发送人用户ID") - @NotNull(message = "发送人用户ID 不能为空") - private Long sendUserId; - - @Schema(name = "messageTypeId", title = "消息类型") - @NotNull(message = "消息类型 不能为空") - private Long messageTypeId; - - @Schema(name = "cover", title = "封面") - private String cover; - - @Schema(name = "summary", title = "消息简介") - @NotBlank(message = "消息简介 不能为空") - @NotNull(message = "消息简介 不能为空") - private String summary; - - @Schema(name = "content", title = "消息内容") - @NotBlank(message = "消息内容 不能为空") - @NotNull(message = "消息内容 不能为空") - private String content; - - @Schema(name = "editorType", title = "编辑器类型") - @NotBlank(message = "编辑器类型 不能为空") - @NotNull(message = "编辑器类型 不能为空") - private String editorType; - - @Schema(name = "level", title = "消息等级") - private String level; - - @Schema(name = "extra", title = "消息等级详情") - private String extra; - -} - diff --git a/service/src/main/java/cn/bunny/services/service/configuration/EmailTemplateService.java b/service/src/main/java/cn/bunny/services/service/configuration/EmailTemplateService.java index 0bda51b..4a55f5b 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/EmailTemplateService.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/EmailTemplateService.java @@ -6,7 +6,6 @@ import cn.bunny.services.domain.configuration.entity.EmailTemplate; import cn.bunny.services.domain.configuration.vo.EmailTemplateVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import jakarta.validation.Valid; import java.util.List; import java.util.Map; @@ -33,14 +32,14 @@ public interface EmailTemplateService extends IService { * * @param dto 添加表单 */ - void createEmailTemplate(@Valid EmailTemplateDto dto); + void createEmailTemplate(EmailTemplateDto dto); /** * 更新邮件模板表 * * @param dto 更新表单 */ - void updateEmailTemplate(@Valid EmailTemplateDto dto); + void updateEmailTemplate(EmailTemplateDto dto); /** * 删除|批量删除邮件模板表类型 diff --git a/service/src/main/java/cn/bunny/services/service/configuration/EmailUsersService.java b/service/src/main/java/cn/bunny/services/service/configuration/EmailUsersService.java index 1ee315d..7803fb7 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/EmailUsersService.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/EmailUsersService.java @@ -6,7 +6,6 @@ import cn.bunny.services.domain.configuration.entity.EmailUsers; import cn.bunny.services.domain.configuration.vo.EmailUsersVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import jakarta.validation.Valid; import java.util.List; import java.util.Map; @@ -33,14 +32,14 @@ public interface EmailUsersService extends IService { * * @param dto 添加表单 */ - void createEmailUsers(@Valid EmailUsersDto dto); + void createEmailUsers(EmailUsersDto dto); /** * 更新邮箱用户发送配置 * * @param dto 更新表单 */ - void updateEmailUsers(@Valid EmailUsersDto dto); + void updateEmailUsers(EmailUsersDto dto); /** * 删除|批量删除邮箱用户发送配置类型 diff --git a/service/src/main/java/cn/bunny/services/service/configuration/I18nService.java b/service/src/main/java/cn/bunny/services/service/configuration/I18nService.java index 37e5b44..f3220da 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/I18nService.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/I18nService.java @@ -8,7 +8,6 @@ import cn.bunny.services.domain.configuration.entity.I18n; import cn.bunny.services.domain.configuration.vo.I18nVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import jakarta.validation.Valid; import org.springframework.http.ResponseEntity; import java.util.HashMap; @@ -72,5 +71,5 @@ public interface I18nService extends IService { * * @param dto 文件更新对象 */ - void uploadI18nFile(@Valid I18nUpdateByFileDto dto); + void uploadI18nFile(I18nUpdateByFileDto dto); } \ No newline at end of file diff --git a/service/src/main/java/cn/bunny/services/service/configuration/I18nTypeService.java b/service/src/main/java/cn/bunny/services/service/configuration/I18nTypeService.java index e816fdc..2b234b6 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/I18nTypeService.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/I18nTypeService.java @@ -4,7 +4,6 @@ import cn.bunny.services.domain.configuration.dto.I18nTypeDto; import cn.bunny.services.domain.configuration.entity.I18nType; import cn.bunny.services.domain.configuration.vo.I18nTypeVo; import com.baomidou.mybatisplus.extension.service.IService; -import jakarta.validation.Valid; import java.util.List; @@ -30,14 +29,14 @@ public interface I18nTypeService extends IService { * * @param dto 多语言类型添加 */ - void createI18nType(@Valid I18nTypeDto dto); + void createI18nType(I18nTypeDto dto); /** * 更新多语言类型 * * @param dto 多语言类型更新 */ - void updateI18nType(@Valid I18nTypeDto dto); + void updateI18nType(I18nTypeDto dto); /** * 删除多语言类型 diff --git a/service/src/main/java/cn/bunny/services/service/configuration/impl/EmailTemplateServiceImpl.java b/service/src/main/java/cn/bunny/services/service/configuration/impl/EmailTemplateServiceImpl.java index 9cc8866..67f946e 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/impl/EmailTemplateServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/impl/EmailTemplateServiceImpl.java @@ -14,7 +14,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import jakarta.validation.Valid; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -71,7 +70,7 @@ public class EmailTemplateServiceImpl extends ServiceImpl i @CacheEvict(cacheNames = CACHE_NAMES, key = "'i18nMap'", beforeInvocation = true), @CacheEvict(cacheNames = CACHE_NAMES, key = "'i18nTypeList'", beforeInvocation = true), }) - public void createI18nType(@Valid I18nTypeDto dto) { + public void createI18nType(I18nTypeDto dto) { String typeName = dto.getTypeName(); Boolean isDefault = dto.getIsDefault(); I18nType i18nType = new I18nType(); @@ -89,7 +88,7 @@ public class I18nTypeServiceImpl extends ServiceImpl i @CacheEvict(cacheNames = CACHE_NAMES, key = "'i18nMap'", beforeInvocation = true), @CacheEvict(cacheNames = CACHE_NAMES, key = "'i18nTypeList'", beforeInvocation = true), }) - public void updateI18nType(@Valid I18nTypeDto dto) { + public void updateI18nType(I18nTypeDto dto) { Long id = dto.getId(); Boolean isDefault = dto.getIsDefault(); I18nType i18nType = new I18nType(); diff --git a/service/src/main/java/cn/bunny/services/service/file/impl/FilesParDetailServiceImpl.java b/service/src/main/java/cn/bunny/services/service/file/impl/FilesParDetailServiceImpl.java index e5a0afa..8ee277b 100644 --- a/service/src/main/java/cn/bunny/services/service/file/impl/FilesParDetailServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/file/impl/FilesParDetailServiceImpl.java @@ -9,7 +9,6 @@ import cn.bunny.services.service.file.FilesParDetailService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import jakarta.validation.Valid; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -53,7 +52,7 @@ public class FilesParDetailServiceImpl extends ServiceImpl { * * @param dto 用户消息表单 */ - void updateMarkMessageReceived(@Valid MessageReceivedUpdateDto dto); + void updateMarkMessageReceived(MessageReceivedUpdateDto dto); /** * 管理删除用户接受的消息 diff --git a/service/src/main/java/cn/bunny/services/service/message/MessageService.java b/service/src/main/java/cn/bunny/services/service/message/MessageService.java index b1e23f5..55bfd99 100644 --- a/service/src/main/java/cn/bunny/services/service/message/MessageService.java +++ b/service/src/main/java/cn/bunny/services/service/message/MessageService.java @@ -1,9 +1,7 @@ package cn.bunny.services.service.message; import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.message.dto.MessageAddDto; import cn.bunny.services.domain.message.dto.MessageDto; -import cn.bunny.services.domain.message.dto.MessageUpdateDto; import cn.bunny.services.domain.message.entity.Message; import cn.bunny.services.domain.message.vo.MessageDetailVo; import cn.bunny.services.domain.message.vo.MessageReceivedWithUserVo; @@ -44,14 +42,14 @@ public interface MessageService extends IService { * * @param dto 添加表单 */ - void addMessage(MessageAddDto dto); + void createMessage(MessageDto dto); /** * * 更新系统消息 * * @param dto 更新表单 */ - void updateMessage(MessageUpdateDto dto); + void updateMessage(MessageDto dto); /** * * 删除|批量删除系统消息类型 diff --git a/service/src/main/java/cn/bunny/services/service/message/MessageTypeService.java b/service/src/main/java/cn/bunny/services/service/message/MessageTypeService.java index df977a6..2d57d4b 100644 --- a/service/src/main/java/cn/bunny/services/service/message/MessageTypeService.java +++ b/service/src/main/java/cn/bunny/services/service/message/MessageTypeService.java @@ -1,14 +1,11 @@ package cn.bunny.services.service.message; -import cn.bunny.services.domain.message.dto.MessageTypeAddDto; +import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.domain.message.dto.MessageTypeDto; -import cn.bunny.services.domain.message.dto.MessageTypeUpdateDto; import cn.bunny.services.domain.message.entity.MessageType; import cn.bunny.services.domain.message.vo.MessageTypeVo; -import cn.bunny.services.domain.common.model.vo.result.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import jakarta.validation.Valid; import java.util.List; @@ -34,14 +31,14 @@ public interface MessageTypeService extends IService { * * @param dto 添加表单 */ - void addMessageType(@Valid MessageTypeAddDto dto); + void createMessageType(MessageTypeDto dto); /** * * 更新系统消息类型 * * @param dto 更新表单 */ - void updateMessageType(@Valid MessageTypeUpdateDto dto); + void updateMessageType(MessageTypeDto dto); /** * * 删除|批量删除系统消息类型类型 diff --git a/service/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java b/service/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java index a12cf08..4fa149f 100644 --- a/service/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/message/impl/MessageReceivedServiceImpl.java @@ -17,7 +17,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import jakarta.validation.Valid; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -64,7 +63,7 @@ public class MessageReceivedServiceImpl extends ServiceImpl messageReceivedList = dto.getIds().stream().map(id -> { MessageReceived messageReceived = new MessageReceived(); messageReceived.setId(id); diff --git a/service/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java b/service/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java index e6df4f2..ef0911a 100644 --- a/service/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/message/impl/MessageServiceImpl.java @@ -4,9 +4,7 @@ import cn.bunny.services.context.BaseContext; import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.domain.common.model.entity.BaseEntity; import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.message.dto.MessageAddDto; import cn.bunny.services.domain.message.dto.MessageDto; -import cn.bunny.services.domain.message.dto.MessageUpdateDto; import cn.bunny.services.domain.message.entity.Message; import cn.bunny.services.domain.message.entity.MessageReceived; import cn.bunny.services.domain.message.vo.MessageDetailVo; @@ -141,7 +139,7 @@ public class MessageServiceImpl extends ServiceImpl impl * @param dto 系统消息添加 */ @Override - public void addMessage(MessageAddDto dto) { + public void createMessage(MessageDto dto) { // 如果发送人为空设置当前登录的人的ID if (dto.getSendUserId() == null) dto.setSendUserId(BaseContext.getUserId()); @@ -176,7 +174,7 @@ public class MessageServiceImpl extends ServiceImpl impl * @param dto 系统消息更新 */ @Override - public void updateMessage(MessageUpdateDto dto) { + public void updateMessage(MessageDto dto) { // 如果发送人为空设置当前登录的人的ID Long sendUserId = dto.getSendUserId(); if (sendUserId == null) dto.setSendUserId(BaseContext.getUserId()); diff --git a/service/src/main/java/cn/bunny/services/service/message/impl/MessageTypeServiceImpl.java b/service/src/main/java/cn/bunny/services/service/message/impl/MessageTypeServiceImpl.java index 2cafd1c..5565f59 100644 --- a/service/src/main/java/cn/bunny/services/service/message/impl/MessageTypeServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/message/impl/MessageTypeServiceImpl.java @@ -1,18 +1,15 @@ package cn.bunny.services.service.message.impl; -import cn.bunny.services.domain.message.dto.MessageTypeAddDto; +import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.domain.message.dto.MessageTypeDto; -import cn.bunny.services.domain.message.dto.MessageTypeUpdateDto; import cn.bunny.services.domain.message.entity.MessageType; import cn.bunny.services.domain.message.vo.MessageTypeVo; -import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.mapper.message.MessageTypeMapper; import cn.bunny.services.service.message.MessageTypeService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import jakarta.validation.Valid; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -56,7 +53,7 @@ public class MessageTypeServiceImpl extends ServiceImpl { * * @param dto 添加表单 */ - void addSchedulersGroup(@Valid SchedulersGroupAddDto dto); + void addSchedulersGroup(SchedulersGroupAddDto dto); /** * * 更新任务调度分组 * * @param dto 更新表单 */ - void updateSchedulersGroup(@Valid SchedulersGroupUpdateDto dto); + void updateSchedulersGroup(SchedulersGroupUpdateDto dto); /** * * 删除|批量删除任务调度分组类型 diff --git a/service/src/main/java/cn/bunny/services/service/schedule/SchedulersService.java b/service/src/main/java/cn/bunny/services/service/schedule/SchedulersService.java index 33aea92..bdf3a81 100644 --- a/service/src/main/java/cn/bunny/services/service/schedule/SchedulersService.java +++ b/service/src/main/java/cn/bunny/services/service/schedule/SchedulersService.java @@ -8,7 +8,6 @@ import cn.bunny.services.domain.quartz.entity.Schedulers; import cn.bunny.services.domain.quartz.vo.SchedulersVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import jakarta.validation.Valid; /** *

@@ -32,7 +31,7 @@ public interface SchedulersService extends IService { * * @param dto 添加表单 */ - void addSchedulers(@Valid SchedulersAddDto dto); + void addSchedulers(SchedulersAddDto dto); /** * * 暂停Schedulers任务 diff --git a/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java b/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java index b0d04b1..40f3266 100644 --- a/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/schedule/impl/SchedulersGroupServiceImpl.java @@ -1,17 +1,16 @@ package cn.bunny.services.service.schedule.impl; +import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.domain.quartz.dto.SchedulersGroupAddDto; import cn.bunny.services.domain.quartz.dto.SchedulersGroupDto; import cn.bunny.services.domain.quartz.dto.SchedulersGroupUpdateDto; import cn.bunny.services.domain.quartz.entity.SchedulersGroup; import cn.bunny.services.domain.quartz.vo.SchedulersGroupVo; -import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.mapper.schedule.SchedulersGroupMapper; import cn.bunny.services.service.schedule.SchedulersGroupService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import jakarta.validation.Valid; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -69,7 +68,7 @@ public class SchedulersGroupServiceImpl extends ServiceImpl { * * @param dto 添加表单 */ - void addDept(@Valid DeptAddDto dto); + void addDept(DeptAddDto dto); /** * * 更新部门 * * @param dto 更新表单 */ - void updateDept(@Valid DeptUpdateDto dto); + void updateDept(DeptUpdateDto dto); /** * * 删除|批量删除部门类型 diff --git a/service/src/main/java/cn/bunny/services/service/system/PermissionService.java b/service/src/main/java/cn/bunny/services/service/system/PermissionService.java index 593606a..6c2c0fb 100644 --- a/service/src/main/java/cn/bunny/services/service/system/PermissionService.java +++ b/service/src/main/java/cn/bunny/services/service/system/PermissionService.java @@ -9,7 +9,6 @@ import cn.bunny.services.domain.system.entity.Permission; import cn.bunny.services.domain.system.vo.PermissionVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import jakarta.validation.Valid; import org.springframework.http.ResponseEntity; import org.springframework.web.multipart.MultipartFile; @@ -37,14 +36,14 @@ public interface PermissionService extends IService { * * @param dto 添加表单 */ - void addPermission(@Valid PermissionAddDto dto); + void addPermission(PermissionAddDto dto); /** * * 更新权限 * * @param dto 更新表单 */ - void updatePermission(@Valid PermissionUpdateDto dto); + void updatePermission(PermissionUpdateDto dto); /** * * 删除|批量删除权限类型 @@ -86,7 +85,7 @@ public interface PermissionService extends IService { /** * 批量修改权限 * - * @param dto 权限数组 + * @param list 权限数组 */ - void updatePermissionBatch(@Valid List list); + void updatePermissionBatch(List list); } diff --git a/service/src/main/java/cn/bunny/services/service/system/RolePermissionService.java b/service/src/main/java/cn/bunny/services/service/system/RolePermissionService.java index b13e5e3..7deaebe 100644 --- a/service/src/main/java/cn/bunny/services/service/system/RolePermissionService.java +++ b/service/src/main/java/cn/bunny/services/service/system/RolePermissionService.java @@ -3,7 +3,6 @@ package cn.bunny.services.service.system; import cn.bunny.services.domain.system.dto.AssignPowersToRoleDto; import cn.bunny.services.domain.system.entity.RolePermission; import com.baomidou.mybatisplus.extension.service.IService; -import jakarta.validation.Valid; import java.util.List; @@ -30,5 +29,5 @@ public interface RolePermissionService extends IService { * * @param powerIds 权限id */ - void addRolPermission(@Valid AssignPowersToRoleDto powerIds); + void addRolPermission(AssignPowersToRoleDto powerIds); } diff --git a/service/src/main/java/cn/bunny/services/service/system/RoleService.java b/service/src/main/java/cn/bunny/services/service/system/RoleService.java index c37de2c..7fc8485 100644 --- a/service/src/main/java/cn/bunny/services/service/system/RoleService.java +++ b/service/src/main/java/cn/bunny/services/service/system/RoleService.java @@ -1,14 +1,13 @@ package cn.bunny.services.service.system; +import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.domain.system.dto.role.RoleAddDto; import cn.bunny.services.domain.system.dto.role.RoleDto; import cn.bunny.services.domain.system.dto.role.RoleUpdateDto; import cn.bunny.services.domain.system.entity.Role; import cn.bunny.services.domain.system.vo.RoleVo; -import cn.bunny.services.domain.common.model.vo.result.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import jakarta.validation.Valid; import org.springframework.http.ResponseEntity; import org.springframework.web.multipart.MultipartFile; @@ -36,14 +35,14 @@ public interface RoleService extends IService { * * @param dto 添加表单 */ - void addRole(@Valid RoleAddDto dto); + void addRole(RoleAddDto dto); /** * * 更新角色 * * @param dto 更新表单 */ - void updateRole(@Valid RoleUpdateDto dto); + void updateRole(RoleUpdateDto dto); /** * * 删除|批量删除角色类型 diff --git a/service/src/main/java/cn/bunny/services/service/system/RouterService.java b/service/src/main/java/cn/bunny/services/service/system/RouterService.java index 15035ca..f7dbae7 100644 --- a/service/src/main/java/cn/bunny/services/service/system/RouterService.java +++ b/service/src/main/java/cn/bunny/services/service/system/RouterService.java @@ -6,7 +6,6 @@ import cn.bunny.services.domain.system.entity.router.Router; import cn.bunny.services.domain.system.vo.router.RouterManageVo; import cn.bunny.services.domain.system.vo.router.WebUserRouterVo; import com.baomidou.mybatisplus.extension.service.IService; -import jakarta.validation.Valid; import java.util.List; @@ -38,14 +37,14 @@ public interface RouterService extends IService { * * @param dto 添加菜单表单 */ - void addRouter(@Valid RouterAddDto dto); + void addRouter(RouterAddDto dto); /** * * 更新路由菜单 * * @param dto 更新表单 */ - void updateRouter(@Valid RouterUpdateDto dto); + void updateRouter(RouterUpdateDto dto); /** * * 删除路由菜单 diff --git a/service/src/main/java/cn/bunny/services/service/system/UserService.java b/service/src/main/java/cn/bunny/services/service/system/UserService.java index 2140701..7d6bbbf 100644 --- a/service/src/main/java/cn/bunny/services/service/system/UserService.java +++ b/service/src/main/java/cn/bunny/services/service/system/UserService.java @@ -9,7 +9,6 @@ import cn.bunny.services.domain.system.vo.user.AdminUserVo; import cn.bunny.services.domain.system.vo.user.UserVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import jakarta.validation.Valid; import java.util.List; @@ -35,14 +34,14 @@ public interface UserService extends IService { * * @param dto 添加表单 */ - void addUserByAdmin(@Valid AdminUserAddDto dto); + void addUserByAdmin(AdminUserAddDto dto); /** * * 更新用户信息 * * @param dto 更新表单 */ - void updateUserByAdmin(@Valid AdminUserUpdateDto dto); + void updateUserByAdmin(AdminUserUpdateDto dto); /** * * 删除|批量删除用户信息类型 diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/PermissionServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/PermissionServiceImpl.java index 02c0031..53312e5 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/PermissionServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/system/impl/PermissionServiceImpl.java @@ -27,7 +27,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import jakarta.annotation.Resource; -import jakarta.validation.Valid; import org.springframework.beans.BeanUtils; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; @@ -131,7 +130,7 @@ public class PermissionServiceImpl extends ServiceImpl permissionList = list(Wrappers.lambdaQuery().eq(Permission::getId, id)); if (permissionList.isEmpty()) throw new AuthCustomerException(ResultCodeEnum.DATA_NOT_EXIST); diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java index affdf8a..39381ea 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/system/impl/RoleServiceImpl.java @@ -20,7 +20,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import jakarta.annotation.Resource; -import jakarta.validation.Valid; import org.springframework.beans.BeanUtils; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; @@ -172,7 +171,7 @@ public class RoleServiceImpl extends ServiceImpl implements Ro @Caching(evict = { @CacheEvict(cacheNames = CACHE_NAMES, key = "'roleList'", beforeInvocation = true), }) - public void addRole(@Valid RoleAddDto dto) { + public void addRole(RoleAddDto dto) { Role role = new Role(); BeanUtils.copyProperties(dto, role); save(role); @@ -208,7 +207,7 @@ public class RoleServiceImpl extends ServiceImpl implements Ro @Caching(evict = { @CacheEvict(cacheNames = CACHE_NAMES, key = "'roleList'", beforeInvocation = true), }) - public void updateRole(@Valid RoleUpdateDto dto) { + public void updateRole(RoleUpdateDto dto) { // 查询更新的角色是否存在 Long roleId = dto.getId(); List roleList = list(Wrappers.lambdaQuery().eq(Role::getId, roleId)); diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java index ecf6c5a..15f8592 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/system/impl/UserServiceImpl.java @@ -35,7 +35,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import jakarta.annotation.Resource; -import jakarta.validation.Valid; import org.springframework.beans.BeanUtils; import org.springframework.context.ApplicationEventPublisher; import org.springframework.data.redis.core.RedisTemplate; @@ -235,7 +234,7 @@ public class UserServiceImpl extends ServiceImpl implemen * @param dto 用户信息添加 */ @Override - public void addUserByAdmin(@Valid AdminUserAddDto dto) { + public void addUserByAdmin(AdminUserAddDto dto) { // 对密码加密 String encodePassword = passwordEncoder.encode(dto.getPassword());