From f84d9e69907cb678150eaa6393fd74cf042fcca4 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:39:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentRunningSectionService.java | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 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 b4fa460..bcdb8fd 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;
@@ -12,7 +13,7 @@
/**
* @Description: 璁惧杩愯鏃舵鐘舵�佽〃
* @Author: LiuS
- * @Date: 2023-04-13
+ * @Date: 2023-04-13
* @Version: V1.0
*/
public interface IMdcEquipmentRunningSectionService extends IService<MdcEquipmentRunningSection> {
@@ -38,8 +39,42 @@
List<MdcEquipmentRunningSection> listForEquipmentStatisticalInfo(String equipmentId, Date startDate, Date endDate);
/**
- * 鏌ヨ璁惧鍘嗗彶杩愯鐘舵�佽褰曟暟鎹�
+ * 鏌ヨ璁惧鍘嗗彶杩愯鐘舵�佽褰曟暟鎹�
*/
List<Map<String, Object>> logChart(MdcEquipmentRunningSectionVo equipmentRunningSectionVo);
+ /**
+ * 璁＄畻涓�娈垫椂闂村唴鐨勬暟鎹�
+ */
+ List<MdcEquipmentRunningSection> listEquipmentRunningSection(String equipmentid, long start, long end);
+
+ /**
+ * 鏌ヨ鏌愪釜璁惧涓�娈垫椂闂村唴鐨勬暟鎹�
+ */
+ 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);
}
--
Gitblit v1.9.3