From 69a3e436bedfc828930e08cbbac7df57f4fd83cb Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Fri, 12 Jun 2020 16:46:03 +0800
Subject: [PATCH] update去除站点层,更改设备图标为站点图标

---
 src/main/java/com/moral/mapper/AlarmMapper.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/moral/mapper/AlarmMapper.java b/src/main/java/com/moral/mapper/AlarmMapper.java
index a184316..bbb4f18 100644
--- a/src/main/java/com/moral/mapper/AlarmMapper.java
+++ b/src/main/java/com/moral/mapper/AlarmMapper.java
@@ -1,13 +1,14 @@
 package com.moral.mapper;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
 import com.moral.common.mapper.BaseMapper;
 import com.moral.entity.Alarm;
+import org.apache.ibatis.annotations.Param;
 
 public interface AlarmMapper extends BaseMapper<Alarm> {
 	
-	List<Map<String, Object>> getAlarmData(Map<String, Object> parameters);
-
+	List<Map> countByTimes(@Param("start")Date start, @Param("end")Date end, @Param("format")String format,@Param("list") List<String> list);
 }
\ No newline at end of file

--
Gitblit v1.8.0