Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHuaDataManagerImpl.java =================================================================== diff -u -r35645 -r35652 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHuaDataManagerImpl.java (.../XinHuaDataManagerImpl.java) (revision 35645) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHuaDataManagerImpl.java (.../XinHuaDataManagerImpl.java) (revision 35652) @@ -600,7 +600,7 @@ } else { //灭菌炉数据处理 logger.debug(String.format("开始处理灭菌炉数据:品牌【%s】,机器号【%s】,循环次数【%s】", brand,machineNumber,cycleCounter)); - JSONObject jsObject = sterilizerDataReadAndSave(cacheFile,devInterface,null,null, enableDetailedDeviceInformation, loginUserData, isAutoCompleteSterilization, sterilizaMatchPatternForDate, ymdFormat); + JSONObject jsObject = sterilizerDataReadAndSave(cacheFile,devInterface,null,null, enableDetailedDeviceInformation, loginUserData, isAutoCompleteSterilization, sterilizaMatchPatternForDate); boolean isEnd = jsObject.optBoolean("isEnd", false);//灭菌阶段是否为已结束 //若灭菌炉的灭菌阶段为:已结束,则把该文件放进backUp文件夹中 if(isEnd){ @@ -616,7 +616,8 @@ throw new IOException(fileName + "文件在移动和删除过程中发生错误"); } }else{//如果没结束 或者没有开始时间 或者 最后修改时间超过3天 移动到errFiles中 - String startDateYMD = jsObject.optString("startDateYMD"); + Date lastModifiedDate = new Date(file.getLastModified()); + String startDateYMD = ymdFormat.format(lastModifiedDate); if(StringUtils.isBlank(startDateYMD) || ymdFormat.parse(startDateYMD).before(ymdFormat.parse(ymdFormat.format(endStartTime)))){ appLogManager.saveLog(loginUserData, Log.MODEL_DEVICE_INTERFACE, Log.TYPE_QUERY, "如预期方式被移动"); smbFileManager.moveSmbFile(session, file, errFilesDirURL); @@ -758,7 +759,7 @@ if(fileName.toUpperCase().contains("ST")){ //灭菌炉数据处理 logger.debug(String.format("开始处理灭菌炉数据:品牌【%s】,机器号【%s】,循环次数【%s】", brand,machineNumber,cycleCounter)); - JSONObject jsObject = sterilizerDataReadAndSave(null, devInterface, cacheFile, ftp, enableDetailedDeviceInformation, loginUserData, isAutoCompleteSterilization,sterilizaMatchPatternForDate, ymdFormat); + JSONObject jsObject = sterilizerDataReadAndSave(null, devInterface, cacheFile, ftp, enableDetailedDeviceInformation, loginUserData, isAutoCompleteSterilization,sterilizaMatchPatternForDate); changeResult = ftpFileManager.changeWorkingDirectory(ftp, directoryIso); if(!changeResult){ throw new RuntimeException("切换目录[" + directory + "]失败"); @@ -901,7 +902,7 @@ * @return */ private JSONObject sterilizerDataReadAndSave(SmbFile remoteFile,DeviceInterface devInterface, FTPFile ftpFile, FTPClient ftp, boolean enableDetailedDeviceInformation, LoginUserData loginUserData, String isAutoCompleteSterilization - , boolean sterilizaMatchPatternForDate, DateFormat ymdFormat){ + , boolean sterilizaMatchPatternForDate){ //文件名称 String fileName = null; if(remoteFile != null){ @@ -992,7 +993,6 @@ String timeStr = line.substring(16,28); Date startDate = gedDate(timeStr); if(procStartTime == null){ - reusltJson.put("startDateYMD", ymdFormat.format(startDate)); procStartTime = startDate; } if(lineNum == 0){//第一行