From e3be796314346bcdcd94d819b2a1438d76dcf2d7 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 14 三月 2023 16:49:54 +0800
Subject: [PATCH] Merge pull request #778 from xiaoQQya/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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..336082f 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;
@@ -201,4 +204,9 @@
return true;
}
+
+ @Override
+ public List<Device> getDeviceByChannelId(String channelId) {
+ return channelMapper.getDeviceByChannelId(channelId);
+ }
}
--
Gitblit v1.8.0