Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImpl.java =================================================================== diff -u -r31436 -r31437 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImpl.java (.../DeviceInterfaceDataProcessImpl.java) (revision 31436) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImpl.java (.../DeviceInterfaceDataProcessImpl.java) (revision 31437) @@ -194,12 +194,26 @@ //若新华设备有型号且为长龙 if(DeviceInterface.CHANGLONG.equals(devInterface.getDeviceModel())){ Object xinHua_ChangLongBean = SpringBeanManger.getBean("xinHua_ChangLongDataManager"); - dm = (DeviceDataManager) xinHua_ChangLongBean; - dm.readAndSaveRecord(devInterface,rs.getMachineNumber(),DeviceInterface.XINHUA,null,enableDetailedDeviceInformation,loginUserData); + if(xinHua_ChangLongBean != null){ + dm = (DeviceDataManager) xinHua_ChangLongBean; + dm.readAndSaveRecord(devInterface,rs.getMachineNumber(),DeviceInterface.XINHUA,null,enableDetailedDeviceInformation,loginUserData); + } + xinHua_ChangLongBean = SpringBeanManger.getBean("changLongDataManagerTargetFJSSSYY"); + if(xinHua_ChangLongBean != null){ + dm = (DeviceDataManager) xinHua_ChangLongBean; + dm.readAndSaveRecord(devInterface,rs.getMachineNumber(),DeviceInterface.XINHUA,null,enableDetailedDeviceInformation,loginUserData); + } }else{ Object xinHuaBean = SpringBeanManger.getBean("xinHuaDataManager"); - dm = (DeviceDataManager) xinHuaBean; - dm.readAndSaveRecord(devInterface,rs.getMachineNumber(),DeviceInterface.XINHUA,null,enableDetailedDeviceInformation,loginUserData); + if(xinHuaBean != null){ + dm = (DeviceDataManager) xinHuaBean; + dm.readAndSaveRecord(devInterface,rs.getMachineNumber(),DeviceInterface.XINHUA,null,enableDetailedDeviceInformation,loginUserData); + } + xinHuaBean = SpringBeanManger.getBean("xinHuaDataManagerForFJSSSYY"); + if(xinHuaBean != null){ + dm = (DeviceDataManager) xinHuaBean; + dm.readAndSaveRecord(devInterface,rs.getMachineNumber(),DeviceInterface.XINHUA,null,enableDetailedDeviceInformation,loginUserData); + } } break; case DeviceInterface.MARGE://美雅洁清洗机非定时读取文件获取数据(根据modbus协议实时读取)