diff --git a/ip-learning-spark/src/main/scala/cn/ac/iie/service/update/UpdateDocument.scala b/ip-learning-spark/src/main/scala/cn/ac/iie/service/update/UpdateDocument.scala index 16a77d3..1599e0f 100644 --- a/ip-learning-spark/src/main/scala/cn/ac/iie/service/update/UpdateDocument.scala +++ b/ip-learning-spark/src/main/scala/cn/ac/iie/service/update/UpdateDocument.scala @@ -144,8 +144,10 @@ object UpdateDocument { val key = subId.concat("-" + ip + "-" + vsysId) if (subidLocIpDoc != null) { - updateMaxAttribute(subidLocIpDoc, lastFoundTime, "LAST_FOUND_TIME") subidLocIpDoc.addAttribute("VSYS_ID", vsysId) + subidLocIpDoc.addAttribute("SUBSCRIBER", subId) + subidLocIpDoc.addAttribute("IP", ip) + updateMaxAttribute(subidLocIpDoc, lastFoundTime, "LAST_FOUND_TIME") } else { subidLocIpDoc = new BaseEdgeDocument() subidLocIpDoc.setKey(key) @@ -286,17 +288,20 @@ object UpdateDocument { val distinctIp: Array[String] = mergeDistinctIp(distCipRecent) val key = fqdn.concat("-" + serverIp + "-" + vsysId) if (fqdnLocIpDoc != null) { + fqdnLocIpDoc.addAttribute("FQDN", fqdn) + fqdnLocIpDoc.addAttribute("IP", serverIp) + fqdnLocIpDoc.addAttribute("VSYS_ID", vsysId) updateMaxAttribute(fqdnLocIpDoc, lastFoundTime, "LAST_FOUND_TIME") updateProtocolAttritube(fqdnLocIpDoc, sepAttritubeMap) updateDistinctIp(fqdnLocIpDoc, distinctIp) - fqdnLocIpDoc.addAttribute("VSYS_ID", vsysId) } else { fqdnLocIpDoc = new BaseEdgeDocument() fqdnLocIpDoc.setKey(key) fqdnLocIpDoc.setFrom("FQDN/" + fqdn+ "-" + vsysId) fqdnLocIpDoc.setTo("IP/" + serverIp+ "-" + vsysId) fqdnLocIpDoc.addAttribute("FIRST_FOUND_TIME", firstFoundTime) - fqdnLocIpDoc.addAttribute("LAST_FOUND_TIME", lastFoundTime) + fqdnLocIpDoc.addAttribute("FQDN", fqdn) + fqdnLocIpDoc.addAttribute("IP", serverIp) fqdnLocIpDoc.addAttribute("VSYS_ID", vsysId) putProtocolAttritube(fqdnLocIpDoc, sepAttritubeMap)