From bc8cd378fd72f43e66120c540f57f630580aa093 Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期四, 11 九月 2025 10:57:13 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcHomeService.java | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcHomeService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcHomeService.java index cadcb5a..a6cd01f 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcHomeService.java +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcHomeService.java @@ -6,6 +6,7 @@ import org.jeecg.modules.mdc.entity.MdcOverallEquipmentEfficiency; import org.jeecg.modules.mdc.vo.MdcCommonVo; import org.jeecg.modules.mdc.vo.MdcHomeEfficiencyVo; +import org.jeecg.modules.system.entity.MdcProduction; import java.util.List; import java.util.Map; @@ -19,27 +20,27 @@ /** * 璁惧杩愯鐘舵�佺粺璁� */ - List<MdcCommonVo> getEquipmentStatusStatistics(String userId, String key); + List<MdcCommonVo> getEquipmentStatusStatistics(String productionId); /** * 璁惧鍒╃敤鐜囩粺璁� */ - List<MdcCommonVo> getEquipmentUtilizationStatistics(String userId, String key); + List<MdcCommonVo> getEquipmentUtilizationStatistics(String productionId); /** * 璁惧OEE缁熻 */ - List<MdcCommonVo> getEquipmentOeeStatistics(String userId, String key); + List<MdcCommonVo> getEquipmentOeeStatistics(String productionId); /** * 璁惧OEE鍜屽埄鐢ㄧ巼缁熻鏌辩姸鍥� */ - Map<String, Object> getEquipmentMonthStatistics(String userId, String key); + Map<String, Object> getEquipmentMonthStatistics(String productionId); /** * 宸ユ绾у墠涓冨ぉ鍒╃敤鐜囨姌绾垮浘 */ - Map<String, Object> getEquipmentDayUtilizationStatistics(String userId, String key); + Map<String, Object> getEquipmentDayUtilizationStatistics(String productionId); /** * 鏌ヨ璁惧涓婃湀OEE @@ -72,4 +73,6 @@ MdcEquipmentDto getEquipmentDetails(String equipmentId); List<MdcFeedback> getFeedbackList(String key); + + List<MdcProduction> getAllWorkShop(); } -- Gitblit v1.9.3