From 97e257c176f77b995ee4b5c5c1d9899e883f5208 Mon Sep 17 00:00:00 2001 From: ls Date: Thu, 23 Jan 2025 00:35:34 +0800 Subject: [PATCH] update --- .../src/main/resources/application-release.yml | 2 +- .../database/controller/NasaDataRecordController.java | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/physical-launcher/src/main/resources/application-release.yml b/physical-launcher/src/main/resources/application-release.yml index 82168ab..fa7894c 100644 --- a/physical-launcher/src/main/resources/application-release.yml +++ b/physical-launcher/src/main/resources/application-release.yml @@ -231,7 +231,7 @@ jeecg: #webapp文件路径 webapp: /opt/jeecg-boot/webapp 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: accessKey: ?? diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/NasaDataRecordController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/NasaDataRecordController.java index f27f4bb..c30bf0a 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/NasaDataRecordController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/NasaDataRecordController.java @@ -60,7 +60,9 @@ public class NasaDataRecordController extends JeecgController { String fileList = nr.getFileList(); if (StringUtils.isNotBlank(fileList)) { - Map files = JSON.parseObject(fileList, Map.class); + List> list = JSON.parseObject(fileList, new TypeReference<>() {}); + Map files = new HashMap<>(); + list.forEach(files::putAll); nr.setFileMap(files); } }); @@ -164,7 +166,9 @@ public class NasaDataRecordController extends JeecgController files = JSON.parseObject(fileList, Map.class); + List> list = JSON.parseObject(fileList, new TypeReference<>() {}); + Map files = new HashMap<>(); + list.forEach(files::putAll); nasaDataRecord.setFileMap(files); } return Result.OK(nasaDataRecord);