Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java =================================================================== diff -u -r27004 -r27112 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java (.../BelimedDataManagerImpl.java) (revision 27004) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java (.../BelimedDataManagerImpl.java) (revision 27112) @@ -244,9 +244,7 @@ SterilizerRecord record = new SterilizerRecord(); record.setMachineNo(split[0].replaceAll("\"", "")); record.setCycleCounter(Long.parseLong(split[1])); - String time = split[2]; - time = yymmdd + time.replaceAll("\"", ""); - time = time.substring(time.indexOf(" ") + 1); + String time = yymmdd + getTime(split[2].replaceAll("\"", "")); if(procStartTime == null){ procStartTime = sdf.parse(time); } @@ -272,14 +270,7 @@ SterilizerRecord record = new SterilizerRecord(); record.setMachineNo(split[0].replaceAll("\"", "")); record.setCycleCounter(Long.parseLong(split[1])); - String time = split[2]; - time = time.replaceAll("\"", ""); - time = time.substring(time.indexOf(" ") + 1); - String hmsTime = getTime(time); - if (StringUtils.isBlank(hmsTime)) { - hmsTime = getTime1(time); - } - time = yymmdd + hmsTime; + String time = yymmdd + getTime(split[2].replaceAll("\"", "")); record.setTime(time); if(procStartTime == null){ procStartTime = sdf.parse(time); @@ -465,7 +456,7 @@ /** * 12小时制转24小时 以AM或者PM结尾 * - * @time time12h 格式如 12:22:51 PM 12:22:51 AM + * @time time12h 格式如 12:22:51 PM 12:22:51 AM 或者 Tuesday 12:17:14 * @return 12:22:51 */ public String getTime(String time) { @@ -490,7 +481,9 @@ return String.valueOf(hour) + ":" + timeSplit[1] + ":" + timeSplit[2]; // time.replace(timeSplit[0], String.valueOf(hour)); - } else { + }else if(time.contains("day")){ + return time.substring(time.indexOf(" ") + 1); + }else { return time; // 新接口文件时间格式 } } @@ -568,13 +561,7 @@ if (split.length == 13 && lineNo != 1) { record.setMachineNo(split[0].replaceAll("\"", "")); record.setCycleCounter(Long.parseLong(split[1])); - String time = split[2]; - time = time.replaceAll("\"", ""); - String hmsTime = getTime1(time); - if (StringUtils.isBlank(hmsTime)) { - hmsTime = getTime(time); - } - time = yymmdd + hmsTime; + String time = yymmdd + getTime(split[2].replaceAll("\"", "")); record.setTime(time); record.setStep(split[3]); record.setPhase(split[4]);