From 9d89ff58e1d08c4b84173985af549e9667869c2c Mon Sep 17 00:00:00 2001
From: abu <3109389044@qq.com>
Date: Mon, 7 Apr 2025 15:19:45 +0800
Subject: [PATCH] reivew
---
.../java/com/imooc/controller/VlogController.java | 12 +++++++-----
.../src/main/resources/mapper/VlogMapperCustom.xml | 12 +++++++++++-
.../src/main/java/com/imooc/service/VlogService.java | 2 ++
.../java/com/imooc/service/impl/VlogServiceImpl.java | 8 ++++++++
4 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/book-api/src/main/java/com/imooc/controller/VlogController.java b/book-api/src/main/java/com/imooc/controller/VlogController.java
index 8fd3bb0..92ba593 100644
--- a/book-api/src/main/java/com/imooc/controller/VlogController.java
+++ b/book-api/src/main/java/com/imooc/controller/VlogController.java
@@ -78,7 +78,7 @@ public class VlogController extends BaseInfoProperties {
transVdUrl = (String) output.get("Url");
}
}
- log.info("任务流 [截取首帧，视频转码，添加水印] 完成, FileId: {}, 封面图 URL: {},视频地址: {}", fileId, coverUrl,transVdUrl);
+ log.info("任务流 [截取首帧，视频转码] 完成, FileId: {}, 封面图 URL: {},视频地址: {}", fileId, coverUrl,transVdUrl);
// TODO: 更新数据库，存储首帧图,设置云端地址，删除本地视频文件
vlogService.updateVlogFirstImg(fileId,coverUrl,transVdUrl);
} else {
@@ -114,12 +114,12 @@ public class VlogController extends BaseInfoProperties {
String label = (String) output.get("Label"); // 违规内容
String subLabel = (String) output.get("SubLabel"); // 违规子标签
log.info("视频文件 {} 审核驳回, 原因: {} - {}", fileId, label, subLabel);
- // TODO: 更新数据库
+ // TODO: 更新数据库,发送站内信
vlogService.updateVlogStatus(fileId,2,label);
} else if ("pass".equals(suggestion)) {
// 审核通过，处理通过逻辑,修改视频状态为1，发送站内消息，告知审核结果
log.info("视频文件 {} 审核通过", fileId);
- // TODO: 更新数据库
+ // TODO: 更新数据库，发送站内信
vlogService.updateVlogStatus(fileId,1,"通过");
} else if ("review".equals(suggestion)){
@@ -127,7 +127,7 @@ public class VlogController extends BaseInfoProperties {
String label = (String) output.get("Label"); // 违规内容
String subLabel = (String) output.get("SubLabel"); // 违规子标签
log.info("视频文件 {} 建议复审, 原因: {} - {}", fileId, label, subLabel);
- // TODO: 更新数据库
+ // TODO: 更新数据库，发送站内信
vlogService.updateVlogStatus(fileId,3,"等待复审");
}
@@ -161,6 +161,8 @@ public class VlogController extends BaseInfoProperties {
@GetMapping("indexList")
public GraceJSONResult indexList(@RequestParam(defaultValue = "") String userId,
@RequestParam(defaultValue = "") String search,
+ @RequestParam(defaultValue = "") String cityCode,
+ @RequestParam(defaultValue = "") String status,
@RequestParam Integer page,
@RequestParam Integer pageSize) {
@@ -171,7 +173,7 @@ public class VlogController extends BaseInfoProperties {
pageSize = COMMON_PAGE_SIZE;
}
- PagedGridResult gridResult = vlogService.getIndexVlogList(userId, search, page, pageSize);
+ PagedGridResult gridResult = vlogService.getIndexVlogList(userId, search, cityCode,status, page, pageSize);
return GraceJSONResult.ok(gridResult);
}
diff --git a/book-mapper/src/main/resources/mapper/VlogMapperCustom.xml b/book-mapper/src/main/resources/mapper/VlogMapperCustom.xml
index 99d7b29..a9e3e91 100644
--- a/book-mapper/src/main/resources/mapper/VlogMapperCustom.xml
+++ b/book-mapper/src/main/resources/mapper/VlogMapperCustom.xml
@@ -29,8 +29,18 @@
v.vloger_id = u.id
WHERE
v.is_private = 0
- AND v.status = 1
+
+
+ AND v.status = #{paramMap.status}
+
+
+ AND v.status = 1
+
+
AND v.first_frame_img IS NOT NULL
+
+ AND v.cityCode = #{paramMap.cityCode}
+
AND v.title like '%${paramMap.search}%'
diff --git a/book-service/src/main/java/com/imooc/service/VlogService.java b/book-service/src/main/java/com/imooc/service/VlogService.java
index bb55d1e..82234c3 100644
--- a/book-service/src/main/java/com/imooc/service/VlogService.java
+++ b/book-service/src/main/java/com/imooc/service/VlogService.java
@@ -25,6 +25,8 @@ public interface VlogService {
*/
public PagedGridResult getIndexVlogList(String userId,
String search,
+ String cityCode,
+ String status,
Integer page,
Integer pageSize);
diff --git a/book-service/src/main/java/com/imooc/service/impl/VlogServiceImpl.java b/book-service/src/main/java/com/imooc/service/impl/VlogServiceImpl.java
index 9eddf89..007d74b 100644
--- a/book-service/src/main/java/com/imooc/service/impl/VlogServiceImpl.java
+++ b/book-service/src/main/java/com/imooc/service/impl/VlogServiceImpl.java
@@ -100,6 +100,8 @@ public class VlogServiceImpl extends BaseInfoProperties implements VlogService {
@Override
public PagedGridResult getIndexVlogList(String userId,
String search,
+ String cityCode,
+ String status,
Integer page,
Integer pageSize) {
@@ -109,6 +111,12 @@ public class VlogServiceImpl extends BaseInfoProperties implements VlogService {
if (StringUtils.isNotBlank(search)) {
map.put("search", search);
}
+ if (StringUtils.isNotBlank(cityCode)) {
+ map.put("cityCode", cityCode);
+ }
+ if (StringUtils.isNotBlank(status)) {
+ map.put("status", status);
+ }
List list = vlogMapperCustom.getIndexVlogList(map);
for (IndexVlogVO v : list) {