From 8767c5c554ed4a1532206c2ff9e0e9ad3e528ae0 Mon Sep 17 00:00:00 2001 From: tortoise <2891138827@qq.com> Date: Fri, 30 Aug 2024 12:28:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=AA=E4=BA=BA=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sims/common/ModelMapperConfig.java | 1 - .../sims/controller/RecordController.java | 5 +-- .../sims/controller/UserController.java | 3 +- .../top/suyiiyii/sims/dto/UserRecordDto.java | 39 ------------------- 4 files changed, 2 insertions(+), 46 deletions(-) delete mode 100644 src/main/java/top/suyiiyii/sims/dto/UserRecordDto.java diff --git a/src/main/java/top/suyiiyii/sims/common/ModelMapperConfig.java b/src/main/java/top/suyiiyii/sims/common/ModelMapperConfig.java index b053317..d7f6bbb 100644 --- a/src/main/java/top/suyiiyii/sims/common/ModelMapperConfig.java +++ b/src/main/java/top/suyiiyii/sims/common/ModelMapperConfig.java @@ -5,7 +5,6 @@ import org.modelmapper.convention.MatchingStrategies; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import top.suyiiyii.sims.dto.RecordDto; -import top.suyiiyii.sims.dto.UserRecordDto; /** * @Author tortoise diff --git a/src/main/java/top/suyiiyii/sims/controller/RecordController.java b/src/main/java/top/suyiiyii/sims/controller/RecordController.java index 09177d8..d363d77 100644 --- a/src/main/java/top/suyiiyii/sims/controller/RecordController.java +++ b/src/main/java/top/suyiiyii/sims/controller/RecordController.java @@ -43,7 +43,6 @@ RecordController { List records = recordService.getAllRecords(page, size); List recordDtos = new ArrayList<>(); for (Record record : records) { - RecordDto recordDto = modelMapper.map(record, RecordDto.class); recordDto.setCategoryName(categoryService.getCategoryName(record.getCategoryId())); recordDto.setSubCategoryName(categoryService.getsubCategoryName(record.getCategoryId())); @@ -66,8 +65,6 @@ RecordController { RecordDto recordDto = modelMapper.map(record, RecordDto.class); recordDto.setCategoryName(categoryService.getCategoryName(record.getCategoryId())); recordDto.setSubCategoryName(categoryService.getsubCategoryName(record.getCategoryId())); - - recordDtos.add(recordDto); } return Result.success(recordDtos); @@ -106,7 +103,7 @@ RecordController { recordService.addRecord(record); return Result.msg("添加成功"); } - @AuthAccess(allowRoles = {"admin"}) + @AuthAccess(allowRoles = {"admin"}) @Operation(summary = "模糊查询奖惩记录") @GetMapping("/admin/likeRecords") public Result> searchRecords( diff --git a/src/main/java/top/suyiiyii/sims/controller/UserController.java b/src/main/java/top/suyiiyii/sims/controller/UserController.java index 85ebec9..59a5d37 100644 --- a/src/main/java/top/suyiiyii/sims/controller/UserController.java +++ b/src/main/java/top/suyiiyii/sims/controller/UserController.java @@ -3,6 +3,7 @@ package top.suyiiyii.sims.controller; import cn.hutool.core.util.StrUtil; import io.swagger.v3.oas.annotations.Operation; import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.constraints.Max; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -54,7 +55,6 @@ public class UserController { response.setToken(token); return Result.success(response); } - @AuthAccess(allowRoles = {"guest"}) @PostMapping("/user/register") public Result register(@RequestBody RegisterRequest request) { @@ -113,7 +113,6 @@ public class UserController { private String username; private Integer studentId; private String password; - private String email; private String grade; private String userGroup; diff --git a/src/main/java/top/suyiiyii/sims/dto/UserRecordDto.java b/src/main/java/top/suyiiyii/sims/dto/UserRecordDto.java deleted file mode 100644 index 13460de..0000000 --- a/src/main/java/top/suyiiyii/sims/dto/UserRecordDto.java +++ /dev/null @@ -1,39 +0,0 @@ -package top.suyiiyii.sims.dto; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @Author tortoise - * @Date 2024/8/29 21:02 - * @PackageName:top.suyiiyii.sims.dto - * @ClassName: UserRecordDto - * @Description: TODO - * @Version 1.0 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -public class UserRecordDto { - // 用户ID - private Integer studentId; - - - private String categoryName; - - private String subCategoryName; - // 奖惩日期 - private Long date; - // 奖惩内容 - private String content; - // 奖惩原因 - private String reason; - // 奖惩金额 - private Double amount; - // 奖惩备注 - private String remark; - // 是否撤销 - private Boolean isRevoked; - -}