From 876e8a1c9e6e950d51e42f265ad3027869d4f908 Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期二, 22 七月 2025 18:26:06 +0800
Subject: [PATCH] 修改点检结果为异常，异常是否报修为否的情况下生成故障数据的逻辑；设备附件列表新增描述信息丢失
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java | 173 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 168 insertions(+), 5 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 8733675..dc82510 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
@@ -196,6 +196,12 @@
mdcEfficiencyResultDto.setWaitLong(mdcEfficiencyResultDto.getWaitLong().divide(new BigDecimal(dates.size()), 0, RoundingMode.HALF_UP));
mdcEfficiencyResultDto1.setCloseLong(mdcEfficiencyResultDto.getCloseLong());
mdcEfficiencyResultDto.setCloseLong(mdcEfficiencyResultDto.getCloseLong().divide(new BigDecimal(dates.size()), 0, RoundingMode.HALF_UP));
+ mdcEfficiencyResultDto1.setFaultLong(mdcEfficiencyResultDto.getFaultLong());
+ mdcEfficiencyResultDto.setFaultLong(mdcEfficiencyResultDto.getFaultLong().divide(new BigDecimal(dates.size()), 0, RoundingMode.HALF_UP));
+ mdcEfficiencyResultDto1.setFaultRate(mdcEfficiencyResultDto.getFaultRate());
+ mdcEfficiencyResultDto.setFaultRate(mdcEfficiencyResultDto.getFaultRate().divide(new BigDecimal(dates.size()), 4, RoundingMode.HALF_UP));
+ mdcEfficiencyResultDto1.setRemoveFaultRunLong(mdcEfficiencyResultDto.getRemoveFaultRunLong());
+ mdcEfficiencyResultDto.setRemoveFaultRunLong(mdcEfficiencyResultDto.getRemoveFaultRunLong().divide(new BigDecimal(dates.size()), 0, RoundingMode.HALF_UP));
long rate = mdcEfficiencyResultDto.getUtilizationRate().multiply(new BigDecimal("100")).longValue();
for (MdcUtilizationRate mdcUtilizationRate : mdcUtilizationRateList) {
if (rate >= mdcUtilizationRate.getMinimumRange() && rate < mdcUtilizationRate.getMaximumRange()) {
@@ -284,6 +290,12 @@
mdcEfficiencyResultDto.setWaitLong(mdcEfficiencyResultDto.getWaitLong().divide(new BigDecimal(dates.size()), 0, RoundingMode.HALF_UP));
mdcEfficiencyResultDto1.setCloseLong(mdcEfficiencyResultDto.getCloseLong());
mdcEfficiencyResultDto.setCloseLong(mdcEfficiencyResultDto.getCloseLong().divide(new BigDecimal(dates.size()), 0, RoundingMode.HALF_UP));
+ mdcEfficiencyResultDto1.setFaultLong(mdcEfficiencyResultDto.getFaultLong());
+ mdcEfficiencyResultDto.setFaultLong(mdcEfficiencyResultDto.getFaultLong().divide(new BigDecimal(dates.size()), 0, RoundingMode.HALF_UP));
+ mdcEfficiencyResultDto1.setFaultRate(mdcEfficiencyResultDto.getFaultRate());
+ mdcEfficiencyResultDto.setFaultRate(mdcEfficiencyResultDto.getFaultRate().divide(new BigDecimal(dates.size()), 4, RoundingMode.HALF_UP));
+ mdcEfficiencyResultDto1.setRemoveFaultRunLong(mdcEfficiencyResultDto.getRemoveFaultRunLong());
+ mdcEfficiencyResultDto.setRemoveFaultRunLong(mdcEfficiencyResultDto.getRemoveFaultRunLong().divide(new BigDecimal(dates.size()), 0, RoundingMode.HALF_UP));
long rate = mdcEfficiencyResultDto.getUtilizationRate().multiply(new BigDecimal("100")).longValue();
for (MdcUtilizationRate mdcUtilizationRate : mdcUtilizationRateList) {
if (rate >= mdcUtilizationRate.getMinimumRange() && rate < mdcUtilizationRate.getMaximumRange()) {
@@ -349,7 +361,10 @@
a.getOpenRate().add(b.getOpenRate()),
a.getOpenLong().add(b.getOpenLong()),
a.getWaitLong().add(b.getWaitLong()),
- a.getCloseLong().add(b.getCloseLong()))).ifPresent(result::add);
+ a.getCloseLong().add(b.getCloseLong()),
+ a.getFaultLong().add(b.getFaultLong()),
+ a.getFaultRate().add(b.getFaultRate()),
+ a.getRemoveFaultRunLong().add(b.getRemoveFaultRunLong()))).ifPresent(result::add);
});
for (MdcEfficiencyResultDto mdcEfficiencyResultDto : result) {
mdcEfficiencyResultDto.setUtilizationRate(mdcEfficiencyResultDto.getUtilizationRate().divide(new BigDecimal(mdcEfficiencyList.size()), 4, RoundingMode.HALF_UP));
@@ -392,7 +407,10 @@
a.getOpenRate().add(b.getOpenRate()),
a.getOpenLong().add(b.getOpenLong()),
a.getWaitLong().add(b.getWaitLong()),
- a.getCloseLong().add(b.getCloseLong()))).ifPresent(result::add);
+ a.getCloseLong().add(b.getCloseLong()),
+ a.getFaultLong().add(b.getFaultLong()),
+ a.getFaultRate().add(b.getFaultRate()),
+ a.getRemoveFaultRunLong().add(b.getRemoveFaultRunLong()))).ifPresent(result::add);
});
for (MdcEfficiencyResultDto mdcEfficiencyResultDto : result) {
mdcEfficiencyResultDto.setUtilizationRate(mdcEfficiencyResultDto.getUtilizationRate().divide(new BigDecimal(mdcEfficiencyList.size()), 4, RoundingMode.HALF_UP));
@@ -696,7 +714,10 @@
a.getOpenRate().add(b.getOpenRate()),
a.getOpenLong().add(b.getOpenLong()),
a.getWaitLong().add(b.getWaitLong()),
- a.getCloseLong().add(b.getCloseLong()))).ifPresent(result::add);
+ a.getCloseLong().add(b.getCloseLong()),
+ a.getFaultLong().add(b.getFaultLong()),
+ a.getFaultRate().add(b.getFaultRate()),
+ a.getRemoveFaultRunLong().add(b.getRemoveFaultRunLong()))).ifPresent(result::add);
});
for (MdcEfficiencyResultDto mdcEfficiencyResultDto : result) {
mdcEfficiencyResultDto.setUtilizationRate(mdcEfficiencyResultDto.getUtilizationRate().divide(new BigDecimal(mdcEfficiencyList.size()), 4, RoundingMode.HALF_UP));
@@ -706,6 +727,9 @@
mdcEfficiencyResultDto.setWaitLong(mdcEfficiencyResultDto.getWaitLong().divide(new BigDecimal(mdcEfficiencyList.size()), 0, RoundingMode.HALF_UP));
mdcEfficiencyResultDto.setOpenLong(mdcEfficiencyResultDto.getOpenLong().divide(new BigDecimal(mdcEfficiencyList.size()), 0, RoundingMode.HALF_UP));
mdcEfficiencyResultDto.setProcessLong(mdcEfficiencyResultDto.getProcessLong().divide(new BigDecimal(mdcEfficiencyList.size()), 0, RoundingMode.HALF_UP));
+ mdcEfficiencyResultDto.setFaultLong(mdcEfficiencyResultDto.getFaultLong().divide(new BigDecimal(mdcEfficiencyList.size()), 0, RoundingMode.HALF_UP));
+ mdcEfficiencyResultDto.setFaultRate(mdcEfficiencyResultDto.getFaultRate().divide(new BigDecimal(mdcEfficiencyList.size()), 4, RoundingMode.HALF_UP));
+ mdcEfficiencyResultDto.setRemoveFaultRunLong(mdcEfficiencyResultDto.getRemoveFaultRunLong().divide(new BigDecimal(mdcEfficiencyList.size()), 0, RoundingMode.HALF_UP));
long rate = mdcEfficiencyResultDto.getStartRate().multiply(new BigDecimal("100")).longValue();
for (MdcUtilizationRate mdcUtilizationRate : mdcUtilizationRateList) {
if (rate >= mdcUtilizationRate.getMinimumRange() && rate < mdcUtilizationRate.getMaximumRange()) {
@@ -740,12 +764,16 @@
a.getOpenRate().add(b.getOpenRate()),
a.getOpenLong().add(b.getOpenLong()),
a.getWaitLong().add(b.getWaitLong()),
- a.getCloseLong().add(b.getCloseLong()))).ifPresent(result::add);
+ a.getCloseLong().add(b.getCloseLong()),
+ a.getFaultLong().add(b.getFaultLong()),
+ a.getFaultRate().add(b.getFaultRate()),
+ a.getRemoveFaultRunLong().add(b.getRemoveFaultRunLong()))).ifPresent(result::add);
});
for (MdcEfficiencyResultDto mdcEfficiencyResultDto : result) {
mdcEfficiencyResultDto.setUtilizationRate(mdcEfficiencyResultDto.getUtilizationRate().divide(new BigDecimal(mdcEfficiencyList.size()), 4, RoundingMode.HALF_UP));
mdcEfficiencyResultDto.setOpenRate(mdcEfficiencyResultDto.getOpenRate().divide(new BigDecimal(mdcEfficiencyList.size()), 4, RoundingMode.HALF_UP));
mdcEfficiencyResultDto.setStartRate(mdcEfficiencyResultDto.getStartRate().divide(new BigDecimal(mdcEfficiencyList.size()), 4, RoundingMode.HALF_UP));
+ mdcEfficiencyResultDto.setFaultRate(mdcEfficiencyResultDto.getFaultRate().divide(new BigDecimal(mdcEfficiencyList.size()), 4, RoundingMode.HALF_UP));
long rate = mdcEfficiencyResultDto.getStartRate().multiply(new BigDecimal("100")).longValue();
for (MdcUtilizationRate mdcUtilizationRate : mdcUtilizationRateList) {
if (rate >= mdcUtilizationRate.getMinimumRange() && rate < mdcUtilizationRate.getMaximumRange()) {
@@ -1766,7 +1794,7 @@
List<String> equipmentIdList = equipmentList.stream().map(MdcEquipment::getEquipmentId).collect(Collectors.toList());
List<EquipmentEfficiencyAnalyzeDto> dataList = mdcEfficiencyReportMapper.equipmentEfficiencyAnalyze(equipmentIdList, equEffVo.getMonth());
result.put("dataList", dataList);
- List<String> equipmentNameList = dataList.stream().map(EquipmentEfficiencyAnalyzeDto::getEquipmentName).collect(Collectors.toList());
+ List<String> equipmentNameList = dataList.stream().map(EquipmentEfficiencyAnalyzeDto::getEquipmentId).collect(Collectors.toList());
result.put("equipmentNameList", equipmentNameList);
}
return result;
@@ -1931,6 +1959,129 @@
return result;
}
+ @Override
+ public Map<String, Object> comprehensiveRateAnalyze(String userId, EquEffVo vo) {
+ Map<String, Object> result = new HashMap<>();
+ // 1. 鏃ユ湡澶勭悊
+ LocalDate now = LocalDate.now();
+ Date start = DateUtils.toDate(now.plusMonths(-12).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);
+
+ // 1. 澶勭悊鐢熶骇ID
+ List<String> mdcProductionIds = StringUtils.isBlank(vo.getProductionIds())
+ ? Collections.singletonList(vo.getProductionId())
+ : Arrays.asList(vo.getProductionIds().split(","));
+
+ List<String> allProductionIds = mdcProductionService.findChildren(mdcProductionIds);
+ if (allProductionIds.isEmpty()) {
+ return result; // 鎻愬墠杩斿洖绌虹粨鏋�
+ }
+ //鏁版嵁鏉冮檺杩囨护
+ allProductionIds = mdcProductionService.findProIdsByUId(userId, allProductionIds);
+ // 2. 鑾峰彇璁惧鍒楄〃
+ List<MdcEquipment> equipmentList = StringUtils.isNotBlank(vo.getEquipmentType())
+ ? mdcEquipmentService.findByProIdsAndType(allProductionIds, Arrays.asList(vo.getEquipmentType().split(",")))
+ : mdcEquipmentService.findByProductionIds(allProductionIds);
+
+ if (equipmentList.isEmpty()) {
+ return result;
+ }
+
+ // 3. 鏁版嵁澶勭悊
+ List<String> equipmentIdList = equipmentList.stream()
+ .map(MdcEquipment::getEquipmentId)
+ .collect(Collectors.toList());
+ String startStr = monthBetween.get(0).replaceAll("-", "");
+ String endStr = monthBetween.get(monthBetween.size() - 1).replaceAll("-", "");
+ List<ComRateDto> comRateDtoList = mdcEfficiencyReportMapper.comprehensiveRateAnalyze(equipmentIdList, startStr, endStr);
+ if (comRateDtoList.isEmpty()) {
+ return result; // 鎻愬墠杩斿洖绌虹粨鏋�
+ }
+ List<ComRateDto> dataList = new ArrayList<>();
+ Map<String, ComRateDto> map = comRateDtoList.stream().collect(Collectors.toMap(ComRateDto::getTheMonth, comRateDto -> comRateDto));
+ monthBetween.forEach(date -> {
+ String d = date.replaceAll("-", "");
+ String month = date.substring(date.lastIndexOf("-") + 1).replaceFirst("^0*", "") + "鏈�";
+ if (map.containsKey(d)) {
+ ComRateDto comRateDto = map.get(d);
+ comRateDto.setTheMonth(month);
+ comRateDto.setUtilizationRate(comRateDto.getUtilizationRate().setScale(2, RoundingMode.HALF_UP));
+ comRateDto.setShiftUtilizationRate(comRateDto.getShiftUtilizationRate() != null ? comRateDto.getShiftUtilizationRate().setScale(2, RoundingMode.HALF_UP) : BigDecimal.ZERO);
+ comRateDto.setAmendUtilizationRate(comRateDto.getAmendUtilizationRate().setScale(2, RoundingMode.HALF_UP));
+ comRateDto.setProcessLong(comRateDto.getProcessLong().divide(new BigDecimal("3600"), 2, RoundingMode.HALF_UP));
+ dataList.add(comRateDto);
+ } else {
+ ComRateDto comRateDto = new ComRateDto();
+ comRateDto.setTheMonth(month);
+ dataList.add(comRateDto);
+ }
+ });
+ result.put("dataList", dataList);
+
+ if (StringUtils.isNotBlank(vo.getShiftId())) {
+ List<MdcShiftSub> shiftSubList = mdcShiftSubService.list(new LambdaQueryWrapper<MdcShiftSub>().eq(MdcShiftSub::getShiftId, vo.getShiftId()));
+ if (shiftSubList == null || shiftSubList.isEmpty()) {
+ return result;
+ }
+ List<String> shiftSubNameList = shiftSubList.stream().map(MdcShiftSub::getShiftSubName).collect(Collectors.toList());
+ result.put("shiftSubList", shiftSubNameList);
+
+ List<ComShiftRateDto> comShiftRateDtoList = mdcEfficiencyReportMapper.comprehensiveShiftRateAnalyze(equipmentIdList, startStr, endStr, vo.getShiftId());
+ Map<String, List<ComShiftRateDto>> groupMap;
+ if (comShiftRateDtoList != null && !comShiftRateDtoList.isEmpty()) {
+ groupMap = comShiftRateDtoList.stream().collect(Collectors.groupingBy(ComShiftRateDto::getShiftSub));
+ } else {
+ groupMap = new HashMap<>();
+ }
+ List<ComShiftDto> shiftDataList = new ArrayList<>();
+ shiftSubList.forEach(mdcShiftSub -> {
+ ComShiftDto comShiftDto = new ComShiftDto();
+ comShiftDto.setShiftSubName(mdcShiftSub.getShiftSubName());
+ if (groupMap.containsKey(mdcShiftSub.getId())) {
+ List<ComShiftRateDto> csrd = groupMap.get(mdcShiftSub.getId());
+ Map<String, ComShiftRateDto> collect = csrd.stream().collect(Collectors.toMap(ComShiftRateDto::getTheMonth, comShiftRateDto -> comShiftRateDto));
+ List<ComShiftChildDto> comShiftChildDtoList = new ArrayList<>();
+ monthBetween.forEach(date -> {
+ String d = date.replaceAll("-", "");
+ String month = date.substring(date.lastIndexOf("-") + 1).replaceFirst("^0*", "") + "鏈�";
+ if (collect.containsKey(d)) {
+ ComShiftRateDto comShiftRateDto = collect.get(d);
+ ComShiftChildDto comShiftChildDto = new ComShiftChildDto();
+ comShiftChildDto.setMonth(month);
+ comShiftChildDto.setUtilizationRate(comShiftRateDto.getUtilizationRate().setScale(2, RoundingMode.HALF_UP));
+ comShiftChildDtoList.add(comShiftChildDto);
+ } else {
+ ComShiftChildDto comShiftChildDto = new ComShiftChildDto();
+ comShiftChildDto.setMonth(month);
+ comShiftChildDtoList.add(comShiftChildDto);
+ }
+ });
+ comShiftDto.setDataList(comShiftChildDtoList);
+ } else {
+ List<ComShiftChildDto> comShiftChildDtoList = new ArrayList<>();
+ monthBetween.forEach(date -> {
+ String month = date.substring(date.lastIndexOf("-") + 1).replaceFirst("^0*", "") + "鏈�";
+ ComShiftChildDto comShiftChildDto = new ComShiftChildDto();
+ comShiftChildDto.setMonth(month);
+ comShiftChildDtoList.add(comShiftChildDto);
+ });
+ comShiftDto.setDataList(comShiftChildDtoList);
+ }
+ shiftDataList.add(comShiftDto);
+ });
+
+ result.put("shiftDataList", shiftDataList);
+ }
+
+ return result;
+ }
+
// 鎻愬彇鐨勫钩鍧囧�艰绠楁柟娉�
private TeamEquEffDto calculateAverages(List<TeamEquEffDto> items) {
BigDecimal size = new BigDecimal(items.size());
@@ -2023,6 +2174,9 @@
mdcEfficiencyResultDto.setOpenLong(efficiencyDto.getOpenLong());
mdcEfficiencyResultDto.setWaitLong(efficiencyDto.getWaitLong());
mdcEfficiencyResultDto.setCloseLong(efficiencyDto.getCloseLong());
+ mdcEfficiencyResultDto.setFaultLong(efficiencyDto.getFaultLong());
+ mdcEfficiencyResultDto.setFaultRate(efficiencyDto.getFaultRate());
+ mdcEfficiencyResultDto.setRemoveFaultRunLong(efficiencyDto.getRemoveFaultRunLong());
long rate = efficiencyDto.getUtilizationRate().multiply(new BigDecimal("100")).longValue();
for (MdcUtilizationRate mdcUtilizationRate : mdcUtilizationRateList) {
if (rate >= mdcUtilizationRate.getMinimumRange() && rate < mdcUtilizationRate.getMaximumRange()) {
@@ -2040,6 +2194,9 @@
mdcEfficiencyResultDto.setOpenLong(new BigDecimal("0"));
mdcEfficiencyResultDto.setWaitLong(new BigDecimal("0"));
mdcEfficiencyResultDto.setCloseLong(new BigDecimal("0"));
+ mdcEfficiencyResultDto.setFaultLong(new BigDecimal("0"));
+ mdcEfficiencyResultDto.setFaultRate(new BigDecimal("0"));
+ mdcEfficiencyResultDto.setRemoveFaultRunLong(new BigDecimal("0"));
for (MdcUtilizationRate mdcUtilizationRate : mdcUtilizationRateList) {
if (0 >= mdcUtilizationRate.getMinimumRange() && 0 < mdcUtilizationRate.getMaximumRange()) {
mdcEfficiencyResultDto.setColor(mdcUtilizationRate.getRateParameterColor());
@@ -2055,6 +2212,9 @@
mdcEfficiencyResultDto.setOpenLong(new BigDecimal("0"));
mdcEfficiencyResultDto.setWaitLong(new BigDecimal("0"));
mdcEfficiencyResultDto.setCloseLong(new BigDecimal("0"));
+ mdcEfficiencyResultDto.setFaultLong(new BigDecimal("0"));
+ mdcEfficiencyResultDto.setFaultRate(new BigDecimal("0"));
+ mdcEfficiencyResultDto.setRemoveFaultRunLong(new BigDecimal("0"));
for (MdcUtilizationRate mdcUtilizationRate : mdcUtilizationRateList) {
if (0 >= mdcUtilizationRate.getMinimumRange() && 0 < mdcUtilizationRate.getMaximumRange()) {
mdcEfficiencyResultDto.setColor(mdcUtilizationRate.getRateParameterColor());
@@ -2068,6 +2228,9 @@
efficiencyResultDto.setOpenLong(efficiencyResultDto.getOpenLong().add(mdcEfficiencyResultDto.getOpenLong()));
efficiencyResultDto.setWaitLong(efficiencyResultDto.getWaitLong().add(mdcEfficiencyResultDto.getWaitLong()));
efficiencyResultDto.setCloseLong(efficiencyResultDto.getCloseLong().add(mdcEfficiencyResultDto.getCloseLong()));
+ efficiencyResultDto.setFaultLong(efficiencyResultDto.getFaultLong().add(mdcEfficiencyResultDto.getFaultLong()));
+ efficiencyResultDto.setFaultRate(efficiencyResultDto.getFaultRate().add(mdcEfficiencyResultDto.getFaultRate()));
+ efficiencyResultDto.setRemoveFaultRunLong(efficiencyResultDto.getRemoveFaultRunLong().add(mdcEfficiencyResultDto.getRemoveFaultRunLong()));
return mdcEfficiencyResultDto;
}
--
Gitblit v1.9.3