Index: ssts-web/src/main/resources/spring/test/applicationContext-test.xml =================================================================== diff -u -r20794 -r20803 --- ssts-web/src/main/resources/spring/test/applicationContext-test.xml (.../applicationContext-test.xml) (revision 20794) +++ ssts-web/src/main/resources/spring/test/applicationContext-test.xml (.../applicationContext-test.xml) (revision 20803) @@ -4,13 +4,13 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd" default-autowire="byName"> - + - + - + Index: ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataProcess.java =================================================================== diff -u --- ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataProcess.java (revision 0) +++ ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataProcess.java (revision 20803) @@ -0,0 +1,13 @@ +package com.forgon.disinfectsystem.initdata.service; +/** + * 初始化数据处理。目前主要是测试用例中初始化基础数据 + * @author kzh + * + */ +public interface InitializeDataProcess { + + void initializeCSSDTestData(); + + void initBasicData(); + +} Index: ssts-web/src/test/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java =================================================================== diff -u -r20799 -r20803 --- ssts-web/src/test/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java (.../CSSDTestDataProcess.java) (revision 20799) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java (.../CSSDTestDataProcess.java) (revision 20803) @@ -71,6 +71,7 @@ import com.forgon.disinfectsystem.entity.idcardinstance.IDCardInstance; import com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoringconfig.QualityMonitoringDefinition; import com.forgon.disinfectsystem.entity.urgent.UrgentLevel; +import com.forgon.disinfectsystem.initdata.service.InitializeDataProcess; import com.forgon.disinfectsystem.stockmanage.cssdstock.service.TousseStockManager; import com.forgon.disinfectsystem.tousse.materialdefinition.service.MaterialDefinitionManager; import com.forgon.disinfectsystem.tousse.materialinstance.service.MaterialInstanceManager; @@ -93,7 +94,7 @@ import com.forgon.treenode.service.THTreeNodeManager; -public class CSSDTestDataProcess { +public class CSSDTestDataProcess implements InitializeDataProcess { protected Map map = new HashMap(); Index: ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataManagerImpl.java =================================================================== diff -u -r19486 -r20803 --- ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataManagerImpl.java (.../InitializeDataManagerImpl.java) (revision 19486) +++ ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataManagerImpl.java (.../InitializeDataManagerImpl.java) (revision 20803) @@ -35,8 +35,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.support.TransactionSynchronizationManager; -import test.forgon.disinfectsystem.CSSDTestDataProcess; - import com.forgon.directory.model.BarcodeDevice; import com.forgon.directory.model.OrgUnit; import com.forgon.directory.model.OrgUserRelation; @@ -112,7 +110,7 @@ private WareHouseManager wareHouseManager; - private CSSDTestDataProcess cssdTestDataProcess; + private InitializeDataProcess initializeDataProcess; private UrgentLevelManager urgentLevelManager; private OperationRoomManager operationRoomManager; @@ -191,8 +189,8 @@ this.wareHouseManager = wareHouseManager; } - public void setCssdTestDataProcess(CSSDTestDataProcess cssdTestDataProcess) { - this.cssdTestDataProcess = cssdTestDataProcess; + public void setInitializeDataProcess(InitializeDataProcess initializeDataProcess) { + this.initializeDataProcess = initializeDataProcess; } @Override @@ -225,10 +223,10 @@ initIndexes(); //运行测试用例的初始化方法(删除所有表的数据,然后初始化基础数据),启动tomcat不会调用此方法 - if(cssdTestDataProcess != null){ - cssdTestDataProcess.initializeCSSDTestData(); + if(initializeDataProcess != null){ + initializeDataProcess.initializeCSSDTestData(); //由于部分测试用例 - cssdTestDataProcess.initBasicData(); + initializeDataProcess.initBasicData(); } initializationData = (InitializationData) commonReadXmlManager