修改日志记录

device-manager-ui/admin/src/views/site/list.vue

@@ -7,7 +7,7 @@
     <span>站点结构</span>
   </div>
         <el-scrollbar style="height: 100%">
-            
+
           <el-tree
             size="mini"
             ref="areaTree"
@@ -23,7 +23,7 @@
             @node-click="handleNodeClick"
           >
           </el-tree>
-            
+
         </el-scrollbar>
     </el-card>
       </el-col>
@@ -87,7 +87,7 @@ export default {
             this.$message.info("请选择区域后新增站点!")
             return
         }
-    
+
       row.areaCode=this.currentNode.areaCode
       row.areaName=this.currentNode.label
       this.$refs.dialogform.add(row);
@@ -115,7 +115,7 @@ export default {
       if(node.type=='site'){
         this.toView(this.currentNode);
       }
-      
+
     },
     renderContent: function (h, { node, data, store }) {
       return (
@@ -249,4 +249,4 @@ export default {
   }
 
 }
-</style>
\ No newline at end of file
+</style>

device-manager/src/main/java/com/mortals/xhx/base/framework/listener/DirectDynamicListener.java

@@ -66,6 +66,11 @@ public class DirectDynamicListener implements MessageListener {
         String deviceCode = queueMsg.getHeaders().getData().get(DEVICECODE);
         String messageType = queueMsg.getHeaders().getData().get(MESSAGETYPE);
         try {
+            if(ObjectUtils.isEmpty(deviceCode)){
+                log.info("onMessage deviceCode is null,receive data:{}",data);
+                return;
+            }
+
             DeviceEntity deviceEntity = deviceService.getExtCache(deviceCode);
             if (!ObjectUtils.isEmpty(deviceEntity)) {
                 cacheService.set(RedisKey.KEY_DEVICE_ONLINE_CACHE + deviceEntity.getDeviceCode(), "", GlobalSysInfo.getParamIntValue(Constant.HEARTBEAT_TIMEOUT, 120));