From cf1c76b57e0312c567f818d711477eb99cb8adf2 Mon Sep 17 00:00:00 2001 From: "logic.fang" Date: Sat, 8 Feb 2025 14:29:10 +0800 Subject: [PATCH] =?UTF-8?q?44991=20=E4=BA=A7=E7=BA=BF=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8810=E7=82=B9=E6=AD=A3=E4=BB=A5?= =?UTF-8?q?=E5=90=8E=E6=89=8D=E8=83=BD=E7=9C=8B=E5=88=B08-9=E7=82=B9?= =?UTF-8?q?=E7=9A=84=E6=8A=A5=E5=B7=A5=E6=95=B0=E6=8D=AE=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/board/IMesYfBoardServiceImpl.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 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 5d6e909..ef08ea7 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 @@ -528,34 +528,43 @@ public class IMesYfBoardServiceImpl implements IMesYfBoardService { Map> timeZoneMap = new LinkedHashMap<>(); DateTimeFormatter hourFormatter = DateTimeFormatter.ofPattern("HH"); DateTimeFormatter dayFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd "); +// //时间节点计算测试 +// String dateStr = "2025-02-08 09:30:00"; +// DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); +// LocalDateTime nowTime = LocalDateTime.parse(dateStr, formatter); LocalDateTime nowTime = LocalDateTime.now(); - String nowDay = dayFormatter.format(nowTime); String startTime; String endTime; String key; for (int i = 0; i < designatedQuantity; i++) { Map zoneMap = new HashMap<>(); + String startTimeDay; + String endTimeDay; if (i == 0) { //第一个区段获取当前时间所在的小时区间 startTime = hourFormatter.format(nowTime.minusHours(i)) + ":00"; + startTimeDay = dayFormatter.format(nowTime.minusHours(i)); endTime = hourFormatter.format(nowTime.plusHours(1)) + ":00"; + endTimeDay = dayFormatter.format(nowTime.plusHours(i)); }else { startTime = hourFormatter.format(nowTime.minusHours(i)) + ":00"; + startTimeDay = dayFormatter.format(nowTime.minusHours(i)); endTime = hourFormatter.format(nowTime.minusHours(i - 1)) + ":00"; + endTimeDay = dayFormatter.format(nowTime.minusHours(i - 1)); } key = startTime + "-" + endTime; - zoneMap.put(START_TIME, nowDay + startTime + ":00"); - zoneMap.put(END_TIME, nowDay + endTime + ":00"); + zoneMap.put(START_TIME, startTimeDay + startTime + ":00"); + zoneMap.put(END_TIME, endTimeDay + endTime + ":00"); timeZoneMap.put(key, zoneMap); Map map = new HashMap<>(); if (i == 0) { //将第一个时间段作为本段查询时间区间的结束（因为是递减） - map.put(END_TIME, nowDay + startTime + ":00"); + map.put(END_TIME, endTimeDay + endTime + ":00"); timeZoneMap.put(END_TIME, map); } if (i == designatedQuantity - 1) { //将最后一个时间段作为本段查询时间区间的开始（因为是递减） - map.put(START_TIME, nowDay + endTime + ":00"); + map.put(START_TIME, startTimeDay + startTime + ":00"); timeZoneMap.put(START_TIME, map); } }