From df80448fbd1bccdba131d797c0c7e93274ed6ba1 Mon Sep 17 00:00:00 2001 From: ZhuDongming <773644075@qq.com> Date: Sun, 28 Jun 2020 16:51:44 +0800 Subject: [PATCH] update离线去除风向图标 --- src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java index b3d7066..830090e 100644 --- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java +++ b/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; } -- Gitblit v1.8.0