From 730f508ff802ba7ce7c7209abd3894de4fcb5713 Mon Sep 17 00:00:00 2001 From: 86156 <823267011@qq.com> Date: Tue, 30 Sep 2025 18:07:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=A5=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/common/CommonController.java | 4 ++-- .../java/com/ruoyi/video/domain/VMinioObject.java | 12 ++++++------ .../ruoyi/video/service/VideoAnalysisService.java | 8 ++++---- .../service/impl/InspectionTaskServiceImpl.java | 6 +++--- .../ruoyi/video/thread/MediaTransferFlvByJavacv.java | 2 +- .../resources/mapper/video/VMinioObjectMapper.xml | 3 +++ 6 files changed, 19 insertions(+), 16 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java index 0e87b90..cf3017c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java @@ -101,7 +101,7 @@ public class CommonController // persist to v_minio_object VMinioObject record = new VMinioObject(); record.setObjectName(fileName); - record.setObjectUrl(url); + record.setUrl(url); record.setOriginalName(file.getOriginalFilename()); try { record.setCreateBy(SecurityUtils.getUsername()); } catch (Exception ignored) {} vMinioObjectService.insert(record); @@ -158,7 +158,7 @@ public class CommonController // persist each to v_minio_object VMinioObject record = new VMinioObject(); record.setObjectName(fileName); - record.setObjectUrl(url); + record.setUrl(url); record.setOriginalName(file.getOriginalFilename()); try { record.setCreateBy(SecurityUtils.getUsername()); } catch (Exception ignored) {} vMinioObjectService.insert(record); diff --git a/ruoyi-video/src/main/java/com/ruoyi/video/domain/VMinioObject.java b/ruoyi-video/src/main/java/com/ruoyi/video/domain/VMinioObject.java index f61b152..2d8bd3a 100644 --- a/ruoyi-video/src/main/java/com/ruoyi/video/domain/VMinioObject.java +++ b/ruoyi-video/src/main/java/com/ruoyi/video/domain/VMinioObject.java @@ -15,8 +15,8 @@ public class VMinioObject { /** 对象名称 */ private String objectName; - /** 对象URL */ - private String objectUrl; + /** 对象URL（数据库字段名为url） */ + private String url; /** 对象大小(字节) */ private Long objectSize; @@ -85,12 +85,12 @@ public class VMinioObject { this.objectName = objectName; } - public String getObjectUrl() { - return objectUrl; + public String getUrl() { + return url; } - public void setObjectUrl(String objectUrl) { - this.objectUrl = objectUrl; + public void setUrl(String url) { + this.url = url; } public Long getObjectSize() { diff --git a/ruoyi-video/src/main/java/com/ruoyi/video/service/VideoAnalysisService.java b/ruoyi-video/src/main/java/com/ruoyi/video/service/VideoAnalysisService.java index 68d8160..5cfe633 100644 --- a/ruoyi-video/src/main/java/com/ruoyi/video/service/VideoAnalysisService.java +++ b/ruoyi-video/src/main/java/com/ruoyi/video/service/VideoAnalysisService.java @@ -246,7 +246,7 @@ public class VideoAnalysisService { VMinioObject minioObject = new VMinioObject(); minioObject.setBucketName(bucketName); minioObject.setObjectName(fileName); - minioObject.setObjectUrl(objectUrl); + minioObject.setUrl(objectUrl); minioObject.setCreateBy("system"); minioObject.setCreateTime(new Date()); Long objectId = vMinioObjectService.insertVMinioObject(minioObject); @@ -288,7 +288,7 @@ public class VideoAnalysisService { VMinioObject minioObject = new VMinioObject(); minioObject.setBucketName(bucketName); minioObject.setObjectName(fileName); - minioObject.setObjectUrl(objectUrl); + minioObject.setUrl(objectUrl); minioObject.setCreateBy("system"); minioObject.setCreateTime(new Date()); Long objectId = vMinioObjectService.insertVMinioObject(minioObject); @@ -475,7 +475,7 @@ public class VideoAnalysisService { VMinioObject minioObject = new VMinioObject(); minioObject.setBucketName(bucketName); minioObject.setObjectName(fileName); - minioObject.setObjectUrl(objectUrl); + minioObject.setUrl(objectUrl); minioObject.setCreateBy("system"); minioObject.setCreateTime(new Date()); Long objectId = vMinioObjectService.insertVMinioObject(minioObject); @@ -535,7 +535,7 @@ public class VideoAnalysisService { VMinioObject minioObject = new VMinioObject(); minioObject.setBucketName(bucketName); minioObject.setObjectName(fileName); - minioObject.setObjectUrl(objectUrl); + minioObject.setUrl(objectUrl); minioObject.setCreateBy("system"); minioObject.setCreateTime(new Date()); Long objectId = vMinioObjectService.insertVMinioObject(minioObject); diff --git a/ruoyi-video/src/main/java/com/ruoyi/video/service/impl/InspectionTaskServiceImpl.java b/ruoyi-video/src/main/java/com/ruoyi/video/service/impl/InspectionTaskServiceImpl.java index cdefad9..92c3ea9 100644 --- a/ruoyi-video/src/main/java/com/ruoyi/video/service/impl/InspectionTaskServiceImpl.java +++ b/ruoyi-video/src/main/java/com/ruoyi/video/service/impl/InspectionTaskServiceImpl.java @@ -276,7 +276,7 @@ public class InspectionTaskServiceImpl implements InspectionTaskService { VMinioObject minioObject = new VMinioObject(); minioObject.setBucketName(bucketName); minioObject.setObjectName(fileName); - minioObject.setObjectUrl(objectUrl); + minioObject.setUrl(objectUrl); minioObject.setCreateBy("system"); minioObject.setCreateTime(new Date()); Long objectId = vMinioObjectService.insertVMinioObject(minioObject); @@ -448,7 +448,7 @@ public class InspectionTaskServiceImpl implements InspectionTaskService { VMinioObject rec = new VMinioObject(); rec.setObjectName(up.getObjectName()); - rec.setObjectUrl(up.getUrl()); + rec.setUrl(up.getUrl()); rec.setOriginalName(originalName); objSvc.insertVMinioObject(rec); @@ -540,7 +540,7 @@ public class InspectionTaskServiceImpl implements InspectionTaskService { VMinioObject vrec = new VMinioObject(); vrec.setObjectName(upv.getObjectName()); - vrec.setObjectUrl(upv.getUrl()); + vrec.setUrl(upv.getUrl()); vrec.setOriginalName(originalName); objSvc.insertVMinioObject(vrec); diff --git a/ruoyi-video/src/main/java/com/ruoyi/video/thread/MediaTransferFlvByJavacv.java b/ruoyi-video/src/main/java/com/ruoyi/video/thread/MediaTransferFlvByJavacv.java index d2375d0..cc98212 100644 --- a/ruoyi-video/src/main/java/com/ruoyi/video/thread/MediaTransferFlvByJavacv.java +++ b/ruoyi-video/src/main/java/com/ruoyi/video/thread/MediaTransferFlvByJavacv.java @@ -146,7 +146,7 @@ public class MediaTransferFlvByJavacv extends MediaTransfer implements Runnable VMinioObject minioObject = new VMinioObject(); minioObject.setBucketName(bucketName); minioObject.setObjectName(fileName); - minioObject.setObjectUrl(objectUrl); + minioObject.setUrl(objectUrl); minioObject.setCreateBy("system"); minioObject.setCreateTime(new Date()); Long minioId = vMinioObjectService.insertVMinioObject(minioObject); diff --git a/ruoyi-video/src/main/resources/mapper/video/VMinioObjectMapper.xml b/ruoyi-video/src/main/resources/mapper/video/VMinioObjectMapper.xml index 59601bc..d4761aa 100644 --- a/ruoyi-video/src/main/resources/mapper/video/VMinioObjectMapper.xml +++ b/ruoyi-video/src/main/resources/mapper/video/VMinioObjectMapper.xml @@ -4,6 +4,7 @@ + @@ -17,6 +18,7 @@ INSERT INTO v_minio_object ( + bucket_name, object_name, url, original_name, @@ -27,6 +29,7 @@ remark, del_flag ) VALUES ( + #{bucketName}, #{objectName}, #{url}, #{originalName},