From 6cce9ad4c95a9cf7c1afc066fe71d8eac482f76f Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 28 Nov 2017 07:03:31 +0800
Subject: [PATCH] test

---
 src/main/java/com/moral/monitor/dao/JobDao.java |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/moral/monitor/dao/JobDao.java b/src/main/java/com/moral/monitor/dao/JobDao.java
index 9dda52c..a92c6d4 100644
--- a/src/main/java/com/moral/monitor/dao/JobDao.java
+++ b/src/main/java/com/moral/monitor/dao/JobDao.java
@@ -1,17 +1,24 @@
 package com.moral.monitor.dao;
 
-import com.moral.monitor.entity.History;
-import org.springframework.stereotype.Repository;
-
 import java.util.List;
 import java.util.Map;
+
+import org.springframework.stereotype.Repository;
+
+import com.moral.monitor.entity.Equipment;
+import com.moral.monitor.entity.History;
+import com.moral.monitor.entity.Logger;
 
 @Repository
 public interface JobDao {
 
-    public List<Map<String, String>> findAdjustByMac(String mac);
+    public Map<String,Object> findEquWithAdjustsByMac(String mac);
 
     public void updateStateByMac(String mac, int state);
 
     public int batchInsertHistory(List<History> historyList);
+
+    public List<Equipment> getAllEquipment();
+
+    public Logger getLoggerByMac(String mac);
 }

--
Gitblit v1.8.0