From be3aa0812cb43be7484e162b4fece5344e9eb5c8 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 14 三月 2024 11:12:43 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java
index 1880efa..198b5fe 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java
@@ -9,6 +9,7 @@
import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.entity.MdcEquipmentMonitor;
import org.jeecg.modules.mdc.model.MdcEquipmentTree;
+import org.jeecg.modules.mdc.vo.MdcCommonVo;
import org.jeecg.modules.mdc.vo.MdcEquipmentVo;
import org.jeecg.modules.mdc.vo.WorkshopEquipmentVo;
@@ -178,7 +179,7 @@
IPage<MdcEquipment> pageList(Page<MdcEquipment> page, MdcEquipmentVo mdcEquipment, HttpServletRequest req);
/**
- * 鐩戞帶璁惧杞�熶换鍔�
+ * 鐩戞帶璁惧杩愯鍙傛暟浠诲姟
*/
void monitoringSpeedProcess();
@@ -187,6 +188,24 @@
* @param mdcEquipment
* @return
*/
- List<MdcEquipment> exportXlsList(MdcEquipment mdcEquipment);
+ List<MdcEquipment> exportXlsList(MdcEquipmentVo mdcEquipment);
+ /**
+ * 閫氳繃杞﹂棿ids鑾峰彇璁惧鏍�
+ * @param ids
+ * @return
+ */
+ List<MdcEquipmentTree> loadTreeListByProductionIds(String ids);
+
+ /**
+ * 鏌ヨ鍗曡〃鏁版嵁
+ * @param tableName
+ * @return
+ */
+ MdcEquipmentDto getWorkLineLast(String tableName);
+
+ /**
+ * 璁惧杩愯鐘舵�佺粺璁�
+ */
+ List<MdcCommonVo> getEquipmentStatusStatistics(String userId, String key);
}
--
Gitblit v1.9.3