Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java =================================================================== diff -u -r26796 -r26890 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java (.../BelimedDataManagerImpl.java) (revision 26796) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java (.../BelimedDataManagerImpl.java) (revision 26890) @@ -10,6 +10,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; @@ -213,6 +214,7 @@ da.setTime(remoteFile.getDate()); fileName = remoteFile.getName(); } + SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); DateFormat df1 = DateFormat.getDateInstance();// 日期格式,精确到日 String yymmdd = df1.format(da).replace("-", "/") + " "; inputStream = commonFileManager.getInputStream(remoteType, ftp, fileName, remoteFile, out); @@ -236,6 +238,9 @@ record.setCycleCounter(Long.parseLong(split[1])); String time = split[2]; time = time.replaceAll("\"", ""); + String procStartTimeStr = yymmdd + time.substring(time.indexOf(" ") + 1); + Date procStartTime = sdf.parse(procStartTimeStr); + record.setProcStartTime(procStartTime); time = yymmdd + time; record.setTime(time); record.setStep(split[3]); @@ -264,8 +269,11 @@ if (StringUtils.isBlank(hmsTime)) { hmsTime = getTime1(time); } + String procStartTimeStr = yymmdd + time.substring(time.indexOf(" ") + 1); time = yymmdd + hmsTime; record.setTime(time); + Date procStartTime = sdf.parse(procStartTimeStr); + record.setProcStartTime(procStartTime); record.setStep(split[3]); record.setPhase(split[4]); record.setMessageNo(split[5]); @@ -296,6 +304,8 @@ appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_DEVICE_INTERFACE, Log.TYPE_ADD, devInterface.getName() + "设备接口连接异常," + e.getMessage()); + } catch(Exception e){ + logger.warn(e.getMessage()); }finally{ FileSystemHelper.closeInputStream(inputStream, br, isr, out); } Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r26871 -r26890 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 26871) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 26890) @@ -1121,15 +1121,13 @@ if(sr != null){ Session session = objectDao.getHibernateSession(); String cycleStr = " and s.cycleCounter = "+sr.getCycleCounter()+" "; - Date beginProcStartTime = new Date(sr.getStartDate().getTime() - 10*60*1000); - Date endProcStartTime = new Date(sr.getStartDate().getTime() + 10*60*1000); - - String beginProcStartTimeStr = ForgonDateUtils.safelyFormatDate(beginProcStartTime,ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS,""); - String endProcStartTimeStr =ForgonDateUtils.safelyFormatDate(endProcStartTime,ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS,""); String dateSql = ""; //中山六院是按照开始时间来匹配数据的 if(CssdUtils.isProject("zsly")){ - cycleStr = ""; + Date beginProcStartTime = new Date(sr.getStartDate().getTime() - 10*60*1000); + Date endProcStartTime = new Date(sr.getStartDate().getTime() + 480*60*1000); + String beginProcStartTimeStr = ForgonDateUtils.safelyFormatDate(beginProcStartTime,ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS,""); + String endProcStartTimeStr =ForgonDateUtils.safelyFormatDate(endProcStartTime,ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS,""); dateSql = " and "+dateQueryAdapter.dateAreaSql("s.procStartTime", beginProcStartTimeStr, endProcStartTimeStr, false); } String queryString = "select s from SterilizerRecord s" Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java =================================================================== diff -u -r26765 -r26890 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java (.../SterilizerRecordLineChartAction.java) (revision 26765) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java (.../SterilizerRecordLineChartAction.java) (revision 26890) @@ -97,6 +97,8 @@ rueslt.put("t1TempData", t1TempArray); rueslt.put("p1MbarData", p1MbarArray); StrutsResponseUtils.output(true, rueslt); + }else{ + StrutsResponseUtils.output(false, rueslt); } }catch (Exception e) { StrutsResponseUtils.output(false ,e.getMessage());