From 0306d5836a7a56614e01af35b9e70f0224b47cb2 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 14 十二月 2023 13:51:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/java/com/ruoyi/alarm/external/mapper/ArdAlarmExternalMapper.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/alarm/external/mapper/ArdAlarmExternalMapper.java b/ard-work/src/main/java/com/ruoyi/alarm/external/mapper/ArdAlarmExternalMapper.java
index b7e5973..246a0e3 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/external/mapper/ArdAlarmExternalMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/external/mapper/ArdAlarmExternalMapper.java
@@ -1,7 +1,11 @@
 package com.ruoyi.alarm.external.mapper;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.alarm.external.domain.ArdAlarmExternal;
+import com.ruoyi.statistical.param.ESParam;
+import com.ruoyi.statistical.vo.CountVo;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -10,7 +14,7 @@
  * @author ard
  * @date 2023-07-07
  */
-public interface ArdAlarmExternalMapper 
+public interface ArdAlarmExternalMapper extends BaseMapper<ArdAlarmExternal>
 {
     /**
      * 鏌ヨ澶栬仈鎶ヨ
@@ -65,4 +69,10 @@
     public List<ArdAlarmExternal> selectListAllByCommand(@Param("refreshTime") String refreshTime, @Param("alarmType") String alarmType);
 
     public int updateViewTimeByCondition(@Param("defenseName")String defenseName,@Param("alarmType")String alarmType,@Param("alarmTime") String alarmTime,@Param("viewTime") String viewTime);
+
+    //鏍规嵁鏈堜唤缁熻鏁伴噺
+    List<CountVo> externalYear(ESParam esParam);
+    //鏍规嵁澶╃粺璁℃暟閲�
+    List<CountVo> externalMonth(ESParam esParam);
+
 }

--
Gitblit v1.9.3