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 44c2c2d1..eb01803b 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 @@ -194,7 +194,7 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService { } String taskAssociationFileSaveName = taskAssociationFileSavePrefixName + ".xlsx"; SystemOperate.outputHttpFileStream(httpServletResponse, taskAssociationFile, taskAssociationFileSaveName); -// file.delete(); + file.delete(); } } return response; diff --git a/project/src/main/java/com/sdm/project/bo/ExportOperate.java b/project/src/main/java/com/sdm/project/bo/ExportOperate.java index 21094681..f2839b9b 100644 --- a/project/src/main/java/com/sdm/project/bo/ExportOperate.java +++ b/project/src/main/java/com/sdm/project/bo/ExportOperate.java @@ -27,7 +27,7 @@ public class ExportOperate { String columnFileName = TEMP_EXPORT_PATH + System.currentTimeMillis() + "colunms2.json"; String exportFileName = ""; if (!saveContentsToFile(task, taskJsonFileName) || !saveContentsToFile(colunms, columnFileName)) { - log.error("保存分析项库文件失败"); + log.error("保存数据文件失败"); } else { String shellPath = scriptPath + File.separator + "exportExcel.py"; exportFileName = TEMP_EXPORT_PATH + System.currentTimeMillis() + "task.xlsx"; @@ -35,18 +35,18 @@ public class ExportOperate { try { String resultString = SystemOperate.exeShellCmd(cmd); if (resultString.contains("error")) { - log.error("生成分析项库文件失败"); + log.error("生成数据文件失败"); } } catch (IOException e) { e.printStackTrace(); } finally { File taskFile = new File(taskJsonFileName); if (taskFile.exists()) { -// taskFile.delete(); + taskFile.delete(); } File columnFile = new File(columnFileName); if (columnFile.exists()) { -// columnFile.delete(); + columnFile.delete(); } } } diff --git a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java index 128f0be0..399bb553 100644 --- a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java @@ -2900,7 +2900,7 @@ public class TaskServiceImpl implements ITaskService { }else { String taskSaveName = "仿真任务.xlsx"; SystemOperate.outputHttpFileStream(httpServletResponse, taskFileName, taskSaveName); -// file.delete(); + file.delete(); } } return response; @@ -2924,7 +2924,7 @@ public class TaskServiceImpl implements ITaskService { }else { String taskSaveName = "仿真算例.xlsx"; SystemOperate.outputHttpFileStream(httpServletResponse, runFileName, taskSaveName); -// file.delete(); + file.delete(); } } return response; @@ -2948,7 +2948,7 @@ public class TaskServiceImpl implements ITaskService { }else { String taskSaveName = "仿真指标.xlsx"; SystemOperate.outputHttpFileStream(httpServletResponse, performanceFileName, taskSaveName); -// file.delete(); + file.delete(); } } return response;