From 15a20a91316b726f45ccc9e06bbd632f10eedb43 Mon Sep 17 00:00:00 2001 From: Lius <Lius2225@163.com> Date: 星期五, 13 九月 2024 14:10:55 +0800 Subject: [PATCH] update --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java | 43 ++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 40 insertions(+), 3 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 ad938b7..ca91607 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,9 +9,12 @@ 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.MdcEfficiencyReportQueryVo; +import org.jeecg.modules.mdc.vo.MdcEfficiencyReportShiftQueryVo; 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; @@ -98,12 +101,12 @@ /** * 鍔犺浇閮ㄩ棬璁惧鏍� */ - List<MdcEquipmentTree> loadTreeListByDepart(String userId); + List<MdcEquipmentTree> loadTreeListByDepart(String userId, String key); /** * 鍔犺浇浜х嚎璁惧鏍� */ - List<MdcEquipmentTree> loadTreeListByProduction(String userId); + List<MdcEquipmentTree> loadTreeListByProduction(String userId, String key); /** * 璁惧鐩戞帶鍒楄〃 @@ -169,5 +172,39 @@ */ IPage<MdcEquipment> getEquipmentByWorkshopId(Page<MdcEquipment> page, WorkshopEquipmentVo workshopEquipmentVo); - List<String> listEquipmentId(String equipmentType, List<String> equipmentIdList); + List<String> listEquipmentId(MdcEfficiencyReportQueryVo vo); + + /** + * 鍒楄〃鏌ヨ + */ + 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); + + List<String> listEquipmentIdShift(MdcEfficiencyReportShiftQueryVo vo); + } -- Gitblit v1.9.3