From 48c8f6440a6c0b0c060467a0633bc669ca255345 Mon Sep 17 00:00:00 2001
From: PC <PC@PC1RHZ4L>
Date: 星期六, 30 三月 2024 16:12:41 +0800
Subject: [PATCH] wangzq commit!
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/report/service/impl/WorkstationAlarmServiceImpl.java | 10 +++++-----
smart-man-boot/src/main/java/com/qianwen/smartman/modules/perf/wrapper/PerfWrapper.java | 16 ++++------------
2 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/perf/wrapper/PerfWrapper.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/perf/wrapper/PerfWrapper.java
index c03cad8..e26eba3 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/perf/wrapper/PerfWrapper.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/perf/wrapper/PerfWrapper.java
@@ -85,9 +85,7 @@
if (sum == 0) {
kv.putAll(stateRatio);
} else {
- stateRatio.forEach(k, v -> {
- kv.put(k, NumberUtil.decimalFormat(MdcConstant.RATE_FORMAT, v.longValue() / (sum * 1.0d)));
- });
+ stateRatio.forEach((k, v) -> kv.put(k, NumberUtil.decimalFormat(MdcConstant.RATE_FORMAT, v.longValue() / (sum * 1.0d))));
}
}
kv.put(OUTPUT_KEY, outputMap.getOrDefault(time2, 0L));
@@ -155,9 +153,7 @@
if (sum == 0) {
kv.putAll(stateRatio);
} else {
- stateRatio.forEach(k, v -> {
- kv.put(k, NumberUtil.decimalFormat(MdcConstant.RATE_FORMAT, v.longValue() / (sum * 1.0d)));
- });
+ stateRatio.forEach((k, v) ->kv.put(k, NumberUtil.decimalFormat(MdcConstant.RATE_FORMAT, v.longValue() / (sum * 1.0d))));
}
}
kv.put(OUTPUT_KEY, outputMap.getOrDefault(day, 0L));
@@ -205,9 +201,7 @@
if (sum == 0) {
kv.putAll(stateRatio);
} else {
- stateRatio.forEach(k, v -> {
- kv.put(k, NumberUtil.decimalFormat(MdcConstant.RATE_FORMAT, v.longValue() / (sum * 1.0d)));
- });
+ stateRatio.forEach((k, v) ->kv.put(k, NumberUtil.decimalFormat(MdcConstant.RATE_FORMAT, v.longValue() / (sum * 1.0d))));
}
}
kv.put(OUTPUT_KEY, outputMap.getOrDefault(wId, 0L));
@@ -255,9 +249,7 @@
if (sum == 0) {
kv.putAll(stateRatio);
} else {
- stateRatio.forEach(k, v -> {
- kv.put(k, NumberUtil.decimalFormat(MdcConstant.RATE_FORMAT, v.longValue() / (sum * 1.0d)));
- });
+ stateRatio.forEach((k, v) ->kv.put(k, NumberUtil.decimalFormat(MdcConstant.RATE_FORMAT, v.longValue() / (sum * 1.0d))));
}
}
kv.put(OUTPUT_KEY, outputMap.getOrDefault(eId, 0L));
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..f508327 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
@@ -107,13 +107,13 @@
Map<Long, List<WorkstaionAlarmByTimeReportVO>> workstationOutMap = (Map) reportData.parallelStream().collect(Collectors.groupingBy((v0) -> {
return v0.getWorkstationId();
}));
- workstationOutMap.forEach(workstationId, outputList -> {
+ workstationOutMap.forEach((workstationId, outputList) -> {
Map<String, Integer> countMap = (Map) 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);
@@ -239,12 +239,12 @@
Map<String, List<WorkstaionAlarmByShiftReportVO>> workstationOutMap = (Map) 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 = (Map) 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 -> {
+ workstationOutMap.forEach((key, vos) -> {
Map<String, Integer> countMap = (Map) vos.parallelStream().collect(Collectors.groupingBy(o2 -> {
return LocalDate.parse(String.valueOf(o2.getFactoryDate()), DateTimeFormatter.ofPattern("yyyyMMdd")).toString();
}, Collectors.reducing(0, e2 -> {
@@ -252,7 +252,7 @@
}, (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);
--
Gitblit v1.9.3