From e7aaa62a5c499747275a78ed6157024f15b9ab1e Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 29 三月 2024 21:29:55 +0800
Subject: [PATCH] report模块修复
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/report/service/impl/WorkstationAlarmServiceImpl.java | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/report/service/impl/WorkstationAlarmServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/report/service/impl/WorkstationAlarmServiceImpl.java
index a833a87..a1eedab 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/report/service/impl/WorkstationAlarmServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/report/service/impl/WorkstationAlarmServiceImpl.java
@@ -73,7 +73,7 @@
return jsonObject;
}
CommonUtil.fillWorkStationGroup(workstationVOPage);
- List<Long> workstationIds = (List) voPageRecords.stream().map((v0) -> {
+ List<Long> workstationIds = voPageRecords.stream().map((v0) -> {
return v0.getWorkstationId();
}).collect(Collectors.toList());
StatisticalMethodEnum anEnum = StatisticalMethodEnum.of(workstationAlarmByTimeSelectVO.getDateCycle());
@@ -92,28 +92,28 @@
result.add(resultVO);
});
});
- Map<String, WorkstaionAlarmByTimeReportVO> voMap = (Map) result.parallelStream().collect(Collectors.toMap(c -> {
+ Map<String, WorkstaionAlarmByTimeReportVO> voMap = result.parallelStream().collect(Collectors.toMap(c -> {
return c.getWorkstationId() + c.getShowDate();
}, o -> {
return o;
}));
- Map<Long, Integer> wsCount = (Map) reportData.parallelStream().collect(Collectors.groupingBy((v0) -> {
+ Map<Long, Integer> wsCount = reportData.parallelStream().collect(Collectors.groupingBy((v0) -> {
return v0.getWorkstationId();
}, Collectors.reducing(0, e -> {
return 1;
}, (v0, v1) -> {
return Integer.sum(v0, v1);
})));
- Map<Long, List<WorkstaionAlarmByTimeReportVO>> workstationOutMap = (Map) reportData.parallelStream().collect(Collectors.groupingBy((v0) -> {
+ Map<Long, List<WorkstaionAlarmByTimeReportVO>> workstationOutMap = reportData.parallelStream().collect(Collectors.groupingBy((v0) -> {
return v0.getWorkstationId();
}));
- workstationOutMap.forEach(workstationId, outputList -> {
- Map<String, Integer> countMap = (Map) outputList.parallelStream().collect(Collectors.groupingBy(groupKey(anEnum), Collectors.reducing(0, e2 -> {
+ workstationOutMap.forEach((workstationId, outputList) -> {
+ Map<String, Integer> countMap = outputList.parallelStream().collect(Collectors.groupingBy(groupKey(anEnum), Collectors.reducing(0, e2 -> {
return 1;
}, (v0, v1) -> {
return Integer.sum(v0, v1);
})));
- countMap.forEach(k, v -> {
+ countMap.forEach((k, v) -> {
WorkstaionAlarmByTimeReportVO vo = (WorkstaionAlarmByTimeReportVO) voMap.get(workstationId + k);
if (!Objects.isNull(vo)) {
vo.setAlarmCount(v);
@@ -207,12 +207,12 @@
}
CommonUtil.fillWorkStationGroup(workstationVOPage);
List<WorkstationDataDTO> workstationData = workstationVOPage.getRecords();
- List<Long> ids = (List) workstationData.parallelStream().map((v0) -> {
+ List<Long> ids = workstationData.parallelStream().map((v0) -> {
return v0.getWorkstationId();
}).collect(Collectors.toList());
List<ShiftInfoDTO> shiftInfoDtoList = this.calendarMapper.listShiftInfo(ids, LocalDate.parse(workstationAlarmByTimeSelectVO.getShowDate_begin()), LocalDate.parse(workstationAlarmByTimeSelectVO.getShowDate_end()));
List<WorkstationShiftDTO> workstationShifts = CommonUtil.dataMerge(workstationData, shiftInfoDtoList);
- List<WorkstationShiftDTO> filter = (List) workstationShifts.parallelStream().filter(CommonUtil.conditionFilter(workstationAlarmByTimeSelectVO.getShiftIndexName(), workstationAlarmByTimeSelectVO.getShiftIndex())).collect(Collectors.toList());
+ List<WorkstationShiftDTO> filter = workstationShifts.parallelStream().filter(CommonUtil.conditionFilter(workstationAlarmByTimeSelectVO.getShiftIndexName(), workstationAlarmByTimeSelectVO.getShiftIndex())).collect(Collectors.toList());
List<WorkstaionAlarmByShiftReportVO> result = new ArrayList<>();
fillDateCol.forEach(f -> {
filter.forEach(shift -> {
@@ -229,30 +229,30 @@
boolean filterType = FilterOffUtils.whetherToFilter(OpenTypeEnums.PARAM_KEY_TYPE, OpenTypeEnums.ALARM_ANALYSIS);
boolean filterShift = FilterOffUtils.whetherToFilter(OpenTypeEnums.PARAM_KEY_SHIFT, OpenTypeEnums.ALARM_ANALYSIS);
List<WorkstaionAlarmByShiftReportVO> voList = this.superAlarmMapper.alarmReportByShift(ids, beginTime, endTime, Boolean.valueOf(filterType), Boolean.valueOf(filterShift));
- Map<String, Integer> wsCount = (Map) voList.parallelStream().collect(Collectors.groupingBy(o -> {
+ Map<String, Integer> wsCount = voList.parallelStream().collect(Collectors.groupingBy(o -> {
return o.getWorkstationId() + "-" + o.getShiftIndex();
}, Collectors.reducing(0, e -> {
return 1;
}, (v0, v1) -> {
return Integer.sum(v0, v1);
})));
- Map<String, List<WorkstaionAlarmByShiftReportVO>> workstationOutMap = (Map) voList.parallelStream().collect(Collectors.groupingBy(s -> {
+ Map<String, List<WorkstaionAlarmByShiftReportVO>> workstationOutMap = voList.parallelStream().collect(Collectors.groupingBy(s -> {
return s.getWorkstationId() + "-" + s.getShiftIndex();
}));
- Map<String, WorkstaionAlarmByShiftReportVO> voMap = (Map) result.parallelStream().collect(LinkedHashMap::new, map, c -> {
+ Map<String, WorkstaionAlarmByShiftReportVO> voMap = result.parallelStream().collect(LinkedHashMap::new, (map, c) -> {
WorkstaionAlarmByShiftReportVO workstaionAlarmByShiftReportVO = (WorkstaionAlarmByShiftReportVO) map.put(c.getWorkstationId() + "-" + c.getShiftIndex() + "-" + c.getShowDate(), c);
}, (v0, v1) -> {
v0.putAll(v1);
});
- workstationOutMap.forEach(key, vos -> {
- Map<String, Integer> countMap = (Map) vos.parallelStream().collect(Collectors.groupingBy(o2 -> {
+ workstationOutMap.forEach((key, vos) -> {
+ Map<String, Integer> countMap = vos.parallelStream().collect(Collectors.groupingBy(o2 -> {
return LocalDate.parse(String.valueOf(o2.getFactoryDate()), DateTimeFormatter.ofPattern("yyyyMMdd")).toString();
}, Collectors.reducing(0, e2 -> {
return 1;
}, (v0, v1) -> {
return Integer.sum(v0, v1);
})));
- countMap.forEach(k, v -> {
+ countMap.forEach((k, v) -> {
WorkstaionAlarmByShiftReportVO vo = (WorkstaionAlarmByShiftReportVO) voMap.get(key + "-" + k);
if (!Objects.isNull(vo)) {
vo.setAlarmCount(v);
@@ -293,7 +293,7 @@
}
LocalDate currentDate = LocalDate.parse(drillWorkstationAlarmByShiftSelectVO.getCurrentDate(), DateTimeFormatter.ofPattern(DateConstant.PATTERN_DATE));
List<ShiftInfoDTO> shiftInfoDtoList = this.shiftDetailService.getShiftInfoDtoList(Lists.newArrayList(new Long[]{drillWorkstationAlarmByShiftSelectVO.getWorkstationId()}), currentDate, currentDate);
- Map<Integer, String> shiftMap = (Map) shiftInfoDtoList.stream().collect(Collectors.toMap((v0) -> {
+ Map<Integer, String> shiftMap = shiftInfoDtoList.stream().collect(Collectors.toMap((v0) -> {
return v0.getShiftIndex();
}, (v0) -> {
return v0.getIndexName();
@@ -340,7 +340,7 @@
if (!filterType && !filterShift) {
return data;
}
- return (List) data.stream().filter(item -> {
+ return data.stream().filter(item -> {
return (filterType && item.getShiftTimeType().equals(2)) ? false : true;
}).filter(item2 -> {
return !filterShift || item2.getShiftIndex().intValue() > 0;
--
Gitblit v1.9.3