From 842f40df34de7405567469c8454dd5d3011358fa Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期四, 16 二月 2023 14:01:09 +0800 Subject: [PATCH] 修复更新通道是更新各个坐标系的位置信息 --- src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java | 5 ++++- src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java index 7527631..3c423c0 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java @@ -19,6 +19,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; /** * @author lin @@ -179,11 +180,13 @@ @Override public boolean updateAllGps(Device device) { List<DeviceChannel> deviceChannels = channelMapper.getChannelsWithoutTransform(device.getDeviceId()); - List<DeviceChannel> result = new ArrayList<>(); + List<DeviceChannel> result = new CopyOnWriteArrayList<>(); if (deviceChannels.size() == 0) { return true; } + String now = DateUtil.getNow(); deviceChannels.parallelStream().forEach(deviceChannel -> { + deviceChannel.setUpdateTime(now); result.add(updateGps(deviceChannel, device)); }); int limitCount = 300; diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java index 4fe0a22..dd3659d 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java @@ -358,7 +358,17 @@ @Select("select count(1) as total, sum(status) as online from device_channel") ResourceBaceInfo getOverview(); - @Select("select * from device_channel where deviceId = #{deviceId} " + - "and latitude * longitude > 0 and latitudeGcj02 * latitudeWgs84 * longitudeWgs84 * longitudeGcj02 = 0") + @Select("select channelId" + + ", deviceId" + + ", latitude" + + ", longitude" + + ", latitudeWgs84" + + ", longitudeWgs84" + + ", latitudeGcj02" + + ", longitudeGcj02 " + + "from device_channel where deviceId = #{deviceId} " + + "and latitude != 0 " + + "and longitude != 0 " + + "and (latitudeGcj02 = 0 or latitudeWgs84 = 0 or longitudeWgs84 = 0 or longitudeGcj02 = 0)") List<DeviceChannel> getChannelsWithoutTransform(String deviceId); } -- Gitblit v1.8.0