Index: forgon-tools/src/main/java/com/forgon/tools/date/DateTools.java =================================================================== diff -u -r40450 -r40610 --- forgon-tools/src/main/java/com/forgon/tools/date/DateTools.java (.../DateTools.java) (revision 40450) +++ forgon-tools/src/main/java/com/forgon/tools/date/DateTools.java (.../DateTools.java) (revision 40610) @@ -1206,4 +1206,12 @@ daysMap.put("firstHalfOfYearDays", firstHalfDays); daysMap.put("secondHalfOfYearDays", secondHalfDays); } + /** + * 获取现在的年月 + * @return 202509 + */ + public static String getYearAndMonth(){ + YearMonth currentYearMonth = YearMonth.now(); + return currentYearMonth.format(DateTimeFormatter.ofPattern("yyyy")) + currentYearMonth.format(DateTimeFormatter.ofPattern("MM")); + } } Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/CaspDataManagerImpl.java =================================================================== diff -u -r35645 -r40610 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/CaspDataManagerImpl.java (.../CaspDataManagerImpl.java) (revision 35645) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/CaspDataManagerImpl.java (.../CaspDataManagerImpl.java) (revision 40610) @@ -44,6 +44,7 @@ import com.forgon.log.model.Log; import com.forgon.log.service.LogManager; import com.forgon.tools.FileSystemHelper; +import com.forgon.tools.date.DateTools; import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.util.ForgonDateUtils; @@ -136,7 +137,7 @@ shareList = share.list(); length = shareList.length; } - String backUpPath = rootPath + "/backUp"; + String backUpPath = rootPath + "/backUp/"+DateTools.getYearAndMonth(); commonFileManager.makeDirectory(remoteType, ftp, backUpPath, session, enableDetailedDeviceInformation, loginUserData); SimpleDateFormat sdfToday = new SimpleDateFormat("yyyyMMdd"); int readAmount = 0;//每次遍历接口只读5个文件,避免定时器一个循环的时间处理不完