Merge remote-tracking branch 'origin/master'

沈斌

2017-11-07 45db1ff89c6389a2e4b84b252870326d510049ba

 src/main/java/com/moral/monitor/dao/JobDao.java

@@ -1,6 +1,8 @@
package com.moral.monitor.dao;

import com.moral.monitor.entity.Equipment;
import com.moral.monitor.entity.History;
import com.moral.monitor.entity.Logger;
import org.springframework.stereotype.Repository;

import java.util.List;
@@ -14,4 +16,8 @@
    public void updateStateByMac(String mac, int state);

    public int batchInsertHistory(List<History> historyList);

    public List<Equipment> getAllEquipment();

    public Logger getLoggerByMac(String mac);
}