diff --git a/pqs-event/event-common/src/main/java/com/njcn/event/common/service/CommMonitorEventReportService.java b/pqs-event/event-common/src/main/java/com/njcn/event/common/service/CommMonitorEventReportService.java index 02a9c2a0e..b67218667 100644 --- a/pqs-event/event-common/src/main/java/com/njcn/event/common/service/CommMonitorEventReportService.java +++ b/pqs-event/event-common/src/main/java/com/njcn/event/common/service/CommMonitorEventReportService.java @@ -32,5 +32,5 @@ public interface CommMonitorEventReportService { * @param index * @return */ - String saveStableEventReport(List index, Map map); + String saveStableEventReport(List index, Map map, String fileName); } diff --git a/pqs-event/event-common/src/main/java/com/njcn/event/common/service/impl/CommMonitorEventReportServiceImpl.java b/pqs-event/event-common/src/main/java/com/njcn/event/common/service/impl/CommMonitorEventReportServiceImpl.java index 65aade92a..3dcf96519 100644 --- a/pqs-event/event-common/src/main/java/com/njcn/event/common/service/impl/CommMonitorEventReportServiceImpl.java +++ b/pqs-event/event-common/src/main/java/com/njcn/event/common/service/impl/CommMonitorEventReportServiceImpl.java @@ -658,7 +658,7 @@ public class CommMonitorEventReportServiceImpl implements CommMonitorEventReport } @Override - public String saveStableEventReport(List eventIndex, Map map) { + public String saveStableEventReport(List eventIndex, Map map, String fileName) { WordUtil wordUtil = new WordUtil(); for (String index : eventIndex) { RmpEventDetailPO detail = rmpEventDetailMapper.selectById(index); @@ -709,7 +709,12 @@ public class CommMonitorEventReportServiceImpl implements CommMonitorEventReport } try { InputStream inputStream = wordUtil.createReport2(eventIndex); - String filePath = fileStorageUtil.uploadStream(inputStream, OssPath.APP_EVENT_REPORT, "暂降事件报告.docx"); + String filePath; + if (Objects.isNull(fileName)) { + filePath = fileStorageUtil.uploadStream(inputStream, OssPath.APP_EVENT_REPORT, null); + } else { + filePath = fileStorageUtil.uploadStreamSpecifyName(inputStream, OssPath.APP_EVENT_REPORT, fileName); + } return filePath; } catch (IOException | InvalidFormatException e) { throw new RuntimeException(e);