From 5a0dbf5c84f677c9f20252ccc63221dc7ba68d6c Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 15 五月 2025 08:48:07 +0800
Subject: [PATCH] 修改项
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcLargeScreenServiceImpl.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 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 0930b96..98d6757 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
@@ -3,8 +3,10 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.vo.DictModel;
+import org.jeecg.modules.mdc.entity.MdcEquipmentDaySummary;
import org.jeecg.modules.mdc.entity.MdcEquipmentMonitor;
import org.jeecg.modules.mdc.service.IEquipmentAlarmService;
+import org.jeecg.modules.mdc.service.IMdcEquipmentDaySummaryService;
import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.jeecg.modules.mdc.service.IMdcEquipmentStatisticalInfoService;
import org.jeecg.modules.mdc.util.DateUtils;
@@ -18,7 +20,10 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.time.LocalDate;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -44,6 +49,9 @@
@Resource
private IEquipmentAlarmService equipmentAlarmService;
+ @Resource
+ private IMdcEquipmentDaySummaryService mdcEquipmentDaySummaryService;
+
/**
* 璁惧鐘舵�佹儏鍐�
*
@@ -53,6 +61,7 @@
@Override
public EquipmentStatusOverview equipmentStatusOverview(String productionId) {
EquipmentStatusOverview equipmentStatusOverview = new EquipmentStatusOverview();
+ // 璁惧鐘舵��
List<MdcEquipmentMonitor> equipmentMonitorList = mdcEquipmentService.getEquipmentMonitorList(productionId);
if (equipmentMonitorList != null && !equipmentMonitorList.isEmpty()) {
equipmentStatusOverview.setEquipmentCount(equipmentMonitorList.size());
@@ -88,6 +97,12 @@
}
}
}
+ // mes浜ч噺
+ MdcEquipmentDaySummary mdcEquipmentDaySummary = mdcEquipmentDaySummaryService.statisticsQty(productionId);
+ if (mdcEquipmentDaySummary != null) {
+ equipmentStatusOverview.setQualifiedQty(mdcEquipmentDaySummary.getQualifiedQty());
+ equipmentStatusOverview.setPlanQty(mdcEquipmentDaySummary.getPlanQty());
+ }
return equipmentStatusOverview;
}
--
Gitblit v1.9.3