THENG
/
a-tuoheng-airline
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug:修复报错

This commit is contained in:
gyb 2026-02-09 10:58:01 +08:00
parent b9eded75c7
commit ae03e92685
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pom.xml
View File

@ -98,11 +98,6 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common-core</artifactId>
</dependency>
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-modules-file</artifactId>
<version>3.6.7</version>
</dependency>
<!-- Flyway Database Migration -->
<dependency>

12
src/main/java/com/ruoyi/airline/service/impl/AirlineFileServiceGroupInfoImpl.java
View File

@ -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<String> fileUrl = remoteFileService.uploadFileByData(zipFileName, "zip", zipFileContent);
return fileUrl.getData();
} catch (Exception e) {
log.error("批量导出航线失败", e);
throw new BaseException("批量导出航线失败");