From 60e317f7782c718d28920060fd686d2092c99c1e Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 09 五月 2024 20:00:39 +0800
Subject: [PATCH] 替换大批错误注释
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/report/service/impl/OutputStatisticsReportServiceImpl.java | 33 ++++++++++++++++++---------------
1 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/report/service/impl/OutputStatisticsReportServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/report/service/impl/OutputStatisticsReportServiceImpl.java
index f6eb88b..8f95657 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/report/service/impl/OutputStatisticsReportServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/report/service/impl/OutputStatisticsReportServiceImpl.java
@@ -41,7 +41,7 @@
import org.springframework.stereotype.Service;
@Service
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/report/service/impl/OutputStatisticsReportServiceImpl.class */
+
public class OutputStatisticsReportServiceImpl implements IOutputStatisticsReportService {
private final SuperAggregateOutputMapper aggregateOutputMapper;
private final WorkstationMapper workstationMapper;
@@ -62,7 +62,7 @@
this.commonMapper = commonMapper;
}
- @Override // org.springblade.modules.report.service.IOutputStatisticsReportService
+
public JSONObject outputStatisticsByShift(StatisticsQueryVO queryVO) {
queryVO.setBeginTime(DateCycleUtil.setTimeCondition(TIME_CONDITION, Boolean.TRUE));
queryVO.setEndTime(DateCycleUtil.setTimeCondition(TIME_CONDITION, Boolean.FALSE));
@@ -73,24 +73,27 @@
if (CollectionUtil.isEmpty(workstationData)) {
return new JSONObject();
}
- 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(queryVO.getBeginTime()), LocalDate.parse(queryVO.getEndTime()));
List<WorkstationShiftDTO> workstationShifts = CommonUtil.dataMerge(workstationData, shiftInfoDtoList);
- List<WorkstationShiftDTO> filter = (List) workstationShifts.parallelStream().filter(CommonUtil.conditionFilter(queryVO.getShiftName(), queryVO.getShiftIndex())).collect(Collectors.toList());
+ List<WorkstationShiftDTO> filter =workstationShifts.parallelStream().filter(CommonUtil.conditionFilter(queryVO.getShiftName(), queryVO.getShiftIndex())).collect(Collectors.toList());
List<OutputShiftResultVO> result = settingResult(fillDateCol, filter);
String beginTime = DateCycleUtil.getDateByDateCycle(queryVO.getBeginTime(), anEnum, Boolean.TRUE);
String endTime = DateCycleUtil.getDateByDateCycle(queryVO.getEndTime(), anEnum, Boolean.FALSE);
List<SuperAggregateOutput> outputs = multithreadingTask(beginTime, endTime, ids, queryVO.getStatisticsType());
- Map<String, List<SuperAggregateOutput>> workstationOutMap = (Map) outputs.parallelStream().collect(Collectors.groupingBy(s -> {
+ Map<String, List<SuperAggregateOutput>> workstationOutMap = outputs.parallelStream().collect(Collectors.groupingBy(s -> {
return s.getWorkstationId() + "-" + s.getShiftIndex();
}));
- Map<String, OutputShiftResultVO> voMap = (Map) result.parallelStream().collect(LinkedHashMap::new, map, c -> {
+ //Map<String, OutputShiftResultVO> voMap2 = (Map<String, OutputShiftResultVO>)result.parallelStream().collect(LinkedHashMap::new, (map, c) -> {map.put(c.getWorkstationId() + "-" + c.getShiftIndex() + "-" + c.getDateCycle(), c)}, Map::putAll);
+
+ Map<String, OutputShiftResultVO> voMap = result.parallelStream().collect(LinkedHashMap::new, (map, c) -> {
+
OutputShiftResultVO outputShiftResultVO = (OutputShiftResultVO) map.put(c.getWorkstationId() + "-" + c.getShiftIndex() + "-" + c.getDateCycle(), c);
}, (v0, v1) -> {
v0.putAll(v1);
- });
+ }); /**/
resultCount(workstationOutMap, anEnum, voMap);
return ResultUtil.dataToJsonObject(voMap.values(), Long.valueOf(iPage.getTotal()), queryVO.getPageSize());
}
@@ -116,13 +119,13 @@
}
private <T, R extends OutputResultVO> void resultCount(Map<T, List<SuperAggregateOutput>> workstationOutMap, StatisticalMethodEnum anEnum, Map<String, R> voMap) {
- workstationOutMap.forEach(outputKey, outputList -> {
- Map<String, Long> output = (Map) outputList.parallelStream().collect(Collectors.groupingBy(groupKey(anEnum), Collectors.mapping((v0) -> {
+ workstationOutMap.forEach((outputKey, outputList) -> {
+ Map<String, Long> output = outputList.parallelStream().collect(Collectors.groupingBy(groupKey(anEnum), Collectors.mapping((v0) -> {
return v0.getOutput();
}, Collectors.reducing(0L, (v0, v1) -> {
return Long.sum(v0, v1);
}))));
- output.forEach(k, v -> {
+ output.forEach((k, v) -> {
OutputResultVO vo = (OutputResultVO) voMap.get(outputKey + "-" + k);
if (!Objects.isNull(vo)) {
vo.setOutputCount(v);
@@ -143,7 +146,7 @@
return workstationData;
}
- @Override // org.springblade.modules.report.service.IOutputStatisticsReportService
+
public JSONObject outputStatisticsByDate(StatisticsQueryVO queryVO) {
queryVO.setBeginTime(DateCycleUtil.setTimeCondition(TIME_CONDITION, Boolean.TRUE));
queryVO.setEndTime(DateCycleUtil.setTimeCondition(TIME_CONDITION, Boolean.FALSE));
@@ -157,16 +160,16 @@
return new JSONObject();
}
List<OutputResultVO> result = Convert.toList(OutputResultVO.class, settingResult(fillDateCol, workstationData));
- Map<String, OutputResultVO> voMap = (Map) result.parallelStream().collect(Collectors.toMap(c -> {
+ Map<String, OutputResultVO> voMap = result.parallelStream().collect(Collectors.toMap(c -> {
return c.getWorkstationId() + "-" + c.getDateCycle();
}, o -> {
return o;
}));
- List<Long> ids = (List) workstationData.parallelStream().map((v0) -> {
+ List<Long> ids = workstationData.parallelStream().map((v0) -> {
return v0.getWorkstationId();
}).collect(Collectors.toList());
List<SuperAggregateOutput> outputs = multithreadingTask(beginTime, endTime, ids, queryVO.getStatisticsType());
- Map<Long, List<SuperAggregateOutput>> workstationOutMap = (Map) outputs.parallelStream().collect(Collectors.groupingBy((v0) -> {
+ Map<Long, List<SuperAggregateOutput>> workstationOutMap = outputs.parallelStream().collect(Collectors.groupingBy((v0) -> {
return v0.getWorkstationId();
}));
resultCount(workstationOutMap, anEnum, voMap);
@@ -203,7 +206,7 @@
workstationIds.forEach(id -> {
callables.add(() -> {
if (!childOutputTables.contains("aggregate_output_" + id)) {
- return new ArrayList();
+ return new ArrayList<>();
}
List<SuperAggregateOutput> output = this.aggregateOutputMapper.getOutputByDateCycleAndWorkstationId(beginTime, endTime, id, statisticsType);
return FilterOffUtils.filterOffDay(output, OpenTypeEnums.OUT_PUT);
--
Gitblit v1.9.3