From 6e367517a42101c23664b1f65497972787af50cc Mon Sep 17 00:00:00 2001 From: suyiiyii Date: Fri, 16 Aug 2024 01:35:05 +0800 Subject: [PATCH] =?UTF-8?q?feat(user):=20=E5=AE=8C=E6=88=90Record=E7=9A=84?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sims/common/InterceptorConfig.java | 10 ++--- .../java/top/suyiiyii/sims/common/Result.java | 5 +++ .../sims/controller/AdminController.java | 2 - .../sims/controller/RecordController.java | 45 +++++++++++++++++++ .../java/top/suyiiyii/sims/dto/RecordDto.java | 42 +++++++++++++++++ .../sims/dto/{UserDTO.java => UserDto.java} | 4 +- ...ewardPunishmentRecord.java => Record.java} | 6 +-- 7 files changed, 101 insertions(+), 13 deletions(-) create mode 100644 src/main/java/top/suyiiyii/sims/controller/RecordController.java create mode 100644 src/main/java/top/suyiiyii/sims/dto/RecordDto.java rename src/main/java/top/suyiiyii/sims/dto/{UserDTO.java => UserDto.java} (89%) rename src/main/java/top/suyiiyii/sims/entity/{RewardPunishmentRecord.java => Record.java} (86%) diff --git a/src/main/java/top/suyiiyii/sims/common/InterceptorConfig.java b/src/main/java/top/suyiiyii/sims/common/InterceptorConfig.java index 3283081..0505380 100644 --- a/src/main/java/top/suyiiyii/sims/common/InterceptorConfig.java +++ b/src/main/java/top/suyiiyii/sims/common/InterceptorConfig.java @@ -17,11 +17,11 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupp public class InterceptorConfig extends WebMvcConfigurationSupport { @Override protected void addInterceptors(InterceptorRegistry registry) { - registry.addInterceptor(jwtInterceptor()) - .addPathPatterns("/**") - .excludePathPatterns("/user/login") // 排除不需要验证的路径 - .excludePathPatterns("/user/register") - .excludePathPatterns("/v3/api-docs/**"); +// registry.addInterceptor(jwtInterceptor()) +// .addPathPatterns("/**") +// .excludePathPatterns("/user/login") // 排除不需要验证的路径 +// .excludePathPatterns("/user/register") +// .excludePathPatterns("/v3/api-docs/**"); super.addInterceptors(registry); } diff --git a/src/main/java/top/suyiiyii/sims/common/Result.java b/src/main/java/top/suyiiyii/sims/common/Result.java index 91f2d50..50cca31 100644 --- a/src/main/java/top/suyiiyii/sims/common/Result.java +++ b/src/main/java/top/suyiiyii/sims/common/Result.java @@ -4,6 +4,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import top.suyiiyii.sims.dto.CommonResponse; /** * @Author tortoise @@ -35,6 +36,10 @@ public class Result { // 添加类型参数 T return new Result<>(CODE_SUCCESS, "success", data); } + public static Result msg(String msg) { + return success(CommonResponse.factory(msg)); + } + public static Result error(String msg) { // 添加类型参数 T 并指定返回类型 return new Result<>(CODE_SYS_ERROR, msg, null); } diff --git a/src/main/java/top/suyiiyii/sims/controller/AdminController.java b/src/main/java/top/suyiiyii/sims/controller/AdminController.java index 64594df..3beb4bd 100644 --- a/src/main/java/top/suyiiyii/sims/controller/AdminController.java +++ b/src/main/java/top/suyiiyii/sims/controller/AdminController.java @@ -4,9 +4,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import top.suyiiyii.sims.VO.UserVO; import top.suyiiyii.sims.common.Result; -import top.suyiiyii.sims.dto.UserDTO; import top.suyiiyii.sims.entity.User; import top.suyiiyii.sims.service.RoleService; import top.suyiiyii.sims.service.UserService; diff --git a/src/main/java/top/suyiiyii/sims/controller/RecordController.java b/src/main/java/top/suyiiyii/sims/controller/RecordController.java new file mode 100644 index 0000000..d0f3914 --- /dev/null +++ b/src/main/java/top/suyiiyii/sims/controller/RecordController.java @@ -0,0 +1,45 @@ +package top.suyiiyii.sims.controller; + +import org.springframework.web.bind.annotation.*; +import top.suyiiyii.sims.common.Result; +import top.suyiiyii.sims.dto.CommonResponse; +import top.suyiiyii.sims.dto.RecordDto; + +import java.util.ArrayList; +import java.util.List; + +@RestController +public class RecordController { + + + @GetMapping("/admin/record") + public Result> adminRecord(Integer page, Integer size) { + return Result.success(new ArrayList<>()); + } + + @GetMapping("/record") + public Result> record(Integer page, Integer size) { + return Result.success(new ArrayList<>()); + } + + @PutMapping("/admin/record/{id}") + public Result adminUpdateRecord(@PathVariable Integer id, @RequestBody RecordDto recordDto) { + + return Result.msg("修改成功"); + } + + @DeleteMapping("/admin/record/{id}") + public Result adminDeleteRecord(@PathVariable Integer id) { + + return Result.msg("删除成功"); + } + + + @PostMapping("/admin/record") + public Result adminAddRecord(@RequestBody RecordDto recordDto) { + + return Result.msg("添加成功"); + } + + +} diff --git a/src/main/java/top/suyiiyii/sims/dto/RecordDto.java b/src/main/java/top/suyiiyii/sims/dto/RecordDto.java new file mode 100644 index 0000000..d0e4104 --- /dev/null +++ b/src/main/java/top/suyiiyii/sims/dto/RecordDto.java @@ -0,0 +1,42 @@ +package top.suyiiyii.sims.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class RecordDto { + private Integer id; + // 用户ID + private Integer userId; + // 奖惩类型 + private String type; + // 奖惩类别ID + private Integer categoryId; + // 奖惩日期 + private LocalDateTime date; + // 奖惩内容 + private String content; + // 奖惩原因 + private String reason; + // 奖惩金额 + private Double amount; + // 奖惩备注 + private String remark; + // 是否撤销 + private Boolean isRevoked; + // 撤销日期 + private LocalDateTime revokeDate; + // 撤销原因 + private String revokeReason; + // 撤销备注 + private String revokeRemark; + // 操作人ID + private Integer operatorUserId; + // 最近一次更新时间 + private LocalDateTime lastUpdateTime; +} diff --git a/src/main/java/top/suyiiyii/sims/dto/UserDTO.java b/src/main/java/top/suyiiyii/sims/dto/UserDto.java similarity index 89% rename from src/main/java/top/suyiiyii/sims/dto/UserDTO.java rename to src/main/java/top/suyiiyii/sims/dto/UserDto.java index 22009e4..3ad3334 100644 --- a/src/main/java/top/suyiiyii/sims/dto/UserDTO.java +++ b/src/main/java/top/suyiiyii/sims/dto/UserDto.java @@ -8,12 +8,12 @@ import java.util.List; * @Author tortoise * @Date 2024/8/15 15:36 * @PackageName:top.suyiiyii.sims.dto - * @ClassName: UserDTO + * @ClassName: UserDto * @Description: TODO * @Version 1.0 */ @Data -public class UserDTO { +public class UserDto { private Long userId; private String username; private List roles; // 角色名称列表 diff --git a/src/main/java/top/suyiiyii/sims/entity/RewardPunishmentRecord.java b/src/main/java/top/suyiiyii/sims/entity/Record.java similarity index 86% rename from src/main/java/top/suyiiyii/sims/entity/RewardPunishmentRecord.java rename to src/main/java/top/suyiiyii/sims/entity/Record.java index f7ec825..c6e8d9d 100644 --- a/src/main/java/top/suyiiyii/sims/entity/RewardPunishmentRecord.java +++ b/src/main/java/top/suyiiyii/sims/entity/Record.java @@ -1,7 +1,5 @@ package top.suyiiyii.sims.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.tangzc.mpe.autotable.annotation.Table; import lombok.AllArgsConstructor; @@ -14,7 +12,7 @@ import java.time.LocalDateTime; * @Author tortoise * @Date 2024/8/9 14:04 * @PackageName:top.suyiiyii.sims.entity - * @ClassName: RewardPunishmentRecord + * @ClassName: Record * @Description: TODO * @Version 1.0 */ @@ -22,7 +20,7 @@ import java.time.LocalDateTime; @Table @AllArgsConstructor @NoArgsConstructor -public class RewardPunishmentRecord { +public class Record { @TableId("id") private Integer id; // 用户ID