功能完善

liuhaonan

2022-03-03 bcf05e201d05906fa51b091a853fb1cff424ff7c

功能完善

 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;


 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>

 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;

 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 {

 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);