diff --git a/data/src/main/java/com/sdm/data/model/resp/ListBigFileResp.java b/data/src/main/java/com/sdm/data/model/resp/ListBigFileResp.java index 74f1d42f..c3d4e191 100644 --- a/data/src/main/java/com/sdm/data/model/resp/ListBigFileResp.java +++ b/data/src/main/java/com/sdm/data/model/resp/ListBigFileResp.java @@ -25,6 +25,10 @@ public class ListBigFileResp extends BaseResp { @TableField("approveType") private Integer approveType; + @Schema(description= "数据类型:1-文件夹,2-文件") + @TableField("dataType") + private Integer dataType; + //创建时间 @Schema(description = "创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/data/src/main/java/com/sdm/data/service/impl/DataAnalysisServiceImpl.java b/data/src/main/java/com/sdm/data/service/impl/DataAnalysisServiceImpl.java index 279e6069..95e3443d 100644 --- a/data/src/main/java/com/sdm/data/service/impl/DataAnalysisServiceImpl.java +++ b/data/src/main/java/com/sdm/data/service/impl/DataAnalysisServiceImpl.java @@ -198,7 +198,7 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService { public SdmResponse getCSVData(List fileIds) { try { // 存储所有文件的X轴和Y轴数据 - List> allXData = new ArrayList<>(); + List> allXData = new ArrayList<>(); List> allYData = new ArrayList<>(); // 遍历所有文件ID @@ -212,7 +212,7 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService { BufferedReader reader = new BufferedReader(new InputStreamReader(bis, StandardCharsets.UTF_8)); // 分别存储当前文件的X轴和Y轴数据 - List xData = new ArrayList<>(); + List xData = new ArrayList<>(); List yData = new ArrayList<>(); String line; @@ -220,7 +220,7 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService { String[] values = line.split(","); if (values.length >= 2) { try { - int xValue = Integer.parseInt(values[0].trim()); + Float xValue = Float.parseFloat(values[0].trim()); float yValue = Float.parseFloat(values[1].trim()); xData.add(xValue); yData.add(yValue);