Merge remote-tracking branch 'origin/master'

沈斌

2017-11-11 45be44fb95325305373647231ef74e72d1501f8c

 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);
}