physical3/physical-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
ls
2025-06-14 20:49:45 +08:00
parent b65752f094
commit e7d2b26aa7
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
physical-launcher/src/main/resources/application-dev.yml
View File

@@ -209,7 +209,7 @@ minidao:
jeecg: jeecg:
template: template:
path: /app/templates path: /Users/lise/PersonalSpace/physical3/physical-boot/templates
# 平台上线安全配置 # 平台上线安全配置
firewall: firewall:
# 数据源安全 (开启后，Online报表和图表的数据源为必填) # 数据源安全 (开启后，Online报表和图表的数据源为必填)
@@ -232,7 +232,7 @@ jeecg:
#webapp文件路径 #webapp文件路径
webapp: /opt/webapp webapp: /opt/webapp
shiro: 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存储和大鱼短信秘钥配置
oss: oss:
accessKey: ?? accessKey: ??

8
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java
View File

@@ -83,10 +83,10 @@ public class ExperimentReportController extends JeecgController<ExperimentReport
} }
Page<ExperimentReport> page = new Page<>(pageNo, pageSize); Page<ExperimentReport> page = new Page<>(pageNo, pageSize);
IPage<ExperimentReport> pageList = experimentReportService.join(page, experimentReport, queryWrapper); IPage<ExperimentReport> pageList = experimentReportService.join(page, experimentReport, queryWrapper);
//pageList.getRecords().forEach(v -> { pageList.getRecords().forEach(v -> {
// ExperimentDoc experimentDoc = experimentDocService.getByExperimentId(v.getExperimentId(), ExperimentDocType.sybg.getType()); ExperimentDoc experimentDoc = experimentDocService.getByExperimentId(v.getExperimentId(), ExperimentDocType.sybg.getType());
// v.setFileUrl(Optional.ofNullable(experimentDoc).map(ExperimentDoc::getFilePath).orElse(null)); v.setFileUrl(Optional.ofNullable(experimentDoc).map(ExperimentDoc::getFilePath).orElse(null));
//}); });
return Result.OK(pageList); return Result.OK(pageList);
} }