From 6961ad49eade69069c3990b6e723313913d28fb1 Mon Sep 17 00:00:00 2001 From: weidong Date: Fri, 26 Jan 2024 10:48:13 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9mqtt=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/imdroid/beidou_fwd/task/GZYForwarder.java | 2 +- .../com/imdroid/beidou_fwd/task/GZYMQTTForwarder.java | 2 +- .../sideslope/calc/SingleLineGNSSCalcService.java | 7 +++---- .../executor/D3F0SelfCheckMessageExecutor.java | 2 -- .../executor/D3F2StopIndicationMessageExecutor.java | 10 +++++----- .../java/com/imdroid/common/util/ThreadManager.java | 4 ++-- 6 files changed, 12 insertions(+), 15 deletions(-) diff --git a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GZYForwarder.java b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GZYForwarder.java index 52bea357..42eebb58 100644 --- a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GZYForwarder.java +++ b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GZYForwarder.java @@ -33,7 +33,7 @@ public class GZYForwarder extends Forwarder{ @PostConstruct void registerMe(){ - init(FORWARDER_NAME, host+":"+port,2,true); + init(FORWARDER_NAME, "UDP "+host+":"+port,2,true); udpClient = new UDPClient(); udpClient.init(host, port); } diff --git a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GZYMQTTForwarder.java b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GZYMQTTForwarder.java index 6e7de209..cc84608e 100644 --- a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GZYMQTTForwarder.java +++ b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GZYMQTTForwarder.java @@ -24,7 +24,7 @@ import java.util.List; public class GZYMQTTForwarder extends Forwarder { private final Logger logger = LoggerFactory.getLogger(GZYMQTTForwarder.class); - static final String FORWARDER_NAME = "贵州交勘院"; + static final String FORWARDER_NAME = "贵州交勘院MQTT"; @Value("${mqtt.server.brokerUrl}") private String brokerUrl; @Value("${mqtt.server.username}") diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/calc/SingleLineGNSSCalcService.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/calc/SingleLineGNSSCalcService.java index b4e27c20..fb591513 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/calc/SingleLineGNSSCalcService.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/calc/SingleLineGNSSCalcService.java @@ -1,5 +1,6 @@ package com.imdroid.sideslope.calc; +import com.imdroid.common.util.ThreadManager; import com.imdroid.secapi.dto.GnssCalcData; import com.imdroid.sideslope.bd.*; import com.imdroid.sideslope.message.D341LocationMessage; @@ -34,8 +35,6 @@ public class SingleLineGNSSCalcService implements GNSSDataCalcService { private static final Map cleanPositionStatusMap = new ConcurrentHashMap<>(); - private static final ScheduledExecutorService executorService = Executors.newScheduledThreadPool(4); - @Autowired WarningService warningService; @@ -72,7 +71,7 @@ public class SingleLineGNSSCalcService implements GNSSDataCalcService { @Override public void calSingleDone(String deviceId, Integer tenantId, LocalDateTime resultTime) { - executorService.schedule(() -> { + ThreadManager.getScheduledThreadPool().schedule(() -> { try { calCycleResult(deviceId, tenantId, resultTime); } catch (Exception e) { @@ -90,7 +89,7 @@ public class SingleLineGNSSCalcService implements GNSSDataCalcService { future = null; } - future = executorService.schedule(() -> { + future = ThreadManager.getScheduledThreadPool().schedule(() -> { try { calCycleResult(deviceId, tenantId, date); } catch (Exception e) { diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F0SelfCheckMessageExecutor.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F0SelfCheckMessageExecutor.java index ac29b727..a0c04b9c 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F0SelfCheckMessageExecutor.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F0SelfCheckMessageExecutor.java @@ -53,8 +53,6 @@ public class D3F0SelfCheckMessageExecutor implements Executor { dataPersistService.saveDeviceTrxStat(message, (uploadTime!=null)); + // 通知beidou服务设备休眠 + beidouClient.onDeviceStop(deviceId,device.getTenantId()); + if(uploadTime!=null){ + beidouClient.onGnssUpload(deviceId,device.getTenantId(),uploadTime); + } }); - // 通知beidou服务设备休眠 - beidouClient.onDeviceStop(deviceId,device.getTenantId()); - if(uploadTime!=null){ - beidouClient.onGnssUpload(deviceId,device.getTenantId(),uploadTime); - } return null; } diff --git a/sec-common/src/main/java/com/imdroid/common/util/ThreadManager.java b/sec-common/src/main/java/com/imdroid/common/util/ThreadManager.java index da8b015d..51111a49 100644 --- a/sec-common/src/main/java/com/imdroid/common/util/ThreadManager.java +++ b/sec-common/src/main/java/com/imdroid/common/util/ThreadManager.java @@ -14,7 +14,7 @@ public class ThreadManager { private static final class FixedThreadPoolHolder { //固定线程池 - static final ExecutorService fixedThreadPool = Executors.newFixedThreadPool(3); + static final ExecutorService fixedThreadPool = Executors.newFixedThreadPool(10); } public static ExecutorService getFixedThreadPool() { @@ -23,7 +23,7 @@ public class ThreadManager { private static final class ScheduledThreadPoolHolder { //定时线程池 - static final ScheduledExecutorService scheduledThreadPool = Executors.newScheduledThreadPool(4); + static final ScheduledExecutorService scheduledThreadPool = Executors.newScheduledThreadPool(10); } public static ScheduledExecutorService getScheduledThreadPool() {