|
|
|
@ -539,41 +539,39 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
|
|
|
|
|
public ServiceBody<TerminalScheduleRuleTimeListModel> getCmaSchelduleDetials(RequestIdVo vo) {
|
|
|
|
|
TerminalScheduleRuleTimeListModel model = new TerminalScheduleRuleTimeListModel();
|
|
|
|
|
RequestResults results = requestResultsDao.selectByRequestId(vo.getRequestid());
|
|
|
|
|
if(null!=results){
|
|
|
|
|
String resultsData = results.getData();
|
|
|
|
|
if (StringUtils.isNotBlank(resultsData)) {
|
|
|
|
|
JSONObject resultObj = JSONObject.parseObject(resultsData);
|
|
|
|
|
if (null != resultObj.get("groupData")) {
|
|
|
|
|
List<PhotoTimeResultDto> 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<String> resultList = Lists.newArrayList();
|
|
|
|
|
for(int i = 0;i<(group/toIndex);i++) {
|
|
|
|
|
List<PhotoTimeResultDto> 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<DateTime> dateTimes = MyDateUtils.rangeToList(startTime, endTime, DateField.MINUTE, span);
|
|
|
|
|
for (DateTime data : dateTimes) {
|
|
|
|
|
String dateTime = DateUtil.formatTime(data);
|
|
|
|
|
resultList.add(dateTime);
|
|
|
|
|
}
|
|
|
|
|
if(null!=results) {
|
|
|
|
|
String resultsData = results.getData();
|
|
|
|
|
if (StringUtils.isNotBlank(resultsData)) {
|
|
|
|
|
JSONObject resultObj = JSONObject.parseObject(resultsData);
|
|
|
|
|
if (null != resultObj.get("groupData")) {
|
|
|
|
|
List<PhotoTimeResultDto> 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<String> resultList = Lists.newArrayList();
|
|
|
|
|
for (int i = 0; i < (group / toIndex); i++) {
|
|
|
|
|
List<PhotoTimeResultDto> 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<DateTime> 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);
|
|
|
|
|
}
|
|
|
|
|
model.setList(resultList);
|
|
|
|
|
model.setIsNew(true);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return Asserts.success(model);
|
|
|
|
|
} else {
|
|
|
|
|
return Asserts.error("查询失败");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|