From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +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 | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 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 d70061b..c523148 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
@@ -10,7 +10,9 @@
import org.jeecg.modules.mdc.entity.MdcEquipmentMonitor;
import org.jeecg.modules.mdc.model.MdcEquipmentTree;
import org.jeecg.modules.mdc.vo.MdcEquipmentVo;
+import org.jeecg.modules.mdc.vo.WorkshopEquipmentVo;
+import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
@@ -162,4 +164,43 @@
* 鏍规嵁閮ㄩ棬灞傜骇鏌ヨ璁惧鍗曚釜
*/
MdcEquipment getEquipmentByDepPid(String pid, String userId);
+
+ /**
+ * 鏍规嵁澶у睆杞﹂棿id鏌ヨ璁惧鍒楄〃
+ */
+ IPage<MdcEquipment> getEquipmentByWorkshopId(Page<MdcEquipment> page, WorkshopEquipmentVo workshopEquipmentVo);
+
+ List<String> listEquipmentId(String equipmentType, List<String> equipmentIdList);
+
+ /**
+ * 鍒楄〃鏌ヨ
+ */
+ IPage<MdcEquipment> pageList(Page<MdcEquipment> page, MdcEquipmentVo mdcEquipment, HttpServletRequest req);
+
+ /**
+ * 鐩戞帶璁惧杩愯鍙傛暟浠诲姟
+ */
+ void monitoringSpeedProcess();
+
+ /**
+ * 瀵煎嚭List
+ * @param mdcEquipment
+ * @return
+ */
+ List<MdcEquipment> exportXlsList(MdcEquipmentVo mdcEquipment);
+
+ /**
+ * 閫氳繃杞﹂棿ids鑾峰彇璁惧鏍�
+ * @param ids
+ * @return
+ */
+ List<MdcEquipmentTree> loadTreeListByProductionIds(String ids);
+
+ /**
+ * 鏌ヨ鍗曡〃鏁版嵁
+ * @param tableName
+ * @return
+ */
+ MdcEquipmentDto getWorkLineLast(String tableName);
+
}
--
Gitblit v1.9.3