From 52354105bb95eb449720349fb6c60e398be651dc Mon Sep 17 00:00:00 2001 From: 18616268358 <1440265357@qq.com> Date: Mon, 29 May 2023 14:24:45 +0800 Subject: [PATCH] =?UTF-8?q?#20230529=20=E6=AC=A3=E5=BD=B1=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=B9=B3=E5=8F=B0=E6=8B=8D=E7=85=A7=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=A1=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/TerminalScheduleRuleServiceImpl.java | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleRuleServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleRuleServiceImpl.java index ae23c83..3ada2b8 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleRuleServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleRuleServiceImpl.java @@ -546,16 +546,24 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ if (null != resultObj.get("groupData")) { List resultDtoList = JSONArray.parseArray(resultObj.get("groupData").toString(), PhotoTimeResultDto.class); if (CollectionUtil.isNotEmpty(resultDtoList)) { + int group = Integer.parseInt(resultObj.get("group").toString()); + int toIndex = 3; List resultList = Lists.newArrayList(); - String startTimeStr = resultDtoList.get(0).getHour() + ":" + resultDtoList.get(0).getMinute() + ":00"; - String endTimeStr = resultDtoList.get(1).getHour() + ":" + resultDtoList.get(1).getMinute() + ":00"; - Date startTime = DateUtil.parseTime(startTimeStr); - Date endTime = DateUtil.parseTime(endTimeStr); - Integer span = resultDtoList.get(2).getHour() * 60 + resultDtoList.get(2).getMinute(); - List dateTimes = MyDateUtils.rangeToList(startTime, endTime, DateField.MINUTE, span); - for (DateTime data : dateTimes) { - String dateTime = DateUtil.formatTime(data); - resultList.add(dateTime); + for(int i = 0;i<(group/toIndex);i++) { + List newList = resultDtoList.subList(i, i + toIndex); + for (int i1 = 0; i1 < newList.size(); i1++) { + String startTimeStr = resultDtoList.get(2).getHour() + ":" + resultDtoList.get(2).getMinute() + ":00"; + String endTimeStr = resultDtoList.get(1).getHour() + ":" + resultDtoList.get(1).getMinute() + ":00"; + Date startTime = DateUtil.parseTime(startTimeStr); + Date endTime = DateUtil.parseTime(endTimeStr); + Integer span = resultDtoList.get(0).getHour() * 60 + resultDtoList.get(0).getMinute(); + List dateTimes = MyDateUtils.rangeToList(startTime, endTime, DateField.MINUTE, span); + for (DateTime data : dateTimes) { + String dateTime = DateUtil.formatTime(data); + resultList.add(dateTime); + } + + } } model.setList(resultList); model.setIsNew(true);