Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/MargeMAGGSZK260DataManagerImpl.java =================================================================== diff -u -r41147 -r41160 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/MargeMAGGSZK260DataManagerImpl.java (.../MargeMAGGSZK260DataManagerImpl.java) (revision 41147) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/MargeMAGGSZK260DataManagerImpl.java (.../MargeMAGGSZK260DataManagerImpl.java) (revision 41160) @@ -204,15 +204,16 @@ String fileName = null; String line = null; List washDataList = new ArrayList(); + Path tempFile = null; try { if(DeviceInterface.INTERFACETYPE_FTP.equals(remoteType)){ fileName = ftpFile.getName(); }else{ fileName = smbForm.getName(); } - Path tempFile = commonFileManager.getTempFile(remoteType, ftp, fileName, smbForm); + tempFile = commonFileManager.getTempFile(remoteType, ftp, fileName, smbForm); // 获取文件编码 - String detectedEncoding = commonFileManager.getDetectedEncoding(tempFile , true); + String detectedEncoding = commonFileManager.getDetectedEncoding(tempFile); int lineNo = 0; try (InputStream finalStream = Files.newInputStream(tempFile); InputStreamReader reader = new InputStreamReader(finalStream, detectedEncoding); @@ -293,6 +294,7 @@ } appLogManager.saveLog(loginUserData, Log.MODEL_DEVICE_INTERFACE, Log.TYPE_ADD, description); } + commonFileManager.deleteTempFile(tempFile); e.printStackTrace(); } if(CollectionUtils.isNotEmpty(washDataList)){