Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/LowTemperatureManagerImpl.java =================================================================== diff -u -r40026 -r40030 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/LowTemperatureManagerImpl.java (.../LowTemperatureManagerImpl.java) (revision 40026) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/LowTemperatureManagerImpl.java (.../LowTemperatureManagerImpl.java) (revision 40030) @@ -46,7 +46,7 @@ /** * 低温灭菌器数据处理 */ -@Service("lowTemperatureImpl") +@Service("lowTemperatureManagerImpl") @Transactional public class LowTemperatureManagerImpl implements DeviceDataManager { private ObjectDao objectDao; Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/Getinge86SeriesDataManagerImpl.java =================================================================== diff -u -r40026 -r40030 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/Getinge86SeriesDataManagerImpl.java (.../Getinge86SeriesDataManagerImpl.java) (revision 40026) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/Getinge86SeriesDataManagerImpl.java (.../Getinge86SeriesDataManagerImpl.java) (revision 40030) @@ -55,7 +55,7 @@ * @author zhouPeiMian 2021-01-22 * */ -@Service("getingWashDataManager") +@Service("getinge86SeriesDataManagerImpl") @Transactional public class Getinge86SeriesDataManagerImpl implements DeviceDataManager{ private LogManager appLogManager; Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImpl.java =================================================================== diff -u -r40026 -r40030 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImpl.java (.../DeviceInterfaceDataProcessImpl.java) (revision 40026) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImpl.java (.../DeviceInterfaceDataProcessImpl.java) (revision 40030) @@ -119,9 +119,9 @@ xG2CXinhuaDataManagerImpl.readAndSaveRecord(devInterface,st.getMachineNumber(),DeviceInterface.BELIMED,st.getIsAutoCompleteSterilization(),enableDetailedDeviceInformation,loginUserData); break; } else if(DeviceInterface.DEVICETYPE_HIGH.equals(devInterface.getDeviceType())){ - dm = (DeviceDataManager) SpringBeanManger.getBean("highTemperatureManagerTarget"); + dm = (DeviceDataManager) SpringBeanManger.getBean("highTemperatureManagerImpl"); }else if(DeviceInterface.DEVICETYPE_LOW.equals(devInterface.getDeviceType())){ - dm = (DeviceDataManager) SpringBeanManger.getBean("lowTemperatureManagerTarget"); + dm = (DeviceDataManager) SpringBeanManger.getBean("lowTemperatureManagerImpl"); }else{ dm = (DeviceDataManager) SpringBeanManger.getBean("xinHuaDataManager"); } @@ -209,7 +209,7 @@ if(StringUtils.equals(devInterface.getDeviceModel(), DeviceInterface.GETING_86_SERIES) || StringUtils.equals(devInterface.getDeviceModel(), DeviceInterface.GETING_SUZHOUJIEDING_46_5)){ // 86-series型号和苏州洁定46-5数据格式类似,调用相同接口 - getingeBean = SpringBeanManger.getBean("getingWashDataManager"); + getingeBean = SpringBeanManger.getBean("getinge86SeriesDataManagerImpl"); }else if(DeviceInterface.GETING_WD500.equals(devInterface.getDeviceModel())){ getingeWD500DataManagerImpl.readAndSaveRecord(devInterface,rs.getMachineNumber(),DeviceInterface.STERIS,null,enableDetailedDeviceInformation,loginUserData); }else{ @@ -248,7 +248,7 @@ dm.readAndSaveRecord(devInterface,rs.getMachineNumber(),DeviceInterface.XINHUA,null,enableDetailedDeviceInformation,loginUserData); } else if(DeviceInterface.XINHUA_CHANGLONG_DC_4.equals(devInterface.getDeviceModel())){ // 福建石狮市医院,新华多舱式清洗机,型号为长龙(FJSSSYY-1) - Object xinHua_ChangLongBean = SpringBeanManger.getBean("changLongDataManagerTargetFJSSSYY"); + Object xinHua_ChangLongBean = SpringBeanManger.getBean("changLongDataManagerImplFJSSSYY"); dm = (DeviceDataManager) xinHua_ChangLongBean; dm.readAndSaveRecord(devInterface,rs.getMachineNumber(),DeviceInterface.XINHUA,null,enableDetailedDeviceInformation,loginUserData); }else{ Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/ChangLongDataManagerImplFJSSSYY.java =================================================================== diff -u -r40026 -r40030 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/ChangLongDataManagerImplFJSSSYY.java (.../ChangLongDataManagerImplFJSSSYY.java) (revision 40026) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/ChangLongDataManagerImplFJSSSYY.java (.../ChangLongDataManagerImplFJSSSYY.java) (revision 40030) @@ -45,7 +45,7 @@ * @author ZhouPeiMian * @since 2020-05-22 */ -@Service("changLongDataManagerTargetFJSSSYY") +@Service("changLongDataManagerImplFJSSSYY") @Transactional public class ChangLongDataManagerImplFJSSSYY implements DeviceDataManager{ Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/HighTemperatureManagerImpl.java =================================================================== diff -u -r40026 -r40030 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/HighTemperatureManagerImpl.java (.../HighTemperatureManagerImpl.java) (revision 40026) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/HighTemperatureManagerImpl.java (.../HighTemperatureManagerImpl.java) (revision 40030) @@ -48,7 +48,7 @@ * 高温灭菌器数据处理 @author zc.li 2020.06.29 */ -@Service("highTemperatureImpl") +@Service("highTemperatureManagerImpl") @Transactional public class HighTemperatureManagerImpl implements DeviceDataManager { private ObjectDao objectDao; Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImplForFJSSSYY.java =================================================================== diff -u -r40026 -r40030 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImplForFJSSSYY.java (.../DeviceInterfaceDataProcessImplForFJSSSYY.java) (revision 40026) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImplForFJSSSYY.java (.../DeviceInterfaceDataProcessImplForFJSSSYY.java) (revision 40030) @@ -121,7 +121,7 @@ case DeviceInterface.XINHUA: //若新华设备有型号且为长龙 if(DeviceInterface.CHANGLONG.equals(devInterface.getDeviceModel())){ - Object xinHua_ChangLongBean = SpringBeanManger.getBean("changLongDataManagerTargetFJSSSYY"); + Object xinHua_ChangLongBean = SpringBeanManger.getBean("changLongDataManagerImplFJSSSYY"); dm = (DeviceDataManager) xinHua_ChangLongBean; dm.readAndSaveRecord(devInterface,rs.getMachineNumber(),DeviceInterface.XINHUA,null,enableDetailedDeviceInformation,loginUserData); }else{