From e7d2b26aa74c2056f9c9e60d5d71c24d11914a99 Mon Sep 17 00:00:00 2001 From: ls Date: Sat, 14 Jun 2025 20:49:45 +0800 Subject: [PATCH] update --- physical-launcher/src/main/resources/application-dev.yml | 4 ++-- .../database/controller/ExperimentReportController.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/physical-launcher/src/main/resources/application-dev.yml b/physical-launcher/src/main/resources/application-dev.yml index 5a3492a..65866a8 100644 --- a/physical-launcher/src/main/resources/application-dev.yml +++ b/physical-launcher/src/main/resources/application-dev.yml @@ -209,7 +209,7 @@ minidao: jeecg: template: - path: /app/templates + path: /Users/lise/PersonalSpace/physical3/physical-boot/templates # 平台上线安全配置 firewall: # 数据源安全 (开启后，Online报表和图表的数据源为必填) @@ -232,7 +232,7 @@ jeecg: #webapp文件路径 webapp: /opt/webapp shiro: - excludeUrls: /library/documentLibrary/home,/database/experimentDoc/**,/sys/common/upload,/sys/common/batchUpload,/sys/common/download,/sys/user/**,/test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/bigscreen/category/**,/bigscreen/visual/**,/bigscreen/map/**,/jmreport/bigscreen2/** + excludeUrls: /**/exportXls,/library/documentLibrary/home,/database/experimentDoc/**,/sys/common/upload,/sys/common/batchUpload,/sys/common/download,/sys/user/**,/test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/bigscreen/category/**,/bigscreen/visual/**,/bigscreen/map/**,/jmreport/bigscreen2/** #阿里云oss存储和大鱼短信秘钥配置 oss: accessKey: ?? diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java index 2dbe84d..e165fd5 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java @@ -83,10 +83,10 @@ public class ExperimentReportController extends JeecgController page = new Page<>(pageNo, pageSize); IPage pageList = experimentReportService.join(page, experimentReport, queryWrapper); - //pageList.getRecords().forEach(v -> { - // ExperimentDoc experimentDoc = experimentDocService.getByExperimentId(v.getExperimentId(), ExperimentDocType.sybg.getType()); - // v.setFileUrl(Optional.ofNullable(experimentDoc).map(ExperimentDoc::getFilePath).orElse(null)); - //}); + pageList.getRecords().forEach(v -> { + ExperimentDoc experimentDoc = experimentDocService.getByExperimentId(v.getExperimentId(), ExperimentDocType.sybg.getType()); + v.setFileUrl(Optional.ofNullable(experimentDoc).map(ExperimentDoc::getFilePath).orElse(null)); + }); return Result.OK(pageList); }