changes

liuhaonan

2022-10-25 d495f9b8cdc83663e4189bc3cc72ac9543ff5555

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java

@@ -7,7 +7,6 @@
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.minio.entity.MinIoConstant;
import com.sandu.ximon.admin.param.IpVolumeMissionParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
@@ -107,24 +106,11 @@
            if (fileEntity == null) {
                throw new BusinessException("fileId为" + fileId + "的文件不存在");
            }
            if (fileEntity.getUserId() == null && fileEntity.getClientId() != null) {
                fileEntity.setUserId(fileEntity.getClientId());
            }
            String absolutePath;
            absolutePath = MinIoConstant.getAbsolutePath(
                    MinIoConstant.BROADCAST_FILE.getBucketName() + fileEntity.getUserId(),
                    fileEntity.getFileName()
            );
            if (fileEntity.getUserId() == null && fileEntity.getClientId() != null) {
                absolutePath = MinIoConstant.getAbsolutePath(
                        MinIoConstant.ADMIN_BROADCAST_FILE.getBucketName(),
                        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);
@@ -250,22 +236,11 @@
            taskFileEntity.setFileId(fileId);

            IpVolumeFile fileEntity = ipVolumeFileService.getById(fileId);
            String absolutePath;
            absolutePath = MinIoConstant.getAbsolutePath(
                    MinIoConstant.BROADCAST_FILE.getBucketName() + fileEntity.getUserId(),
                    fileEntity.getFileName()
            );
            if (fileEntity.getUserId() == null && fileEntity.getClientId() == null) {
                absolutePath = MinIoConstant.getAbsolutePath(
                        MinIoConstant.ADMIN_BROADCAST_FILE.getBucketName(),
                        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);