diff --git a/pom.xml b/pom.xml index ec826ee..2e4a87e 100644 --- a/pom.xml +++ b/pom.xml @@ -98,11 +98,6 @@ com.ruoyi ruoyi-common-core - - com.ruoyi - ruoyi-modules-file - 3.6.7 - diff --git a/src/main/java/com/ruoyi/airline/service/impl/AirlineFileServiceGroupInfoImpl.java b/src/main/java/com/ruoyi/airline/service/impl/AirlineFileServiceGroupInfoImpl.java index 44274ca..a4f0c33 100644 --- a/src/main/java/com/ruoyi/airline/service/impl/AirlineFileServiceGroupInfoImpl.java +++ b/src/main/java/com/ruoyi/airline/service/impl/AirlineFileServiceGroupInfoImpl.java @@ -8,7 +8,9 @@ import com.ruoyi.airline.service.api.IAirlineFileService; import com.ruoyi.airline.service.convert.AirlineFileGroupInfoServiceConvert; import com.ruoyi.airline.service.dto.AirlineFileDTO; import com.ruoyi.airline.service.dto.AirlineFileGroupInfoDTO; +import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.exception.base.BaseException; +import com.ruoyi.system.api.RemoteFileService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -18,9 +20,7 @@ import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; import java.io.ByteArrayOutputStream; -import java.io.IOException; -import org.apache.commons.io.IOUtils; -import com.ruoyi.file.service.ISysFileService; + /** * 航线文件Service实现类 @@ -44,7 +44,7 @@ public class AirlineFileServiceGroupInfoImpl implements IAirlineFileGroupInfoSer private IAirlineFileGroupInfoDomain iAirlineFileGroupInfoDomain; @Autowired - private ISysFileService sysFileService; + private RemoteFileService remoteFileService; @Override @@ -178,8 +178,8 @@ public class AirlineFileServiceGroupInfoImpl implements IAirlineFileGroupInfoSer // 将zip文件上传到minio String zipFileName = "airlines_export_" + System.currentTimeMillis() + ".zip"; String zipFileContent = baos.toString(); - - return sysFileService.uploadFileByData(zipFileName, "zip", zipFileContent); + R fileUrl = remoteFileService.uploadFileByData(zipFileName, "zip", zipFileContent); + return fileUrl.getData(); } catch (Exception e) { log.error("批量导出航线失败", e); throw new BaseException("批量导出航线失败");