DeXun/rtsp-video-analysis-system
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复工作

Browse Source
This commit is contained in:
86156
2025-09-30 18:07:39 +08:00
parent 34a4c7912c
commit 730f508ff8
6 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
View File

@@ -101,7 +101,7 @@ public class CommonController
// persist to v_minio_object // persist to v_minio_object
VMinioObject record = new VMinioObject(); VMinioObject record = new VMinioObject();
record.setObjectName(fileName); record.setObjectName(fileName);
record.setObjectUrl(url); record.setUrl(url);
record.setOriginalName(file.getOriginalFilename()); record.setOriginalName(file.getOriginalFilename());
try { record.setCreateBy(SecurityUtils.getUsername()); } catch (Exception ignored) {} try { record.setCreateBy(SecurityUtils.getUsername()); } catch (Exception ignored) {}
vMinioObjectService.insert(record); vMinioObjectService.insert(record);
@@ -158,7 +158,7 @@ public class CommonController
// persist each to v_minio_object // persist each to v_minio_object
VMinioObject record = new VMinioObject(); VMinioObject record = new VMinioObject();
record.setObjectName(fileName); record.setObjectName(fileName);
record.setObjectUrl(url); record.setUrl(url);
record.setOriginalName(file.getOriginalFilename()); record.setOriginalName(file.getOriginalFilename());
try { record.setCreateBy(SecurityUtils.getUsername()); } catch (Exception ignored) {} try { record.setCreateBy(SecurityUtils.getUsername()); } catch (Exception ignored) {}
vMinioObjectService.insert(record); vMinioObjectService.insert(record);

12
ruoyi-video/src/main/java/com/ruoyi/video/domain/VMinioObject.java
View File

