Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/GetingeDataManagerImpl.java
===================================================================
diff -u -r35056 -r35419
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/GetingeDataManagerImpl.java	(.../GetingeDataManagerImpl.java)	(revision 35056)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/GetingeDataManagerImpl.java	(.../GetingeDataManagerImpl.java)	(revision 35419)
@@ -49,7 +49,6 @@
 import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecord;
 import com.forgon.disinfectsystem.filemanager.CommonFileManager;
 import com.forgon.disinfectsystem.filemanager.FtpFileManager;
-import com.forgon.disinfectsystem.filemanager.SmbFileManager;
 import com.forgon.disinfectsystem.sterilizationmanager.sterilizationrecord.service.SterilizationRecordManager;
 import com.forgon.disinfectsystem.washanddisinfectmanager.washanddisinfectrecord.service.WashAndDisinfectRecordManager;
 import com.forgon.log.model.Log;
@@ -69,15 +68,11 @@
 	private SterilizationRecordManager sterilizationRecordManager;
 	private WashAndDisinfectRecordManager washAndDisinfectRecordManager;
 	private DateQueryAdapter dateQueryAdapter;
-	private SmbFileManager smbFileManager;
 	private FtpFileManager ftpFileManager;
 	private CommonFileManager commonFileManager;
 	public void setCommonFileManager(CommonFileManager commonFileManager) {
 		this.commonFileManager = commonFileManager;
 	}
-	public void setSmbFileManager(SmbFileManager smbFileManager) {
-		this.smbFileManager = smbFileManager;
-	}
 	public void setFtpFileManager(FtpFileManager ftpFileManager) {
 		this.ftpFileManager = ftpFileManager;
 	}
@@ -242,108 +237,6 @@
 		}
 		
 	}
