根据时间段获取数据

lizijie

2020-08-07 2edb89372b20625cedf80821dc90b7f7ae8c310c

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

@@ -23,6 +23,7 @@
import com.moral.common.util.ValidateUtil;

import com.moral.entity.Device;

import com.moral.entity.DeviceProperty;

import com.moral.entity.MonitorPoint;

import com.moral.mapper.DeviceMapper;

import com.moral.mapper.DevicePropertyMapper;

import com.moral.mapper.DeviceVersionMapper;

@@ -220,6 +221,10 @@
        Example.Criteria deviceCriteria = deviceExample.createCriteria();

        deviceCriteria.orEqualTo("isDelete", Constants.IS_DELETE_FALSE);

        List<Device> devicesInfo = deviceMapper.selectByExample(deviceExample);

        Example monitorExample = new Example(MonitorPoint.class);//实例化

        Example.Criteria monitorCriteria = monitorExample.createCriteria();

        monitorCriteria.orEqualTo("isDelete", Constants.IS_DELETE_FALSE);

        List<MonitorPoint> monitorsInfo = monitorPointMapper.selectByExample(monitorExample);

        for (Device d : deviceList) {

            if (dv.contains(d.getDeviceVersionId())) {

                d.setHasWindInfo(true);

@@ -229,6 +234,11 @@
            for (Device temp : devicesInfo) {

                if (d.getId().equals(temp.getId())) {

                    d.setState(temp.getState());

                }

            }

            for (MonitorPoint mp : monitorsInfo) {

                if (d.getMonitorPointId().equals(mp.getId())) {

                    d.setMonitorPoint(mp);

                }

            }

        }

@@ -687,4 +697,10 @@
        }

        return deviceListHasWind;

    }



    @Override

    public Map<String, Object> getAllFieldByMac(Map<String, Object> parameters) {

        Map<String, Object> deviceMap = deviceMapper.selectAllFieldByMac(parameters);

        return deviceMap;

    }

}