Merge remote-tracking branch 'origin/master'

jinpengyong

2020-06-03 4f3fd6c40cf8ff706f86363ccd6555164f348d63

 src/main/java/com/moral/service/impl/DeviceServiceImpl.java

@@ -28,6 +28,21 @@
    }



    @Override

    public List<Map<String, Object>> getSensorDataOnce(Map<String, Object> parameters) {

        return historyMapper.getSensorDataOnce(parameters);

    }



    @Override

    public List<Map<String, Object>> getSensorDataByMac(Map<String, Object> parameters) {

        return historyMapper.getSensorDataByMac(parameters);

    }



    @Override

    public List<Map<String, Object>> getSensorDataByMacOnce(Map<String, Object> parameters) {

        return historyMapper.getSensorDataByMacOnce(parameters);

    }



    @Override

    public List<String> getMacs() {

        return deviceMapper.getMacs();

    }