From 5677ab158fb78d1267c16bbbf29eb690e0b4039f Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期三, 13 十二月 2023 16:53:39 +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/IMdcEquipmentRunningSectionService.java | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentRunningSectionService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentRunningSectionService.java index 35e2297..fe2d87b 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentRunningSectionService.java +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentRunningSectionService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.mdc.dto.MdcEquipmentRunningSectionDto; import org.jeecg.modules.mdc.entity.MdcEquipmentRunningSection; +import org.jeecg.modules.mdc.vo.MdcAlarmAnalyzeQueryVo; import org.jeecg.modules.mdc.vo.MdcEquipmentRunningSectionVo; import java.util.Date; @@ -51,4 +52,34 @@ * 鏌ヨ鏌愪釜璁惧涓�娈垫椂闂村唴鐨勬暟鎹� */ List<MdcEquipmentRunningSection> listRunningSectionFromLog(String equipmentid, long start, long end); + + /** + * 鏌ヨ鎽镐釜璁惧涓�娈垫椂闂村唴鐨勮繍琛屾暟鎹� + */ + List<MdcEquipmentRunningSection> listEquipmentRunningSectionRun(String equipmentid, long start, long end); + + /** + * 鏌ヨ鎽镐釜璁惧涓�娈垫椂闂村唴鐨勬晠闅滄暟鎹� + */ + List<MdcEquipmentRunningSection> listEquipmentRunningSectionError(String equipmentid, long start, long end); + + /** + * 鏌ヨ鎶ヨ鏁版嵁 + */ + List<MdcEquipmentRunningSection> findAlarmList(MdcAlarmAnalyzeQueryVo vo); + + /** + * 鏌ヨ娆℃暟 + */ + Integer findAlarmCount(String equipmentId, String startDate, String endDate, String alarmCode); + + /** + * 鏍规嵁鏃ユ湡鏌ヨ娆℃暟 + */ + Integer findAlarmCountByDate(String startDate, String endDate, MdcAlarmAnalyzeQueryVo vo); + + /** + * 鏌ヨ鏃堕棿娈靛唴杩愯鏁版嵁 + */ + List<MdcEquipmentRunningSection> selectRunningData(String equipmentId, Date startDate, Date endDate); } -- Gitblit v1.9.3