abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改启动报错

Browse Source
This commit is contained in:
曹佳豪 2025-06-14 15:01:14 +08:00
parent e78c6d2b0d
commit eacad6e370
3 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/admin/VlogUploadController.java
View File

@ -64,8 +64,8 @@ public class VlogUploadController extends BaseInfoProperties {
if (StringUtils.isNotBlank(vlogBO.getMobile()) if (StringUtils.isNotBlank(vlogBO.getMobile())
|| StringUtils.isNotBlank(vlogBO.getNickname()) || StringUtils.isNotBlank(vlogBO.getNickname())
|| StringUtils.isNotBlank(vlogBO.getTitleQuery()) || StringUtils.isNotBlank(vlogBO.getTitleQuery())
|| StringUtils.isNotBlank(vlogBO.getStartTime()) || vlogBO.getStartTime() != null
|| StringUtils.isNotBlank(vlogBO.getEndTime()) || vlogBO.getEndTime() != null
|| vlogBO.getStatus() != null || vlogBO.getStatus() != null
|| StringUtils.isNotBlank(vlogBO.getColumn())) { || StringUtils.isNotBlank(vlogBO.getColumn())) {
@ -179,8 +179,8 @@ public class VlogUploadController extends BaseInfoProperties {
*/ */
@PostMapping("/audit") @PostMapping("/audit")
public R<Void> auditVlog(@RequestParam String vlogId, public R<Void> auditVlog(@RequestParam String vlogId,
@RequestParam Integer status, @RequestParam Integer status,
@RequestParam(required = false) String reason) { @RequestParam(required = false) String reason) {
try { try {
vlogUploadService.auditVlog(vlogId, status, reason); vlogUploadService.auditVlog(vlogId, status, reason);
return R.ok(); return R.ok();

14
ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/domain/bo/VlogBO.java
View File

@ -10,6 +10,8 @@ import lombok.NoArgsConstructor;
import lombok.ToString; import lombok.ToString;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.dromara.common.core.domain.BaseBO; import org.dromara.common.core.domain.BaseBO;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
@Data @Data
@AllArgsConstructor @AllArgsConstructor
@ -57,10 +59,10 @@ public class VlogBO extends BaseBO {
private Integer status; private Integer status;
@ApiModelProperty("创建时间范围-开始时间") @ApiModelProperty("创建时间范围-开始时间")
private String startTime; private LocalDateTime startTime;
@ApiModelProperty("创建时间范围-结束时间") @ApiModelProperty("创建时间范围-结束时间")
private String endTime; private LocalDateTime endTime;
@Override @Override
public LambdaQueryWrapper<Vlog> toWrapper() { public LambdaQueryWrapper<Vlog> toWrapper() {
@ -84,9 +86,11 @@ public class VlogBO extends BaseBO {
} }
// 添加时间范围查询 // 添加时间范围查询
if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) { if (startTime != null && endTime != null) {
wrapper.ge(Vlog::getCreateTime, startTime); String startTimeStr = startTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
wrapper.lt(Vlog::getCreateTime, endTime); String endTimeStr = endTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
wrapper.ge(Vlog::getCreateTime, startTimeStr);
wrapper.lt(Vlog::getCreateTime, endTimeStr);
} }
// 添加排序条件 // 添加排序条件

36
ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/service/impl/VlogServiceImpl.java
View File

@ -69,8 +69,8 @@ public class VlogServiceImpl extends BaseInfoProperties implements VlogService {
public void updateVlogStatus(String fileId, Integer status, String reason) { public void updateVlogStatus(String fileId, Integer status, String reason) {
LambdaUpdateWrapper<Vlog> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<Vlog> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(Vlog::getFileId, fileId) updateWrapper.eq(Vlog::getFileId, fileId)
.set(Vlog::getStatus, status) .set(Vlog::getStatus, status)
.set(Vlog::getReason, reason); .set(Vlog::getReason, reason);
vlogMapper.update(null, updateWrapper); vlogMapper.update(null, updateWrapper);
} }
@ -79,8 +79,8 @@ public class VlogServiceImpl extends BaseInfoProperties implements VlogService {
public void updateVlogFirstImg(String fileId, String url, String fileUrl) { public void updateVlogFirstImg(String fileId, String url, String fileUrl) {
LambdaUpdateWrapper<Vlog> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<Vlog> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(Vlog::getFileId, fileId) updateWrapper.eq(Vlog::getFileId, fileId)
.set(Vlog::getFirstFrameImg, url) .set(Vlog::getFirstFrameImg, url)
.set(Vlog::getUrl, fileUrl); .set(Vlog::getUrl, fileUrl);
vlogMapper.update(null, updateWrapper); vlogMapper.update(null, updateWrapper);
} }
@ -230,8 +230,8 @@ public class VlogServiceImpl extends BaseInfoProperties implements VlogService {
public void changeToPrivateOrPublic(String userId, String vlogId, Integer yesOrNo) { public void changeToPrivateOrPublic(String userId, String vlogId, Integer yesOrNo) {
LambdaUpdateWrapper<Vlog> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<Vlog> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(Vlog::getId, vlogId) updateWrapper.eq(Vlog::getId, vlogId)
.eq(Vlog::getVlogerId, userId) .eq(Vlog::getVlogerId, userId)
.set(Vlog::getIsPrivate, yesOrNo); .set(Vlog::getIsPrivate, yesOrNo);
vlogMapper.update(null, updateWrapper); vlogMapper.update(null, updateWrapper);
} }
@ -240,8 +240,8 @@ public class VlogServiceImpl extends BaseInfoProperties implements VlogService {
public void changeVlogStatus(String userId, String vlogId, Integer status) { public void changeVlogStatus(String userId, String vlogId, Integer status) {
LambdaUpdateWrapper<Vlog> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<Vlog> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(Vlog::getId, vlogId) updateWrapper.eq(Vlog::getId, vlogId)
.eq(Vlog::getVlogerId, userId) .eq(Vlog::getVlogerId, userId)
.set(Vlog::getStatus, status); .set(Vlog::getStatus, status);
vlogMapper.update(null, updateWrapper); vlogMapper.update(null, updateWrapper);
} }
@ -250,7 +250,7 @@ public class VlogServiceImpl extends BaseInfoProperties implements VlogService {
Page<Vlog> pageParam = new Page<>(page, pageSize); Page<Vlog> pageParam = new Page<>(page, pageSize);
LambdaQueryWrapper<Vlog> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<Vlog> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(Vlog::getVlogerId, userId) queryWrapper.eq(Vlog::getVlogerId, userId)
.eq(Vlog::getIsPrivate, yesOrNo); .eq(Vlog::getIsPrivate, yesOrNo);
Page<Vlog> vlogPage = vlogMapper.selectPage(pageParam, queryWrapper); Page<Vlog> vlogPage = vlogMapper.selectPage(pageParam, queryWrapper);
List<Vlog> vlogList = vlogPage.getRecords(); List<Vlog> vlogList = vlogPage.getRecords();
@ -301,7 +301,7 @@ public class VlogServiceImpl extends BaseInfoProperties implements VlogService {
public void flushCounts(String vlogId, Integer counts) { public void flushCounts(String vlogId, Integer counts) {
LambdaUpdateWrapper<Vlog> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<Vlog> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(Vlog::getId, vlogId) updateWrapper.eq(Vlog::getId, vlogId)
.set(Vlog::getLikeCounts, counts); .set(Vlog::getLikeCounts, counts);
vlogMapper.update(null, updateWrapper); vlogMapper.update(null, updateWrapper);
} }
@ -310,7 +310,7 @@ public class VlogServiceImpl extends BaseInfoProperties implements VlogService {
public void userUnLikeVlog(String userId, String vlogId) { public void userUnLikeVlog(String userId, String vlogId) {
LambdaQueryWrapper<MyLikedVlog> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<MyLikedVlog> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(MyLikedVlog::getUserId, userId) queryWrapper.eq(MyLikedVlog::getUserId, userId)
.eq(MyLikedVlog::getVlogId, vlogId); .eq(MyLikedVlog::getVlogId, vlogId);
myLikedVlogMapper.delete(queryWrapper); myLikedVlogMapper.delete(queryWrapper);
// 我喜欢的视频总数累减 // 我喜欢的视频总数累减
@ -515,7 +515,7 @@ public class VlogServiceImpl extends BaseInfoProperties implements VlogService {
public IPage<Map<String, Object>> getVlogListByMobile(Page<Map<String, Object>> page, VlogBO vlogBO) { public IPage<Map<String, Object>> getVlogListByMobile(Page<Map<String, Object>> page, VlogBO vlogBO) {
// 统一调用新的Mapper方法进行查询和排序 // 统一调用新的Mapper方法进行查询和排序
// 预处理时间字符串，确保转换为MySQL DATETIME兼容格式 // 预处理时间字符串，确保转换为MySQL DATETIME兼容格式
String beginTimeStr = vlogBO.getStartTime(); String beginTimeStr = vlogBO.getStartTime() != null ? vlogBO.getStartTime().toString() : null;
if (StringUtils.isNotBlank(beginTimeStr)) { if (StringUtils.isNotBlank(beginTimeStr)) {
try { try {
// 移除双引号，解析为 Instant，然后转换为 LocalDateTime // 移除双引号，解析为 Instant，然后转换为 LocalDateTime
@ -524,9 +524,8 @@ public class VlogServiceImpl extends BaseInfoProperties implements VlogService {
System.out.println("Cleaned beginTimeStr: " + cleanedBeginTimeStr); System.out.println("Cleaned beginTimeStr: " + cleanedBeginTimeStr);
Instant instant = Instant.parse(cleanedBeginTimeStr); Instant instant = Instant.parse(cleanedBeginTimeStr);
LocalDateTime dateTime = LocalDateTime.ofInstant(instant, ZoneOffset.UTC); LocalDateTime dateTime = LocalDateTime.ofInstant(instant, ZoneOffset.UTC);
String formattedDateTime = dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); System.out.println("Formatted startTime: " + dateTime);
System.out.println("Formatted startTime: " + formattedDateTime); vlogBO.setStartTime(dateTime);
vlogBO.setStartTime(formattedDateTime);
} catch (Exception e) { } catch (Exception e) {
// 处理解析异常，例如日志记录 // 处理解析异常，例如日志记录
System.err.println("Error parsing beginTime: " + beginTimeStr + " - " + e.getMessage()); System.err.println("Error parsing beginTime: " + beginTimeStr + " - " + e.getMessage());
@ -537,7 +536,7 @@ public class VlogServiceImpl extends BaseInfoProperties implements VlogService {
vlogBO.setStartTime(null); vlogBO.setStartTime(null);
} }
String endTimeStr = vlogBO.getEndTime(); String endTimeStr = vlogBO.getEndTime() != null ? vlogBO.getEndTime().toString() : null;
if (StringUtils.isNotBlank(endTimeStr)) { if (StringUtils.isNotBlank(endTimeStr)) {
try { try {
// 移除双引号，解析为 Instant，然后转换为 LocalDateTime // 移除双引号，解析为 Instant，然后转换为 LocalDateTime
@ -546,9 +545,8 @@ public class VlogServiceImpl extends BaseInfoProperties implements VlogService {
System.out.println("Cleaned endTimeStr: " + cleanedEndTimeStr); System.out.println("Cleaned endTimeStr: " + cleanedEndTimeStr);
Instant instant = Instant.parse(cleanedEndTimeStr); Instant instant = Instant.parse(cleanedEndTimeStr);
LocalDateTime dateTime = LocalDateTime.ofInstant(instant, ZoneOffset.UTC); LocalDateTime dateTime = LocalDateTime.ofInstant(instant, ZoneOffset.UTC);
String formattedDateTime = dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); System.out.println("Formatted endTime: " + dateTime);
System.out.println("Formatted endTime: " + formattedDateTime); vlogBO.setEndTime(dateTime);
vlogBO.setEndTime(formattedDateTime);
} catch (Exception e) { } catch (Exception e) {
// 处理解析异常，例如日志记录 // 处理解析异常，例如日志记录
System.err.println("Error parsing endTime: " + endTimeStr + " - " + e.getMessage()); System.err.println("Error parsing endTime: " + endTimeStr + " - " + e.getMessage());