Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/CaspDataManagerImpl.java =================================================================== diff -u -r39460 -r40026 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/CaspDataManagerImpl.java (.../CaspDataManagerImpl.java) (revision 39460) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/CaspDataManagerImpl.java (.../CaspDataManagerImpl.java) (revision 40026) @@ -27,6 +27,7 @@ import org.apache.log4j.Logger; import org.hibernate.Query; import org.hibernate.Session; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.integration.smb.session.SmbSession; import org.springframework.integration.smb.session.SmbShare; import org.springframework.stereotype.Service; @@ -47,11 +48,13 @@ import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.util.ForgonDateUtils; +import org.springframework.transaction.annotation.Transactional; /** * 低温灭菌器数据处理 */ -@Service("caspDataManagerTarget") +@Service("caspDataManager") +@Transactional public class CaspDataManagerImpl implements DeviceDataManager { private ObjectDao objectDao; private LogManager appLogManager; @@ -60,29 +63,19 @@ private CommonFileManager commonFileManager; private DateQueryAdapter dateQueryAdapter; private static final Logger logger = Logger - .getLogger(LowTemperatureManagerImpl.class); - public void setDateQueryAdapter(DateQueryAdapter dateQueryAdapter) { - this.dateQueryAdapter = dateQueryAdapter; - } - public void setFtpFileManager(FtpFileManager ftpFileManager) { + .getLogger(CaspDataManagerImpl.class); + public CaspDataManagerImpl(){} + @Autowired + public CaspDataManagerImpl(ObjectDao objectDao, LogManager appLogManager,SterilizationRecordManager sterilizationRecordManager, FtpFileManager ftpFileManager, CommonFileManager commonFileManager + , DateQueryAdapter dateQueryAdapter) { + this.objectDao = objectDao; + this.appLogManager = appLogManager; + this.sterilizationRecordManager = sterilizationRecordManager; this.ftpFileManager = ftpFileManager; - } - public void setCommonFileManager(CommonFileManager commonFileManager) { this.commonFileManager = commonFileManager; + this.dateQueryAdapter = dateQueryAdapter; } - public void setSterilizationRecordManager( - SterilizationRecordManager sterilizationRecordManager) { - this.sterilizationRecordManager = sterilizationRecordManager; - } - public void setObjectDao(ObjectDao objectDao) { - this.objectDao = objectDao; - } - - public void setAppLogManager(LogManager appLogManager) { - this.appLogManager = appLogManager; - } - /** * 从接口读取数据和存入数据库 */ Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/Johnson100NXDataManagerImpl.java =================================================================== diff -u -r39460 -r40026 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/Johnson100NXDataManagerImpl.java (.../Johnson100NXDataManagerImpl.java) (revision 39460) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/Johnson100NXDataManagerImpl.java (.../Johnson100NXDataManagerImpl.java) (revision 40026) @@ -32,7 +32,6 @@ import com.forgon.Constants; import com.forgon.databaseadapter.service.DateQueryAdapter; import com.forgon.directory.vo.LoginUserData; -import com.forgon.disinfectsystem.common.CssdUtils; import com.forgon.disinfectsystem.entity.basedatamanager.deviceinterface.DeviceInterface; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.Johnson100NXStageDetails; @@ -49,32 +48,33 @@ import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.util.ForgonDateUtils; import com.opencsv.CSVReader; +import org.springframework.transaction.annotation.Transactional; @Component +@Transactional public class Johnson100NXDataManagerImpl implements DeviceDataManager{ - private static final Logger logger = Logger.getLogger(MaTaDataManagerImpl.class); - @Autowired + private static final Logger logger = Logger.getLogger(Johnson100NXDataManagerImpl.class); private ObjectDao objectDao; - @Autowired private FtpFileManager ftpFileManager; - @Autowired private CommonFileManager commonFileManager; - @Autowired private LogManager appLogManager; - @Autowired private SterilizationRecordManager sterilizationRecordManager; private InitDbConnection dbConnection; private DateQueryAdapter dateQueryAdapter; - public void setDateQueryAdapter(DateQueryAdapter dateQueryAdapter) { - this.dateQueryAdapter = dateQueryAdapter; - } - public void setDbConnection(InitDbConnection dbConnection) { + private JdbcTemplate jdbcTemplate; + public Johnson100NXDataManagerImpl() {} + @Autowired + public Johnson100NXDataManagerImpl(ObjectDao objectDao, FtpFileManager ftpFileManager, CommonFileManager commonFileManager, LogManager appLogManager, SterilizationRecordManager sterilizationRecordManager + , InitDbConnection dbConnection, DateQueryAdapter dateQueryAdapter, JdbcTemplate jdbcTemplate) { + this.objectDao = objectDao; + this.ftpFileManager = ftpFileManager; + this.commonFileManager = commonFileManager; + this.appLogManager = appLogManager; + this.sterilizationRecordManager = sterilizationRecordManager; this.dbConnection = dbConnection; - } - public void setJdbcTemplate(JdbcTemplate jdbcTemplate) { + this.dateQueryAdapter = dateQueryAdapter; this.jdbcTemplate = jdbcTemplate; } - private JdbcTemplate jdbcTemplate; @Override public void readAndSaveRecord(DeviceInterface devInterface, String machineNo, String brand, String isAutoCompleteSterilization, Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHuaDataManagerImpl.java =================================================================== diff -u -r39460 -r40026 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHuaDataManagerImpl.java (.../XinHuaDataManagerImpl.java) (revision 39460) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHuaDataManagerImpl.java (.../XinHuaDataManagerImpl.java) (revision 40026) @@ -33,6 +33,7 @@ import org.apache.log4j.Logger; import org.hibernate.Query; import org.hibernate.Session; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.integration.smb.session.SmbSession; import org.springframework.integration.smb.session.SmbShare; @@ -68,11 +69,16 @@ import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.string.StringTools; import com.forgon.tools.util.ForgonDateUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + /** * 新华灭菌炉、清洗机数据处理 * @author shuyongfu * @since 2018-11-12 */ +@Service("xinHuaDataManager") +@Transactional public class XinHuaDataManagerImpl implements DeviceDataManager{ private LogManager appLogManager; private ObjectDao objectDao; @@ -85,39 +91,20 @@ private DateQueryAdapter dateQueryAdapter; private CommonFileManager commonFileManager; private SmbFileManager smbFileManager; - public void setSmbFileManager(SmbFileManager smbFileManager) { - this.smbFileManager = smbFileManager; - } - public void setCommonFileManager(CommonFileManager commonFileManager) { - this.commonFileManager = commonFileManager; - } - public void setDateQueryAdapter(DateQueryAdapter dateQueryAdapter) { - this.dateQueryAdapter = dateQueryAdapter; - } - public void setDbConnection(InitDbConnection dbConnection) { + public XinHuaDataManagerImpl() {} + @Autowired + public XinHuaDataManagerImpl(ObjectDao objectDao, SterilizationRecordManager sterilizationRecordManager, LogManager appLogManager, InitDbConnection dbConnection + , WashAndDisinfectRecordManager washAndDisinfectRecordManager, FtpFileManager ftpFileManager, DateQueryAdapter dateQueryAdapter, CommonFileManager commonFileManager, SmbFileManager smbFileManager) { + this.objectDao = objectDao; + this.sterilizationRecordManager = sterilizationRecordManager; + this.appLogManager = appLogManager; this.dbConnection = dbConnection; - } - public void setFtpFileManager(FtpFileManager ftpFileManager) { + this.washAndDisinfectRecordManager = washAndDisinfectRecordManager; this.ftpFileManager = ftpFileManager; + this.dateQueryAdapter = dateQueryAdapter; + this.commonFileManager = commonFileManager; + this.smbFileManager = smbFileManager; } - public void setWashAndDisinfectRecordManager( - WashAndDisinfectRecordManager washAndDisinfectRecordManager) { - this.washAndDisinfectRecordManager = washAndDisinfectRecordManager; - } - - public void setSterilizationRecordManager( - SterilizationRecordManager sterilizationRecordManager) { - this.sterilizationRecordManager = sterilizationRecordManager; - } - - public void setObjectDao(ObjectDao objectDao) { - this.objectDao = objectDao; - } - - public void setAppLogManager(LogManager appLogManager) { - this.appLogManager = appLogManager; - } - /** * 从接口读取数据和存入数据库 */ Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/Getinge86SeriesDataManagerImpl.java =================================================================== diff -u -r39460 -r40026 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/Getinge86SeriesDataManagerImpl.java (.../Getinge86SeriesDataManagerImpl.java) (revision 39460) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/Getinge86SeriesDataManagerImpl.java (.../Getinge86SeriesDataManagerImpl.java) (revision 40026) @@ -13,7 +13,6 @@ import java.util.Map; import jcifs.smb.SmbFile; -import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.apache.commons.collections.CollectionUtils; @@ -25,6 +24,7 @@ import org.apache.log4j.Logger; import org.hibernate.Query; import org.hibernate.Session; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.integration.smb.session.SmbSession; import org.springframework.integration.smb.session.SmbShare; @@ -40,54 +40,44 @@ import com.forgon.disinfectsystem.filemanager.CommonFileManager; import com.forgon.disinfectsystem.filemanager.FtpFileManager; import com.forgon.disinfectsystem.filemanager.SmbFileManager; -import com.forgon.disinfectsystem.washanddisinfectmanager.washanddisinfectrecord.service.WashAndDisinfectRecordManager; import com.forgon.log.model.Log; import com.forgon.log.service.LogManager; import com.forgon.tools.FileSystemHelper; import com.forgon.tools.date.DateTools; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.string.StringTools; import com.forgon.tools.util.ForgonDateUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + /** * 洁定灭菌炉、清洗机数据处理 * @author zhouPeiMian 2021-01-22 * */ +@Service("getingWashDataManager") +@Transactional public class Getinge86SeriesDataManagerImpl implements DeviceDataManager{ private LogManager appLogManager; private ObjectDao objectDao; - private WashAndDisinfectRecordManager washAndDisinfectRecordManager; private SmbFileManager smbFileManager; private FtpFileManager ftpFileManager; private CommonFileManager commonFileManager; private DateQueryAdapter dateQueryAdapter; - public void setDateQueryAdapter(DateQueryAdapter dateQueryAdapter) { - this.dateQueryAdapter = dateQueryAdapter; - } - public void setCommonFileManager(CommonFileManager commonFileManager) { - this.commonFileManager = commonFileManager; - } - public void setSmbFileManager(SmbFileManager smbFileManager) { - this.smbFileManager = smbFileManager; - } - public void setFtpFileManager(FtpFileManager ftpFileManager) { - this.ftpFileManager = ftpFileManager; - } private static final Logger logger = Logger - .getLogger(GetingeDataManagerImpl.class); - - public void setWashAndDisinfectRecordManager( - WashAndDisinfectRecordManager washAndDisinfectRecordManager) { - this.washAndDisinfectRecordManager = washAndDisinfectRecordManager; - } - - public void setObjectDao(ObjectDao objectDao) { + .getLogger(Getinge86SeriesDataManagerImpl.class); + public Getinge86SeriesDataManagerImpl(){} + @Autowired + public Getinge86SeriesDataManagerImpl(ObjectDao objectDao, LogManager appLogManager, + SmbFileManager smbFileManager, FtpFileManager ftpFileManager, CommonFileManager commonFileManager + , DateQueryAdapter dateQueryAdapter){ this.objectDao = objectDao; - } - - public void setAppLogManager(LogManager appLogManager) { this.appLogManager = appLogManager; + this.smbFileManager = smbFileManager; + this.ftpFileManager = ftpFileManager; + this.commonFileManager = commonFileManager; + this.dateQueryAdapter = dateQueryAdapter; } /** Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/GetingeWD500DataManagerImpl.java =================================================================== diff -u -r39460 -r40026 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/GetingeWD500DataManagerImpl.java (.../GetingeWD500DataManagerImpl.java) (revision 39460) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/GetingeWD500DataManagerImpl.java (.../GetingeWD500DataManagerImpl.java) (revision 40026) @@ -42,24 +42,31 @@ import com.forgon.tools.FileSystemHelper; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.util.ForgonDateUtils; +import org.springframework.transaction.annotation.Transactional; /** * 洁定wd500 */ @Service("getingeWD500DataManagerImpl") +@Transactional public class GetingeWD500DataManagerImpl implements DeviceDataManager{ private static final Logger logger = Logger .getLogger(GetingeWD500DataManagerImpl.class); - @Autowired private FtpFileManager ftpFileManager; - @Autowired private CommonFileManager commonFileManager; - @Autowired private LogManager appLogManager; - @Autowired private ObjectDao objectDao; - @Autowired private DateQueryAdapter dateQueryAdapter; + public GetingeWD500DataManagerImpl() {} + @Autowired + public GetingeWD500DataManagerImpl(FtpFileManager ftpFileManager, CommonFileManager commonFileManager, ObjectDao objectDao, DateQueryAdapter dateQueryAdapter + , LogManager appLogManager) { + this.ftpFileManager = ftpFileManager; + this.commonFileManager = commonFileManager; + this.objectDao = objectDao; + this.dateQueryAdapter = dateQueryAdapter; + this.appLogManager = appLogManager; + } @Override public void readAndSaveRecord(DeviceInterface devInterface, String machineNo, String brand, String isAutoCompleteSterilization, Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/MaTaDataManagerImpl.java =================================================================== diff -u -r39460 -r40026 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/MaTaDataManagerImpl.java (.../MaTaDataManagerImpl.java) (revision 39460) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/MaTaDataManagerImpl.java (.../MaTaDataManagerImpl.java) (revision 40026) @@ -30,7 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.integration.smb.session.SmbSession; import org.springframework.integration.smb.session.SmbShare; -import org.springframework.orm.hibernate4.SessionFactoryUtils; +import org.springframework.orm.hibernate5.SessionFactoryUtils; import org.springframework.stereotype.Component; import com.forgon.directory.vo.LoginUserData; @@ -49,22 +49,29 @@ import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.util.ForgonDateUtils; +import org.springframework.transaction.annotation.Transactional; + /** * 西班牙美达 */ @Component +@Transactional public class MaTaDataManagerImpl implements DeviceDataManager{ private static final Logger logger = Logger.getLogger(MaTaDataManagerImpl.class); - @Autowired private ObjectDao objectDao; - @Autowired private FtpFileManager ftpFileManager; - @Autowired private CommonFileManager commonFileManager; - @Autowired private LogManager appLogManager; - @Autowired private SterilizationRecordManager sterilizationRecordManager; + public MaTaDataManagerImpl() {} + @Autowired + public MaTaDataManagerImpl(ObjectDao objectDao, FtpFileManager ftpFileManager, CommonFileManager commonFileManager, LogManager appLogManager, SterilizationRecordManager sterilizationRecordManager) { + this.objectDao = objectDao; + this.ftpFileManager = ftpFileManager; + this.commonFileManager = commonFileManager; + this.appLogManager = appLogManager; + this.sterilizationRecordManager = sterilizationRecordManager; + } @Override public void readAndSaveRecord(DeviceInterface devInterface, String machineNo, String brand, String isAutoCompleteSterilization, Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHua_ChangLongDataImpl.java =================================================================== diff -u -r39460 -r40026 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHua_ChangLongDataImpl.java (.../XinHua_ChangLongDataImpl.java) (revision 39460) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHua_ChangLongDataImpl.java (.../XinHua_ChangLongDataImpl.java) (revision 40026) @@ -24,6 +24,7 @@ import org.apache.log4j.Logger; import org.hibernate.Query; import org.hibernate.Session; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.integration.smb.session.SmbSession; import org.springframework.integration.smb.session.SmbShare; import com.forgon.directory.vo.LoginUserData; @@ -34,47 +35,39 @@ import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washData.WashDataOfChangLong; import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecord; import com.forgon.disinfectsystem.washanddisinfectmanager.washanddisinfectrecord.service.WashAndDisinfectRecordManager; -import com.forgon.exception.SystemException; import com.forgon.log.model.Log; import com.forgon.log.service.LogManager; import com.forgon.tools.MathTools; import com.forgon.tools.date.DateTools; import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.db.InitDbConnection; import com.forgon.tools.hibernate.ObjectDao; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +/** + * 新华清洗机【长龙型号】 + */ +@Service("xinHua_ChangLongDataManager") +@Transactional public class XinHua_ChangLongDataImpl implements DeviceDataManager{ private static final String LOCALHOST = "localhost"; - private Logger log = Logger.getLogger(this.getClass()); - + private final Logger log = Logger.getLogger(this.getClass()); private ObjectDao objectDao; - private WashAndDisinfectRecordManager washAndDisinfectRecordManager; - private LogManager appLogManager; - private InitDbConnection dbConnection; - - public void setObjectDao(ObjectDao objectDao) { + public XinHua_ChangLongDataImpl() {} + @Autowired + public XinHua_ChangLongDataImpl(ObjectDao objectDao, WashAndDisinfectRecordManager washAndDisinfectRecordManager, LogManager appLogManager, InitDbConnection dbConnection) { this.objectDao = objectDao; - } - - public void setWashAndDisinfectRecordManager( - WashAndDisinfectRecordManager washAndDisinfectRecordManager) { this.washAndDisinfectRecordManager = washAndDisinfectRecordManager; - } - - public void setDbConnection(InitDbConnection dbConnection) { + this.appLogManager = appLogManager; this.dbConnection = dbConnection; } - - public void setAppLogManager(LogManager appLogManager) { - this.appLogManager = appLogManager; - } - @Override public void readAndSaveRecord(DeviceInterface devInterface, String machineNo, String brand, String isAutoCompleteSterilization, boolean enableDetailedDeviceInformation, LoginUserData loginUserData) { Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImplForFJSSSYY.java =================================================================== diff -u -r39460 -r40026 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImplForFJSSSYY.java (.../DeviceInterfaceDataProcessImplForFJSSSYY.java) (revision 39460) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImplForFJSSSYY.java (.../DeviceInterfaceDataProcessImplForFJSSSYY.java) (revision 40026) @@ -4,8 +4,6 @@ package com.forgon.disinfectsystem.maintain.device.service; import java.util.List; - -import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -20,40 +18,33 @@ import com.forgon.log.model.Log; import com.forgon.log.service.LogManager; import com.forgon.tools.SpringBeanManger; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; /** * @author JC 2016-2-3 * */ +@Service("deviceInterfaceDataProcessImplForFJSSSYY") +@Transactional public class DeviceInterfaceDataProcessImplForFJSSSYY implements DeviceInterfaceDataProcess { - @Autowired private SterilizerManager sterilizerManager; - - @Autowired + private RinserManager rinserManager; - private Logger logger = Logger.getLogger(getClass()); + private final Logger logger = Logger.getLogger(getClass()); - /** - * 日志管理 - */ - @Autowired private LogManager appLogManager; - /*public void setSterilizerManager(SterilizerManager sterilizerManager) { + public DeviceInterfaceDataProcessImplForFJSSSYY(){} + @Autowired + public DeviceInterfaceDataProcessImplForFJSSSYY(SterilizerManager sterilizerManager, LogManager appLogManager, RinserManager rinserManager){ + this.appLogManager = appLogManager; this.sterilizerManager = sterilizerManager; - } - - public void setRinserManager(RinserManager rinserManager) { this.rinserManager = rinserManager; } - - public void setAppLogManager(LogManager appLogManager) { - this.appLogManager = appLogManager; - }*/ - /** * 设备接口数据处理，遍历所有设备，逐个处理 */ Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/SterisAMSCO3052DataManagerImpl.java =================================================================== diff -u -r39460 -r40026 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/SterisAMSCO3052DataManagerImpl.java (.../SterisAMSCO3052DataManagerImpl.java) (revision 39460) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/SterisAMSCO3052DataManagerImpl.java (.../SterisAMSCO3052DataManagerImpl.java) (revision 40026) @@ -26,6 +26,7 @@ import org.apache.log4j.Logger; import org.hibernate.Query; import org.hibernate.Session; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.integration.smb.session.SmbSession; import org.springframework.integration.smb.session.SmbShare; @@ -35,7 +36,6 @@ import com.forgon.disinfectsystem.entity.basedatamanager.deviceinterface.DeviceInterface; import com.forgon.disinfectsystem.entity.basedatamanager.rinser.Rinser; import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washData.WashDataItemOfSteris; -import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washData.WashDataOfGeting; import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washData.WashDataOfSteris; import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecord; import com.forgon.disinfectsystem.filemanager.CommonFileManager; @@ -46,11 +46,16 @@ import com.forgon.tools.date.DateTools; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.util.ForgonDateUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + /** * 史帝瑞清洗机(型号：AMSCO 3052)清洗数据(没有温度曲线，只显示各个阶段的参数) * @author ZhouPeiMian * @since 2021-03-26 */ +@Service("sterisAMSCO3052DataManager") +@Transactional public class SterisAMSCO3052DataManagerImpl implements DeviceDataManager{ private LogManager appLogManager; private ObjectDao objectDao; @@ -60,26 +65,16 @@ .getLogger(SterisAMSCO3052DataManagerImpl.class); private FtpFileManager ftpFileManager; private CommonFileManager commonFileManager; - - public void setFtpFileManager(FtpFileManager ftpFileManager) { + public SterisAMSCO3052DataManagerImpl() {} + @Autowired + public SterisAMSCO3052DataManagerImpl(LogManager appLogManager , ObjectDao objectDao, DateQueryAdapter dateQueryAdapter, FtpFileManager ftpFileManager, CommonFileManager commonFileManager) { + this.objectDao = objectDao; + this.dateQueryAdapter = dateQueryAdapter; this.ftpFileManager = ftpFileManager; - } - public void setCommonFileManager(CommonFileManager commonFileManager) { this.commonFileManager = commonFileManager; - } - - public void setObjectDao(ObjectDao objectDao) { - this.objectDao = objectDao; - } - - public void setAppLogManager(LogManager appLogManager) { this.appLogManager = appLogManager; } - public void setDateQueryAdapter(DateQueryAdapter dateQueryAdapter) { - this.dateQueryAdapter = dateQueryAdapter; - } - /** * 从接口读取数据和存入数据库 */ Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/ChangLongDataManagerImpl.java =================================================================== diff -u -r39460 -r40026 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/ChangLongDataManagerImpl.java (.../ChangLongDataManagerImpl.java) (revision 39460) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/ChangLongDataManagerImpl.java (.../ChangLongDataManagerImpl.java) (revision 40026) @@ -18,6 +18,7 @@ import org.apache.log4j.Logger; import org.hibernate.Query; import org.hibernate.Session; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.integration.smb.session.SmbSession; import org.springframework.integration.smb.session.SmbShare; import org.springframework.stereotype.Service; @@ -31,9 +32,11 @@ import com.forgon.log.model.Log; import com.forgon.log.service.LogManager; import com.forgon.tools.hibernate.ObjectDao; +import org.springframework.transaction.annotation.Transactional; -@Service("changLongDataManagerTarget") +@Service("changLongDataManager") +@Transactional public class ChangLongDataManagerImpl implements DeviceDataManager{ private static final String START_FLAG = "----------------------------------------"; @@ -140,26 +143,19 @@ private WashAndDisinfectRecordManager washAndDisinfectRecordManager; - private SimpleDateFormat sdfFrom = new SimpleDateFormat("yyyyMMdd HH:mm"); - private SimpleDateFormat sdfTo = new SimpleDateFormat("yyyy/MM/dd HH:mm"); + private final SimpleDateFormat sdfFrom = new SimpleDateFormat("yyyyMMdd HH:mm"); + private final SimpleDateFormat sdfTo = new SimpleDateFormat("yyyy/MM/dd HH:mm"); private static final Logger logger = Logger .getLogger(ChangLongDataManagerImpl.class); - - - public void setWashAndDisinfectRecordManager( - WashAndDisinfectRecordManager washAndDisinfectRecordManager) { - this.washAndDisinfectRecordManager = washAndDisinfectRecordManager; - } - - public void setObjectDao(ObjectDao objectDao) { + public ChangLongDataManagerImpl(){} + @Autowired + public ChangLongDataManagerImpl(ObjectDao objectDao, WashAndDisinfectRecordManager washAndDisinfectRecordManager + , LogManager appLogManager){ this.objectDao = objectDao; - } - - public void setAppLogManager(LogManager appLogManager) { + this.washAndDisinfectRecordManager = washAndDisinfectRecordManager; this.appLogManager = appLogManager; } - /** * 从接口读取数据和存入数据库 */ Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/FileOfDatReader.java =================================================================== diff -u -r39460 -r40026 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/FileOfDatReader.java (.../FileOfDatReader.java) (revision 39460) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/FileOfDatReader.java (.../FileOfDatReader.java) (revision 40026) @@ -15,8 +15,6 @@ * 从一个input Stream中读取记录（清洗或者灭菌） */ public class FileOfDatReader { - - private Logger logger = Logger.getLogger(getClass()); private long fileTempSkip = 0L; private long readLength = 0L; @@ -33,8 +31,8 @@ String beginMark = null; //一条记录的结束标志 String endMark = "结束时间:"; - - //标识每个字节的类型 + + //标识每个字节的类型 private enum ByteStatus { EMPTY ,SKIP ,WRITE ,BR ,OTHER,LF}; //标识每行数据的类型 private enum LineStatus { RECORD_START , RECORD_END, RECORD_OTHER}; Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/YouYuanDataManagerImpl.java =================================================================== diff -u -r39460 -r40026 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/YouYuanDataManagerImpl.java (.../YouYuanDataManagerImpl.java) (revision 39460) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/YouYuanDataManagerImpl.java (.../YouYuanDataManagerImpl.java) (revision 40026) @@ -27,6 +27,7 @@ import org.apache.log4j.Logger; import org.hibernate.Query; import org.hibernate.Session; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.integration.smb.session.SmbSession; import org.springframework.integration.smb.session.SmbShare; @@ -49,42 +50,34 @@ import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.util.ForgonDateUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; /** * 连云港佑源减压沸腾清洗消毒机数据处理 * @author zhouPeiMian * @since 2021-03-22 */ +@Service("youYuanDataManager") +@Transactional public class YouYuanDataManagerImpl implements DeviceDataManager{ private LogManager appLogManager; private ObjectDao objectDao; private FtpFileManager ftpFileManager; private CommonFileManager commonFileManager; private DateQueryAdapter dateQueryAdapter; - - public void setDateQueryAdapter(DateQueryAdapter dateQueryAdapter) { - this.dateQueryAdapter = dateQueryAdapter; - } - - public void setCommonFileManager(CommonFileManager commonFileManager) { - this.commonFileManager = commonFileManager; - } - - public void setFtpFileManager(FtpFileManager ftpFileManager) { - this.ftpFileManager = ftpFileManager; - } private static final Logger logger = Logger .getLogger(YouYuanDataManagerImpl.class); - - public void setObjectDao(ObjectDao objectDao) { + public YouYuanDataManagerImpl(){} + @Autowired + public YouYuanDataManagerImpl(DateQueryAdapter dateQueryAdapter , LogManager appLogManager, ObjectDao objectDao, FtpFileManager ftpFileManager, CommonFileManager commonFileManager) { + this.appLogManager = appLogManager; this.objectDao = objectDao; + this.ftpFileManager = ftpFileManager; + this.commonFileManager = commonFileManager; + this.dateQueryAdapter = dateQueryAdapter; } - - public void setAppLogManager(LogManager appLogManager) { - this.appLogManager = appLogManager; - } - /** * 从接口读取数据和存入数据库 */ Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/LowTemperatureManagerImpl.java =================================================================== diff -u -r39460 -r40026 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/LowTemperatureManagerImpl.java (.../LowTemperatureManagerImpl.java) (revision 39460) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/LowTemperatureManagerImpl.java (.../LowTemperatureManagerImpl.java) (revision 40026) @@ -22,6 +22,7 @@ import org.apache.log4j.Logger; import org.hibernate.Query; import org.hibernate.Session; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.integration.smb.session.SmbSession; import org.springframework.integration.smb.session.SmbShare; import org.springframework.stereotype.Service; @@ -40,43 +41,34 @@ import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.util.ForgonDateUtils; +import org.springframework.transaction.annotation.Transactional; /** * 低温灭菌器数据处理 */ -@Service("lowTemperatureManagerTarget") +@Service("lowTemperatureImpl") +@Transactional public class LowTemperatureManagerImpl implements DeviceDataManager { - private ObjectDao objectDao; private LogManager appLogManager; private SterilizationRecordManager sterilizationRecordManager; private FtpFileManager ftpFileManager; private CommonFileManager commonFileManager; - private DateQueryAdapter dateQueryAdapter; + private DateQueryAdapter dateQueryAdapter; private static final Logger logger = Logger .getLogger(LowTemperatureManagerImpl.class); - public void setDateQueryAdapter(DateQueryAdapter dateQueryAdapter) { - this.dateQueryAdapter = dateQueryAdapter; - } - public void setFtpFileManager(FtpFileManager ftpFileManager) { + public LowTemperatureManagerImpl(){} + @Autowired + public LowTemperatureManagerImpl(ObjectDao objectDao, LogManager appLogManager, FtpFileManager ftpFileManager, CommonFileManager commonFileManager + , SterilizationRecordManager sterilizationRecordManager, DateQueryAdapter dateQueryAdapter){ + this.objectDao = objectDao; + this.appLogManager = appLogManager; this.ftpFileManager = ftpFileManager; - } - public void setCommonFileManager(CommonFileManager commonFileManager) { this.commonFileManager = commonFileManager; - } - public void setSterilizationRecordManager( - SterilizationRecordManager sterilizationRecordManager) { this.sterilizationRecordManager = sterilizationRecordManager; + this.dateQueryAdapter = dateQueryAdapter; } - public void setObjectDao(ObjectDao objectDao) { - this.objectDao = objectDao; - } - - public void setAppLogManager(LogManager appLogManager) { - this.appLogManager = appLogManager; - } - /** * 从接口读取数据和存入数据库 */ Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/GetingeDataManagerImpl.java =================================================================== diff -u -r39460 -r40026 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/GetingeDataManagerImpl.java (.../GetingeDataManagerImpl.java) (revision 39460) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/GetingeDataManagerImpl.java (.../GetingeDataManagerImpl.java) (revision 40026) @@ -32,6 +32,7 @@ import org.apache.log4j.Logger; import org.hibernate.Query; import org.hibernate.Session; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.integration.smb.session.SmbSession; import org.springframework.integration.smb.session.SmbShare; @@ -59,11 +60,16 @@ import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.util.ForgonDateUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + /** * 洁定灭菌炉、清洗机数据处理 * @author JC 2017-09-11 * */ +@Service("getingeDataManager") +@Transactional public class GetingeDataManagerImpl implements DeviceDataManager{ private LogManager appLogManager; private ObjectDao objectDao; @@ -72,39 +78,22 @@ private DateQueryAdapter dateQueryAdapter; private FtpFileManager ftpFileManager; private CommonFileManager commonFileManager; - public void setCommonFileManager(CommonFileManager commonFileManager) { - this.commonFileManager = commonFileManager; - } - public void setFtpFileManager(FtpFileManager ftpFileManager) { - this.ftpFileManager = ftpFileManager; - } - public void setDateQueryAdapter(DateQueryAdapter dateQueryAdapter) { - this.dateQueryAdapter = dateQueryAdapter; - } - private static final Logger logger = Logger .getLogger(GetingeDataManagerImpl.class); - - - public void setWashAndDisinfectRecordManager( - WashAndDisinfectRecordManager washAndDisinfectRecordManager) { - this.washAndDisinfectRecordManager = washAndDisinfectRecordManager; - } - public void setSterilizationRecordManager( - SterilizationRecordManager sterilizationRecordManager) { + public GetingeDataManagerImpl() {} + @Autowired + public GetingeDataManagerImpl(LogManager appLogManager, ObjectDao objectDao, SterilizationRecordManager sterilizationRecordManager + , WashAndDisinfectRecordManager washAndDisinfectRecordManager, DateQueryAdapter dateQueryAdapter, FtpFileManager ftpFileManager, CommonFileManager commonFileManager) { + this.appLogManager = appLogManager; + this.objectDao = objectDao; this.sterilizationRecordManager = sterilizationRecordManager; + this.washAndDisinfectRecordManager = washAndDisinfectRecordManager; + this.dateQueryAdapter = dateQueryAdapter; + this.ftpFileManager = ftpFileManager; + this.commonFileManager = commonFileManager; } - - public void setObjectDao(ObjectDao objectDao) { - this.objectDao = objectDao; - } - - public void setAppLogManager(LogManager appLogManager) { - this.appLogManager = appLogManager; - } - /** * 从接口读取数据和存入数据库 */ Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/SterisDataManagerImpl.java =================================================================== diff -u -r39460 -r40026 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/SterisDataManagerImpl.java (.../SterisDataManagerImpl.java) (revision 39460) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/SterisDataManagerImpl.java (.../SterisDataManagerImpl.java) (revision 40026) @@ -10,7 +10,6 @@ import java.sql.SQLException; import java.sql.Timestamp; import java.text.DateFormat; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; @@ -30,6 +29,7 @@ import org.apache.log4j.Logger; import org.hibernate.Query; import org.hibernate.Session; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.integration.smb.session.SmbSession; import org.springframework.integration.smb.session.SmbShare; import org.springframework.jdbc.core.BatchPreparedStatementSetter; @@ -56,6 +56,11 @@ import com.forgon.tools.db.InitDbConnection; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.util.ForgonDateUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service("sterisDataManager") +@Transactional public class SterisDataManagerImpl implements DeviceDataManager{ private LogManager appLogManager; private ObjectDao objectDao; @@ -64,44 +69,25 @@ private DateQueryAdapter dateQueryAdapter; private JdbcTemplate jdbcTemplate; private InitDbConnection dbConnection; - - public void setDateQueryAdapter(DateQueryAdapter dateQueryAdapter) { - this.dateQueryAdapter = dateQueryAdapter; - } - public void setJdbcTemplate(JdbcTemplate jdbcTemplate) { - this.jdbcTemplate = jdbcTemplate; - } - public void setDbConnection(InitDbConnection dbConnection) { - this.dbConnection = dbConnection; - } private static final Logger logger = Logger .getLogger(SterisDataManagerImpl.class); private FtpFileManager ftpFileManager; private CommonFileManager commonFileManager; - - public void setFtpFileManager(FtpFileManager ftpFileManager) { + public SterisDataManagerImpl(){} + @Autowired + public SterisDataManagerImpl(LogManager appLogManager, ObjectDao objectDao, SterilizationRecordManager sterilizationRecordManager + , WashAndDisinfectRecordManager washAndDisinfectRecordManager, DateQueryAdapter dateQueryAdapter, InitDbConnection dbConnection + , FtpFileManager ftpFileManager, CommonFileManager commonFileManager, JdbcTemplate jdbcTemplate) { + this.appLogManager = appLogManager; + this.objectDao = objectDao; + this.sterilizationRecordManager = sterilizationRecordManager; + this.washAndDisinfectRecordManager = washAndDisinfectRecordManager; + this.dateQueryAdapter = dateQueryAdapter; + this.dbConnection = dbConnection; this.ftpFileManager = ftpFileManager; - } - public void setCommonFileManager(CommonFileManager commonFileManager) { this.commonFileManager = commonFileManager; + this.jdbcTemplate = jdbcTemplate; } - public void setWashAndDisinfectRecordManager( - WashAndDisinfectRecordManager washAndDisinfectRecordManager) { - this.washAndDisinfectRecordManager = washAndDisinfectRecordManager; - } - - public void setSterilizationRecordManager( - SterilizationRecordManager sterilizationRecordManager) { - this.sterilizationRecordManager = sterilizationRecordManager; - } - - public void setObjectDao(ObjectDao objectDao) { - this.objectDao = objectDao; - } - - public void setAppLogManager(LogManager appLogManager) { - this.appLogManager = appLogManager; - } /** * 读取保存史帝瑞过氧化氢灭菌器参数文件 * (型号：Amsco V-PRO MAX) Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java =================================================================== diff -u -r39460 -r40026 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java (.../BelimedDataManagerImpl.java) (revision 39460) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java (.../BelimedDataManagerImpl.java) (revision 40026) @@ -31,6 +31,7 @@ import org.apache.log4j.Logger; import org.hibernate.Query; import org.hibernate.Session; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.integration.smb.session.SmbSession; import org.springframework.integration.smb.session.SmbShare; @@ -57,13 +58,16 @@ import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.util.ForgonDateUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; /** * @author JC 2016-2-3 倍力曼读取和保存数据的实现 目前包括灭菌炉和清洗机 * */ +@Service("belimedDataManager") +@Transactional public class BelimedDataManagerImpl implements DeviceDataManager { - private ObjectDao objectDao; private LogManager appLogManager; private SterilizationRecordManager sterilizationRecordManager; @@ -72,28 +76,17 @@ private DateQueryAdapter dateQueryAdapter; private static final Logger logger = Logger .getLogger(BelimedDataManagerImpl.class); - public void setDateQueryAdapter(DateQueryAdapter dateQueryAdapter) { - this.dateQueryAdapter = dateQueryAdapter; - } - public void setFtpFileManager(FtpFileManager ftpFileManager) { + public BelimedDataManagerImpl(){} + @Autowired + public BelimedDataManagerImpl(ObjectDao objectDao,LogManager appLogManager, SterilizationRecordManager sterilizationRecordManager + , FtpFileManager ftpFileManager, CommonFileManager commonFileManager, DateQueryAdapter dateQueryAdapter) { + this.objectDao = objectDao; + this.appLogManager = appLogManager; + this.sterilizationRecordManager = sterilizationRecordManager; this.ftpFileManager = ftpFileManager; - } - public void setCommonFileManager(CommonFileManager commonFileManager) { this.commonFileManager = commonFileManager; + this.dateQueryAdapter = dateQueryAdapter; } - public void setSterilizationRecordManager( - SterilizationRecordManager sterilizationRecordManager) { - this.sterilizationRecordManager = sterilizationRecordManager; - } - - public void setObjectDao(ObjectDao objectDao) { - this.objectDao = objectDao; - } - - public void setAppLogManager(LogManager appLogManager) { - this.appLogManager = appLogManager; - } - /** * 从接口读取数据和存入数据库 */ Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XG2CXinhuaDataManagerImpl.java =================================================================== diff -u -r39460 -r40026 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XG2CXinhuaDataManagerImpl.java (.../XG2CXinhuaDataManagerImpl.java) (revision 39460) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XG2CXinhuaDataManagerImpl.java (.../XG2CXinhuaDataManagerImpl.java) (revision 40026) @@ -48,27 +48,30 @@ import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.string.StringTools; import com.forgon.tools.util.ForgonDateUtils; +import org.springframework.transaction.annotation.Transactional; + @Component +@Transactional public class XG2CXinhuaDataManagerImpl implements DeviceDataManager{ - private static final Logger logger = Logger.getLogger(MaTaDataManagerImpl.class); - @Autowired + private static final Logger logger = Logger.getLogger(XG2CXinhuaDataManagerImpl.class); private ObjectDao objectDao; - @Autowired private FtpFileManager ftpFileManager; - @Autowired private CommonFileManager commonFileManager; - @Autowired private LogManager appLogManager; - @Autowired private SterilizationRecordManager sterilizationRecordManager; private InitDbConnection dbConnection; private JdbcTemplate jdbcTemplate; - public void setJdbcTemplate(JdbcTemplate jdbcTemplate) { + public XG2CXinhuaDataManagerImpl() {} + @Autowired + public XG2CXinhuaDataManagerImpl(JdbcTemplate jdbcTemplate, ObjectDao objectDao, FtpFileManager ftpFileManager, CommonFileManager commonFileManager, LogManager appLogManager , SterilizationRecordManager sterilizationRecordManager, InitDbConnection dbConnection) { + this.objectDao = objectDao; + this.ftpFileManager = ftpFileManager; + this.commonFileManager = commonFileManager; + this.appLogManager = appLogManager; + this.sterilizationRecordManager = sterilizationRecordManager; + this.dbConnection = dbConnection; this.jdbcTemplate = jdbcTemplate; } - public void setDbConnection(InitDbConnection dbConnection) { - this.dbConnection = dbConnection; - } @Override public void readAndSaveRecord(DeviceInterface devInterface, String machineNo, String brand, String isAutoCompleteSterilization, Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/Marge120CSVDataManagerImpl.java =================================================================== diff -u -r39460 -r40026 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/Marge120CSVDataManagerImpl.java (.../Marge120CSVDataManagerImpl.java) (revision 39460) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/Marge120CSVDataManagerImpl.java (.../Marge120CSVDataManagerImpl.java) (revision 40026) @@ -16,6 +16,7 @@ import org.apache.commons.net.ftp.FTPFile; import org.apache.commons.net.ftp.FTPFileFilter; import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.integration.smb.session.SmbSession; import org.springframework.integration.smb.session.SmbShare; @@ -35,9 +36,14 @@ import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.util.ForgonDateUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + /** * 美雅洁120型号清洗机CSV接口文件 数据处理(SZLGEY-13) */ +@Service("marge120CSVDataManager") +@Transactional public class Marge120CSVDataManagerImpl implements DeviceDataManager{ private static final Logger logger = Logger.getLogger(Marge120CSVDataManagerImpl.class); @@ -51,27 +57,15 @@ private FtpFileManager ftpFileManager; private CommonFileManager commonFileManager; - - public void setAppLogManager(LogManager appLogManager) { - this.appLogManager = appLogManager; - } - - public void setObjectDao(ObjectDao objectDao) { + public Marge120CSVDataManagerImpl(){} + @Autowired + public Marge120CSVDataManagerImpl(ObjectDao objectDao, LogManager appLogManager, FtpFileManager ftpFileManager, CommonFileManager commonFileManager, DateQueryAdapter dateQueryAdapter){ this.objectDao = objectDao; - } - - public void setDateQueryAdapter(DateQueryAdapter dateQueryAdapter) { - this.dateQueryAdapter = dateQueryAdapter; - } - - public void setFtpFileManager(FtpFileManager ftpFileManager) { + this.appLogManager = appLogManager; this.ftpFileManager = ftpFileManager; - } - - public void setCommonFileManager(CommonFileManager commonFileManager) { this.commonFileManager = commonFileManager; + this.dateQueryAdapter = dateQueryAdapter; } - @Override public void readAndSaveRecord(DeviceInterface devInterface, String machineNo, String brand, String isAutoCompleteSterilization, boolean enableDetailedDeviceInformation, LoginUserData loginUserData) { Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/JiangHanDataManagerImpl.java =================================================================== diff -u -r39460 -r40026 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/JiangHanDataManagerImpl.java (.../JiangHanDataManagerImpl.java) (revision 39460) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/JiangHanDataManagerImpl.java (.../JiangHanDataManagerImpl.java) (revision 40026) @@ -13,17 +13,15 @@ import jcifs.smb.SmbFile; import jcifs.smb.SmbFileInputStream; import net.sf.json.JSONArray; - -import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.hibernate.Query; import org.hibernate.Session; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.integration.smb.session.SmbSession; import org.springframework.integration.smb.session.SmbShare; import com.forgon.directory.vo.LoginUserData; -import com.forgon.disinfectsystem.common.CssdUtils; import com.forgon.disinfectsystem.entity.basedatamanager.deviceinterface.DeviceInterface; import com.forgon.disinfectsystem.entity.basedatamanager.deviceinterface.JiangHanDatFileDetail; import com.forgon.disinfectsystem.entity.basedatamanager.rinser.Rinser; @@ -37,12 +35,16 @@ import com.forgon.log.service.LogManager; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.util.ForgonDateUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; /** * * @author niutouren 2018-04-16 * */ +@Service("jiangHanDataManager") +@Transactional public class JiangHanDataManagerImpl implements DeviceDataManager { private ObjectDao objectDao; @@ -56,25 +58,15 @@ private static final Logger logger = Logger .getLogger(JiangHanDataManagerImpl.class); - public void setSterilizationRecordManager( - SterilizationRecordManager sterilizationRecordManager) { + public JiangHanDataManagerImpl() {} + @Autowired + public JiangHanDataManagerImpl(ObjectDao objectDao, LogManager appLogManager, SterilizationRecordManager sterilizationRecordManager, WashAndDisinfectRecordManager washAndDisinfectRecordManager) { + this.objectDao = objectDao; + this.appLogManager = appLogManager; this.sterilizationRecordManager = sterilizationRecordManager; - } - - public void setWashAndDisinfectRecordManager( - WashAndDisinfectRecordManager washAndDisinfectRecordManager) { this.washAndDisinfectRecordManager = washAndDisinfectRecordManager; } - public void setObjectDao(ObjectDao objectDao) { - this.objectDao = objectDao; - } - - public void setAppLogManager(LogManager appLogManager) { - this.appLogManager = appLogManager; - } - - /** * 从接口读取数据和存入数据库 */ Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/SteriVac3MManagerImpl.java =================================================================== diff -u -r39460 -r40026 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/SteriVac3MManagerImpl.java (.../SteriVac3MManagerImpl.java) (revision 39460) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/SteriVac3MManagerImpl.java (.../SteriVac3MManagerImpl.java) (revision 40026) @@ -2,8 +2,6 @@ import java.io.BufferedReader; import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.nio.file.Files; @@ -38,19 +36,26 @@ import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.util.ForgonDateUtils; import com.forgon.tools.util.PathUtils; +import org.springframework.transaction.annotation.Transactional; + @Component +@Transactional public class SteriVac3MManagerImpl implements DeviceDataManager{ private static final Logger logger = Logger.getLogger(SteriVac3MManagerImpl.class); - @Autowired private ObjectDao objectDao; - @Autowired private FtpFileManager ftpFileManager; - @Autowired private CommonFileManager commonFileManager; - @Autowired private LogManager appLogManager; - @Autowired private SterilizationRecordManager sterilizationRecordManager; + public SteriVac3MManagerImpl(){} + @Autowired + public SteriVac3MManagerImpl(ObjectDao objectDao, FtpFileManager ftpFileManager, CommonFileManager commonFileManager, LogManager appLogManager, SterilizationRecordManager sterilizationRecordManager) { + this.objectDao = objectDao; + this.ftpFileManager = ftpFileManager; + this.commonFileManager = commonFileManager; + this.appLogManager = appLogManager; + this.sterilizationRecordManager = sterilizationRecordManager; + } @Override public void readAndSaveRecord(DeviceInterface devInterface, String machineNo, String brand, String isAutoCompleteSterilization, Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/Melag43BPlusManagerImpl.java =================================================================== diff -u -r39460 -r40026 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/Melag43BPlusManagerImpl.java (.../Melag43BPlusManagerImpl.java) (revision 39460) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/Melag43BPlusManagerImpl.java (.../Melag43BPlusManagerImpl.java) (revision 40026) @@ -42,22 +42,28 @@ import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.util.ForgonDateUtils; +import org.springframework.transaction.annotation.Transactional; @Component +@Transactional public class Melag43BPlusManagerImpl implements DeviceDataManager{ private static final Logger logger = Logger.getLogger(Melag43BPlusManagerImpl.class); - @Autowired private ObjectDao objectDao; - @Autowired private FtpFileManager ftpFileManager; - @Autowired private CommonFileManager commonFileManager; - @Autowired private LogManager appLogManager; - @Autowired private SterilizationRecordManager sterilizationRecordManager; - @Autowired private DateQueryAdapter dateQueryAdapter; + public Melag43BPlusManagerImpl() {} + @Autowired + public Melag43BPlusManagerImpl(SterilizationRecordManager sterilizationRecordManager, ObjectDao objectDao, FtpFileManager ftpFileManager, CommonFileManager commonFileManager, LogManager appLogManager, DateQueryAdapter dateQueryAdapter) { + this.objectDao = objectDao; + this.ftpFileManager = ftpFileManager; + this.commonFileManager = commonFileManager; + this.appLogManager = appLogManager; + this.dateQueryAdapter = dateQueryAdapter; + this.sterilizationRecordManager = sterilizationRecordManager; + } /** * 程序步骤缩写SP-S-开始 */ Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/ChangLongDataManagerImplFJSSSYY.java =================================================================== diff -u -r39460 -r40026 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/ChangLongDataManagerImplFJSSSYY.java (.../ChangLongDataManagerImplFJSSSYY.java) (revision 39460) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/ChangLongDataManagerImplFJSSSYY.java (.../ChangLongDataManagerImplFJSSSYY.java) (revision 40026) @@ -18,6 +18,7 @@ import org.apache.commons.net.ftp.FTPFile; import org.apache.commons.net.ftp.FTPFileFilter; import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.integration.smb.session.SmbSession; import org.springframework.integration.smb.session.SmbShare; import org.springframework.stereotype.Service; @@ -37,13 +38,15 @@ import com.forgon.tools.date.DateTools; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.util.ForgonDateUtils; +import org.springframework.transaction.annotation.Transactional; /** * 新华长隆多舱清洗机数据处理(FJSSSYY-1) * @author ZhouPeiMian * @since 2020-05-22 */ @Service("changLongDataManagerTargetFJSSSYY") +@Transactional public class ChangLongDataManagerImplFJSSSYY implements DeviceDataManager{ @@ -60,26 +63,16 @@ private static final Logger logger = Logger .getLogger(ChangLongDataManagerImplFJSSSYY.class); - public void setObjectDao(ObjectDao objectDao) { + public ChangLongDataManagerImplFJSSSYY(){} + @Autowired + public ChangLongDataManagerImplFJSSSYY(ObjectDao objectDao, LogManager appLogManager, DateQueryAdapter dateQueryAdapter + , FtpFileManager ftpFileManager, CommonFileManager commonFileManager){ this.objectDao = objectDao; - } - - public void setAppLogManager(LogManager appLogManager) { this.appLogManager = appLogManager; - } - - public void setDateQueryAdapter(DateQueryAdapter dateQueryAdapter) { this.dateQueryAdapter = dateQueryAdapter; - } - - public void setFtpFileManager(FtpFileManager ftpFileManager) { this.ftpFileManager = ftpFileManager; - } - - public void setCommonFileManager(CommonFileManager commonFileManager) { this.commonFileManager = commonFileManager; } - /** * 从接口读取数据和存入数据库 */ Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataV2ManagerImpl.java =================================================================== diff -u -r39460 -r40026 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataV2ManagerImpl.java (.../BelimedDataV2ManagerImpl.java) (revision 39460) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataV2ManagerImpl.java (.../BelimedDataV2ManagerImpl.java) (revision 40026) @@ -48,22 +48,29 @@ import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.util.ForgonDateUtils; import com.forgon.tools.util.PathUtils; +import org.springframework.transaction.annotation.Transactional; + @Component +@Transactional public class BelimedDataV2ManagerImpl implements DeviceDataManager{ private static final Logger logger = Logger.getLogger(SteriVac3MManagerImpl.class); - @Autowired private ObjectDao objectDao; - @Autowired private FtpFileManager ftpFileManager; - @Autowired private CommonFileManager commonFileManager; - @Autowired private LogManager appLogManager; - @Autowired private SterilizationRecordManager sterilizationRecordManager; - @Autowired private DateQueryAdapter dateQueryAdapter; - + public BelimedDataV2ManagerImpl(){} + @Autowired + public BelimedDataV2ManagerImpl(ObjectDao objectDao,FtpFileManager ftpFileManager, CommonFileManager commonFileManager + , LogManager appLogManager, SterilizationRecordManager sterilizationRecordManager, DateQueryAdapter dateQueryAdapter){ + this.objectDao = objectDao; + this.ftpFileManager = ftpFileManager; + this.commonFileManager = commonFileManager; + this.appLogManager = appLogManager; + this.sterilizationRecordManager = sterilizationRecordManager; + this.dateQueryAdapter = dateQueryAdapter; + } @Override public void readAndSaveRecord(DeviceInterface devInterface, String machineNo, String brand, String isAutoCompleteSterilization, Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/JNKDataManagerImpl.java =================================================================== diff -u -r39460 -r40026 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/JNKDataManagerImpl.java (.../JNKDataManagerImpl.java) (revision 39460) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/JNKDataManagerImpl.java (.../JNKDataManagerImpl.java) (revision 40026) @@ -42,24 +42,30 @@ import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.util.ForgonDateUtils; import com.forgon.tools.util.SqlUtils; +import org.springframework.transaction.annotation.Transactional; /** * 金尼克 */ @Service("jNKDataManagerImpl") +@Transactional public class JNKDataManagerImpl implements DeviceDataManager{ private static final Logger logger = Logger .getLogger(JNKDataManagerImpl.class); - @Autowired private FtpFileManager ftpFileManager; - @Autowired private CommonFileManager commonFileManager; - @Autowired private LogManager appLogManager; - @Autowired private ObjectDao objectDao; - @Autowired private DateQueryAdapter dateQueryAdapter; + public JNKDataManagerImpl() {} + @Autowired + public JNKDataManagerImpl(FtpFileManager ftpFileManager, CommonFileManager commonFileManager, LogManager appLogManager, ObjectDao objectDao, DateQueryAdapter dateQueryAdapter) { + this.ftpFileManager = ftpFileManager; + this.commonFileManager = commonFileManager; + this.appLogManager = appLogManager; + this.objectDao = objectDao; + this.dateQueryAdapter = dateQueryAdapter; + } @Override public void readAndSaveRecord(DeviceInterface devInterface, String machineNo, String brand, String isAutoCompleteSterilization, Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/HighTemperatureManagerImpl.java =================================================================== diff -u -r39460 -r40026 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/HighTemperatureManagerImpl.java (.../HighTemperatureManagerImpl.java) (revision 39460) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/HighTemperatureManagerImpl.java (.../HighTemperatureManagerImpl.java) (revision 40026) @@ -23,6 +23,7 @@ import org.apache.log4j.Logger; import org.hibernate.Query; import org.hibernate.Session; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.integration.smb.session.SmbSession; import org.springframework.integration.smb.session.SmbShare; import org.springframework.stereotype.Service; @@ -41,44 +42,34 @@ import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.util.ForgonDateUtils; +import org.springframework.transaction.annotation.Transactional; /** * 高温灭菌器数据处理 @author zc.li 2020.06.29 */ -@Service("highTemperatureManagerTarget") +@Service("highTemperatureImpl") +@Transactional public class HighTemperatureManagerImpl implements DeviceDataManager { - private ObjectDao objectDao; private LogManager appLogManager; private SterilizationRecordManager sterilizationRecordManager; private FtpFileManager ftpFileManager; private CommonFileManager commonFileManager; - private DateQueryAdapter dateQueryAdapter; + private DateQueryAdapter dateQueryAdapter; private static final Logger logger = Logger .getLogger(HighTemperatureManagerImpl.class); - public void setDateQueryAdapter(DateQueryAdapter dateQueryAdapter) { - this.dateQueryAdapter = dateQueryAdapter; - } - public void setFtpFileManager(FtpFileManager ftpFileManager) { + public HighTemperatureManagerImpl() {} + @Autowired + public HighTemperatureManagerImpl(ObjectDao objectDao, LogManager appLogManager, SterilizationRecordManager sterilizationRecordManager, FtpFileManager ftpFileManager, CommonFileManager commonFileManager, DateQueryAdapter dateQueryAdapter) { + this.objectDao = objectDao; + this.appLogManager = appLogManager; + this.sterilizationRecordManager = sterilizationRecordManager; this.ftpFileManager = ftpFileManager; - } - public void setCommonFileManager(CommonFileManager commonFileManager) { this.commonFileManager = commonFileManager; + this.dateQueryAdapter = dateQueryAdapter; } - public void setSterilizationRecordManager( - SterilizationRecordManager sterilizationRecordManager) { - this.sterilizationRecordManager = sterilizationRecordManager; - } - public void setObjectDao(ObjectDao objectDao) { - this.objectDao = objectDao; - } - - public void setAppLogManager(LogManager appLogManager) { - this.appLogManager = appLogManager; - } - /** * 从接口读取数据和存入数据库 */ Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/JohnsonDataManagerImpl.java =================================================================== diff -u -r39460 -r40026 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/JohnsonDataManagerImpl.java (.../JohnsonDataManagerImpl.java) (revision 39460) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/JohnsonDataManagerImpl.java (.../JohnsonDataManagerImpl.java) (revision 40026) @@ -27,6 +27,7 @@ import org.hibernate.NonUniqueResultException; import org.hibernate.Query; import org.hibernate.Session; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.integration.smb.session.SmbSession; import org.springframework.integration.smb.session.SmbShare; import org.springframework.stereotype.Service; @@ -47,12 +48,14 @@ import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.util.ForgonDateUtils; +import org.springframework.transaction.annotation.Transactional; /** * 强生低温灭菌器数据处理 @author zc.li 2020.11.23 */ -@Service("johnsonDataManagerTarget") +@Service("johnsonDataManager") +@Transactional public class JohnsonDataManagerImpl implements DeviceDataManager { private ObjectDao objectDao; @@ -63,28 +66,16 @@ private DateQueryAdapter dateQueryAdapter; private static final Logger logger = Logger .getLogger(JohnsonDataManagerImpl.class); - public void setDateQueryAdapter(DateQueryAdapter dateQueryAdapter) { - this.dateQueryAdapter = dateQueryAdapter; - } - public void setFtpFileManager(FtpFileManager ftpFileManager) { + public JohnsonDataManagerImpl(){} + @Autowired + public JohnsonDataManagerImpl(DateQueryAdapter dateQueryAdapter, ObjectDao objectDao, LogManager appLogManager, SterilizationRecordManager sterilizationRecordManager, FtpFileManager ftpFileManager, CommonFileManager commonFileManager){ + this.objectDao = objectDao; + this.appLogManager = appLogManager; + this.sterilizationRecordManager = sterilizationRecordManager; this.ftpFileManager = ftpFileManager; - } - public void setCommonFileManager(CommonFileManager commonFileManager) { this.commonFileManager = commonFileManager; + this.dateQueryAdapter = dateQueryAdapter; } - public void setSterilizationRecordManager( - SterilizationRecordManager sterilizationRecordManager) { - this.sterilizationRecordManager = sterilizationRecordManager; - } - - public void setObjectDao(ObjectDao objectDao) { - this.objectDao = objectDao; - } - - public void setAppLogManager(LogManager appLogManager) { - this.appLogManager = appLogManager; - } - /** * 从接口读取数据和存入数据库 */ Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHuaDataManagerImplForFJSSSYY.java =================================================================== diff -u -r39460 -r40026 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHuaDataManagerImplForFJSSSYY.java (.../XinHuaDataManagerImplForFJSSSYY.java) (revision 39460) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHuaDataManagerImplForFJSSSYY.java (.../XinHuaDataManagerImplForFJSSSYY.java) (revision 40026) @@ -17,6 +17,7 @@ import org.apache.commons.net.ftp.FTPFile; import org.apache.commons.net.ftp.FTPFileFilter; import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.integration.smb.session.SmbSession; import org.springframework.integration.smb.session.SmbShare; @@ -35,45 +36,35 @@ import com.forgon.tools.date.DateTools; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.util.ForgonDateUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + /** * 新华自动清洗机数据处理(FJSSSYY-1) + * 福建石狮市人民医院的 新华清洗机 * @author ZhouPeiMian * @since 2020-05-22 */ +@Service("xinHuaDataManagerForFJSSSYY") +@Transactional public class XinHuaDataManagerImplForFJSSSYY implements DeviceDataManager{ private static final Logger logger = Logger.getLogger(XinHuaDataManagerImplForFJSSSYY.class); - private ObjectDao objectDao; - private LogManager appLogManager; - private DateQueryAdapter dateQueryAdapter; - private FtpFileManager ftpFileManager; - private CommonFileManager commonFileManager; - - public void setAppLogManager(LogManager appLogManager) { - this.appLogManager = appLogManager; + public XinHuaDataManagerImplForFJSSSYY(){} + @Autowired + public XinHuaDataManagerImplForFJSSSYY(ObjectDao objectDao, LogManager appLogManager, FtpFileManager ftpFileManager, CommonFileManager commonFileManager + , DateQueryAdapter dateQueryAdapter) { + this.objectDao = objectDao; + this.appLogManager = appLogManager; + this.ftpFileManager = ftpFileManager; + this.commonFileManager = commonFileManager; + this.dateQueryAdapter = dateQueryAdapter; } - - public void setObjectDao(ObjectDao objectDao) { - this.objectDao = objectDao; - } - - public void setDateQueryAdapter(DateQueryAdapter dateQueryAdapter) { - this.dateQueryAdapter = dateQueryAdapter; - } - - public void setFtpFileManager(FtpFileManager ftpFileManager) { - this.ftpFileManager = ftpFileManager; - } - - public void setCommonFileManager(CommonFileManager commonFileManager) { - this.commonFileManager = commonFileManager; - } - @Override public void readAndSaveRecord(DeviceInterface devInterface, String machineNo, String brand, String isAutoCompleteSterilization, boolean enableDetailedDeviceInformation, LoginUserData loginUserData) { Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImpl.java =================================================================== diff -u -r39460 -r40026 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImpl.java (.../DeviceInterfaceDataProcessImpl.java) (revision 39460) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImpl.java (.../DeviceInterfaceDataProcessImpl.java) (revision 40026) @@ -4,7 +4,6 @@ package com.forgon.disinfectsystem.maintain.device.service; import java.util.List; - import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -20,44 +19,41 @@ import com.forgon.log.model.Log; import com.forgon.log.service.LogManager; import com.forgon.tools.SpringBeanManger; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; /** * @author JC 2016-2-3 * */ +@Service("deviceInterfaceDataProcess") +@Transactional public class DeviceInterfaceDataProcessImpl implements DeviceInterfaceDataProcess { - private SterilizerManager sterilizerManager; - private RinserManager rinserManager; - - private Logger logger = Logger.getLogger(getClass()); - @Autowired + private final Logger logger = Logger.getLogger(getClass()); private MaTaDataManagerImpl maTaDataManagerImpl; - @Autowired private SteriVac3MManagerImpl steriVac3MManagerImpl; - @Autowired private XG2CXinhuaDataManagerImpl xG2CXinhuaDataManagerImpl; - @Autowired private Johnson100NXDataManagerImpl johnson100NXDataManagerImpl; - @Autowired private BelimedDataV2ManagerImpl belimedDataV2ManagerImpl; - @Autowired private GetingeWD500DataManagerImpl getingeWD500DataManagerImpl; - /** - * 日志管理 - */ - @Autowired private LogManager appLogManager; - - public void setSterilizerManager(SterilizerManager sterilizerManager) { + public DeviceInterfaceDataProcessImpl() {} + @Autowired + public DeviceInterfaceDataProcessImpl(SterilizerManager sterilizerManager, RinserManager rinserManager, MaTaDataManagerImpl maTaDataManagerImpl + , SteriVac3MManagerImpl steriVac3MManagerImpl, XG2CXinhuaDataManagerImpl xG2CXinhuaDataManagerImpl, Johnson100NXDataManagerImpl johnson100NXDataManagerImpl + , LogManager appLogManager, GetingeWD500DataManagerImpl getingeWD500DataManagerImpl, BelimedDataV2ManagerImpl belimedDataV2ManagerImpl) { this.sterilizerManager = sterilizerManager; - } - - public void setRinserManager(RinserManager rinserManager) { this.rinserManager = rinserManager; + this.maTaDataManagerImpl = maTaDataManagerImpl; + this.steriVac3MManagerImpl = steriVac3MManagerImpl; + this.xG2CXinhuaDataManagerImpl = xG2CXinhuaDataManagerImpl; + this.johnson100NXDataManagerImpl = johnson100NXDataManagerImpl; + this.belimedDataV2ManagerImpl = belimedDataV2ManagerImpl; + this.getingeWD500DataManagerImpl = getingeWD500DataManagerImpl; + this.appLogManager = appLogManager; } - /** * 设备接口数据处理，遍历所有设备，逐个处理 */