ZhuDongming
2020-06-28 f55f6e05bae945d275101592782fb3b8980d77cf
src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -206,6 +206,7 @@
     */
    @Override
    public List<Device> query(Map<String, Object> params) {
        List<Integer> dv = deviceMapper.getHasWindDirAndWindSpeedDeviceVersion();
        Object orgIdObj = params.get("orgId");
        List<Device> deviceList = null;
        if (orgIdObj != null) {
@@ -215,6 +216,13 @@
            deviceList = deviceMapper.selectByMap(params);
            // loadDeviceState(deviceList);
        }
      for(Device d:deviceList){
            if(dv.contains(d.getDeviceVersionId())){
                d.setHasWindInfo(true);
            }else{
                d.setHasWindInfo(false);
            }
      }
        return deviceList;
    }
@@ -635,4 +643,19 @@
    public List<String> getMacsByOrganizationId(List<Object> organizationIdList) {
        return deviceMapper.getMacsByOrganizationId(organizationIdList);
    }
    @Override
    public List<Device> getDeviceById1(int id) {
        return deviceMapper.getDeviceById1(id);
    }
    @Override
    public List<Device> getDeviceById2(int id) {
        return deviceMapper.getDeviceById2(id);
    }
    @Override
    public List<Device> getDeviceById3(int id) {
        return deviceMapper.getDeviceById3(id);
    }
}