chulibug

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java

@@ -3820,10 +3820,16 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                             pqsTerminalPushLogDTO.setNodeId(nodeId);
                             pqsTerminalPushLogDTO.setNodeName(nodeName);
                         }else {
+                            //如果存在说明设备未被删除，不存在说明有一条删除日志，直接return；
+                            if(lineMap.containsKey(deviceId)){
                                 pqsTerminalPushLogDTO.setDevName(lineMap.get(deviceId).getName());
                                 String nodeId = deviceMap.get(deviceId).getNodeId();
                                 pqsTerminalPushLogDTO.setNodeId(nodeId);
                                 pqsTerminalPushLogDTO.setNodeName(nodeMap.get(nodeId).getName());
+                            }else{
+                                return;
+                            }
+
                         }
 
                         pqsTerminalPushLogDTO.setProcessUpdateFlag(false);