From adaa53ebd1d8e1294b573200b57040089925411f Mon Sep 17 00:00:00 2001 From: renkaige Date: Wed, 31 Oct 2018 10:33:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9nms=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E7=9A=84=E4=BF=A1=E6=81=AF=E4=B8=ADdate=E7=B1=BB=E5=9E=8Bsprin?= =?UTF-8?q?g=E8=87=AA=E5=8A=A8=E5=8A=A08=E5=B0=8F=E6=97=B6=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nis/domain/restful/NmsDiRule.java | 10 ++++--- .../restful/TrafficNetflowPortInfo.java | 30 +++++++++++++++++++ .../restful/TrafficNmsServerStatistic.java | 6 ++-- .../controller/restful/NmsInfoController.java | 2 +- .../restful/NtcLogSearchController.java | 1 - 5 files changed, 41 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/nis/domain/restful/NmsDiRule.java b/src/main/java/com/nis/domain/restful/NmsDiRule.java index 4882051..e885869 100644 --- a/src/main/java/com/nis/domain/restful/NmsDiRule.java +++ b/src/main/java/com/nis/domain/restful/NmsDiRule.java @@ -5,6 +5,8 @@ import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.nis.util.JsonDateDeserializer; import com.wordnik.swagger.annotations.ApiModelProperty; public class NmsDiRule implements Serializable { @@ -154,19 +156,19 @@ public class NmsDiRule implements Serializable { public void setDetectionSetInfoId(long detectionSetInfoId) { this.detectionSetInfoId = detectionSetInfoId; } - + @JsonDeserialize(using = JsonDateDeserializer.class) public Date getDataCheckTime() { return dataCheckTime; } - + @JsonDeserialize(using = JsonDateDeserializer.class) public void setDataCheckTime(Date dataCheckTime) { this.dataCheckTime = dataCheckTime; } - + @JsonDeserialize(using = JsonDateDeserializer.class) public Date getDataArriveTime() { return dataArriveTime; } - + @JsonDeserialize(using = JsonDateDeserializer.class) public void setDataArriveTime(Date dataArriveTime) { this.dataArriveTime = dataArriveTime; } diff --git a/src/main/java/com/nis/domain/restful/TrafficNetflowPortInfo.java b/src/main/java/com/nis/domain/restful/TrafficNetflowPortInfo.java index d78dc32..1efbf82 100644 --- a/src/main/java/com/nis/domain/restful/TrafficNetflowPortInfo.java +++ b/src/main/java/com/nis/domain/restful/TrafficNetflowPortInfo.java @@ -5,6 +5,8 @@ import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.nis.util.JsonDateDeserializer; import com.wordnik.swagger.annotations.ApiModelProperty; public class TrafficNetflowPortInfo implements Serializable { @@ -26,81 +28,109 @@ public class TrafficNetflowPortInfo implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "dataArriveTime", notes = "") private Date recvTime; + public long getStat_id() { return stat_id; } + public void setStat_id(long stat_id) { this.stat_id = stat_id; } + public long getPort() { return port; } + public void setPort(long port) { this.port = port; } + public String getNodeName() { return nodeName; } + public void setNodeName(String nodeName) { this.nodeName = nodeName; } + public String getNodeIp() { return nodeIp; } + public void setNodeIp(String nodeIp) { this.nodeIp = nodeIp; } + public String getPortDesc() { return portDesc; } + public void setPortDesc(String portDesc) { this.portDesc = portDesc; } + public long getBandwidth() { return bandwidth; } + public void setBandwidth(long bandwidth) { this.bandwidth = bandwidth; } + public long getInoctets() { return inoctets; } + public void setInoctets(long inoctets) { this.inoctets = inoctets; } + public long getOutoctets() { return outoctets; } + public void setOutoctets(long outoctets) { this.outoctets = outoctets; } + public long getInoctetsSpeed() { return inoctetsSpeed; } + public void setInoctetsSpeed(long inoctetsSpeed) { this.inoctetsSpeed = inoctetsSpeed; } + public long getOutoctetsSpeed() { return outoctetsSpeed; } + public void setOutoctetsSpeed(long outoctetsSpeed) { this.outoctetsSpeed = outoctetsSpeed; } + public long getInpktsSpeed() { return inpktsSpeed; } + public void setInpktsSpeed(long inpktsSpeed) { this.inpktsSpeed = inpktsSpeed; } + public long getOutpktsSpeed() { return outpktsSpeed; } + public void setOutpktsSpeed(long outpktsSpeed) { this.outpktsSpeed = outpktsSpeed; } + + @JsonDeserialize(using = JsonDateDeserializer.class) public Date getRecvTime() { return recvTime; } + + @JsonDeserialize(using = JsonDateDeserializer.class) public void setRecvTime(Date recvTime) { this.recvTime = recvTime; } diff --git a/src/main/java/com/nis/domain/restful/TrafficNmsServerStatistic.java b/src/main/java/com/nis/domain/restful/TrafficNmsServerStatistic.java index 77832b0..1522d81 100644 --- a/src/main/java/com/nis/domain/restful/TrafficNmsServerStatistic.java +++ b/src/main/java/com/nis/domain/restful/TrafficNmsServerStatistic.java @@ -6,6 +6,8 @@ import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.nis.util.JsonDateDeserializer; import com.wordnik.swagger.annotations.ApiModel; import com.wordnik.swagger.annotations.ApiModelProperty; @@ -36,11 +38,11 @@ public class TrafficNmsServerStatistic implements Serializable { private Integer abnormal;// @ApiModelProperty(value = "abnormalMachineList", notes = "异常主机列表") private List abnormalMachineList; - + @JsonDeserialize(using = JsonDateDeserializer.class) public Date getCommitTime() { return commitTime; } - + @JsonDeserialize(using = JsonDateDeserializer.class) public void setCommitTime(Date commitTime) { this.commitTime = commitTime; } diff --git a/src/main/java/com/nis/web/controller/restful/NmsInfoController.java b/src/main/java/com/nis/web/controller/restful/NmsInfoController.java index 702931d..f08207d 100644 --- a/src/main/java/com/nis/web/controller/restful/NmsInfoController.java +++ b/src/main/java/com/nis/web/controller/restful/NmsInfoController.java @@ -91,7 +91,7 @@ public class NmsInfoController extends BaseRestController { Constants.IS_DEBUG ? nmsDiRuleList : null); } - @RequestMapping(value = "/nms/v1/rafficNetflowPortInfo", method = RequestMethod.POST) + @RequestMapping(value = "/nms/v1/trafficNetflowPortInfo", method = RequestMethod.POST) @ApiOperation(value = "存储trafficNetflowPortInfo接口", httpMethod = "POST", response = Map.class, notes = "接收NMS系统上报的trafficNetflowPort信息") @ApiParam(value = "存储trafficNetflowPortInfo接口", name = "saveTrafficNetflowPortInfo", required = true) public Map saveTrafficNetflowPortInfo( diff --git a/src/main/java/com/nis/web/controller/restful/NtcLogSearchController.java b/src/main/java/com/nis/web/controller/restful/NtcLogSearchController.java index b50d367..650c477 100644 --- a/src/main/java/com/nis/web/controller/restful/NtcLogSearchController.java +++ b/src/main/java/com/nis/web/controller/restful/NtcLogSearchController.java @@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.RestController; import com.nis.domain.LogEntity; import com.nis.domain.Page; -import com.nis.domain.restful.DkBehaviorLog; import com.nis.domain.restful.NtcAppLog; import com.nis.domain.restful.NtcBgpLog; import com.nis.domain.restful.NtcDdosLog;