From eacad6e370b8ee4f54d65b26ef31fe39709d1f44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E4=BD=B3=E8=B1=AA?= Date: Sat, 14 Jun 2025 15:01:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=AF=E5=8A=A8=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/VlogUploadController.java | 8 ++--- .../wzj/soopin/content/domain/bo/VlogBO.java | 14 +++++--- .../content/service/impl/VlogServiceImpl.java | 36 +++++++++---------- 3 files changed, 30 insertions(+), 28 deletions(-) diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/admin/VlogUploadController.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/admin/VlogUploadController.java index c22140f00..113c1589b 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/admin/VlogUploadController.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/admin/VlogUploadController.java @@ -64,8 +64,8 @@ public class VlogUploadController extends BaseInfoProperties { if (StringUtils.isNotBlank(vlogBO.getMobile()) || StringUtils.isNotBlank(vlogBO.getNickname()) || StringUtils.isNotBlank(vlogBO.getTitleQuery()) - || StringUtils.isNotBlank(vlogBO.getStartTime()) - || StringUtils.isNotBlank(vlogBO.getEndTime()) + || vlogBO.getStartTime() != null + || vlogBO.getEndTime() != null || vlogBO.getStatus() != null || StringUtils.isNotBlank(vlogBO.getColumn())) { @@ -179,8 +179,8 @@ public class VlogUploadController extends BaseInfoProperties { */ @PostMapping("/audit") public R auditVlog(@RequestParam String vlogId, - @RequestParam Integer status, - @RequestParam(required = false) String reason) { + @RequestParam Integer status, + @RequestParam(required = false) String reason) { try { vlogUploadService.auditVlog(vlogId, status, reason); return R.ok(); diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/domain/bo/VlogBO.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/domain/bo/VlogBO.java index 5001845d6..17f0109d7 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/domain/bo/VlogBO.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/domain/bo/VlogBO.java @@ -10,6 +10,8 @@ import lombok.NoArgsConstructor; import lombok.ToString; import org.apache.commons.lang3.StringUtils; import org.dromara.common.core.domain.BaseBO; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; @Data @AllArgsConstructor @@ -57,10 +59,10 @@ public class VlogBO extends BaseBO { private Integer status; @ApiModelProperty("创建时间范围-开始时间") - private String startTime; + private LocalDateTime startTime; @ApiModelProperty("创建时间范围-结束时间") - private String endTime; + private LocalDateTime endTime; @Override public LambdaQueryWrapper toWrapper() { @@ -84,9 +86,11 @@ public class VlogBO extends BaseBO { } // 添加时间范围查询 - if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) { - wrapper.ge(Vlog::getCreateTime, startTime); - wrapper.lt(Vlog::getCreateTime, endTime); + if (startTime != null && endTime != null) { + String startTimeStr = startTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + String endTimeStr = endTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + wrapper.ge(Vlog::getCreateTime, startTimeStr); + wrapper.lt(Vlog::getCreateTime, endTimeStr); } // 添加排序条件 diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogServiceImpl.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogServiceImpl.java index 806346ee9..dc5f0c417 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogServiceImpl.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogServiceImpl.java @@ -69,8 +69,8 @@ public class VlogServiceImpl extends BaseInfoProperties implements VlogService { public void updateVlogStatus(String fileId, Integer status, String reason) { LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.eq(Vlog::getFileId, fileId) - .set(Vlog::getStatus, status) - .set(Vlog::getReason, reason); + .set(Vlog::getStatus, status) + .set(Vlog::getReason, reason); vlogMapper.update(null, updateWrapper); } @@ -79,8 +79,8 @@ public class VlogServiceImpl extends BaseInfoProperties implements VlogService { public void updateVlogFirstImg(String fileId, String url, String fileUrl) { LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.eq(Vlog::getFileId, fileId) - .set(Vlog::getFirstFrameImg, url) - .set(Vlog::getUrl, fileUrl); + .set(Vlog::getFirstFrameImg, url) + .set(Vlog::getUrl, fileUrl); vlogMapper.update(null, updateWrapper); } @@ -230,8 +230,8 @@ public class VlogServiceImpl extends BaseInfoProperties implements VlogService { public void changeToPrivateOrPublic(String userId, String vlogId, Integer yesOrNo) { LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.eq(Vlog::getId, vlogId) - .eq(Vlog::getVlogerId, userId) - .set(Vlog::getIsPrivate, yesOrNo); + .eq(Vlog::getVlogerId, userId) + .set(Vlog::getIsPrivate, yesOrNo); vlogMapper.update(null, updateWrapper); } @@ -240,8 +240,8 @@ public class VlogServiceImpl extends BaseInfoProperties implements VlogService { public void changeVlogStatus(String userId, String vlogId, Integer status) { LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.eq(Vlog::getId, vlogId) - .eq(Vlog::getVlogerId, userId) - .set(Vlog::getStatus, status); + .eq(Vlog::getVlogerId, userId) + .set(Vlog::getStatus, status); vlogMapper.update(null, updateWrapper); } @@ -250,7 +250,7 @@ public class VlogServiceImpl extends BaseInfoProperties implements VlogService { Page pageParam = new Page<>(page, pageSize); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(Vlog::getVlogerId, userId) - .eq(Vlog::getIsPrivate, yesOrNo); + .eq(Vlog::getIsPrivate, yesOrNo); Page vlogPage = vlogMapper.selectPage(pageParam, queryWrapper); List vlogList = vlogPage.getRecords(); @@ -301,7 +301,7 @@ public class VlogServiceImpl extends BaseInfoProperties implements VlogService { public void flushCounts(String vlogId, Integer counts) { LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.eq(Vlog::getId, vlogId) - .set(Vlog::getLikeCounts, counts); + .set(Vlog::getLikeCounts, counts); vlogMapper.update(null, updateWrapper); } @@ -310,7 +310,7 @@ public class VlogServiceImpl extends BaseInfoProperties implements VlogService { public void userUnLikeVlog(String userId, String vlogId) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(MyLikedVlog::getUserId, userId) - .eq(MyLikedVlog::getVlogId, vlogId); + .eq(MyLikedVlog::getVlogId, vlogId); myLikedVlogMapper.delete(queryWrapper); // 我喜欢的视频总数累减 @@ -515,7 +515,7 @@ public class VlogServiceImpl extends BaseInfoProperties implements VlogService { public IPage> getVlogListByMobile(Page> page, VlogBO vlogBO) { // 统一调用新的Mapper方法进行查询和排序 // 预处理时间字符串，确保转换为MySQL DATETIME兼容格式 - String beginTimeStr = vlogBO.getStartTime(); + String beginTimeStr = vlogBO.getStartTime() != null ? vlogBO.getStartTime().toString() : null; if (StringUtils.isNotBlank(beginTimeStr)) { try { // 移除双引号，解析为 Instant，然后转换为 LocalDateTime @@ -524,9 +524,8 @@ public class VlogServiceImpl extends BaseInfoProperties implements VlogService { System.out.println("Cleaned beginTimeStr: " + cleanedBeginTimeStr); Instant instant = Instant.parse(cleanedBeginTimeStr); LocalDateTime dateTime = LocalDateTime.ofInstant(instant, ZoneOffset.UTC); - String formattedDateTime = dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); - System.out.println("Formatted startTime: " + formattedDateTime); - vlogBO.setStartTime(formattedDateTime); + System.out.println("Formatted startTime: " + dateTime); + vlogBO.setStartTime(dateTime); } catch (Exception e) { // 处理解析异常，例如日志记录 System.err.println("Error parsing beginTime: " + beginTimeStr + " - " + e.getMessage()); @@ -537,7 +536,7 @@ public class VlogServiceImpl extends BaseInfoProperties implements VlogService { vlogBO.setStartTime(null); } - String endTimeStr = vlogBO.getEndTime(); + String endTimeStr = vlogBO.getEndTime() != null ? vlogBO.getEndTime().toString() : null; if (StringUtils.isNotBlank(endTimeStr)) { try { // 移除双引号，解析为 Instant，然后转换为 LocalDateTime @@ -546,9 +545,8 @@ public class VlogServiceImpl extends BaseInfoProperties implements VlogService { System.out.println("Cleaned endTimeStr: " + cleanedEndTimeStr); Instant instant = Instant.parse(cleanedEndTimeStr); LocalDateTime dateTime = LocalDateTime.ofInstant(instant, ZoneOffset.UTC); - String formattedDateTime = dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); - System.out.println("Formatted endTime: " + formattedDateTime); - vlogBO.setEndTime(formattedDateTime); + System.out.println("Formatted endTime: " + dateTime); + vlogBO.setEndTime(dateTime); } catch (Exception e) { // 处理解析异常，例如日志记录 System.err.println("Error parsing endTime: " + endTimeStr + " - " + e.getMessage());