Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
===================================================================
diff -u -r29628 -r29640
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 29628)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 29640)
@@ -6046,8 +6046,8 @@
String machineNo, Date startDate) {
LowTempForJohnsonSterilizerRecord result = null;
try {
- Date beginStartTime = new Date(startDate.getTime() - 5*60*1000);
- Date endStartTime = new Date(startDate.getTime() + 5*60*1000);
+ Date beginStartTime = new Date(startDate.getTime() - 10*60*1000);
+ Date endStartTime = new Date(startDate.getTime() + 10*60*1000);
String beginStartTimeStr = ForgonDateUtils.safelyFormatDate(beginStartTime,ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS,"");
String endStartTimeStr = ForgonDateUtils.safelyFormatDate(endStartTime,ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS,"");
String queryString = " where po.machineNumber ='"
Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/JohnsonDataManagerImpl.java
===================================================================
diff -u -r29628 -r29640
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/JohnsonDataManagerImpl.java (.../JohnsonDataManagerImpl.java) (revision 29628)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/JohnsonDataManagerImpl.java (.../JohnsonDataManagerImpl.java) (revision 29640)
@@ -274,9 +274,7 @@
line = line.substring(line.indexOf("Press")+5).trim();
String relationSymbol = line.substring(0, 1);
lowTempForJohnsonStageDetails.setRelationSymbol(relationSymbol);
- System.out.println("line___"+line+"__"+relationSymbol);
torrStr = line.replaceAll(lowTempForJohnsonStageDetails.getPressureUnit(), "").substring(1).trim();
- System.out.println("torrStr"+torrStr);
lowTempForJohnsonStageDetails.setRelationSymbol(relationSymbol);
lowTempForJohnsonStageDetails.setPress(Double.valueOf(torrStr));
lowTempForJohnsonStageDetails.setLowTempForJohnsonSterilizerRecord(lowTempForJohnsonSterilizerRecord);
@@ -297,9 +295,7 @@
lowTempForJohnsonSterilizerRecord.setEndDate(endDate);
}else if(startReaded){//开始时间下一条数据是程序名
startReaded = false;
- System.out.println("programNameLine:"+line);
String programName = line.substring(3);
- System.out.println("programName:"+programName);
if(lowTempForJohnsonSterilizerRecord == null){
continue;
}
@@ -356,17 +352,13 @@
* @param lowTempForJohnsonSterilizerRecord
*/
private void setStageTime(String line, LowTempForJohnsonSterilizerRecord lowTempForJohnsonSterilizerRecord){
- System.out.println("stageTimeLine:"+line);
String stageTime = line.substring(8).replaceAll(" ", "").replace("sec", "");
int stageTotalMin = 0;
int stageTotalSec = 0;
- System.out.println("stageTime:"+stageTime);
if(stageTime.contains("min")){
String[] timeArr = stageTime.split("min");
stageTotalMin = Integer.valueOf(timeArr[0]);
stageTotalSec = Integer.valueOf(timeArr[1]);
- System.out.println("stageTotalMin:"+ stageTotalMin);
- System.out.println("stageTotalSec:"+ stageTotalSec);
}else{//可能只有秒,没有分
stageTotalSec = Integer.valueOf(stageTime);
}
@@ -419,8 +411,8 @@
boolean result = false;
Date startDate = item.getStartDate();
String machineNo = item.getMachineNumber();
- Date beginStartTime = new Date(startDate.getTime() - 5*60*1000);
- Date endStartTime = new Date(startDate.getTime() + 5*60*1000);
+ Date beginStartTime = new Date(startDate.getTime() - 10*60*1000);
+ Date endStartTime = new Date(startDate.getTime() + 10*60*1000);
String beginStartTimeStr = ForgonDateUtils.safelyFormatDate(beginStartTime,ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS,"");
String endStartTimeStr = ForgonDateUtils.safelyFormatDate(endStartTime,ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS,"");
try {
Index: ssts-web/src/main/webapp/WEB-INF/spring/applicationContext-disinfectsystem-service.xml
===================================================================
diff -u -r29630 -r29640
--- ssts-web/src/main/webapp/WEB-INF/spring/applicationContext-disinfectsystem-service.xml (.../applicationContext-disinfectsystem-service.xml) (revision 29630)
+++ ssts-web/src/main/webapp/WEB-INF/spring/applicationContext-disinfectsystem-service.xml (.../applicationContext-disinfectsystem-service.xml) (revision 29640)
@@ -1780,7 +1780,7 @@
- 0 0/1 * * * ?
+ 0 0/5 * * * ?