This commit is contained in:
ls
2025-01-23 00:35:34 +08:00
parent b15f358360
commit 97e257c176
2 changed files with 7 additions and 3 deletions

View File

@@ -231,7 +231,7 @@ jeecg:
#webapp文件路径 #webapp文件路径
webapp: /opt/jeecg-boot/webapp webapp: /opt/jeecg-boot/webapp
shiro: shiro:
excludeUrls: /sys/common/upload,/sys/common/batchUpload,/sys/common/download,/test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/bigscreen/category/**,/bigscreen/visual/**,/bigscreen/map/**,/jmreport/bigscreen2/**,/api/getUserInfo,/api/sys/common/**,/sys/common/** excludeUrls: /database/nasaDataRecord/fix,/sys/common/upload,/sys/common/batchUpload,/sys/common/download,/test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/bigscreen/category/**,/bigscreen/visual/**,/bigscreen/map/**,/jmreport/bigscreen2/**,/api/getUserInfo,/api/sys/common/**,/sys/common/**
#阿里云oss存储和大鱼短信秘钥配置 #阿里云oss存储和大鱼短信秘钥配置
oss: oss:
accessKey: ?? accessKey: ??

View File

@@ -60,7 +60,9 @@ public class NasaDataRecordController extends JeecgController<NasaDataRecord, IN
pageList.getRecords().forEach(nr -> { pageList.getRecords().forEach(nr -> {
String fileList = nr.getFileList(); String fileList = nr.getFileList();
if (StringUtils.isNotBlank(fileList)) { if (StringUtils.isNotBlank(fileList)) {
Map<String, String> files = JSON.parseObject(fileList, Map.class); List<Map<String, String>> list = JSON.parseObject(fileList, new TypeReference<>() {});
Map<String, String> files = new HashMap<>();
list.forEach(files::putAll);
nr.setFileMap(files); nr.setFileMap(files);
} }
}); });
@@ -164,7 +166,9 @@ public class NasaDataRecordController extends JeecgController<NasaDataRecord, IN
} }
String fileList = nasaDataRecord.getFileList(); String fileList = nasaDataRecord.getFileList();
if (StringUtils.isNotBlank(fileList)) { if (StringUtils.isNotBlank(fileList)) {
Map<String, String> files = JSON.parseObject(fileList, Map.class); List<Map<String, String>> list = JSON.parseObject(fileList, new TypeReference<>() {});
Map<String, String> files = new HashMap<>();
list.forEach(files::putAll);
nasaDataRecord.setFileMap(files); nasaDataRecord.setFileMap(files);
} }
return Result.OK(nasaDataRecord); return Result.OK(nasaDataRecord);