From 2400238fd8ae34a2f10a4ea35db9b1739c534a7e Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期日, 08 十月 2023 13:34:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/alarm/radar/mapper/ArdAlarmRadarPumpMapper.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/radar/mapper/ArdAlarmRadarPumpMapper.java b/ard-work/src/main/java/com/ruoyi/alarm/radar/mapper/ArdAlarmRadarPumpMapper.java
index 576a8c9..df950c2 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/radar/mapper/ArdAlarmRadarPumpMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/radar/mapper/ArdAlarmRadarPumpMapper.java
@@ -3,6 +3,8 @@
import java.util.List;
import com.ruoyi.alarm.radar.domain.ArdAlarmRadarPump;
+import com.ruoyi.statistical.param.ESParam;
+import com.ruoyi.statistical.vo.CountVo;
import org.apache.ibatis.annotations.Param;
/**
@@ -68,4 +70,9 @@
public int updateViewTimeByCondition(@Param("name")String name,@Param("alarmTime") String alarmTime,@Param("viewTime") String viewTime);
ArdAlarmRadarPump selectArdAlarmRadarLastData(String name);
+
+ //鏍规嵁鏈堜唤缁熻鏁伴噺
+ List<CountVo> pumpYear(ESParam esParam);
+ //鏍规嵁澶╃粺璁℃暟閲�
+ List<CountVo> pumpMonth(ESParam esParam);
}
--
Gitblit v1.9.3