Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/filemanager/SmbFileManagerImpl.java =================================================================== diff -u -r26627 -r27115 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/filemanager/SmbFileManagerImpl.java (.../SmbFileManagerImpl.java) (revision 26627) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/filemanager/SmbFileManagerImpl.java (.../SmbFileManagerImpl.java) (revision 27115) @@ -32,14 +32,17 @@ throw new RuntimeException("创建文件异常,path:" + path); } } - public void moveSmbFile(SmbSession session, SmbFile smbForm, String targetRoute){ + public boolean moveSmbFile(SmbSession session, SmbFile smbForm, String targetRoute){ + boolean flag = false; try{ SmbFile desFile = session.createSmbFileObject(targetRoute + "/" + smbForm.getName()); smbForm.copyTo(desFile); smbForm.delete(); + flag = true; }catch(Exception e){ e.printStackTrace(); throw new RuntimeException(smbForm.getName()+"文件在移动和删除过程中发生错误"); } + return flag; } } Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java =================================================================== diff -u -r27112 -r27115 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java (.../BelimedDataManagerImpl.java) (revision 27112) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java (.../BelimedDataManagerImpl.java) (revision 27115) @@ -183,6 +183,18 @@ refreshSterilizaerRecordAmounts(devInterface.getId().toString(),Long.parseLong(cycleCounter),machineNumber); } } + boolean isMove = commonFileManager.moveFile(remoteType, name, ftp, ftpFileManager.getCurrentPath(ftp), backUpPath, session, smbForm); + if(!isMove){ + continue; + } + //移动C文件对应的K文件 + name = name.replaceFirst("C", "K"); + if(DeviceInterface.INTERFACETYPE_SHAREFOLDER.equals(remoteType)){ + smbForm = session.createSmbFileObject(rootPath + File.separator + name); + if(smbForm == null || smbForm.isDirectory()){ + continue; + } + } commonFileManager.moveFile(remoteType, name, ftp, ftpFileManager.getCurrentPath(ftp), backUpPath, session, smbForm); } } catch (Exception e) { Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/filemanager/CommonFileManager.java =================================================================== diff -u -r26637 -r27115 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/filemanager/CommonFileManager.java (.../CommonFileManager.java) (revision 26637) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/filemanager/CommonFileManager.java (.../CommonFileManager.java) (revision 27115) @@ -28,7 +28,7 @@ * @param session smbfile方式参数 SmbSession * @param smbForm smbfile方式参数 移动前SmbFile */ - public void moveFile(String remoteType, String fileName, FTPClient ftp, String sourceRoute, String targetRoute,SmbSession session, SmbFile smbForm); + public boolean moveFile(String remoteType, String fileName, FTPClient ftp, String sourceRoute, String targetRoute,SmbSession session, SmbFile smbForm); /** * 创建文件 * @param remoteType远程方式 Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/filemanager/CommonFileManagerImpl.java =================================================================== diff -u -r26796 -r27115 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/filemanager/CommonFileManagerImpl.java (.../CommonFileManagerImpl.java) (revision 26796) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/filemanager/CommonFileManagerImpl.java (.../CommonFileManagerImpl.java) (revision 27115) @@ -42,14 +42,15 @@ return inputStream; } @Override - public void moveFile(String remoteType, String fileName, FTPClient ftp, + public boolean moveFile(String remoteType, String fileName, FTPClient ftp, String sourceRoute, String targetRoute, SmbSession session, SmbFile smbForm) { if(DeviceInterface.INTERFACETYPE_FTP.equals(remoteType)){ - ftpFileManager.moveFile(fileName, ftp, sourceRoute, targetRoute); + return ftpFileManager.moveFile(fileName, ftp, sourceRoute, targetRoute); }else if(DeviceInterface.INTERFACETYPE_SHAREFOLDER.equals(remoteType)){ - smbFileManager.moveSmbFile(session, smbForm, targetRoute); + return smbFileManager.moveSmbFile(session, smbForm, targetRoute); } + return false; } @Override public void makeDirectory(String remoteType, FTPClient ftp, String path, Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/filemanager/SmbFileManager.java =================================================================== diff -u -r26627 -r27115 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/filemanager/SmbFileManager.java (.../SmbFileManager.java) (revision 26627) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/filemanager/SmbFileManager.java (.../SmbFileManager.java) (revision 27115) @@ -26,5 +26,5 @@ * @param smbForm 移动前的SmbFile * @param targetRoute 目标路径 */ - public void moveSmbFile(SmbSession session, SmbFile smbForm, String targetRoute); + public boolean moveSmbFile(SmbSession session, SmbFile smbForm, String targetRoute); }