diff --git a/src/main/java/com/zh/project0512/controller/ReferenceController.java b/src/main/java/com/zh/project0512/controller/ReferenceController.java index f93a416..deae708 100644 --- a/src/main/java/com/zh/project0512/controller/ReferenceController.java +++ b/src/main/java/com/zh/project0512/controller/ReferenceController.java @@ -205,7 +205,7 @@ public class ReferenceController { @Operation(summary = "素材列表") @PostMapping("/list") - public Result list(@Validated @RequestBody ListRParam param,@RequestHeader("token") @Parameter(name = "登录token") String token) { + public Result list(@Validated @RequestBody ListRParam param,@RequestHeader(value="token",required = false) @Parameter(name = "登录token") String token) { Claims claims = new JwtUtil().parseJWT(token); QueryWrapper queryWrapper = new QueryWrapper<>(); JSONObject obj = new JSONObject(); @@ -242,14 +242,26 @@ public class ReferenceController { @Schema(title = "日期") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss") private LocalDateTime date; + @Schema(title = "素材分组id") + private Integer groupId; + @Schema(title = "月份区间") + private Integer month; } @Operation(summary = "按日期查询") - @PostMapping("/date") - public Result detail(@Validated @RequestBody DetaPParam param) { + @PostMapping("/listByDay") + public Result detail(@Validated @RequestBody DetaPParam param,@RequestHeader(value="token",required = false) @Parameter(name = "登录token") String token) { + Claims claims = new JwtUtil().parseJWT(token); LocalDateTime dayBegin = LocalDateTime.of(param.getDate().toLocalDate(), LocalTime.MIN); LocalDateTime dayLast = LocalDateTime.of(param.getDate().toLocalDate(), LocalTime.MAX); - List list = referenceService.lambdaQuery().between(Reference::getCreatAt, dayBegin, dayLast).list(); + Integer groupId = param.groupId; + QueryWrapper queryWrapper = new QueryWrapper<>(); + if(groupId != null){ + queryWrapper.eq("groupId",groupId); + } + queryWrapper.orderByDesc("creatAt"); + queryWrapper.between("creatAt",dayBegin,dayLast); + List list = referenceService.list(queryWrapper); return Result.success(list); }