From b8e86e2b44b796ced6f8fa557dfee532749dcc6c Mon Sep 17 00:00:00 2001
From: fengxiang <fengxiang@blit.7drlb>
Date: Wed, 15 Nov 2017 17:25:02 +0800
Subject: [PATCH] Merge branch 'master' of http://fengxiang@blit.7drlb.com:8888/r/task.git
---
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