Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/MaTaDataManagerImpl.java =================================================================== diff -u -r36035 -r36065 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/MaTaDataManagerImpl.java (.../MaTaDataManagerImpl.java) (revision 36035) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/MaTaDataManagerImpl.java (.../MaTaDataManagerImpl.java) (revision 36065) @@ -11,7 +11,6 @@ import java.sql.SQLException; import java.sql.Timestamp; import java.text.DateFormat; -import java.text.ParseException; import java.util.Calendar; import java.util.Date; import java.util.List; @@ -26,7 +25,6 @@ import org.apache.commons.net.ftp.FTPFileFilter; import org.apache.log4j.Logger; import org.dom4j.Document; -import org.dom4j.DocumentException; import org.dom4j.DocumentHelper; import org.dom4j.Element; import org.springframework.beans.factory.annotation.Autowired; @@ -44,7 +42,6 @@ import com.forgon.disinfectsystem.filemanager.CommonFileManager; import com.forgon.disinfectsystem.filemanager.FtpFileManager; import com.forgon.disinfectsystem.sterilizationmanager.sterilizationrecord.service.SterilizationRecordManager; -import com.forgon.exception.SystemException; import com.forgon.log.model.Log; import com.forgon.log.service.LogManager; import com.forgon.tools.FileSystemHelper; @@ -232,7 +229,17 @@ }finally{ FileSystemHelper.closeInputStream(inputStream, br, isr, out); } - return handleData(sbf, enableDetailedDeviceInformation, loginUserData, devInterface); + boolean end = false; + try { + end = handleData(sbf, enableDetailedDeviceInformation, loginUserData, devInterface); + } catch (Exception e) { + if(enableDetailedDeviceInformation){ + appLogManager.saveLog(loginUserData, + Log.MODEL_DEVICE_INTERFACE, Log.TYPE_ADD, + devInterface.getName() + "设备接口连接异常," + e.getMessage()); + } + } + return end; } /** * 处理读到的xml数据 @@ -241,8 +248,9 @@ * @param loginUserData 登录用户 * @param devInterface 设备接口 * @return + * @throws Exception */ - private boolean handleData(StringBuffer sbf, boolean enableDetailedDeviceInformation, LoginUserData loginUserData, DeviceInterface devInterface) { + private boolean handleData(StringBuffer sbf, boolean enableDetailedDeviceInformation, LoginUserData loginUserData, DeviceInterface devInterface) throws Exception { if(sbf.length() == 0){ return false; } @@ -343,14 +351,6 @@ pt.executeBatch(); objectDao.excuteSQL(" update " + SterilizationRecord.class.getSimpleName() + " set sterilizationParaType=" + SterilizationRecord.STERILIZATIONPARATYPE_MATACHANA_130LF + " where id="+sterilizationRecordId); end = true; - } catch (SystemException e) { - e.printStackTrace(); - } catch (DocumentException e1) { - e1.printStackTrace(); - } catch (ParseException e) { - e.printStackTrace(); - } catch (SQLException e) { - e.printStackTrace(); } finally{ try { pt.close();