From bcf05e201d05906fa51b091a853fb1cff424ff7c Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期四, 03 三月 2022 14:20:39 +0800
Subject: [PATCH] 功能完善
---
dao/src/main/resources/mapper/IpVolumeFileMapper.xml | 4 ++--
ximon-admin/src/main/java/com/sandu/ximon/admin/param/IpVolumeFileParam.java | 2 +-
dao/src/main/java/com/sandu/ximon/dao/domain/IpVolumeFile.java | 6 +++---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java | 5 ++---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java | 10 +++++-----
5 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/IpVolumeFile.java b/dao/src/main/java/com/sandu/ximon/dao/domain/IpVolumeFile.java
index 1b53378..2dd0e7a 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/IpVolumeFile.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/IpVolumeFile.java
@@ -42,12 +42,12 @@
private String fileName;
/**
- * 鏂囦欢澶у皬
+ * 鏂囦欢url鏂囦欢璺緞
*/
- private Double fileSize;
+ private String fileUrl;
/**
- *
+ * 鏂囦欢澶у皬
*/
private Long originSize;
diff --git a/dao/src/main/resources/mapper/IpVolumeFileMapper.xml b/dao/src/main/resources/mapper/IpVolumeFileMapper.xml
index 562589f..55de163 100644
--- a/dao/src/main/resources/mapper/IpVolumeFileMapper.xml
+++ b/dao/src/main/resources/mapper/IpVolumeFileMapper.xml
@@ -10,14 +10,14 @@
<result property="userName" column="user_name" jdbcType="VARCHAR"/>
<result property="clientId" column="client_id" jdbcType="BIGINT"/>
<result property="fileName" column="file_name" jdbcType="VARCHAR"/>
- <result property="fileSize" column="file_size" jdbcType="DOUBLE"/>
+ <result property="fileUrl" column="file_url" jdbcType="VARCHAR"/>
<result property="originSize" column="origin_size" jdbcType="BIGINT"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
</resultMap>
<sql id="Base_Column_List">
id,user_id,user_name,
- client_id,file_name,file_size,
+ client_id,file_name,file_url,
origin_size,create_time
</sql>
</mapper>
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/param/IpVolumeFileParam.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/IpVolumeFileParam.java
index b78fbb6..d17106f 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/param/IpVolumeFileParam.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/IpVolumeFileParam.java
@@ -13,7 +13,7 @@
private String fileName;
private String fileSize;//LCD鐢�
- private Double fileSizeIp;//ip闊虫煴鐢�
+ // private Double fileSizeIp;//ip闊虫煴鐢�
private String fileUrl;
private Long originSize;//ip闊虫煴鐢�
private String fileType;
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java
index 8c3bfc0..c4041fb 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java
@@ -7,7 +7,6 @@
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.param.IpVolumeFileParam;
-import com.sandu.ximon.admin.param.ReceiveParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.domain.IpVolumeFile;
import com.sandu.ximon.dao.mapper.IpVolumeFileMapper;
@@ -37,7 +36,7 @@
file.setClientId(clientService.getClientId());
}
file.setFileName(fileParam.getFileName());
- file.setFileSize(fileParam.getFileSizeIp());
+ file.setFileUrl(fileParam.getFileUrl());
file.setOriginSize(fileParam.getOriginSize());
return save(file);
}
@@ -51,8 +50,8 @@
}
public LambdaQueryWrapper<IpVolumeFile> listFile(BaseConditionVO baseConditionVO, String keyword) {
- LambdaQueryWrapper<IpVolumeFile> wrapper = Wrappers.lambdaQuery(IpVolumeFile.class).eq(IpVolumeFile::getClientId, clientService.getClientId());
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ LambdaQueryWrapper<IpVolumeFile> wrapper = Wrappers.lambdaQuery(IpVolumeFile.class).eq(IpVolumeFile::getClientId, clientService.getClientId());
if (keyword.isEmpty()) {
return wrapper;
} else {
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java
index eed0810..3f42df5 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java
@@ -92,15 +92,15 @@
taskFileEntity.setFileId(fileId);
IpVolumeFile fileEntity = ipVolumeFileService.getById(fileId);
- String absolutePath = MinIoConstant.getAbsolutePath(
- MinIoConstant.BROADCAST_FILE.getBucketName() + fileEntity.getUserId(),
- fileEntity.getFileName()
- );
+// String absolutePath = MinIoConstant.getAbsolutePath(
+// MinIoConstant.BROADCAST_FILE.getBucketName() + fileEntity.getUserId(),
+// fileEntity.getFileName()
+// );
taskMediaFileVO.setI(i);
i++;
taskMediaFileVO.setT(0);
- taskMediaFileVO.setN(absolutePath);
+ taskMediaFileVO.setN(fileEntity.getFileUrl());
taskMediaFileVO.setS(BigInteger.valueOf(fileEntity.getOriginSize()));
taskMediaFileVOS.add(taskMediaFileVO);
--
Gitblit v1.9.3