@@ -15,8 +15,8 @@ public class VMinioObject {
/** 对象名称 */ /** 对象名称 */
private String objectName; private String objectName;
/** 对象URL */ /** 对象URL（数据库字段名为url） */
private String objectUrl; private String url;
/** 对象大小(字节) */ /** 对象大小(字节) */
private Long objectSize; private Long objectSize;
@@ -85,12 +85,12 @@ public class VMinioObject {
this.objectName = objectName; this.objectName = objectName;
} }
public String getObjectUrl() { public String getUrl() {
return objectUrl; return url;
} }
public void setObjectUrl(String objectUrl) { public void setUrl(String url) {
this.objectUrl = objectUrl; this.url = url;
} }
public Long getObjectSize() { public Long getObjectSize() {

8
ruoyi-video/src/main/java/com/ruoyi/video/service/VideoAnalysisService.java
View File

@@ -246,7 +246,7 @@ public class VideoAnalysisService {
VMinioObject minioObject = new VMinioObject(); VMinioObject minioObject = new VMinioObject();
minioObject.setBucketName(bucketName); minioObject.setBucketName(bucketName);
minioObject.setObjectName(fileName); minioObject.setObjectName(fileName);
minioObject.setObjectUrl(objectUrl); minioObject.setUrl(objectUrl);
minioObject.setCreateBy("system"); minioObject.setCreateBy("system");
minioObject.setCreateTime(new Date()); minioObject.setCreateTime(new Date());
Long objectId = vMinioObjectService.insertVMinioObject(minioObject); Long objectId = vMinioObjectService.insertVMinioObject(minioObject);
@@ -288,7 +288,7 @@ public class VideoAnalysisService {
VMinioObject minioObject = new VMinioObject(); VMinioObject minioObject = new VMinioObject();
minioObject.setBucketName(bucketName); minioObject.setBucketName(bucketName);
minioObject.setObjectName(fileName); minioObject.setObjectName(fileName);
minioObject.setObjectUrl(objectUrl); minioObject.setUrl(objectUrl);
minioObject.setCreateBy("system"); minioObject.setCreateBy("system");
minioObject.setCreateTime(new Date()); minioObject.setCreateTime(new Date());
Long objectId = vMinioObjectService.insertVMinioObject(minioObject); Long objectId = vMinioObjectService.insertVMinioObject(minioObject);
@@ -475,7 +475,7 @@ public class VideoAnalysisService {
VMinioObject minioObject = new VMinioObject(); VMinioObject minioObject = new VMinioObject();
minioObject.setBucketName(bucketName); minioObject.setBucketName(bucketName);
minioObject.setObjectName(fileName); minioObject.setObjectName(fileName);
minioObject.setObjectUrl(objectUrl); minioObject.setUrl(objectUrl);
minioObject.setCreateBy("system"); minioObject.setCreateBy("system");
minioObject.setCreateTime(new Date()); minioObject.setCreateTime(new Date());
Long objectId = vMinioObjectService.insertVMinioObject(minioObject); Long objectId = vMinioObjectService.insertVMinioObject(minioObject);
@@ -535,7 +535,7 @@ public class VideoAnalysisService {
VMinioObject minioObject = new VMinioObject(); VMinioObject minioObject = new VMinioObject();
minioObject.setBucketName(bucketName); minioObject.setBucketName(bucketName);
minioObject.setObjectName(fileName); minioObject.setObjectName(fileName);
minioObject.setObjectUrl(objectUrl); minioObject.setUrl(objectUrl);
minioObject.setCreateBy("system"); minioObject.setCreateBy("system");
minioObject.setCreateTime(new Date()); minioObject.setCreateTime(new Date());
Long objectId = vMinioObjectService.insertVMinioObject(minioObject); Long objectId = vMinioObjectService.insertVMinioObject(minioObject);

6
ruoyi-video/src/main/java/com/ruoyi/video/service/impl/InspectionTaskServiceImpl.java
View File

@@ -276,7 +276,7 @@ public class InspectionTaskServiceImpl implements InspectionTaskService {
VMinioObject minioObject = new VMinioObject(); VMinioObject minioObject = new VMinioObject();
minioObject.setBucketName(bucketName); minioObject.setBucketName(bucketName);
minioObject.setObjectName(fileName); minioObject.setObjectName(fileName);
minioObject.setObjectUrl(objectUrl); minioObject.setUrl(objectUrl);
minioObject.setCreateBy("system"); minioObject.setCreateBy("system");
minioObject.setCreateTime(new Date()); minioObject.setCreateTime(new Date());
Long objectId = vMinioObjectService.insertVMinioObject(minioObject); Long objectId = vMinioObjectService.insertVMinioObject(minioObject);
@@ -448,7 +448,7 @@ public class InspectionTaskServiceImpl implements InspectionTaskService {
VMinioObject rec = new VMinioObject(); VMinioObject rec = new VMinioObject();
rec.setObjectName(up.getObjectName()); rec.setObjectName(up.getObjectName());
rec.setObjectUrl(up.getUrl()); rec.setUrl(up.getUrl());
rec.setOriginalName(originalName); rec.setOriginalName(originalName);
objSvc.insertVMinioObject(rec); objSvc.insertVMinioObject(rec);
@@ -540,7 +540,7 @@ public class InspectionTaskServiceImpl implements InspectionTaskService {
VMinioObject vrec = new VMinioObject(); VMinioObject vrec = new VMinioObject();
vrec.setObjectName(upv.getObjectName()); vrec.setObjectName(upv.getObjectName());
vrec.setObjectUrl(upv.getUrl()); vrec.setUrl(upv.getUrl());
vrec.setOriginalName(originalName); vrec.setOriginalName(originalName);
objSvc.insertVMinioObject(vrec); objSvc.insertVMinioObject(vrec);

2
ruoyi-video/src/main/java/com/ruoyi/video/thread/MediaTransferFlvByJavacv.java
View File

@@ -146,7 +146,7 @@ public class MediaTransferFlvByJavacv extends MediaTransfer implements Runnable
VMinioObject minioObject = new VMinioObject(); VMinioObject minioObject = new VMinioObject();
minioObject.setBucketName(bucketName); minioObject.setBucketName(bucketName);
minioObject.setObjectName(fileName); minioObject.setObjectName(fileName);
minioObject.setObjectUrl(objectUrl); minioObject.setUrl(objectUrl);
minioObject.setCreateBy("system"); minioObject.setCreateBy("system");
minioObject.setCreateTime(new Date()); minioObject.setCreateTime(new Date());
Long minioId = vMinioObjectService.insertVMinioObject(minioObject); Long minioId = vMinioObjectService.insertVMinioObject(minioObject);

3
ruoyi-video/src/main/resources/mapper/video/VMinioObjectMapper.xml
View File

@@ -4,6 +4,7 @@
<resultMap id="VMinioObjectResult" type="com.ruoyi.video.domain.VMinioObject"> <resultMap id="VMinioObjectResult" type="com.ruoyi.video.domain.VMinioObject">
<id property="objectId" column="object_id" /> <id property="objectId" column="object_id" />
<result property="bucketName" column="bucket_name" />
<result property="objectName" column="object_name" /> <result property="objectName" column="object_name" />
<result property="url" column="url" /> <result property="url" column="url" />
<result property="originalName" column="original_name" /> <result property="originalName" column="original_name" />
@@ -17,6 +18,7 @@
<insert id="insertVMinioObject" parameterType="com.ruoyi.video.domain.VMinioObject" useGeneratedKeys="true" keyProperty="objectId"> <insert id="insertVMinioObject" parameterType="com.ruoyi.video.domain.VMinioObject" useGeneratedKeys="true" keyProperty="objectId">
INSERT INTO v_minio_object ( INSERT INTO v_minio_object (
bucket_name,
object_name, object_name,
url, url,
original_name, original_name,
@@ -27,6 +29,7 @@
remark, remark,
del_flag del_flag
) VALUES ( ) VALUES (
#{bucketName},
#{objectName}, #{objectName},
#{url}, #{url},
#{originalName}, #{originalName},