🏷️ feat: 消息相关实体类验证分组
This commit is contained in:
parent
110925fa1f
commit
00d910a524
|
@ -1,12 +1,11 @@
|
||||||
package cn.bunny.services.controller.message;
|
package cn.bunny.services.controller.message;
|
||||||
|
|
||||||
import cn.bunny.services.aop.annotation.PermissionTag;
|
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.enums.ResultCodeEnum;
|
||||||
import cn.bunny.services.domain.common.model.vo.result.PageResult;
|
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.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.MessageDto;
|
||||||
import cn.bunny.services.domain.message.dto.MessageUpdateDto;
|
|
||||||
import cn.bunny.services.domain.message.entity.Message;
|
import cn.bunny.services.domain.message.entity.Message;
|
||||||
import cn.bunny.services.domain.message.vo.MessageDetailVo;
|
import cn.bunny.services.domain.message.vo.MessageDetailVo;
|
||||||
import cn.bunny.services.domain.message.vo.MessageReceivedWithUserVo;
|
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.Parameter;
|
||||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||||
import jakarta.annotation.Resource;
|
import jakarta.annotation.Resource;
|
||||||
import jakarta.validation.Valid;
|
import org.springframework.validation.annotation.Validated;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
@ -55,14 +54,14 @@ public class MessageController {
|
||||||
|
|
||||||
@Operation(summary = "添加系统消息", description = "添加系统消息")
|
@Operation(summary = "添加系统消息", description = "添加系统消息")
|
||||||
@PostMapping()
|
@PostMapping()
|
||||||
public Result<String> addMessage(@Valid @RequestBody MessageAddDto dto) {
|
public Result<String> createMessage(@Validated(ValidationGroups.Add.class) @RequestBody MessageDto dto) {
|
||||||
messageService.addMessage(dto);
|
messageService.createMessage(dto);
|
||||||
return Result.success(ResultCodeEnum.CREATE_SUCCESS);
|
return Result.success(ResultCodeEnum.CREATE_SUCCESS);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Operation(summary = "更系统消息", description = "更新系统消息")
|
@Operation(summary = "更系统消息", description = "更新系统消息")
|
||||||
@PutMapping()
|
@PutMapping()
|
||||||
public Result<String> updateMessage(@Valid @RequestBody MessageUpdateDto dto) {
|
public Result<String> updateMessage(@Validated(ValidationGroups.Update.class) @RequestBody MessageDto dto) {
|
||||||
messageService.updateMessage(dto);
|
messageService.updateMessage(dto);
|
||||||
return Result.success(ResultCodeEnum.UPDATE_SUCCESS);
|
return Result.success(ResultCodeEnum.UPDATE_SUCCESS);
|
||||||
}
|
}
|
||||||
|
|
|
@ -83,7 +83,7 @@ public class MessageReceivedController {
|
||||||
|
|
||||||
@Operation(summary = "用户将消息标为已读", description = "用户将消息标为已读")
|
@Operation(summary = "用户将消息标为已读", description = "用户将消息标为已读")
|
||||||
@PutMapping("private/user/messages/read-status")
|
@PutMapping("private/user/messages/read-status")
|
||||||
public Result<String> markAsReadByUser(@Valid @RequestBody List<Long> ids) {
|
public Result<String> markAsReadByUser(@RequestBody List<Long> ids) {
|
||||||
messageReceivedService.markAsReadByUser(ids);
|
messageReceivedService.markAsReadByUser(ids);
|
||||||
return Result.success(ResultCodeEnum.UPDATE_SUCCESS);
|
return Result.success(ResultCodeEnum.UPDATE_SUCCESS);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,12 +1,11 @@
|
||||||
package cn.bunny.services.controller.message;
|
package cn.bunny.services.controller.message;
|
||||||
|
|
||||||
import cn.bunny.services.aop.annotation.PermissionTag;
|
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.enums.ResultCodeEnum;
|
||||||
import cn.bunny.services.domain.common.model.vo.result.PageResult;
|
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.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.MessageTypeDto;
|
||||||
import cn.bunny.services.domain.message.dto.MessageTypeUpdateDto;
|
|
||||||
import cn.bunny.services.domain.message.entity.MessageType;
|
import cn.bunny.services.domain.message.entity.MessageType;
|
||||||
import cn.bunny.services.domain.message.vo.MessageTypeVo;
|
import cn.bunny.services.domain.message.vo.MessageTypeVo;
|
||||||
import cn.bunny.services.service.message.MessageTypeService;
|
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.Parameter;
|
||||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||||
import jakarta.annotation.Resource;
|
import jakarta.annotation.Resource;
|
||||||
import jakarta.validation.Valid;
|
import org.springframework.validation.annotation.Validated;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
@ -54,15 +53,15 @@ public class MessageTypeController {
|
||||||
@Operation(summary = "添加消息类型", description = "添加系统消息类型")
|
@Operation(summary = "添加消息类型", description = "添加系统消息类型")
|
||||||
@PermissionTag(permission = "messageType:add")
|
@PermissionTag(permission = "messageType:add")
|
||||||
@PostMapping()
|
@PostMapping()
|
||||||
public Result<String> addMessageType(@Valid @RequestBody MessageTypeAddDto dto) {
|
public Result<String> createMessageType(@Validated(ValidationGroups.Add.class) @RequestBody MessageTypeDto dto) {
|
||||||
messageTypeService.addMessageType(dto);
|
messageTypeService.createMessageType(dto);
|
||||||
return Result.success(ResultCodeEnum.CREATE_SUCCESS);
|
return Result.success(ResultCodeEnum.CREATE_SUCCESS);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Operation(summary = "更新消息类型", description = "更新系统消息类型")
|
@Operation(summary = "更新消息类型", description = "更新系统消息类型")
|
||||||
@PermissionTag(permission = "messageType:update")
|
@PermissionTag(permission = "messageType:update")
|
||||||
@PutMapping()
|
@PutMapping()
|
||||||
public Result<String> updateMessageType(@Valid @RequestBody MessageTypeUpdateDto dto) {
|
public Result<String> updateMessageType(@Validated(ValidationGroups.Update.class) @RequestBody MessageTypeDto dto) {
|
||||||
messageTypeService.updateMessageType(dto);
|
messageTypeService.updateMessageType(dto);
|
||||||
return Result.success(ResultCodeEnum.UPDATE_SUCCESS);
|
return Result.success(ResultCodeEnum.UPDATE_SUCCESS);
|
||||||
}
|
}
|
||||||
|
|
|
@ -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<Long> 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;
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,11 +1,17 @@
|
||||||
package cn.bunny.services.domain.message.dto;
|
package cn.bunny.services.domain.message.dto;
|
||||||
|
|
||||||
|
import cn.bunny.services.domain.common.ValidationGroups;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
|
import jakarta.validation.constraints.NotBlank;
|
||||||
|
import jakarta.validation.constraints.NotNull;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Builder;
|
import lombok.Builder;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
|
@ -13,14 +19,42 @@ import lombok.NoArgsConstructor;
|
||||||
@Schema(name = "MessageDto对象", title = "消息分页查询", description = "消息分页查询")
|
@Schema(name = "MessageDto对象", title = "消息分页查询", description = "消息分页查询")
|
||||||
public class MessageDto {
|
public class MessageDto {
|
||||||
|
|
||||||
|
@Schema(name = "id", title = "主键")
|
||||||
|
@NotNull(message = "id不能为空", groups = {ValidationGroups.Update.class})
|
||||||
|
private Long id;
|
||||||
|
|
||||||
@Schema(name = "title", title = "消息标题")
|
@Schema(name = "title", title = "消息标题")
|
||||||
|
@NotBlank(message = "消息标题 不能为空", groups = {ValidationGroups.Add.class, ValidationGroups.Update.class})
|
||||||
private String title;
|
private String title;
|
||||||
|
|
||||||
@Schema(name = "sendNickname", title = "发送人用户昵称")
|
@Schema(name = "receivedUserIds", title = "接收人用户ID")
|
||||||
private String sendNickname;
|
private List<Long> receivedUserIds = new ArrayList<>();
|
||||||
|
|
||||||
@Schema(name = "messageType", title = "消息类型")
|
@Schema(name = "sendUserId", title = "发送人用户ID")
|
||||||
private String messageType;
|
@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 = "消息等级")
|
@Schema(name = "level", title = "消息等级")
|
||||||
private String level;
|
private String level;
|
||||||
|
@ -28,7 +62,10 @@ public class MessageDto {
|
||||||
@Schema(name = "extra", title = "消息等级详情")
|
@Schema(name = "extra", title = "消息等级详情")
|
||||||
private String extra;
|
private String extra;
|
||||||
|
|
||||||
@Schema(name = "editorType", title = "编辑器类型")
|
@Schema(name = "sendNickname", title = "发送人用户昵称")
|
||||||
private String editorType;
|
private String sendNickname;
|
||||||
|
|
||||||
|
@Schema(name = "messageType", title = "消息类型")
|
||||||
|
private String messageType;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -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;
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,6 +1,9 @@
|
||||||
package cn.bunny.services.domain.message.dto;
|
package cn.bunny.services.domain.message.dto;
|
||||||
|
|
||||||
|
import cn.bunny.services.domain.common.ValidationGroups;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
|
import jakarta.validation.constraints.NotBlank;
|
||||||
|
import jakarta.validation.constraints.NotNull;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Builder;
|
import lombok.Builder;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
@ -13,18 +16,24 @@ import lombok.NoArgsConstructor;
|
||||||
@Schema(name = "MessageType对象", title = "系统消息类型分页查询", description = "系统消息类型分页查询")
|
@Schema(name = "MessageType对象", title = "系统消息类型分页查询", description = "系统消息类型分页查询")
|
||||||
public class MessageTypeDto {
|
public class MessageTypeDto {
|
||||||
|
|
||||||
@Schema(name = "status", title = "1:启用 0:禁用")
|
@Schema(name = "id", title = "主键")
|
||||||
private Boolean status;
|
@NotNull(message = "id不能为空", groups = {ValidationGroups.Update.class})
|
||||||
|
private Long id;
|
||||||
|
|
||||||
@Schema(name = "messageName", title = "消息名称")
|
@Schema(name = "messageName", title = "消息名称")
|
||||||
|
@NotBlank(message = "消息名称 不能为空", groups = {ValidationGroups.Add.class})
|
||||||
private String messageName;
|
private String messageName;
|
||||||
|
|
||||||
@Schema(name = "messageType", title = "sys:系统消息,user用户消息")
|
@Schema(name = "messageType", title = "sys:系统消息,user用户消息")
|
||||||
|
@NotBlank(message = "消息类型 不能为空", groups = {ValidationGroups.Add.class})
|
||||||
private String messageType;
|
private String messageType;
|
||||||
|
|
||||||
@Schema(name = "summary", title = "消息备注")
|
@Schema(name = "summary", title = "消息备注")
|
||||||
private String summary;
|
private String summary;
|
||||||
|
|
||||||
|
@Schema(name = "status", title = "消息类型")
|
||||||
|
private Boolean status;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -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;
|
|
||||||
|
|
||||||
}
|
|
|
@ -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<Long> 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;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
|
@ -6,7 +6,6 @@ import cn.bunny.services.domain.configuration.entity.EmailTemplate;
|
||||||
import cn.bunny.services.domain.configuration.vo.EmailTemplateVo;
|
import cn.bunny.services.domain.configuration.vo.EmailTemplateVo;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
import jakarta.validation.Valid;
|
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
@ -33,14 +32,14 @@ public interface EmailTemplateService extends IService<EmailTemplate> {
|
||||||
*
|
*
|
||||||
* @param dto 添加表单
|
* @param dto 添加表单
|
||||||
*/
|
*/
|
||||||
void createEmailTemplate(@Valid EmailTemplateDto dto);
|
void createEmailTemplate(EmailTemplateDto dto);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新邮件模板表
|
* 更新邮件模板表
|
||||||
*
|
*
|
||||||
* @param dto 更新表单
|
* @param dto 更新表单
|
||||||
*/
|
*/
|
||||||
void updateEmailTemplate(@Valid EmailTemplateDto dto);
|
void updateEmailTemplate(EmailTemplateDto dto);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除|批量删除邮件模板表类型
|
* 删除|批量删除邮件模板表类型
|
||||||
|
|
|
@ -6,7 +6,6 @@ import cn.bunny.services.domain.configuration.entity.EmailUsers;
|
||||||
import cn.bunny.services.domain.configuration.vo.EmailUsersVo;
|
import cn.bunny.services.domain.configuration.vo.EmailUsersVo;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
import jakarta.validation.Valid;
|
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
@ -33,14 +32,14 @@ public interface EmailUsersService extends IService<EmailUsers> {
|
||||||
*
|
*
|
||||||
* @param dto 添加表单
|
* @param dto 添加表单
|
||||||
*/
|
*/
|
||||||
void createEmailUsers(@Valid EmailUsersDto dto);
|
void createEmailUsers(EmailUsersDto dto);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新邮箱用户发送配置
|
* 更新邮箱用户发送配置
|
||||||
*
|
*
|
||||||
* @param dto 更新表单
|
* @param dto 更新表单
|
||||||
*/
|
*/
|
||||||
void updateEmailUsers(@Valid EmailUsersDto dto);
|
void updateEmailUsers(EmailUsersDto dto);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除|批量删除邮箱用户发送配置类型
|
* 删除|批量删除邮箱用户发送配置类型
|
||||||
|
|
|
@ -8,7 +8,6 @@ import cn.bunny.services.domain.configuration.entity.I18n;
|
||||||
import cn.bunny.services.domain.configuration.vo.I18nVo;
|
import cn.bunny.services.domain.configuration.vo.I18nVo;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
import jakarta.validation.Valid;
|
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
@ -72,5 +71,5 @@ public interface I18nService extends IService<I18n> {
|
||||||
*
|
*
|
||||||
* @param dto 文件更新对象
|
* @param dto 文件更新对象
|
||||||
*/
|
*/
|
||||||
void uploadI18nFile(@Valid I18nUpdateByFileDto dto);
|
void uploadI18nFile(I18nUpdateByFileDto dto);
|
||||||
}
|
}
|
|
@ -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.entity.I18nType;
|
||||||
import cn.bunny.services.domain.configuration.vo.I18nTypeVo;
|
import cn.bunny.services.domain.configuration.vo.I18nTypeVo;
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
import jakarta.validation.Valid;
|
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
@ -30,14 +29,14 @@ public interface I18nTypeService extends IService<I18nType> {
|
||||||
*
|
*
|
||||||
* @param dto 多语言类型添加
|
* @param dto 多语言类型添加
|
||||||
*/
|
*/
|
||||||
void createI18nType(@Valid I18nTypeDto dto);
|
void createI18nType(I18nTypeDto dto);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新多语言类型
|
* 更新多语言类型
|
||||||
*
|
*
|
||||||
* @param dto 多语言类型更新
|
* @param dto 多语言类型更新
|
||||||
*/
|
*/
|
||||||
void updateI18nType(@Valid I18nTypeDto dto);
|
void updateI18nType(I18nTypeDto dto);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除多语言类型
|
* 删除多语言类型
|
||||||
|
|
|
@ -14,7 +14,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import jakarta.validation.Valid;
|
|
||||||
import org.springframework.beans.BeanUtils;
|
import org.springframework.beans.BeanUtils;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
@ -71,7 +70,7 @@ public class EmailTemplateServiceImpl extends ServiceImpl<EmailTemplateMapper, E
|
||||||
* @param dto 邮件模板表添加
|
* @param dto 邮件模板表添加
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void createEmailTemplate(@Valid EmailTemplateDto dto) {
|
public void createEmailTemplate(EmailTemplateDto dto) {
|
||||||
String type = dto.getType();
|
String type = dto.getType();
|
||||||
|
|
||||||
// 保存数据
|
// 保存数据
|
||||||
|
@ -104,7 +103,7 @@ public class EmailTemplateServiceImpl extends ServiceImpl<EmailTemplateMapper, E
|
||||||
* @param dto 邮件模板表更新
|
* @param dto 邮件模板表更新
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void updateEmailTemplate(@Valid EmailTemplateDto dto) {
|
public void updateEmailTemplate(EmailTemplateDto dto) {
|
||||||
String type = dto.getType();
|
String type = dto.getType();
|
||||||
|
|
||||||
// 查询是否有这个模板
|
// 查询是否有这个模板
|
||||||
|
|
|
@ -13,7 +13,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import jakarta.annotation.Resource;
|
import jakarta.annotation.Resource;
|
||||||
import jakarta.validation.Valid;
|
|
||||||
import org.springframework.beans.BeanUtils;
|
import org.springframework.beans.BeanUtils;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
@ -62,7 +61,7 @@ public class EmailUsersServiceImpl extends ServiceImpl<EmailUsersMapper, EmailUs
|
||||||
* @param dto 邮箱用户发送配置添加
|
* @param dto 邮箱用户发送配置添加
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void createEmailUsers(@Valid EmailUsersDto dto) {
|
public void createEmailUsers(EmailUsersDto dto) {
|
||||||
// 更新邮箱默认状态
|
// 更新邮箱默认状态
|
||||||
updateEmailUserDefault(dto.getIsDefault());
|
updateEmailUserDefault(dto.getIsDefault());
|
||||||
|
|
||||||
|
@ -79,7 +78,7 @@ public class EmailUsersServiceImpl extends ServiceImpl<EmailUsersMapper, EmailUs
|
||||||
* @param dto 邮箱用户发送配置更新
|
* @param dto 邮箱用户发送配置更新
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void updateEmailUsers(@Valid EmailUsersDto dto) {
|
public void updateEmailUsers(EmailUsersDto dto) {
|
||||||
// 更新邮箱默认状态
|
// 更新邮箱默认状态
|
||||||
updateEmailUserDefault(dto.getIsDefault());
|
updateEmailUserDefault(dto.getIsDefault());
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,6 @@ import cn.bunny.services.mapper.configuration.I18nTypeMapper;
|
||||||
import cn.bunny.services.service.configuration.I18nTypeService;
|
import cn.bunny.services.service.configuration.I18nTypeService;
|
||||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import jakarta.validation.Valid;
|
|
||||||
import org.springframework.beans.BeanUtils;
|
import org.springframework.beans.BeanUtils;
|
||||||
import org.springframework.cache.annotation.CacheEvict;
|
import org.springframework.cache.annotation.CacheEvict;
|
||||||
import org.springframework.cache.annotation.Cacheable;
|
import org.springframework.cache.annotation.Cacheable;
|
||||||
|
@ -58,7 +57,7 @@ public class I18nTypeServiceImpl extends ServiceImpl<I18nTypeMapper, I18nType> i
|
||||||
@CacheEvict(cacheNames = CACHE_NAMES, key = "'i18nMap'", beforeInvocation = true),
|
@CacheEvict(cacheNames = CACHE_NAMES, key = "'i18nMap'", beforeInvocation = true),
|
||||||
@CacheEvict(cacheNames = CACHE_NAMES, key = "'i18nTypeList'", 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();
|
String typeName = dto.getTypeName();
|
||||||
Boolean isDefault = dto.getIsDefault();
|
Boolean isDefault = dto.getIsDefault();
|
||||||
I18nType i18nType = new I18nType();
|
I18nType i18nType = new I18nType();
|
||||||
|
@ -89,7 +88,7 @@ public class I18nTypeServiceImpl extends ServiceImpl<I18nTypeMapper, I18nType> i
|
||||||
@CacheEvict(cacheNames = CACHE_NAMES, key = "'i18nMap'", beforeInvocation = true),
|
@CacheEvict(cacheNames = CACHE_NAMES, key = "'i18nMap'", beforeInvocation = true),
|
||||||
@CacheEvict(cacheNames = CACHE_NAMES, key = "'i18nTypeList'", 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();
|
Long id = dto.getId();
|
||||||
Boolean isDefault = dto.getIsDefault();
|
Boolean isDefault = dto.getIsDefault();
|
||||||
I18nType i18nType = new I18nType();
|
I18nType i18nType = new I18nType();
|
||||||
|
|
|
@ -9,7 +9,6 @@ import cn.bunny.services.service.file.FilesParDetailService;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import jakarta.validation.Valid;
|
|
||||||
import org.springframework.beans.BeanUtils;
|
import org.springframework.beans.BeanUtils;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
@ -53,7 +52,7 @@ public class FilesParDetailServiceImpl extends ServiceImpl<FilesParDetailMapper,
|
||||||
* @param dto 文件分片信息表,仅在手动分片上传时使用添加
|
* @param dto 文件分片信息表,仅在手动分片上传时使用添加
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void createFilesParDetail(@Valid FilesParDetailDto dto) {
|
public void createFilesParDetail(FilesParDetailDto dto) {
|
||||||
FilesParDetail filesPardetail = new FilesParDetail();
|
FilesParDetail filesPardetail = new FilesParDetail();
|
||||||
BeanUtils.copyProperties(dto, filesPardetail);
|
BeanUtils.copyProperties(dto, filesPardetail);
|
||||||
save(filesPardetail);
|
save(filesPardetail);
|
||||||
|
@ -65,7 +64,7 @@ public class FilesParDetailServiceImpl extends ServiceImpl<FilesParDetailMapper,
|
||||||
* @param dto 文件分片信息表,仅在手动分片上传时使用更新
|
* @param dto 文件分片信息表,仅在手动分片上传时使用更新
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void updateFilesParDetail(@Valid FilesParDetailDto dto) {
|
public void updateFilesParDetail(FilesParDetailDto dto) {
|
||||||
FilesParDetail filesPardetail = new FilesParDetail();
|
FilesParDetail filesPardetail = new FilesParDetail();
|
||||||
BeanUtils.copyProperties(dto, filesPardetail);
|
BeanUtils.copyProperties(dto, filesPardetail);
|
||||||
updateById(filesPardetail);
|
updateById(filesPardetail);
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
package cn.bunny.services.service.message;
|
package cn.bunny.services.service.message;
|
||||||
|
|
||||||
|
import cn.bunny.services.domain.common.model.vo.result.PageResult;
|
||||||
import cn.bunny.services.domain.message.dto.MessageReceivedDto;
|
import cn.bunny.services.domain.message.dto.MessageReceivedDto;
|
||||||
import cn.bunny.services.domain.message.dto.MessageReceivedUpdateDto;
|
import cn.bunny.services.domain.message.dto.MessageReceivedUpdateDto;
|
||||||
import cn.bunny.services.domain.message.dto.MessageUserDto;
|
import cn.bunny.services.domain.message.dto.MessageUserDto;
|
||||||
|
@ -7,10 +8,8 @@ import cn.bunny.services.domain.message.entity.Message;
|
||||||
import cn.bunny.services.domain.message.entity.MessageReceived;
|
import cn.bunny.services.domain.message.entity.MessageReceived;
|
||||||
import cn.bunny.services.domain.message.vo.MessageReceivedWithMessageVo;
|
import cn.bunny.services.domain.message.vo.MessageReceivedWithMessageVo;
|
||||||
import cn.bunny.services.domain.message.vo.MessageUserVo;
|
import cn.bunny.services.domain.message.vo.MessageUserVo;
|
||||||
import cn.bunny.services.domain.common.model.vo.result.PageResult;
|
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
import jakarta.validation.Valid;
|
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
@ -36,7 +35,7 @@ public interface MessageReceivedService extends IService<MessageReceived> {
|
||||||
*
|
*
|
||||||
* @param dto 用户消息表单
|
* @param dto 用户消息表单
|
||||||
*/
|
*/
|
||||||
void updateMarkMessageReceived(@Valid MessageReceivedUpdateDto dto);
|
void updateMarkMessageReceived(MessageReceivedUpdateDto dto);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 管理删除用户接受的消息
|
* 管理删除用户接受的消息
|
||||||
|
|
|
@ -1,9 +1,7 @@
|
||||||
package cn.bunny.services.service.message;
|
package cn.bunny.services.service.message;
|
||||||
|
|
||||||
import cn.bunny.services.domain.common.model.vo.result.PageResult;
|
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.MessageDto;
|
||||||
import cn.bunny.services.domain.message.dto.MessageUpdateDto;
|
|
||||||
import cn.bunny.services.domain.message.entity.Message;
|
import cn.bunny.services.domain.message.entity.Message;
|
||||||
import cn.bunny.services.domain.message.vo.MessageDetailVo;
|
import cn.bunny.services.domain.message.vo.MessageDetailVo;
|
||||||
import cn.bunny.services.domain.message.vo.MessageReceivedWithUserVo;
|
import cn.bunny.services.domain.message.vo.MessageReceivedWithUserVo;
|
||||||
|
@ -44,14 +42,14 @@ public interface MessageService extends IService<Message> {
|
||||||
*
|
*
|
||||||
* @param dto 添加表单
|
* @param dto 添加表单
|
||||||
*/
|
*/
|
||||||
void addMessage(MessageAddDto dto);
|
void createMessage(MessageDto dto);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* * 更新系统消息
|
* * 更新系统消息
|
||||||
*
|
*
|
||||||
* @param dto 更新表单
|
* @param dto 更新表单
|
||||||
*/
|
*/
|
||||||
void updateMessage(MessageUpdateDto dto);
|
void updateMessage(MessageDto dto);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* * 删除|批量删除系统消息类型
|
* * 删除|批量删除系统消息类型
|
||||||
|
|
|
@ -1,14 +1,11 @@
|
||||||
package cn.bunny.services.service.message;
|
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.MessageTypeDto;
|
||||||
import cn.bunny.services.domain.message.dto.MessageTypeUpdateDto;
|
|
||||||
import cn.bunny.services.domain.message.entity.MessageType;
|
import cn.bunny.services.domain.message.entity.MessageType;
|
||||||
import cn.bunny.services.domain.message.vo.MessageTypeVo;
|
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.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
import jakarta.validation.Valid;
|
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
@ -34,14 +31,14 @@ public interface MessageTypeService extends IService<MessageType> {
|
||||||
*
|
*
|
||||||
* @param dto 添加表单
|
* @param dto 添加表单
|
||||||
*/
|
*/
|
||||||
void addMessageType(@Valid MessageTypeAddDto dto);
|
void createMessageType(MessageTypeDto dto);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* * 更新系统消息类型
|
* * 更新系统消息类型
|
||||||
*
|
*
|
||||||
* @param dto 更新表单
|
* @param dto 更新表单
|
||||||
*/
|
*/
|
||||||
void updateMessageType(@Valid MessageTypeUpdateDto dto);
|
void updateMessageType(MessageTypeDto dto);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* * 删除|批量删除系统消息类型类型
|
* * 删除|批量删除系统消息类型类型
|
||||||
|
|
|
@ -17,7 +17,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import jakarta.validation.Valid;
|
|
||||||
import org.springframework.beans.BeanUtils;
|
import org.springframework.beans.BeanUtils;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
@ -64,7 +63,7 @@ public class MessageReceivedServiceImpl extends ServiceImpl<MessageReceivedMappe
|
||||||
* @param dto 用户消息表单
|
* @param dto 用户消息表单
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void updateMarkMessageReceived(@Valid MessageReceivedUpdateDto dto) {
|
public void updateMarkMessageReceived(MessageReceivedUpdateDto dto) {
|
||||||
List<MessageReceived> messageReceivedList = dto.getIds().stream().map(id -> {
|
List<MessageReceived> messageReceivedList = dto.getIds().stream().map(id -> {
|
||||||
MessageReceived messageReceived = new MessageReceived();
|
MessageReceived messageReceived = new MessageReceived();
|
||||||
messageReceived.setId(id);
|
messageReceived.setId(id);
|
||||||
|
|
|
@ -4,9 +4,7 @@ import cn.bunny.services.context.BaseContext;
|
||||||
import cn.bunny.services.domain.common.enums.ResultCodeEnum;
|
import cn.bunny.services.domain.common.enums.ResultCodeEnum;
|
||||||
import cn.bunny.services.domain.common.model.entity.BaseEntity;
|
import cn.bunny.services.domain.common.model.entity.BaseEntity;
|
||||||
import cn.bunny.services.domain.common.model.vo.result.PageResult;
|
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.MessageDto;
|
||||||
import cn.bunny.services.domain.message.dto.MessageUpdateDto;
|
|
||||||
import cn.bunny.services.domain.message.entity.Message;
|
import cn.bunny.services.domain.message.entity.Message;
|
||||||
import cn.bunny.services.domain.message.entity.MessageReceived;
|
import cn.bunny.services.domain.message.entity.MessageReceived;
|
||||||
import cn.bunny.services.domain.message.vo.MessageDetailVo;
|
import cn.bunny.services.domain.message.vo.MessageDetailVo;
|
||||||
|
@ -141,7 +139,7 @@ public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> impl
|
||||||
* @param dto 系统消息添加
|
* @param dto 系统消息添加
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void addMessage(MessageAddDto dto) {
|
public void createMessage(MessageDto dto) {
|
||||||
// 如果发送人为空设置当前登录的人的ID
|
// 如果发送人为空设置当前登录的人的ID
|
||||||
if (dto.getSendUserId() == null) dto.setSendUserId(BaseContext.getUserId());
|
if (dto.getSendUserId() == null) dto.setSendUserId(BaseContext.getUserId());
|
||||||
|
|
||||||
|
@ -176,7 +174,7 @@ public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> impl
|
||||||
* @param dto 系统消息更新
|
* @param dto 系统消息更新
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void updateMessage(MessageUpdateDto dto) {
|
public void updateMessage(MessageDto dto) {
|
||||||
// 如果发送人为空设置当前登录的人的ID
|
// 如果发送人为空设置当前登录的人的ID
|
||||||
Long sendUserId = dto.getSendUserId();
|
Long sendUserId = dto.getSendUserId();
|
||||||
if (sendUserId == null) dto.setSendUserId(BaseContext.getUserId());
|
if (sendUserId == null) dto.setSendUserId(BaseContext.getUserId());
|
||||||
|
|
|
@ -1,18 +1,15 @@
|
||||||
package cn.bunny.services.service.message.impl;
|
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.MessageTypeDto;
|
||||||
import cn.bunny.services.domain.message.dto.MessageTypeUpdateDto;
|
|
||||||
import cn.bunny.services.domain.message.entity.MessageType;
|
import cn.bunny.services.domain.message.entity.MessageType;
|
||||||
import cn.bunny.services.domain.message.vo.MessageTypeVo;
|
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.mapper.message.MessageTypeMapper;
|
||||||
import cn.bunny.services.service.message.MessageTypeService;
|
import cn.bunny.services.service.message.MessageTypeService;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import jakarta.validation.Valid;
|
|
||||||
import org.springframework.beans.BeanUtils;
|
import org.springframework.beans.BeanUtils;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
@ -56,7 +53,7 @@ public class MessageTypeServiceImpl extends ServiceImpl<MessageTypeMapper, Messa
|
||||||
* @param dto 系统消息类型添加
|
* @param dto 系统消息类型添加
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void addMessageType(@Valid MessageTypeAddDto dto) {
|
public void createMessageType(MessageTypeDto dto) {
|
||||||
// 保存数据
|
// 保存数据
|
||||||
MessageType messageType = new MessageType();
|
MessageType messageType = new MessageType();
|
||||||
BeanUtils.copyProperties(dto, messageType);
|
BeanUtils.copyProperties(dto, messageType);
|
||||||
|
@ -69,7 +66,7 @@ public class MessageTypeServiceImpl extends ServiceImpl<MessageTypeMapper, Messa
|
||||||
* @param dto 系统消息类型更新
|
* @param dto 系统消息类型更新
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void updateMessageType(@Valid MessageTypeUpdateDto dto) {
|
public void updateMessageType(MessageTypeDto dto) {
|
||||||
// 更新内容
|
// 更新内容
|
||||||
MessageType messageType = new MessageType();
|
MessageType messageType = new MessageType();
|
||||||
BeanUtils.copyProperties(dto, messageType);
|
BeanUtils.copyProperties(dto, messageType);
|
||||||
|
|
|
@ -1,14 +1,13 @@
|
||||||
package cn.bunny.services.service.schedule;
|
package cn.bunny.services.service.schedule;
|
||||||
|
|
||||||
|
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.SchedulersGroupAddDto;
|
||||||
import cn.bunny.services.domain.quartz.dto.SchedulersGroupDto;
|
import cn.bunny.services.domain.quartz.dto.SchedulersGroupDto;
|
||||||
import cn.bunny.services.domain.quartz.dto.SchedulersGroupUpdateDto;
|
import cn.bunny.services.domain.quartz.dto.SchedulersGroupUpdateDto;
|
||||||
import cn.bunny.services.domain.quartz.entity.SchedulersGroup;
|
import cn.bunny.services.domain.quartz.entity.SchedulersGroup;
|
||||||
import cn.bunny.services.domain.quartz.vo.SchedulersGroupVo;
|
import cn.bunny.services.domain.quartz.vo.SchedulersGroupVo;
|
||||||
import cn.bunny.services.domain.common.model.vo.result.PageResult;
|
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
import jakarta.validation.Valid;
|
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
@ -34,14 +33,14 @@ public interface SchedulersGroupService extends IService<SchedulersGroup> {
|
||||||
*
|
*
|
||||||
* @param dto 添加表单
|
* @param dto 添加表单
|
||||||
*/
|
*/
|
||||||
void addSchedulersGroup(@Valid SchedulersGroupAddDto dto);
|
void addSchedulersGroup(SchedulersGroupAddDto dto);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* * 更新任务调度分组
|
* * 更新任务调度分组
|
||||||
*
|
*
|
||||||
* @param dto 更新表单
|
* @param dto 更新表单
|
||||||
*/
|
*/
|
||||||
void updateSchedulersGroup(@Valid SchedulersGroupUpdateDto dto);
|
void updateSchedulersGroup(SchedulersGroupUpdateDto dto);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* * 删除|批量删除任务调度分组类型
|
* * 删除|批量删除任务调度分组类型
|
||||||
|
|
|
@ -8,7 +8,6 @@ import cn.bunny.services.domain.quartz.entity.Schedulers;
|
||||||
import cn.bunny.services.domain.quartz.vo.SchedulersVo;
|
import cn.bunny.services.domain.quartz.vo.SchedulersVo;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
import jakarta.validation.Valid;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <p>
|
* <p>
|
||||||
|
@ -32,7 +31,7 @@ public interface SchedulersService extends IService<Schedulers> {
|
||||||
*
|
*
|
||||||
* @param dto 添加表单
|
* @param dto 添加表单
|
||||||
*/
|
*/
|
||||||
void addSchedulers(@Valid SchedulersAddDto dto);
|
void addSchedulers(SchedulersAddDto dto);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* * 暂停Schedulers任务
|
* * 暂停Schedulers任务
|
||||||
|
|
|
@ -1,17 +1,16 @@
|
||||||
package cn.bunny.services.service.schedule.impl;
|
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.SchedulersGroupAddDto;
|
||||||
import cn.bunny.services.domain.quartz.dto.SchedulersGroupDto;
|
import cn.bunny.services.domain.quartz.dto.SchedulersGroupDto;
|
||||||
import cn.bunny.services.domain.quartz.dto.SchedulersGroupUpdateDto;
|
import cn.bunny.services.domain.quartz.dto.SchedulersGroupUpdateDto;
|
||||||
import cn.bunny.services.domain.quartz.entity.SchedulersGroup;
|
import cn.bunny.services.domain.quartz.entity.SchedulersGroup;
|
||||||
import cn.bunny.services.domain.quartz.vo.SchedulersGroupVo;
|
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.mapper.schedule.SchedulersGroupMapper;
|
||||||
import cn.bunny.services.service.schedule.SchedulersGroupService;
|
import cn.bunny.services.service.schedule.SchedulersGroupService;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import jakarta.validation.Valid;
|
|
||||||
import org.springframework.beans.BeanUtils;
|
import org.springframework.beans.BeanUtils;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
@ -69,7 +68,7 @@ public class SchedulersGroupServiceImpl extends ServiceImpl<SchedulersGroupMappe
|
||||||
* @param dto 任务调度分组添加
|
* @param dto 任务调度分组添加
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void addSchedulersGroup(@Valid SchedulersGroupAddDto dto) {
|
public void addSchedulersGroup(SchedulersGroupAddDto dto) {
|
||||||
// 保存数据
|
// 保存数据
|
||||||
SchedulersGroup schedulersGroup = new SchedulersGroup();
|
SchedulersGroup schedulersGroup = new SchedulersGroup();
|
||||||
BeanUtils.copyProperties(dto, schedulersGroup);
|
BeanUtils.copyProperties(dto, schedulersGroup);
|
||||||
|
@ -82,7 +81,7 @@ public class SchedulersGroupServiceImpl extends ServiceImpl<SchedulersGroupMappe
|
||||||
* @param dto 任务调度分组更新
|
* @param dto 任务调度分组更新
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void updateSchedulersGroup(@Valid SchedulersGroupUpdateDto dto) {
|
public void updateSchedulersGroup(SchedulersGroupUpdateDto dto) {
|
||||||
// 更新内容
|
// 更新内容
|
||||||
SchedulersGroup schedulersGroup = new SchedulersGroup();
|
SchedulersGroup schedulersGroup = new SchedulersGroup();
|
||||||
BeanUtils.copyProperties(dto, schedulersGroup);
|
BeanUtils.copyProperties(dto, schedulersGroup);
|
||||||
|
|
|
@ -14,7 +14,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import jakarta.annotation.Resource;
|
import jakarta.annotation.Resource;
|
||||||
import jakarta.validation.Valid;
|
|
||||||
import org.quartz.*;
|
import org.quartz.*;
|
||||||
import org.springframework.beans.BeanUtils;
|
import org.springframework.beans.BeanUtils;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
@ -99,7 +98,7 @@ public class SchedulersServiceImpl extends ServiceImpl<SchedulersMapper, Schedul
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
@Override
|
@Override
|
||||||
public void addSchedulers(@Valid SchedulersAddDto dto) {
|
public void addSchedulers(SchedulersAddDto dto) {
|
||||||
String jobName = dto.getJobName();
|
String jobName = dto.getJobName();
|
||||||
String jobGroup = dto.getJobGroup();
|
String jobGroup = dto.getJobGroup();
|
||||||
String cronExpression = dto.getCronExpression();
|
String cronExpression = dto.getCronExpression();
|
||||||
|
|
|
@ -1,14 +1,13 @@
|
||||||
package cn.bunny.services.service.system;
|
package cn.bunny.services.service.system;
|
||||||
|
|
||||||
|
import cn.bunny.services.domain.common.model.vo.result.PageResult;
|
||||||
import cn.bunny.services.domain.system.dto.dept.DeptAddDto;
|
import cn.bunny.services.domain.system.dto.dept.DeptAddDto;
|
||||||
import cn.bunny.services.domain.system.dto.dept.DeptDto;
|
import cn.bunny.services.domain.system.dto.dept.DeptDto;
|
||||||
import cn.bunny.services.domain.system.dto.dept.DeptUpdateDto;
|
import cn.bunny.services.domain.system.dto.dept.DeptUpdateDto;
|
||||||
import cn.bunny.services.domain.system.entity.Dept;
|
import cn.bunny.services.domain.system.entity.Dept;
|
||||||
import cn.bunny.services.domain.system.vo.DeptVo;
|
import cn.bunny.services.domain.system.vo.DeptVo;
|
||||||
import cn.bunny.services.domain.common.model.vo.result.PageResult;
|
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
import jakarta.validation.Valid;
|
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
@ -34,14 +33,14 @@ public interface DeptService extends IService<Dept> {
|
||||||
*
|
*
|
||||||
* @param dto 添加表单
|
* @param dto 添加表单
|
||||||
*/
|
*/
|
||||||
void addDept(@Valid DeptAddDto dto);
|
void addDept(DeptAddDto dto);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* * 更新部门
|
* * 更新部门
|
||||||
*
|
*
|
||||||
* @param dto 更新表单
|
* @param dto 更新表单
|
||||||
*/
|
*/
|
||||||
void updateDept(@Valid DeptUpdateDto dto);
|
void updateDept(DeptUpdateDto dto);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* * 删除|批量删除部门类型
|
* * 删除|批量删除部门类型
|
||||||
|
|
|
@ -9,7 +9,6 @@ import cn.bunny.services.domain.system.entity.Permission;
|
||||||
import cn.bunny.services.domain.system.vo.PermissionVo;
|
import cn.bunny.services.domain.system.vo.PermissionVo;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
import jakarta.validation.Valid;
|
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.web.multipart.MultipartFile;
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
|
|
||||||
|
@ -37,14 +36,14 @@ public interface PermissionService extends IService<Permission> {
|
||||||
*
|
*
|
||||||
* @param dto 添加表单
|
* @param dto 添加表单
|
||||||
*/
|
*/
|
||||||
void addPermission(@Valid PermissionAddDto dto);
|
void addPermission(PermissionAddDto dto);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* * 更新权限
|
* * 更新权限
|
||||||
*
|
*
|
||||||
* @param dto 更新表单
|
* @param dto 更新表单
|
||||||
*/
|
*/
|
||||||
void updatePermission(@Valid PermissionUpdateDto dto);
|
void updatePermission(PermissionUpdateDto dto);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* * 删除|批量删除权限类型
|
* * 删除|批量删除权限类型
|
||||||
|
@ -86,7 +85,7 @@ public interface PermissionService extends IService<Permission> {
|
||||||
/**
|
/**
|
||||||
* 批量修改权限
|
* 批量修改权限
|
||||||
*
|
*
|
||||||
* @param dto 权限数组
|
* @param list 权限数组
|
||||||
*/
|
*/
|
||||||
void updatePermissionBatch(@Valid List<PermissionUpdateDto> list);
|
void updatePermissionBatch(List<PermissionUpdateDto> list);
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,6 @@ package cn.bunny.services.service.system;
|
||||||
import cn.bunny.services.domain.system.dto.AssignPowersToRoleDto;
|
import cn.bunny.services.domain.system.dto.AssignPowersToRoleDto;
|
||||||
import cn.bunny.services.domain.system.entity.RolePermission;
|
import cn.bunny.services.domain.system.entity.RolePermission;
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
import jakarta.validation.Valid;
|
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
@ -30,5 +29,5 @@ public interface RolePermissionService extends IService<RolePermission> {
|
||||||
*
|
*
|
||||||
* @param powerIds 权限id
|
* @param powerIds 权限id
|
||||||
*/
|
*/
|
||||||
void addRolPermission(@Valid AssignPowersToRoleDto powerIds);
|
void addRolPermission(AssignPowersToRoleDto powerIds);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,14 +1,13 @@
|
||||||
package cn.bunny.services.service.system;
|
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.RoleAddDto;
|
||||||
import cn.bunny.services.domain.system.dto.role.RoleDto;
|
import cn.bunny.services.domain.system.dto.role.RoleDto;
|
||||||
import cn.bunny.services.domain.system.dto.role.RoleUpdateDto;
|
import cn.bunny.services.domain.system.dto.role.RoleUpdateDto;
|
||||||
import cn.bunny.services.domain.system.entity.Role;
|
import cn.bunny.services.domain.system.entity.Role;
|
||||||
import cn.bunny.services.domain.system.vo.RoleVo;
|
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.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
import jakarta.validation.Valid;
|
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.web.multipart.MultipartFile;
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
|
|
||||||
|
@ -36,14 +35,14 @@ public interface RoleService extends IService<Role> {
|
||||||
*
|
*
|
||||||
* @param dto 添加表单
|
* @param dto 添加表单
|
||||||
*/
|
*/
|
||||||
void addRole(@Valid RoleAddDto dto);
|
void addRole(RoleAddDto dto);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* * 更新角色
|
* * 更新角色
|
||||||
*
|
*
|
||||||
* @param dto 更新表单
|
* @param dto 更新表单
|
||||||
*/
|
*/
|
||||||
void updateRole(@Valid RoleUpdateDto dto);
|
void updateRole(RoleUpdateDto dto);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* * 删除|批量删除角色类型
|
* * 删除|批量删除角色类型
|
||||||
|
|
|
@ -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.RouterManageVo;
|
||||||
import cn.bunny.services.domain.system.vo.router.WebUserRouterVo;
|
import cn.bunny.services.domain.system.vo.router.WebUserRouterVo;
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
import jakarta.validation.Valid;
|
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
@ -38,14 +37,14 @@ public interface RouterService extends IService<Router> {
|
||||||
*
|
*
|
||||||
* @param dto 添加菜单表单
|
* @param dto 添加菜单表单
|
||||||
*/
|
*/
|
||||||
void addRouter(@Valid RouterAddDto dto);
|
void addRouter(RouterAddDto dto);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* * 更新路由菜单
|
* * 更新路由菜单
|
||||||
*
|
*
|
||||||
* @param dto 更新表单
|
* @param dto 更新表单
|
||||||
*/
|
*/
|
||||||
void updateRouter(@Valid RouterUpdateDto dto);
|
void updateRouter(RouterUpdateDto dto);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* * 删除路由菜单
|
* * 删除路由菜单
|
||||||
|
|
|
@ -9,7 +9,6 @@ import cn.bunny.services.domain.system.vo.user.AdminUserVo;
|
||||||
import cn.bunny.services.domain.system.vo.user.UserVo;
|
import cn.bunny.services.domain.system.vo.user.UserVo;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
import jakarta.validation.Valid;
|
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
@ -35,14 +34,14 @@ public interface UserService extends IService<AdminUser> {
|
||||||
*
|
*
|
||||||
* @param dto 添加表单
|
* @param dto 添加表单
|
||||||
*/
|
*/
|
||||||
void addUserByAdmin(@Valid AdminUserAddDto dto);
|
void addUserByAdmin(AdminUserAddDto dto);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* * 更新用户信息
|
* * 更新用户信息
|
||||||
*
|
*
|
||||||
* @param dto 更新表单
|
* @param dto 更新表单
|
||||||
*/
|
*/
|
||||||
void updateUserByAdmin(@Valid AdminUserUpdateDto dto);
|
void updateUserByAdmin(AdminUserUpdateDto dto);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* * 删除|批量删除用户信息类型
|
* * 删除|批量删除用户信息类型
|
||||||
|
|
|
@ -27,7 +27,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import jakarta.annotation.Resource;
|
import jakarta.annotation.Resource;
|
||||||
import jakarta.validation.Valid;
|
|
||||||
import org.springframework.beans.BeanUtils;
|
import org.springframework.beans.BeanUtils;
|
||||||
import org.springframework.cache.annotation.CacheEvict;
|
import org.springframework.cache.annotation.CacheEvict;
|
||||||
import org.springframework.cache.annotation.Cacheable;
|
import org.springframework.cache.annotation.Cacheable;
|
||||||
|
@ -131,7 +130,7 @@ public class PermissionServiceImpl extends ServiceImpl<PermissionMapper, Permiss
|
||||||
@Caching(evict = {
|
@Caching(evict = {
|
||||||
@CacheEvict(cacheNames = CACHE_NAMES, key = "'permissionList'", beforeInvocation = true),
|
@CacheEvict(cacheNames = CACHE_NAMES, key = "'permissionList'", beforeInvocation = true),
|
||||||
})
|
})
|
||||||
public void addPermission(@Valid PermissionAddDto dto) {
|
public void addPermission(PermissionAddDto dto) {
|
||||||
Permission permission = new Permission();
|
Permission permission = new Permission();
|
||||||
BeanUtils.copyProperties(dto, permission);
|
BeanUtils.copyProperties(dto, permission);
|
||||||
save(permission);
|
save(permission);
|
||||||
|
@ -146,7 +145,7 @@ public class PermissionServiceImpl extends ServiceImpl<PermissionMapper, Permiss
|
||||||
@Caching(evict = {
|
@Caching(evict = {
|
||||||
@CacheEvict(cacheNames = CACHE_NAMES, key = "'permissionList'", beforeInvocation = true),
|
@CacheEvict(cacheNames = CACHE_NAMES, key = "'permissionList'", beforeInvocation = true),
|
||||||
})
|
})
|
||||||
public void updatePermission(@Valid PermissionUpdateDto dto) {
|
public void updatePermission(PermissionUpdateDto dto) {
|
||||||
Long id = dto.getId();
|
Long id = dto.getId();
|
||||||
List<Permission> permissionList = list(Wrappers.<Permission>lambdaQuery().eq(Permission::getId, id));
|
List<Permission> permissionList = list(Wrappers.<Permission>lambdaQuery().eq(Permission::getId, id));
|
||||||
if (permissionList.isEmpty()) throw new AuthCustomerException(ResultCodeEnum.DATA_NOT_EXIST);
|
if (permissionList.isEmpty()) throw new AuthCustomerException(ResultCodeEnum.DATA_NOT_EXIST);
|
||||||
|
|
|
@ -20,7 +20,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import jakarta.annotation.Resource;
|
import jakarta.annotation.Resource;
|
||||||
import jakarta.validation.Valid;
|
|
||||||
import org.springframework.beans.BeanUtils;
|
import org.springframework.beans.BeanUtils;
|
||||||
import org.springframework.cache.annotation.CacheEvict;
|
import org.springframework.cache.annotation.CacheEvict;
|
||||||
import org.springframework.cache.annotation.Cacheable;
|
import org.springframework.cache.annotation.Cacheable;
|
||||||
|
@ -172,7 +171,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
|
||||||
@Caching(evict = {
|
@Caching(evict = {
|
||||||
@CacheEvict(cacheNames = CACHE_NAMES, key = "'roleList'", beforeInvocation = true),
|
@CacheEvict(cacheNames = CACHE_NAMES, key = "'roleList'", beforeInvocation = true),
|
||||||
})
|
})
|
||||||
public void addRole(@Valid RoleAddDto dto) {
|
public void addRole(RoleAddDto dto) {
|
||||||
Role role = new Role();
|
Role role = new Role();
|
||||||
BeanUtils.copyProperties(dto, role);
|
BeanUtils.copyProperties(dto, role);
|
||||||
save(role);
|
save(role);
|
||||||
|
@ -208,7 +207,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
|
||||||
@Caching(evict = {
|
@Caching(evict = {
|
||||||
@CacheEvict(cacheNames = CACHE_NAMES, key = "'roleList'", beforeInvocation = true),
|
@CacheEvict(cacheNames = CACHE_NAMES, key = "'roleList'", beforeInvocation = true),
|
||||||
})
|
})
|
||||||
public void updateRole(@Valid RoleUpdateDto dto) {
|
public void updateRole(RoleUpdateDto dto) {
|
||||||
// 查询更新的角色是否存在
|
// 查询更新的角色是否存在
|
||||||
Long roleId = dto.getId();
|
Long roleId = dto.getId();
|
||||||
List<Role> roleList = list(Wrappers.<Role>lambdaQuery().eq(Role::getId, roleId));
|
List<Role> roleList = list(Wrappers.<Role>lambdaQuery().eq(Role::getId, roleId));
|
||||||
|
|
|
@ -35,7 +35,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import jakarta.annotation.Resource;
|
import jakarta.annotation.Resource;
|
||||||
import jakarta.validation.Valid;
|
|
||||||
import org.springframework.beans.BeanUtils;
|
import org.springframework.beans.BeanUtils;
|
||||||
import org.springframework.context.ApplicationEventPublisher;
|
import org.springframework.context.ApplicationEventPublisher;
|
||||||
import org.springframework.data.redis.core.RedisTemplate;
|
import org.springframework.data.redis.core.RedisTemplate;
|
||||||
|
@ -235,7 +234,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, AdminUser> implemen
|
||||||
* @param dto 用户信息添加
|
* @param dto 用户信息添加
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void addUserByAdmin(@Valid AdminUserAddDto dto) {
|
public void addUserByAdmin(AdminUserAddDto dto) {
|
||||||
// 对密码加密
|
// 对密码加密
|
||||||
String encodePassword = passwordEncoder.encode(dto.getPassword());
|
String encodePassword = passwordEncoder.encode(dto.getPassword());
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue