diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java index 642a274..f9a311e 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java @@ -695,7 +695,7 @@ public class CommonService { fileName, destPath, strategyStr, - finalEdFileInfo.getFileName() + "." + suffix); + Optional.ofNullable(finalEdFileInfo).map(EdFileInfo::getFileName).orElse("") + "." + suffix); return ElectromagneticResultUtil.success(Optional.ofNullable(finalEdFileInfo).map(EdFileInfo::getId).orElse("")); } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileTagRelationServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileTagRelationServiceImpl.java index a2d7bd1..f4f9810 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileTagRelationServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileTagRelationServiceImpl.java @@ -94,7 +94,7 @@ public class FileTagRelationServiceImpl extends ServiceImpl files = FileUtil.loopFiles(sqlScript, file -> file.lastModified() < dateTime.getTime()); + List files = FileUtil.loopFiles(elePropertyConfig.getSqlDirs(), file -> file.lastModified() < dateTime.getTime()); files.forEach(file -> { boolean deleteSuccess = file.delete(); String success = deleteSuccess ? "success" : "fail"; @@ -253,7 +253,6 @@ public class BackupTask { log.info(msg); }); - } catch (Exception e) { log.warn("导出MySQL数据异常,原因 {}", e.getMessage(), e); }