update离线去除风向图标

ZhuDongming

2020-06-28 df80448fbd1bccdba131d797c0c7e93274ed6ba1

update离线去除风向图标

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

@@ -216,13 +216,22 @@
            deviceList = deviceMapper.selectByMap(params);

            // loadDeviceState(deviceList);

        }

      for(Device d:deviceList){

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

        Example deviceExample = new Example(Device.class);//实例化

        Example.Criteria deviceCriteria = deviceExample.createCriteria();

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

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

        for (Device d : deviceList) {

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

                d.setHasWindInfo(true);

            }else{

            } else {

                d.setHasWindInfo(false);

            }

      }

            for (Device temp : devicesInfo) {

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

                    d.setState(temp.getState());

                }

            }

        }

        return deviceList;

    }




 src/main/webapp/view/newmap.jsp

@@ -488,7 +488,7 @@
                        }
                        var moralMask = new moralMap.Equipment(obj);
                        moralMap.addOverlay(moralMask);
                        if (obj['hasWindInfo']) {
                        if (obj['hasWindInfo'] && obj['state'] != 4) {
                            var moralDeviceWind = new moralMap.Device(obj);
                            moralMap.addOverlay(moralDeviceWind);
                        }