From bdcdaf181eda9ebf5f7d00cb51d6e9cb09e6666a Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Wed, 30 Aug 2023 14:22:47 +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

---
 .../access/controller/CsDeviceController.java  |  2 --
 .../access/handler/MqttMessageHandler.java     | 18 ++++++++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/controller/CsDeviceController.java b/iot-access/access-boot/src/main/java/com/njcn/access/controller/CsDeviceController.java
index f558cc4..7ed2bcf 100644
--- a/iot-access/access-boot/src/main/java/com/njcn/access/controller/CsDeviceController.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/controller/CsDeviceController.java
@@ -7,8 +7,6 @@ import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.csdevice.enums.DeviceOperate;
-import com.njcn.web.advice.DeviceLog;
 import com.njcn.web.annotation.ReturnMsg;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java b/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java
index 4a63141..5daee11 100644
--- a/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java
@@ -86,8 +86,13 @@ public class MqttMessageHandler {
     public void devTopic(String topic, MqttMessage message, @NamedValue("edgeId") String nDid, @Payload String payload){
         //日志记录
         DeviceLogDTO logDto = new DeviceLogDTO();
-        logDto.setUserName(RequestUtil.getUsername());
-        logDto.setLoginName(RequestUtil.getLoginName());
+        try{
+            logDto.setUserName(RequestUtil.getUsername());
+            logDto.setLoginName(RequestUtil.getLoginName());
+        } catch (Exception e) {
+            logDto.setUserName("设备主题录入");
+            logDto.setLoginName(null);
+        }
         logDto.setOperate(nDid + "设备主题录入");
         logDto.setResult(1);
         //业务流程开始
@@ -143,8 +148,13 @@ public class MqttMessageHandler {
         log.info("收到注册应答响应--->" + nDid);
         //日志记录
         DeviceLogDTO logDto = new DeviceLogDTO();
-        logDto.setUserName(RequestUtil.getUsername());
-        logDto.setLoginName(RequestUtil.getLoginName());
+        try{
+            logDto.setUserName(RequestUtil.getUsername());
+            logDto.setLoginName(RequestUtil.getLoginName());
+        } catch (Exception e) {
+            logDto.setUserName("设备注册应答响应");
+            logDto.setLoginName(null);
+        }
         logDto.setOperate("收到设备"+nDid+"注册应答响应");
         logDto.setResult(1);
         //业务处理