Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java =================================================================== diff -u -r34423 -r34435 --- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 34423) +++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 34435) @@ -87,6 +87,7 @@ import com.forgon.disinfectsystem.entity.packing.PackingTask; import com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoring.QualityMonitoringInstance; import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingRecord; +import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord; import com.forgon.disinfectsystem.entity.systemwarning.SystemWarningVo; import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washData.WashData; import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washData.WashDataItemOfChangLong; @@ -800,10 +801,19 @@ @Override public void runTask() { try { - sleep(useTime*60*1000); + if(sleep){ + sleep(useTime*60*1000); + } Calendar endDate = Calendar.getInstance(); endDate.setTime(washRecord.getStartDate()); endDate.add(Calendar.MINUTE, useTime); + if(!sleep){//tomcat重启时 + Calendar now = Calendar.getInstance(); + now.set(Calendar.SECOND, 0); + if (endDate.getTimeInMillis() > now.getTimeInMillis()) { + sleep(endDate.getTimeInMillis() - now.getTimeInMillis()); + } + } updateWashRecordAndBasketStatus(washRecord.getId().toString(), WashAndDisinfectRecord.STATUS_WASHED, Container.CONTAINER_STATUS_WASHED, WashDisinfectInterruptRecord.ITERRUPT_FINISH_FINISH, releaseBasketAfterReturn,endDate.getTime()); } catch (InterruptedException e) { e.printStackTrace();