Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java =================================================================== diff -u -r13821 -r17573 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java (.../BelimedDataManagerImpl.java) (revision 13821) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java (.../BelimedDataManagerImpl.java) (revision 17573) @@ -25,6 +25,7 @@ import jcifs.smb.SmbFile; import jcifs.smb.SmbFileInputStream; +import com.forgon.directory.acegi.tools.AcegiHelper; import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.action.SupplyRoomConfigAction; import com.forgon.disinfectsystem.entity.basedatamanager.deviceinterface.DeviceInterface; import com.forgon.disinfectsystem.entity.basedatamanager.rinser.Rinser; @@ -34,6 +35,7 @@ import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecord; import com.forgon.disinfectsystem.sterilizationmanager.sterilizationrecord.service.SterilizationRecordManager; import com.forgon.disinfectsystem.washanddisinfectmanager.washanddisinfectrecord.service.WashAndDisinfectRecordManager; +import com.forgon.log.model.Log; import com.forgon.log.service.LogManager; import com.forgon.tools.hibernate.ObjectDao; @@ -162,8 +164,7 @@ // 捕获BufferedReader对象关闭时的异常 // e.printStackTrace(); logger.warn(e.getMessage()); - UsernamePasswordAuthenticationToken auth = new UsernamePasswordAuthenticationToken("设备接口服务",""); - appLogManager.writeLog(auth,"IOException" + e.getMessage(), "设备接口异常"); + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_DEVICE_INTERFACE, Log.TYPE_ADD, "设备接口连接异常," + e.getMessage()); } } @@ -252,8 +253,7 @@ } catch (IOException e) { // 捕获BufferedReader对象关闭时的异常 logger.warn(e.getMessage()); - UsernamePasswordAuthenticationToken auth = new UsernamePasswordAuthenticationToken("设备接口服务",""); - appLogManager.writeLog(auth,"IOException" + e.getMessage(), "设备接口异常"); + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_DEVICE_INTERFACE, Log.TYPE_ADD, "设备接口连接异常," + e.getMessage()); return null; } } @@ -362,10 +362,7 @@ return true; } catch (Exception e) { logger.warn(e.getMessage()); - UsernamePasswordAuthenticationToken auth = new UsernamePasswordAuthenticationToken( - "设备接口服务", ""); - appLogManager.writeLog(auth, "IOException" + e.getMessage(), - "设备接口异常"); + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_DEVICE_INTERFACE, Log.TYPE_ADD, "设备接口连接异常," + e.getMessage()); return false; } } @@ -469,8 +466,7 @@ return null; } catch (IOException e) { logger.warn(e.getMessage()); - UsernamePasswordAuthenticationToken auth = new UsernamePasswordAuthenticationToken("设备接口服务",""); - appLogManager.writeLog(auth,"IOException" + e.getMessage(), "设备接口异常"); + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_DEVICE_INTERFACE, Log.TYPE_ADD, "设备接口连接异常," + e.getMessage()); return null; } } Index: forgon-core/src/main/java/com/forgon/log/model/Log.java =================================================================== diff -u -r17561 -r17573 --- forgon-core/src/main/java/com/forgon/log/model/Log.java (.../Log.java) (revision 17561) +++ forgon-core/src/main/java/com/forgon/log/model/Log.java (.../Log.java) (revision 17573) @@ -46,6 +46,7 @@ public static final String MODEL_RECYCLINGERRORANDDAMAGE = "丢失报损模块"; public static final String MODEL_BORROW = "借物管理模块"; public static final String MODEL_SIGN = "签收模块"; + public static final String MODEL_DEVICE_INTERFACE = "设备接口模块"; public static final String TYPE_ADD = "A";//添加 public static final String TYPE_UPDATE = "U";//修改 Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/SterisDataManagerImpl.java =================================================================== diff -u -r13821 -r17573 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/SterisDataManagerImpl.java (.../SterisDataManagerImpl.java) (revision 13821) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/SterisDataManagerImpl.java (.../SterisDataManagerImpl.java) (revision 17573) @@ -21,6 +21,7 @@ import org.hibernate.Session; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import com.forgon.directory.acegi.tools.AcegiHelper; import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.action.SupplyRoomConfigAction; import com.forgon.disinfectsystem.entity.basedatamanager.deviceinterface.DeviceInterface; import com.forgon.disinfectsystem.entity.basedatamanager.rinser.Rinser; @@ -30,6 +31,7 @@ import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecord; import com.forgon.disinfectsystem.sterilizationmanager.sterilizationrecord.service.SterilizationRecordManager; import com.forgon.disinfectsystem.washanddisinfectmanager.washanddisinfectrecord.service.WashAndDisinfectRecordManager; +import com.forgon.log.model.Log; import com.forgon.log.service.LogManager; import com.forgon.tools.hibernate.ObjectDao; public class SterisDataManagerImpl implements DeviceDataManager{ @@ -133,8 +135,7 @@ } catch (IOException e) { // 捕获BufferedReader对象关闭时的异常 logger.warn(e.getMessage()); - UsernamePasswordAuthenticationToken auth = new UsernamePasswordAuthenticationToken("设备接口服务",""); - appLogManager.writeLog(auth,"IOException" + e.getMessage(), "设备接口异常"); + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_DEVICE_INTERFACE, Log.TYPE_ADD, "设备接口连接异常," + e.getMessage()); } } @@ -248,8 +249,7 @@ // 捕获BufferedReader对象关闭时的异常 // e.printStackTrace(); logger.warn(e.getMessage()); - UsernamePasswordAuthenticationToken auth = new UsernamePasswordAuthenticationToken("设备接口服务",""); - appLogManager.writeLog(auth,"IOException" + e.getMessage(), "设备接口异常"); + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_DEVICE_INTERFACE, Log.TYPE_ADD, "设备接口连接异常," + e.getMessage()); return null; } } @@ -425,8 +425,7 @@ // 捕获BufferedReader对象关闭时的异常 // e.printStackTrace(); logger.warn(e.getMessage()); - UsernamePasswordAuthenticationToken auth = new UsernamePasswordAuthenticationToken("设备接口服务",""); - appLogManager.writeLog(auth,"IOException" + e.getMessage(), "设备接口异常"); + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_DEVICE_INTERFACE, Log.TYPE_ADD, "设备接口连接异常," + e.getMessage()); return null; } }