From 943d055689b2df81fa5c60bed5f40dae6135f713 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 31 三月 2025 10:28:01 +0800
Subject: [PATCH] 中心综合利用率趋势接口
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 103 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
index 0d7ebe1..8733675 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
@@ -17,6 +17,7 @@
import org.jeecg.modules.system.service.IMdcProductionService;
import org.jeecg.modules.system.service.ISysDepartService;
import org.jeecg.modules.system.service.ISysDictService;
+import org.jeecg.modules.system.vo.MdcProOptionsVo;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -1749,7 +1750,7 @@
* @return
*/
@Override
- public Map<String, Object> equipmentEfficiencyAnalyze(EquEffVo equEffVo) {
+ public Map<String, Object> equipmentEfficiencyAnalyze(String userId, EquEffVo equEffVo) {
Map<String, Object> result = new HashMap<>();
List<String> mdcProductionIds = new ArrayList<>();
if (StringUtils.isBlank(equEffVo.getProductionIds())) {
@@ -1758,6 +1759,8 @@
mdcProductionIds.addAll(Arrays.asList(equEffVo.getProductionIds().split(",")));
}
List<String> allProductionIds = mdcProductionService.findChildren(mdcProductionIds);
+ //鏁版嵁鏉冮檺杩囨护
+ allProductionIds = mdcProductionService.findProIdsByUId(userId, allProductionIds);
List<MdcEquipment> equipmentList = mdcEquipmentService.findByProductionIds(allProductionIds);
if (equipmentList != null && !equipmentList.isEmpty()) {
List<String> equipmentIdList = equipmentList.stream().map(MdcEquipment::getEquipmentId).collect(Collectors.toList());
@@ -1770,7 +1773,7 @@
}
@Override
- public Map<String, Object> teamEquipmentEfficiencyAnalyze(EquEffVo equEffVo) {
+ public Map<String, Object> teamEquipmentEfficiencyAnalyze(String userId, EquEffVo equEffVo) {
Map<String, Object> result = new HashMap<>();
// 1. 澶勭悊鐢熶骇ID
List<String> mdcProductionIds = StringUtils.isBlank(equEffVo.getProductionIds())
@@ -1781,7 +1784,8 @@
if (allProductionIds.isEmpty()) {
return result; // 鎻愬墠杩斿洖绌虹粨鏋�
}
-
+ //鏁版嵁鏉冮檺杩囨护
+ allProductionIds = mdcProductionService.findProIdsByUId(userId, allProductionIds);
// 2. 鑾峰彇璁惧鍒楄〃
List<MdcEquipment> equipmentList = StringUtils.isNotBlank(equEffVo.getTeamCodes())
? mdcEquipmentService.findByProIdsAndTeamCode(allProductionIds, Arrays.asList(equEffVo.getTeamCodes().split(",")))
@@ -1831,6 +1835,102 @@
}
+ @Override
+ public Map<String, Object> teamEfficiencyAnalyzeByMonth(String userId, EquEffVo equEffVo) {
+ Map<String, Object> result = new HashMap<>();
+
+ // 1. 鏃ユ湡澶勭悊
+ LocalDate now = LocalDate.now();
+ Date start = DateUtils.toDate(now.plusMonths(-6).toString(), DateUtils.STR_DATE);
+ Date end = DateUtils.toDate(now.plusMonths(-1).toString(), DateUtils.STR_DATE);
+
+ List<String> monthBetween = DateUtils.getMonthBetween(start, end);
+ List<String> dateList = monthBetween.stream()
+ .map(date -> date.substring(date.lastIndexOf("-") + 1).replaceFirst("^0*", "") + "鏈�")
+ .collect(Collectors.toList());
+ result.put("dateList", dateList);
+
+ // 2. 鑾峰彇浜х嚎鏁版嵁
+ List<MdcProduction> mdcProductions = mdcProductionService.findMdcPros(userId, equEffVo.getProductionId());
+
+ // 3. 鍒濆鍖栫粨鏋滈泦
+ List<TeamEquEffMonthDto> utilizationRateList = new ArrayList<>();
+ List<TeamEquEffMonthDto> shiftUtilizationRateList = new ArrayList<>();
+ List<TeamEquEffMonthDto> amendUtilizationRateList = new ArrayList<>();
+
+ // 4. 澶勭悊姣忎釜浜х嚎
+ mdcProductions.forEach(mdcProduction -> {
+ // 4.1 鑾峰彇涓嬬骇浜х嚎骞惰繃婊�
+ List<String> allProductionIds = mdcProductionService.recursionChildren(mdcProduction.getId());
+ // 鏁版嵁鏉冮檺杩囨护
+ allProductionIds = mdcProductionService.findProIdsByUId(userId, allProductionIds);
+ // 4.2 鑾峰彇璁惧鍒楄〃
+ List<MdcEquipment> equipmentList = mdcEquipmentService.findByProductionIds(allProductionIds);
+ if (equipmentList == null || equipmentList.isEmpty()) {
+ return;
+ }
+ //鎻愬彇id闆嗗悎
+ List<String> equipmentIdList = equipmentList.stream()
+ .map(MdcEquipment::getEquipmentId)
+ .collect(Collectors.toList());
+
+ TeamEquEffMonthDto urDto = new TeamEquEffMonthDto();
+ TeamEquEffMonthDto surDto = new TeamEquEffMonthDto();
+ TeamEquEffMonthDto aurDto = new TeamEquEffMonthDto();
+ urDto.setProductionName(mdcProduction.getProductionName());
+ surDto.setProductionName(mdcProduction.getProductionName());
+ aurDto.setProductionName(mdcProduction.getProductionName());
+ List<TeamEquEffMonthChildDto> urDataList = new ArrayList<>();
+ List<TeamEquEffMonthChildDto> surDataList = new ArrayList<>();
+ List<TeamEquEffMonthChildDto> aurDataList = new ArrayList<>();
+
+ monthBetween.forEach(date -> {
+ TeamEquEffMonthChildDto urCDto = new TeamEquEffMonthChildDto();
+ TeamEquEffMonthChildDto surCDto = new TeamEquEffMonthChildDto();
+ TeamEquEffMonthChildDto aurCDto = new TeamEquEffMonthChildDto();
+ String month = date.substring(date.lastIndexOf("-") + 1).replaceFirst("^0*", "") + "鏈�";
+ urCDto.setMonth(month);
+ surCDto.setMonth(month);
+ aurCDto.setMonth(month);
+ List<TeamEquEffDto> dataList = mdcEfficiencyReportMapper.teamEquipmentEfficiencyAnalyze(equipmentIdList, date.replaceAll("-", ""));
+ if (dataList != null && !dataList.isEmpty()) {
+ // 璁＄畻骞冲潎鍊�
+ BigDecimal ur = dataList.stream()
+ .map(TeamEquEffDto::getUtilizationRate)
+ .reduce(BigDecimal.ZERO, BigDecimal::add)
+ .divide(BigDecimal.valueOf(dataList.size()), 2, RoundingMode.HALF_UP);
+ //鍒╃敤鐜�
+ urCDto.setUtilizationRate(ur);
+ //鐝鍒╃敤鐜�
+ BigDecimal sur = dataList.stream()
+ .map(TeamEquEffDto::getShiftUtilizationRate)
+ .reduce(BigDecimal.ZERO, BigDecimal::add)
+ .divide(BigDecimal.valueOf(dataList.size()), 2, RoundingMode.HALF_UP);
+ surCDto.setUtilizationRate(sur);
+ //鍘婚櫎鏁呴殰24灏忔椂鍒╃敤鐜�
+ BigDecimal aur = dataList.stream()
+ .map(TeamEquEffDto::getAmendUtilizationRate)
+ .reduce(BigDecimal.ZERO, BigDecimal::add)
+ .divide(BigDecimal.valueOf(dataList.size()), 2, RoundingMode.HALF_UP);
+ aurCDto.setUtilizationRate(aur);
+ }
+ urDataList.add(urCDto);
+ surDataList.add(surCDto);
+ aurDataList.add(aurCDto);
+ });
+ urDto.setDataList(urDataList);
+ surDto.setDataList(surDataList);
+ aurDto.setDataList(aurDataList);
+ utilizationRateList.add(urDto);
+ shiftUtilizationRateList.add(surDto);
+ amendUtilizationRateList.add(aurDto);
+ });
+ result.put("utilizationRateList", utilizationRateList);
+ result.put("shiftUtilizationRateList", shiftUtilizationRateList);
+ result.put("amendUtilizationRateList", amendUtilizationRateList);
+ return result;
+ }
+
// 鎻愬彇鐨勫钩鍧囧�艰绠楁柟娉�
private TeamEquEffDto calculateAverages(List<TeamEquEffDto> items) {
BigDecimal size = new BigDecimal(items.size());
--
Gitblit v1.9.3