From 10910e36e0dffd67aa5334ad366578e0287ec8d7 Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Tue, 12 Nov 2024 16:33:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/RealDataServiceImpl.java        | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/RealDataServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/RealDataServiceImpl.java
index 24014ee..7a8ed83 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/RealDataServiceImpl.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/RealDataServiceImpl.java
@@ -1,6 +1,7 @@
 package com.njcn.csharmonic.service.impl;
 
 import com.njcn.access.api.AskDeviceDataFeignClient;
+import com.njcn.access.utils.MqttUtil;
 import com.njcn.csdevice.api.CsLineFeignClient;
 import com.njcn.csdevice.api.DataSetFeignClient;
 import com.njcn.csdevice.pojo.po.CsDataSet;
@@ -23,12 +24,18 @@ public class RealDataServiceImpl implements RealDataService {
     private final DataSetFeignClient dataSetFeignClient;
     private final AskDeviceDataFeignClient askDeviceDataFeignClient;
     private final RedisUtil redisUtil;
+    private final MqttUtil mqttUtil;
 
     @Override
     public boolean getBaseRealData(String lineId) {
         boolean result = true;
         try {
             String nDid = lineId.substring(0, lineId.length() - 1);
+            String clientName = "NJCN-" + nDid.substring(nDid.length() - 6);
+            boolean mqttClient = mqttUtil.judgeClientOnline(clientName);
+            if (!mqttClient) {
+                throw new RuntimeException("装置离线");
+            }
             Integer clDid = Integer.parseInt(lineId.substring(lineId.length() - 1));
             //获取装置所用模板
             CsLinePO po = csLineFeignClient.getById(lineId).getData();
@@ -47,7 +54,7 @@ public class RealDataServiceImpl implements RealDataService {
                 }
             }
         } catch (InterruptedException e) {
-            throw new RuntimeException(e);
+            throw new RuntimeException(e.getMessage());
         }
         return result;
     }
@@ -57,6 +64,11 @@ public class RealDataServiceImpl implements RealDataService {
         boolean result = true;
         try {
             String nDid = lineId.substring(0, lineId.length() - 1);
+            String clientName = "NJCN-" + nDid.substring(nDid.length() - 6);
+            boolean mqttClient = mqttUtil.judgeClientOnline(clientName);
+            if (!mqttClient) {
+                throw new RuntimeException("装置离线");
+            }
             Integer clDid = Integer.parseInt(lineId.substring(lineId.length() - 1));
             //获取装置所用模板
             CsLinePO po = csLineFeignClient.getById(lineId).getData();
@@ -76,7 +88,7 @@ public class RealDataServiceImpl implements RealDataService {
                 }
             }
         } catch (InterruptedException e) {
-            throw new RuntimeException(e);
+            throw new RuntimeException(e.getMessage());
         }
         return result;
     }