From 27b4f49263e3f85390644fc3ebbd797762da5fa9 Mon Sep 17 00:00:00 2001 From: "logic.fang" <[logic.fang@estsh.com]> Date: Fri, 19 Jul 2024 11:21:14 +0800 Subject: [PATCH 1/2] Merge branch 'dev' of C:\Code\IdeaProjects\yfai\YF\i3plus-mes-yfai with conflicts. --- .../ext/mes/apiservice/serviceimpl/board/IMesYfBoardServiceImpl.java | 2 -- .../src/main/resources/application-71.properties | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) 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..9cb0b95 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 { //不存在该种点检类型的点检单数据 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 ################ From 684d5ea5d90a5500d87ae615d886cd630ae4cb42 Mon Sep 17 00:00:00 2001 From: "logic.fang" <[logic.fang@estsh.com]> Date: Wed, 24 Jul 2024 11:11:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E7=9C=8B=E6=9D=BF-"?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E5=B0=8F=E6=97=B6=E5=AE=8C=E5=B7=A5=E7=8E=87?= =?UTF-8?q?"=E4=B8=8E"=E4=BA=A7=E7=BA=BF=E4=B8=80=E6=AC=A1=E4=B8=8B?= =?UTF-8?q?=E7=BA=BF=E5=90=88=E6=A0=BC=E7=8E=87"=E9=83=A8=E5=88=86?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E9=97=B4=E6=AE=B5=E6=8E=92=E5=BA=8F=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/serviceimpl/board/IMesYfBoardServiceImpl.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) 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 9cb0b95..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 @@ -416,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(); @@ -450,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; } }