From 572466e8ebaa67f1809a97ecf912d30e8802fd98 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 28 四月 2025 14:18:39 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcLargeScreenServiceImpl.java | 27 +++++++++++----------------
1 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcLargeScreenServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcLargeScreenServiceImpl.java
index 175df00..0930b96 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcLargeScreenServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcLargeScreenServiceImpl.java
@@ -65,7 +65,7 @@
equipmentStatusOverview.setWaitCount(equipmentStatusOverview.getWaitCount() + 1);
break;
case 3:
- equipmentStatusOverview.setRunCount(equipmentStatusOverview.getRunCount());
+ equipmentStatusOverview.setRunCount(equipmentStatusOverview.getRunCount() + 1);
break;
case 22:
equipmentStatusOverview.setErrorCount(equipmentStatusOverview.getErrorCount() + 1);
@@ -141,9 +141,7 @@
Map<String, Object> result = new HashMap<>();
// 鑾峰彇瀛愮敓浜у垪琛�
- List<MdcProduction> mdcProductionList = mdcProductionService.list(
- new LambdaQueryWrapper<MdcProduction>().eq(MdcProduction::getParentId, productionId)
- );
+ List<MdcProduction> mdcProductionList = mdcProductionService.list(new LambdaQueryWrapper<MdcProduction>().eq(MdcProduction::getParentId, productionId));
if (mdcProductionList == null || mdcProductionList.isEmpty()) {
return result;
@@ -152,8 +150,7 @@
List<String> dateList = DateUtils.getNearWeek();
result.put("dateList", dateList);
// 璁＄畻姣忎釜宸ユ鐨勫埄鐢ㄧ巼
- List<UtilizationRateDto> utilizationMonthDtoList = new ArrayList<>();
- for (MdcProduction mdcProduction : mdcProductionList) {
+ List<UtilizationRateDto> utilizationMonthDtoList = mdcProductionList.stream().map(mdcProduction -> {
UtilizationRateDto utilizationRateDto = new UtilizationRateDto();
utilizationRateDto.setProductionId(mdcProduction.getId());
utilizationRateDto.setProductionName(mdcProduction.getProductionName());
@@ -161,14 +158,13 @@
.map(date -> {
UtilizationRate utilizationMonth = new UtilizationRate();
utilizationMonth.setDate(date);
- BigDecimal utilizationRate = mdcEquipmentStatisticalInfoService.computeUtilizationWeek(productionId, date.replaceAll("-", ""));
+ BigDecimal utilizationRate = mdcEquipmentStatisticalInfoService.computeUtilizationWeek(mdcProduction.getId(), date.replaceAll("-", ""));
utilizationMonth.setUtilizationRate(utilizationRate);
return utilizationMonth;
- })
- .collect(Collectors.toList());
+ }).collect(Collectors.toList());
utilizationRateDto.setUtilizationRateList(utilizationRates);
- utilizationMonthDtoList.add(utilizationRateDto);
- }
+ return utilizationRateDto;
+ }).collect(Collectors.toList());
//璁＄畻鎬诲巶鐨勫埄鐢ㄧ巼
UtilizationRateDto utilizationRateDto = new UtilizationRateDto();
utilizationRateDto.setProductionName("鎬诲巶");
@@ -208,14 +204,13 @@
result.put("productionList", productionList);
String date = LocalDate.now().minusDays(1).toString().replaceAll("-", "");
- List<UtilizationDayDto> utilizationDayDtos = new ArrayList<>();
- for (MdcProduction mdcProduction : mdcProductionList) {
+ List<UtilizationDayDto> utilizationDayDtos = mdcProductionList.stream().map(mdcProduction -> {
UtilizationDayDto utilizationDayDto = new UtilizationDayDto();
utilizationDayDto.setProductionName(mdcProduction.getProductionName());
- BigDecimal utilizationRate = mdcEquipmentStatisticalInfoService.computeUtilizationWeekTotal(mdcProduction.getId(), date);
+ BigDecimal utilizationRate = mdcEquipmentStatisticalInfoService.computeUtilizationWeek(mdcProduction.getId(), date);
utilizationDayDto.setUtilizationRate(utilizationRate);
- utilizationDayDtos.add(utilizationDayDto);
- }
+ return utilizationDayDto;
+ }).collect(Collectors.toList());
result.put("dataList", utilizationDayDtos);
return result;
}
--
Gitblit v1.9.3