From 45be44fb95325305373647231ef74e72d1501f8c Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Sat, 11 Nov 2017 08:08:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/monitor/dao/JobDao.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/monitor/dao/JobDao.java b/src/main/java/com/moral/monitor/dao/JobDao.java
index 176ba04..a92c6d4 100644
--- a/src/main/java/com/moral/monitor/dao/JobDao.java
+++ b/src/main/java/com/moral/monitor/dao/JobDao.java
@@ -1,14 +1,24 @@
package com.moral.monitor.dao;
-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