Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java =================================================================== diff -u -r30337 -r30371 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java (.../BelimedDataManagerImpl.java) (revision 30337) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java (.../BelimedDataManagerImpl.java) (revision 30371) @@ -214,9 +214,9 @@ if( jsArray != null){ machineNumber = (String)jsArray.get(0); cycleCounter = (String)jsArray.get(1); - Date procStartTime = (Date)jsArray.get(2); // 灭菌炉自动完成灭菌 - String beginStartTimeStr = ForgonDateUtils.safelyFormatDate(new Date(procStartTime.getTime() - 10*60*1000),ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS,""); - String endStartTimeStr = ForgonDateUtils.safelyFormatDate(new Date(procStartTime.getTime() + 10*60*1000),ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS,""); + Long procStartTime = (Long)jsArray.get(2); // 灭菌炉自动完成灭菌 + String beginStartTimeStr = ForgonDateUtils.safelyFormatDate(new Date(procStartTime - 10*60*1000),ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS,""); + String endStartTimeStr = ForgonDateUtils.safelyFormatDate(new Date(procStartTime + 10*60*1000),ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS,""); if(!StringUtils.isNotBlank(isAutoCompleteSterilization) || isAutoCompleteSterilization.equals("是")){ autoFinishSterilizerRecord(beginStartTimeStr, endStartTimeStr, devInterface.getId().toString(),machineNumber); } @@ -445,7 +445,7 @@ jsonArray = new JSONArray(); jsonArray.add(0, machineNumber); jsonArray.add(1, cycleCounter); - jsonArray.add(2, procStartTime); + jsonArray.add(2, procStartTime.getTime()); } catch (FileNotFoundException e) { // 捕获File对象生成时的异常 logger.warn(e.getMessage());