diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/board/IMesYfBoardServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/board/IMesYfBoardServiceImpl.java index de19623..951251e 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/board/IMesYfBoardServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/board/IMesYfBoardServiceImpl.java @@ -277,8 +277,6 @@ public class IMesYfBoardServiceImpl implements IMesYfBoardService { //最新的点检单结果为 NOK //结果设置为“异常” resultModel.setInspectionResults(MesExtEnumUtil.INSPECTION_RESULTS.ABNORMAL.getValue()); - } else { - resultModel.setInspectionResults(MesExtEnumUtil.INSPECTION_RESULTS.NOT_DONE.getValue()); } }else { //不存在该种点检类型的点检单数据 @@ -418,7 +416,7 @@ public class IMesYfBoardServiceImpl implements IMesYfBoardService { * @return 当前时间前指定小时数内的每个小时区间的开始与结束时间 */ private Map> getLastHoursTimeZoneMap(Integer designatedQuantity) { - Map> timeZoneMap = new TreeMap<>(); + Map> timeZoneMap = new LinkedHashMap<>(); DateTimeFormatter hourFormatter = DateTimeFormatter.ofPattern("HH"); DateTimeFormatter dayFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd "); LocalDateTime nowTime = LocalDateTime.now(); @@ -452,7 +450,14 @@ public class IMesYfBoardServiceImpl implements IMesYfBoardService { timeZoneMap.put(START_TIME, map); } } - return timeZoneMap; + //倒序处理 + Map> collectResult = new LinkedHashMap<>(); + ListIterator i = new ArrayList(timeZoneMap.entrySet()).listIterator(timeZoneMap.size()); + while (i.hasPrevious()) { + Map.Entry entry = i.previous(); + collectResult.put(String.valueOf(entry.getKey()), (HashMap) entry.getValue()); + } + return collectResult; } } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/resources/application-71.properties b/modules/i3plus-ext-mes-apiservice/src/main/resources/application-71.properties index c32fda1..6609952 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/resources/application-71.properties +++ b/modules/i3plus-ext-mes-apiservice/src/main/resources/application-71.properties @@ -1,7 +1,7 @@ #\u9879\u76EE\u7AEF\u53E3 server.port=8300 #\u672C\u673Aip -impp.server.ip=172.24.96.1 +impp.server.ip=10.196.75.158 #\u94FE\u8DEF\u8FFD\u8E2Azipkin\u63A7\u5236\u53F0ip\u5730\u5740 impp.console.ip=http://10.195.88.71:8010 ################ \u529F\u80FD\u914D\u7F6E1 ################