From 8c8af4faa4303499fe9e81dd117932e246008eb0 Mon Sep 17 00:00:00 2001 From: aijinhui <aijinhui> Date: 星期六, 07 十月 2023 14:39:28 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ard-work/src/main/java/com/ruoyi/alarm/radar/mapper/ArdAlarmRadarMoveMapper.java | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/alarm/radar/mapper/ArdAlarmRadarMoveMapper.java b/ard-work/src/main/java/com/ruoyi/alarm/radar/mapper/ArdAlarmRadarMoveMapper.java index f51cb6f..0b24084 100644 --- a/ard-work/src/main/java/com/ruoyi/alarm/radar/mapper/ArdAlarmRadarMoveMapper.java +++ b/ard-work/src/main/java/com/ruoyi/alarm/radar/mapper/ArdAlarmRadarMoveMapper.java @@ -2,8 +2,9 @@ import java.util.List; -import com.ruoyi.alarm.radar.domain.ArdAlarmRadar; import com.ruoyi.alarm.radar.domain.ArdAlarmRadarMove; +import com.ruoyi.statistical.param.ESParam; +import com.ruoyi.statistical.vo.CountVo; import org.apache.ibatis.annotations.Param; /** @@ -68,4 +69,7 @@ public int updateViewTimeByCondition(@Param("name")String name,@Param("alarmTime") String alarmTime,@Param("viewTime") String viewTime); ArdAlarmRadarMove selectArdAlarmRadarLastData(String name); + + //鏍规嵁鏈堜唤缁熻鏁伴噺 + List<CountVo> moveYear(ESParam esParam); } -- Gitblit v1.9.3