diff --git a/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java b/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java index ae62141..a13e4da 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java +++ b/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java @@ -243,19 +243,20 @@ public class ReportManageConroller { /** * 获取报告预览 - * @param id + * @param reportId + * @param fileId * @return */ @ApiOperation("获取报告预览") - @GetMapping("/getReportHtml/{id}") - public ResponseMessage getReportHtml(@PathVariable("id") String id) { - String html = reportService.reportHtml(id); + @GetMapping("/getReportHtml") + public ResponseMessage getReportHtml(@RequestParam String reportId, @RequestParam String fileId) { + String html = reportService.reportHtml(reportId, fileId); Map map = new HashMap<>(); map.put("content", html); ReportLogBook reportLog = new ReportLogBook(); reportLog.setId(UUID.randomUUID().toString().replaceAll("-","")); - reportLog.setReportId(id); + reportLog.setReportId(reportId); reportLog.setType(1); reportLog.setUpdateTime(new Date()); reportLog.setUserId(UserUtils.getUserId()); diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/IReportService.java b/adc-da-report/src/main/java/com/adc/da/report/service/IReportService.java index 46ad7c7..54a41fb 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/service/IReportService.java +++ b/adc-da-report/src/main/java/com/adc/da/report/service/IReportService.java @@ -42,10 +42,11 @@ public interface IReportService { /** * 获取报告htmlString - * @param id + * @param reportId + * @param fileId * @return */ - String reportHtml(String id); + String reportHtml(String reportId, String fileId); IPage addReportPage(ReportQueryVo vo) throws Exception; diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java index 527fd78..255a4bb 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java +++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java @@ -422,18 +422,18 @@ public class IReportServiceImpl extends ServiceImpl /** * 报告html * - * @param id + * @param reportId + * @param fileId * @return */ @Override - public String reportHtml(String id) { + public String reportHtml(String reportId, String fileId) { try { - ReportEntity entity = reportDao.selectById(id); - String key = entity.getId() + "-" + entity.getFileId(); + String key = reportId + fileId; String html = stringRedisTemplate.boundValueOps(key).get(); //没有的话就生成 if (StrUtil.isBlank(html)) { - html = createHtmlString(entity.getFileId()); + html = createHtmlString(fileId); log.info("执行完成html" + html);