Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/MargeMAGCL4ataManagerImpl.java =================================================================== diff -u -r40406 -r40467 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/MargeMAGCL4ataManagerImpl.java (.../MargeMAGCL4ataManagerImpl.java) (revision 40406) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/MargeMAGCL4ataManagerImpl.java (.../MargeMAGCL4ataManagerImpl.java) (revision 40467) @@ -16,7 +16,9 @@ import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.util.FileUtils; import com.forgon.tools.util.ForgonDateUtils; + import jcifs.smb.SmbFile; + import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.net.ftp.FTPClient; @@ -141,7 +143,7 @@ if(!machineNo.equals(machineNumber)){ continue; } - String yyyymmdd = fileNameInfos[1].substring(0, name.length() - 7); + String yyyymmdd = fileNameInfos[1].trim().substring(0, 8); if(sdfToday.parse(yyyymmdd).before(sdfToday.parse(sdfToday.format(endStartTime)))){ try{ commonFileManager.moveFile(remoteType, name, ftp, ftpFileManager.getCurrentPath(ftp), backUpPath, session, smbForm);