-	public void readAndSaveRecordByShareFolder(DeviceInterface devInterface,String machineNo,String brand,String isAutoCompleteSterilization, boolean enableDetailedDeviceInformation, LoginUserData loginUserData){
-		SmbSession session=null;
-		String ip = devInterface.getIP();
-		String directory = devInterface.getFolderPath();
-		String userName=devInterface.getDecryptUserName();
-		String pwd = devInterface.getDecryptPassword();
-		String rootURL = "//"+ ip + "/" + directory + "/";
-		logger.debug("设备IP===="+ip);
-		logger.debug("用户名===="+userName);
-		logger.debug("密码===="+pwd);
-		// smbFileName格式  "smb://192.168.2.18/Share/c.csv" 
-		//  获取到名字，判断是清洗机还是灭菌炉，再调用相关的函数处理
-		//"smb://192.168.2.18/Share/"
-		try {
-			SmbShare share = new SmbShare("smb://" + userName +":"+ pwd +"@"+ ip +"/"+ directory +"/");
-			session = new SmbSession(share);
-			String backUp = rootURL +"backUp/";
-			smbFileManager.makeDirectory(session, backUp);
-			for (String name : share.list()){
-				SmbFile smbForm=session.createSmbFileObject(rootURL + name);
-				if(smbForm.isDirectory()){
-					continue;
-				}
-				if( objectDao.getByProperty(SterilizerFileName.class.getSimpleName(), "fileName", name)!=null){
-	                   logger.debug(name+"该文件已经解析过");
-	                   continue; 
-	            }
-				// 只处理.XML文件
-                if ( !(name.endsWith("XML") || name.endsWith("xml")) ){
-                    logger.debug("只处理.XML文件->continue");
-                	continue;
-                }
-                // 机器号和品牌都要匹配，才处理
-                if( brand != devInterface.GETINGE ){
-                    logger.debug("品牌不对-机器品牌号:"+ brand +",接口品牌:" + devInterface.GETINGE+ ">continue="+brand);
-                    continue;
-                }
-                JSONObject machineNumAndIsWashingMachine = getMachineNoAndIsWashingMachine(DeviceInterface.INTERFACETYPE_SHAREFOLDER, null, null, smbForm, devInterface, machineNo);
-                String machineNumber = machineNumAndIsWashingMachine.optString("machineNo");
-                if( !machineNo.equals(machineNumber) ){
-                    logger.debug("机器号不对-机器号:"+machineNo+",文件机器号:"+machineNumber + "->continue="+machineNo);
-                	continue;
-                }
-                String cycleCounter = null;
-                if(machineNumAndIsWashingMachine.optBoolean("isWashingMachine")){
-                	// 清洗机数据的处理
-                	JSONArray jsArray = washDataReadAndSave(smbForm, devInterface, DeviceInterface.INTERFACETYPE_SHAREFOLDER, null, null, machineNumber, enableDetailedDeviceInformation, loginUserData);
-                	if( jsArray != null){
-                		boolean sterilizaMatchPatternForDate = CssdUtils.getSystemSetConfigByNameBool("sterilizaMatchPatternForDate", false);
-                		if(sterilizaMatchPatternForDate){
-                			String procStartTimeStr = (String)jsArray.get(1);
-                			Date startTime = ForgonDateUtils.safelyParseDate(procStartTimeStr, ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS);
-                			refreshWashRecordAmounts(devInterface.getId().toString(), startTime, machineNumber);
-                		}else{
-                			cycleCounter = (String)jsArray.get(0);
-                			refreshWashRecordAmounts(devInterface.getId().toString(),Long.parseLong(cycleCounter),machineNumber);
-                		}
-                	}
-                }else{
-                	// 灭菌炉数据处理
-                	JSONArray jsArray = sterilizerDataReadAndSave(smbForm, devInterface, DeviceInterface.INTERFACETYPE_SHAREFOLDER, null, null, machineNumber, enableDetailedDeviceInformation, loginUserData);
-                	if( jsArray != null){
-                		cycleCounter = (String)jsArray.get(0);
-                		String procStartTimeStr = (String)jsArray.get(1);
-                		
-                		//决定灭菌炉数据，采用哪种匹配模式 ，默认为循环次数，针对中六增加了开始时间
-                		boolean sterilizaMatchPatternForDate = CssdUtils.getSystemSetConfigByNameBool("sterilizaMatchPatternForDate", false);
-                		// 灭菌炉自动完成灭菌
-                		if( !StringUtils.isNotBlank(isAutoCompleteSterilization) || isAutoCompleteSterilization.equals("是")){
-                		    if(sterilizaMatchPatternForDate){
-                		        autoFinishSterilizerRecord(devInterface.getId().toString(),machineNumber,procStartTimeStr); 
-                		    }else{
-                		        autoFinishSterilizerRecord(devInterface.getId().toString(),Long.parseLong(cycleCounter),machineNumber); 
-                		    }
-                		}
-                		if(sterilizaMatchPatternForDate){
-                		    refreshSterilizaerRecordAmounts(devInterface.getId().toString(),procStartTimeStr,machineNumber, enableDetailedDeviceInformation, loginUserData);
-                		}else{
-                		    refreshSterilizaerRecordAmounts(devInterface.getId().toString(),Long.parseLong(cycleCounter),machineNumber, enableDetailedDeviceInformation, loginUserData); 
-                		}
-                	}
-                }
-                SmbFile desFile = session.createSmbFileObject(backUp + name);
-                try{
-                	smbForm.copyTo(desFile);
-                	smbForm.delete();
-                }catch(Exception e){
-                    e.printStackTrace();
-                    logger.debug(name+"文件在移动和删除过程中发生错误");
-                }
-			}
-		} catch (IOException e) {
-			// 捕获BufferedReader对象关闭时的异常
-			logger.warn(e.getMessage());
-			e.printStackTrace();
-			if(enableDetailedDeviceInformation){
-				appLogManager.saveLog(loginUserData, Log.MODEL_DEVICE_INTERFACE, Log.TYPE_ADD, devInterface.getName() + "设备接口连接异常," + e.getMessage());
-			}
-		}finally{
-			session.close();
-		}
-	}
 	/**
 	 * 洁定灭菌炉型号：HS6620
 	 * @param devInterface 设备接口