From ca18a1dc4bef1084cb1844d0f6395f2388d0f03c Mon Sep 17 00:00:00 2001 From: ChaiNingQi <2032830459@qq.com> Date: Mon, 26 Jan 2026 16:18:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E4=B8=AD=E7=9A=84=E5=AE=A1=E6=A0=B8=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vet/VetTrainingVideoController.java | 2 +- .../chenhai/vet/domain/VetTrainingVideo.java | 4 +- .../impl/VetTrainingVideoServiceImpl.java | 38 +++++++++---------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/chenhai-admin/src/main/java/com/chenhai/web/controller/vet/VetTrainingVideoController.java b/chenhai-admin/src/main/java/com/chenhai/web/controller/vet/VetTrainingVideoController.java index 539c8a7..ab1b646 100644 --- a/chenhai-admin/src/main/java/com/chenhai/web/controller/vet/VetTrainingVideoController.java +++ b/chenhai-admin/src/main/java/com/chenhai/web/controller/vet/VetTrainingVideoController.java @@ -98,7 +98,7 @@ public class VetTrainingVideoController extends BaseController { } // 如果是审核通过且公开的视频，增加观看次数 - if ("1".equals(video.getAuditStatus()) && // 1-审核通过 + if ("2".equals(video.getAuditStatus()) && // 2-审核通过 "1".equals(video.getStatus())) { // 1-已上架/公开 trainingVideoService.incrementViewCount(videoId); video.setViewCount(video.getViewCount() + 1); diff --git a/chenhai-system/src/main/java/com/chenhai/vet/domain/VetTrainingVideo.java b/chenhai-system/src/main/java/com/chenhai/vet/domain/VetTrainingVideo.java index fd3e185..9a76591 100644 --- a/chenhai-system/src/main/java/com/chenhai/vet/domain/VetTrainingVideo.java +++ b/chenhai-system/src/main/java/com/chenhai/vet/domain/VetTrainingVideo.java @@ -60,11 +60,11 @@ public class VetTrainingVideo extends BaseEntity private Integer viewCount; /** 上架状态（0-私有 1-公开） */ - @Excel(name = "上架状态", dictType = "video_status") + @Excel(name = "上架状态", dictType = "sys_publish_status") private String status; /** 审核状态（0-待审核 1-审核通过 2-审核拒绝 3-无需审核） */ - @Excel(name = "审核状态", dictType = "video_audit_status") + @Excel(name = "审核状态", dictType = "audit_status") private String auditStatus; /** 审核意见 */ diff --git a/chenhai-system/src/main/java/com/chenhai/vet/service/impl/VetTrainingVideoServiceImpl.java b/chenhai-system/src/main/java/com/chenhai/vet/service/impl/VetTrainingVideoServiceImpl.java index 6dfcc3e..73e1a3b 100644 --- a/chenhai-system/src/main/java/com/chenhai/vet/service/impl/VetTrainingVideoServiceImpl.java +++ b/chenhai-system/src/main/java/com/chenhai/vet/service/impl/VetTrainingVideoServiceImpl.java @@ -100,8 +100,8 @@ public class VetTrainingVideoServiceImpl implements IVetTrainingVideoService { } // 权限校验：只能查看自己的视频或审核通过公开的视频 - boolean canView = "1".equals(video.getAuditStatus()) && // 1-审核通过 - "1".equals(video.getStatus()) || // 1-已上架/公开 + boolean canView = ("2".equals(video.getAuditStatus()) && // 2-审核通过（新编码） + "1".equals(video.getStatus())) || // 1-已上架/公开 currentVetId.equals(video.getUserId()); return canView ? video : null; } @@ -115,8 +115,8 @@ public class VetTrainingVideoServiceImpl implements IVetTrainingVideoService { } // 权限校验：只能播放自己的视频或审核通过公开的视频 - boolean canPlay = "1".equals(video.getAuditStatus()) && // 1-审核通过 - "1".equals(video.getStatus()) || // 1-已上架/公开 + boolean canPlay = ("2".equals(video.getAuditStatus()) && // 2-审核通过（新编码） + "1".equals(video.getStatus())) || // 1-已上架/公开 currentVetId.equals(video.getUserId()); return canPlay ? video.getVideoUrl() : null; } @@ -152,14 +152,14 @@ public class VetTrainingVideoServiceImpl implements IVetTrainingVideoService { } // 只能提交无需审核或审核拒绝的视频 - if (!"3".equals(video.getAuditStatus()) && // 3-无需审核 - !"2".equals(video.getAuditStatus())) { // 2-审核拒绝 + if (!"4".equals(video.getAuditStatus()) && // 3-无需审核 + !"3".equals(video.getAuditStatus())) { // 2-审核拒绝 return false; } // 更新为待审核状态 int result = videoMapper.updateAuditStatus(videoId, - "0", // 0-待审核 + "1", // 1-审核中 "已提交审核", null, new Date()); @@ -175,14 +175,13 @@ public class VetTrainingVideoServiceImpl implements IVetTrainingVideoService { return false; } - // 只能取消待审核状态的视频 - if (!"0".equals(video.getAuditStatus())) { // 0-待审核 + if (!"1".equals(video.getAuditStatus())) { // 1-审核中 return false; } // 更新为无需审核状态 int result = videoMapper.updateAuditStatus(videoId, - "3", // 3-无需审核 + "4", // 4-无需审核 "用户取消审核", null, new Date()); @@ -199,7 +198,7 @@ public class VetTrainingVideoServiceImpl implements IVetTrainingVideoService { } // 只能重新提交审核拒绝状态的视频 - if (!"2".equals(video.getAuditStatus())) { // 2-审核拒绝 + if (!"3".equals(video.getAuditStatus())) { // 2-审核拒绝 return false; } @@ -216,21 +215,22 @@ public class VetTrainingVideoServiceImpl implements IVetTrainingVideoService { @Transactional public boolean auditVideo(Long videoId, String auditStatus, String auditOpinion, Long auditUserId) { // 验证审核状态 - if (!"1".equals(auditStatus) && // 1-审核通过 - !"2".equals(auditStatus)) { // 2-审核拒绝 + if (!"2".equals(auditStatus) && // 2-审核通过 + !"3".equals(auditStatus)) { // 3-审核拒绝 return false; } + VetTrainingVideo video = videoMapper.selectVideoById(videoId); if (video == null) { return false; } - // 只能审核待审核状态的视频 - if (!"0".equals(video.getAuditStatus())) { // 0-待审核 + if (!"1".equals(video.getAuditStatus())) { // 1-审核中 return false; } + int result = videoMapper.updateAuditStatus(videoId, auditStatus, auditOpinion, @@ -238,7 +238,7 @@ public class VetTrainingVideoServiceImpl implements IVetTrainingVideoService { new Date()); // 如果审核通过，自动设置为私有状态，等待用户上架 - if (result > 0 && "1".equals(auditStatus)) { // 1-审核通过 + if (result > 0 && "2".equals(auditStatus)) { // 1-审核通过 videoMapper.updateStatus(videoId, "0"); // 0-未上架/私有 } @@ -260,7 +260,7 @@ public class VetTrainingVideoServiceImpl implements IVetTrainingVideoService { } // 只能上架审核通过的视频 - if (!"1".equals(video.getAuditStatus())) { // 1-审核通过 + if (!"2".equals(video.getAuditStatus())) { // 1-审核通过 return false; } @@ -304,8 +304,8 @@ public class VetTrainingVideoServiceImpl implements IVetTrainingVideoService { } // 只能编辑无需审核、审核拒绝或私有状态的视频 - boolean canEdit = "3".equals(existingVideo.getAuditStatus()) || // 3-无需审核 - "2".equals(existingVideo.getAuditStatus()) || // 2-审核拒绝 + boolean canEdit = "4".equals(existingVideo.getAuditStatus()) || // 4-无需审核 + "3".equals(existingVideo.getAuditStatus()) || // 3-审核拒绝 "0".equals(existingVideo.getStatus()); // 0-未上架/私有 if (!canEdit) {