From 710df8489c740910bda9a557d9a7fdc6cf39df41 Mon Sep 17 00:00:00 2001
From: yangbin <yangbin@qq.com>
Date: 星期四, 20 二月 2025 11:32:55 +0800
Subject: [PATCH] 大屏看板1
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/subcontrol/service/impl/MdcBigScreenServiceImpl.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/subcontrol/service/impl/MdcBigScreenServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/subcontrol/service/impl/MdcBigScreenServiceImpl.java
index 376bd55..adefc97 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/subcontrol/service/impl/MdcBigScreenServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/subcontrol/service/impl/MdcBigScreenServiceImpl.java
@@ -1,6 +1,7 @@
package org.jeecg.modules.mdc.subcontrol.service.impl;
import org.apache.commons.lang.StringUtils;
+import org.checkerframework.checker.units.qual.A;
import org.jeecg.modules.mdc.entity.EquipmentLog;
import org.jeecg.modules.mdc.service.*;
import org.jeecg.modules.mdc.subcontrol.service.MdcBigScreenService;
@@ -34,6 +35,8 @@
private IEquipmentStatisticalInfoService equipmentStatisticalInfoService;
@Autowired
private IMdcEquipmentStatisticalShiftInfoService mdcEquipmentStatisticalShiftInfoService;
+ @Autowired
+ private IMdcEquipmentStatisticalInfoService mdcEquipmentStatisticalInfoService;
@Resource
@@ -50,9 +53,9 @@
List<BigDecimal> processingRateList = new ArrayList<>();
List<BigDecimal> shiftRateList = new ArrayList<>();
//鑾峰彇涓婂懆鍛ㄤ竴鏃ユ湡鍜屽懆鍏棩鏈�
- LocalDate today = LocalDate.now();
- LocalDate monday = today.minusDays(7);
- LocalDate saturday = today.minusDays(1);
+ LocalDate today = LocalDate.now().minusDays(7L);
+ LocalDate monday = today.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY));
+ LocalDate saturday = today.with(TemporalAdjusters.nextOrSame(DayOfWeek.SATURDAY));
List<String> dates = getMiddleDate(monday, saturday);
List<String> equipmentIdList = new ArrayList<>();
//鏍规嵁鍘傚尯id鑾峰彇鍘傚尯璁惧淇℃伅
@@ -126,11 +129,17 @@
List<LastWeekDataVo> lastWeekDataVos = equipmentStatisticalInfoService.findDataRankingForBigScreen(equipmentIdList, monday, saturday);
if (!lastWeekDataVos.isEmpty()) {
for (LastWeekDataVo lastWeekDataVo : lastWeekDataVos) {
- Long size = equipmentStatisticalInfoService.selectSize(lastWeekDataVo.getEquipment(), monday, saturday);
- lastWeekDataVo.setUtilization(new BigDecimal(String.format("%.2f", (Float.parseFloat(lastWeekDataVo.getProcessingLong()) / (86400 * size) * 100))));
+ Long size = mdcEquipmentStatisticalInfoService.selectSize(lastWeekDataVo.getEquipment(), monday, saturday);
+ if (StringUtils.isNotEmpty(lastWeekDataVo.getProcessingLong()) && Float.parseFloat(lastWeekDataVo.getProcessingLong()) >0) {
+ lastWeekDataVo.setUtilization(new BigDecimal(String.format("%.2f",
+ (Float.parseFloat(lastWeekDataVo.getProcessingLong()) / (86400 * size) * 100))));
+ } else {
+ lastWeekDataVo.setUtilization(new BigDecimal(0));
+ }
+
}
List<LastWeekDataVo> collect = lastWeekDataVos.stream().sorted(Comparator.comparing(LastWeekDataVo::getUtilization).reversed()).collect(Collectors.toList());
- if (collect.size() > 3) {
+ if (collect.size() > 6) {
List<LastWeekDataVo> topList = collect.subList(0, 6);
for (LastWeekDataVo vo : topList) {
LastWeekDataRankingVo rankingVo = new LastWeekDataRankingVo();
@@ -138,6 +147,13 @@
rankingVo.setTopRate(vo.getUtilization().toString());
voList.add(rankingVo);
}
+ } else {
+ for (LastWeekDataVo vo : collect) {
+ LastWeekDataRankingVo rankingVo = new LastWeekDataRankingVo();
+ rankingVo.setTopName(vo.getEquipment());
+ rankingVo.setTopRate(vo.getUtilization().toString());
+ voList.add(rankingVo);
+ }
}
}
--
Gitblit v1.9.3