diff --git a/data/common_items.json b/data/common_items.json index 81b1a83..a5a1a02 100644 --- a/data/common_items.json +++ b/data/common_items.json @@ -8,7 +8,7 @@ "载机名称一", "载机名称二", "载机名称三" - ], + ], "sensorDescription": [ "电阻式传感器", "电容式‌传感器" diff --git a/java/src/main/java/com/yfd/platform/modules/experimentalData/controller/CommonItemController.java b/java/src/main/java/com/yfd/platform/modules/experimentalData/controller/CommonItemController.java index 238a8bd..52292b4 100644 --- a/java/src/main/java/com/yfd/platform/modules/experimentalData/controller/CommonItemController.java +++ b/java/src/main/java/com/yfd/platform/modules/experimentalData/controller/CommonItemController.java @@ -6,8 +6,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.web.bind.annotation.*; import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; @@ -98,7 +96,8 @@ public class CommonItemController { Path filePath = dataDir.resolve(FILE_NAME); if (!Files.exists(filePath)) { - // 如果项目根目录下没有文件,尝试从resources目录获取默认数据 + // 如果项目根目录下没有文件,创建默认数据 + System.out.println("文件不存在,创建默认数据: " + filePath.toString()); Files.createDirectories(dataDir); Map> init = new HashMap<>(); init.put("taskLocation", new ArrayList<>()); @@ -111,10 +110,13 @@ public class CommonItemController { // 文件存在,读取数据 try { - return objectMapper.readValue( + System.out.println("正在读取文件: " + filePath.toString()); + Map> data = objectMapper.readValue( filePath.toFile(), new TypeReference>>() {} ); + System.out.println("文件读取成功,数据大小: " + data.size()); + return data; } catch (IOException e) { // 如果读取失败,返回默认数据 System.err.println("读取文件失败: " + e.getMessage()); @@ -133,8 +135,10 @@ public class CommonItemController { Path filePath = dataDir.resolve(FILE_NAME); Files.createDirectories(dataDir); + System.out.println("正在写入文件: " + filePath.toString()); objectMapper.writerWithDefaultPrettyPrinter() .writeValue(filePath.toFile(), data); + System.out.println("文件写入成功"); } private Map success(Object data) {