From ef737224df6ecc0475b8c4806febffbe4f6b1e4e Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 11 四月 2024 16:40:16 +0800
Subject: [PATCH] 更新
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java | 127 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 127 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java
index 25b9414..5b19e55 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java
@@ -2,13 +2,17 @@
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import org.jeecg.modules.mdc.entity.EquipmentLog;
+import org.jeecg.modules.mdc.entity.MdcEquipmentStatisticalInfo;
+import org.jeecg.modules.mdc.entity.MdcOverallEquipmentEfficiency;
import org.jeecg.modules.mdc.mapper.MdcHomeMapper;
import org.jeecg.modules.mdc.service.IEquipmentLogService;
import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.jeecg.modules.mdc.service.IMdcHomeService;
import org.jeecg.modules.mdc.util.DateUtils;
+import org.jeecg.modules.mdc.vo.EquipmentDayUtilizationVo;
import org.jeecg.modules.mdc.vo.MdcCommonVo;
import org.jeecg.modules.mdc.vo.MdcEquipmentStatusVo;
+import org.jeecg.modules.mdc.vo.MdcHomeEfficiencyVo;
import org.jeecg.modules.system.entity.MdcProduction;
import org.springframework.stereotype.Service;
@@ -154,6 +158,7 @@
MdcCommonVo mdcCommonVo = new MdcCommonVo();
mdcCommonVo.setName(mdcProduction.getProductionName());
mdcCommonVo.setProductionCode(mdcProduction.getProductionCode());
+ mdcCommonVo.setProductionId(mdcProduction.getId());
//鑾峰彇姝ゅ眰绾т笅璁惧
List<String> equipmentIdList = mdcEquipmentService.getEquipmentIdsProduction(userId, mdcProduction.getId());
if (equipmentIdList == null || equipmentIdList.isEmpty()) {
@@ -229,4 +234,126 @@
result.put("oeeList", oeeList);
return result;
}
+
+ /**
+ * 宸ユ绾у墠涓冨ぉ鍒╃敤鐜囨姌绾垮浘
+ */
+ @Override
+ public Map<String, Object> getEquipmentDayUtilizationStatistics(String userId, String key) {
+ Map<String, Object> result = new HashMap<>();
+ List<String> equipmentIdList = mdcEquipmentService.getEquipmentIdsProduction(userId, key);
+ //鑾峰彇鍓嶄竷澶╂棩鏈熼泦鍚�
+ String start = DateUtils.format(DateUtils.toDate(LocalDate.now().plusDays(-7).toString(), DateUtils.STR_DATE), DateUtils.STRDATE);
+ String end = DateUtils.format(DateUtils.toDate(LocalDate.now().plusDays(-1).toString(), DateUtils.STR_DATE), DateUtils.STRDATE);
+ if (equipmentIdList != null && !equipmentIdList.isEmpty()) {
+ result.put("equipmentIdList", equipmentIdList);
+ List<MdcEquipmentStatisticalInfo> mdcEquipmentStatisticalInfoList = mdcHomeMapper.getEquipmentSevenUtilizationStatistics(equipmentIdList, start, end);
+ List<EquipmentDayUtilizationVo> dataList = new ArrayList<>();
+ if (mdcEquipmentStatisticalInfoList != null && !mdcEquipmentStatisticalInfoList.isEmpty()) {
+ for (MdcEquipmentStatisticalInfo mdcEquipmentStatisticalInfo : mdcEquipmentStatisticalInfoList) {
+ EquipmentDayUtilizationVo equipmentDayUtilizationVo = new EquipmentDayUtilizationVo();
+ equipmentDayUtilizationVo.setEquipmentId(mdcEquipmentStatisticalInfo.getEquipmentId());
+ equipmentDayUtilizationVo.setUtilizationRate(mdcEquipmentStatisticalInfo.getProcessLong().divide(new BigDecimal("864"), 4, RoundingMode.HALF_UP).divide(new BigDecimal(mdcEquipmentStatisticalInfoList.size()), 4, RoundingMode.HALF_UP).setScale(2, RoundingMode.HALF_UP));
+ if (BigDecimal.ZERO.compareTo(mdcEquipmentStatisticalInfo.getOpenLong()) == -1) {
+ equipmentDayUtilizationVo.setOpenRate(mdcEquipmentStatisticalInfo.getProcessLong().divide(mdcEquipmentStatisticalInfo.getOpenLong(), 4, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP));
+ equipmentDayUtilizationVo.setStartRate(mdcEquipmentStatisticalInfo.getOpenLong().divide(new BigDecimal("864"), 4, RoundingMode.HALF_UP).divide(new BigDecimal(mdcEquipmentStatisticalInfoList.size()), 4, RoundingMode.HALF_UP).setScale(2, RoundingMode.HALF_UP));
+ }
+ dataList.add(equipmentDayUtilizationVo);
+ }
+ }
+ result.put("dataList", dataList);
+ }
+ /*List<String> dayBetween = DateUtils.getDatesStringList2(start, end);
+ List<String> dateList = new ArrayList<>();
+ List<EquipmentDayUtilizationVo> dataList = new ArrayList<>();
+ for (String date : dayBetween) {
+ EquipmentDayUtilizationVo equipmentDayUtilizationVo = new EquipmentDayUtilizationVo();
+ String item = date.substring(4);
+ if (item.startsWith("0")) {
+ item = item.substring(1);
+ String sub = item.substring(1);
+ if (sub.startsWith("0")) {
+ item = item.substring(0, 1) + "鏈�" + sub.substring(1) + "鏃�";
+ } else {
+ item = item.substring(0, 1) + "鏈�" + item.substring(1) + "鏃�";
+ }
+ } else {
+ String sub = item.substring(2);
+ if (sub.startsWith("0")) {
+ item = item.substring(0, 2) + "鏈�" + sub.substring(2) + "鏃�";
+ } else {
+ item = item.substring(0, 2) + "鏈�" + item.substring(2) + "鏃�";
+ }
+ }
+ dateList.add(item);
+ equipmentDayUtilizationVo.setDate(item);
+ if (equipmentIdList != null && !equipmentIdList.isEmpty()) {
+ //鑾峰彇鍓嶄竷澶╁埄鐢ㄧ巼鏁版嵁
+ List<MdcEquipmentStatisticalInfo> mdcEquipmentStatisticalInfos = mdcHomeMapper.getEquipmentDayUtilizationStatistics(equipmentIdList, dayBetween);
+ if (mdcEquipmentStatisticalInfos != null && !mdcEquipmentStatisticalInfos.isEmpty()) {
+ for (MdcEquipmentStatisticalInfo mdcEquipmentStatisticalInfo : mdcEquipmentStatisticalInfos) {
+ if (mdcEquipmentStatisticalInfo.getTheDate().equals(date)) {
+ equipmentDayUtilizationVo.setUtilizationRate(mdcEquipmentStatisticalInfo.getProcessLong().divide(new BigDecimal("864"), 4, RoundingMode.HALF_UP).divide(new BigDecimal(equipmentIdList.size()), 4, RoundingMode.HALF_UP).setScale(2, RoundingMode.HALF_UP));
+ if (BigDecimal.ZERO.compareTo(mdcEquipmentStatisticalInfo.getOpenLong()) == -1) {
+ equipmentDayUtilizationVo.setOpenRate(mdcEquipmentStatisticalInfo.getProcessLong().divide(mdcEquipmentStatisticalInfo.getOpenLong(), 4, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP));
+ equipmentDayUtilizationVo.setStartRate(mdcEquipmentStatisticalInfo.getOpenLong().divide(new BigDecimal("864"), 4, RoundingMode.HALF_UP).divide(new BigDecimal(equipmentIdList.size()), 4, RoundingMode.HALF_UP).setScale(2, RoundingMode.HALF_UP));
+ }
+ }
+ }
+ } else {
+ dataList.add(equipmentDayUtilizationVo);
+ }
+ } else {
+ dataList.add(equipmentDayUtilizationVo);
+ }
+ }
+ result.put("dateList", dateList);
+ result.put("dataList", dataList);*/
+ return result;
+ }
+
+ /**
+ * 鏌ヨ璁惧涓婃湀OEE
+ */
+ @Override
+ public List<MdcOverallEquipmentEfficiency> getEquipmentOEEMonthStatistics(String userId, String key) {
+ List<MdcOverallEquipmentEfficiency> result = new ArrayList<>();
+ List<String> equipmentIdList = mdcEquipmentService.getEquipmentIdsProduction(userId, key);
+ if (equipmentIdList != null && !equipmentIdList.isEmpty()) {
+ String validDate = DateUtils.format(DateUtils.toDate(LocalDate.now().plusMonths(-1).toString(), DateUtils.STR_DATE), DateUtils.STR_YEAR_MONTH);
+ result = mdcHomeMapper.getEquipmentOEEMonthStatistics(validDate, equipmentIdList);
+ }
+ return result;
+ }
+
+ /**
+ * 宸ユ绾ц澶囨晥鐜�
+ */
+ @Override
+ public MdcHomeEfficiencyVo getEquipmentEfficiencyStatistics(String userId, String key) {
+ MdcHomeEfficiencyVo result = new MdcHomeEfficiencyVo();
+ result.setProductionId(key);
+ List<String> equipmentIdList = mdcEquipmentService.getEquipmentIdsProduction(userId, key);
+ if (equipmentIdList != null && !equipmentIdList.isEmpty()) {
+ // 鑾峰彇鍒╃敤鐜囨暟鎹�
+ String date = DateUtils.format(DateUtils.toDate(LocalDate.now().plusDays(-1).toString(), DateUtils.STR_DATE), DateUtils.STRDATE);
+ MdcEquipmentStatisticalInfo mdcEquipmentStatisticalInfo = mdcHomeMapper.getUtilizationByDay(equipmentIdList, date);
+ if (mdcEquipmentStatisticalInfo != null) {
+ result.setUtilizationRate(mdcEquipmentStatisticalInfo.getProcessLong().divide(new BigDecimal("864"), 4, RoundingMode.HALF_UP).divide(new BigDecimal(equipmentIdList.size()), 4, RoundingMode.HALF_UP).setScale(2, RoundingMode.HALF_UP));
+ if (BigDecimal.ZERO.compareTo(mdcEquipmentStatisticalInfo.getOpenLong()) == -1) {
+ result.setOpenRate(mdcEquipmentStatisticalInfo.getProcessLong().divide(mdcEquipmentStatisticalInfo.getOpenLong(), 4, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP));
+ result.setStartRate(mdcEquipmentStatisticalInfo.getOpenLong().divide(new BigDecimal("864"), 4, RoundingMode.HALF_UP).divide(new BigDecimal(equipmentIdList.size()), 4, RoundingMode.HALF_UP).setScale(2, RoundingMode.HALF_UP));
+ }
+ }
+ //鑾峰彇OEE鏁版嵁
+ String month = DateUtils.format(DateUtils.toDate(LocalDate.now().plusMonths(-1).toString(), DateUtils.STR_DATE), DateUtils.STR_YEAR_MONTH);
+ BigDecimal oee = mdcHomeMapper.getOeeByDate(equipmentIdList, month);
+ if (oee == null || oee.compareTo(BigDecimal.ZERO) == 0) {
+ result.setOverallEquipmentEfficiency(BigDecimal.ZERO);
+ } else {
+ result.setOverallEquipmentEfficiency(oee.divide(new BigDecimal(equipmentIdList.size()), 4, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP));
+ }
+ }
+ return result;
+ }
}
--
Gitblit v1.9.3