diff --git a/src/main/java/com/nis/domain/restful/DropInfo.java b/src/main/java/com/nis/domain/restful/DropInfo.java index 982ebb2..9d80f93 100644 --- a/src/main/java/com/nis/domain/restful/DropInfo.java +++ b/src/main/java/com/nis/domain/restful/DropInfo.java @@ -3,6 +3,7 @@ package com.nis.domain.restful; import java.io.Serializable; import java.util.Date; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -36,6 +37,48 @@ public class DropInfo implements Serializable { @ApiModelProperty(value = "统计时间") private Date reportTime;// 五分钟统计时间 + private long baseNum; + private String searchReportStartTime; + private String searchReportEndTime; + private int searchBusinessType; + + + @JsonIgnore + public int getSearchBusinessType() { + return searchBusinessType; + } + + public void setSearchBusinessType(int searchBusinessType) { + this.searchBusinessType = searchBusinessType; + } + + @JsonIgnore + public String getSearchReportStartTime() { + return searchReportStartTime; + } + + public void setSearchReportStartTime(String searchReportStartTime) { + this.searchReportStartTime = searchReportStartTime; + } + + @JsonIgnore + public String getSearchReportEndTime() { + return searchReportEndTime; + } + + public void setSearchReportEndTime(String searchReportEndTime) { + this.searchReportEndTime = searchReportEndTime; + } + + @JsonIgnore + public long getBaseNum() { + return baseNum; + } + + public void setBaseNum(long baseNum) { + this.baseNum = baseNum; + } + public String getLabel() { return label; } diff --git a/src/main/java/com/nis/domain/restful/NtcAreaHomeReport.java b/src/main/java/com/nis/domain/restful/NtcAreaHomeReport.java index bc37cfa..dbb1e97 100644 --- a/src/main/java/com/nis/domain/restful/NtcAreaHomeReport.java +++ b/src/main/java/com/nis/domain/restful/NtcAreaHomeReport.java @@ -6,6 +6,7 @@ import java.util.Date; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat.ISO; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -41,7 +42,38 @@ public class NtcAreaHomeReport implements Serializable { @JsonInclude(value = Include.NON_NULL) @ApiModelProperty(value = "统计时间") - private Date reportTime;// 统计时间 + private Date reportTime;// 统计时间 + + private long baseNum; + private String searchReportStartTime; + private String searchReportEndTime; + + @JsonIgnore + public String getSearchReportStartTime() { + return searchReportStartTime; + } + + public void setSearchReportStartTime(String searchReportStartTime) { + this.searchReportStartTime = searchReportStartTime; + } + + @JsonIgnore + public String getSearchReportEndTime() { + return searchReportEndTime; + } + + public void setSearchReportEndTime(String searchReportEndTime) { + this.searchReportEndTime = searchReportEndTime; + } + + @JsonIgnore + public long getBaseNum() { + return baseNum; + } + + public void setBaseNum(long baseNum) { + this.baseNum = baseNum; + } public int getEntranceId() { return entranceId; diff --git a/src/main/java/com/nis/domain/restful/PxyHttpLog.java b/src/main/java/com/nis/domain/restful/PxyHttpLog.java index 1a13ab4..0bd38b1 100644 --- a/src/main/java/com/nis/domain/restful/PxyHttpLog.java +++ b/src/main/java/com/nis/domain/restful/PxyHttpLog.java @@ -1,5 +1,6 @@ package com.nis.domain.restful; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.nis.domain.LogEntity; import com.wordnik.swagger.annotations.ApiModelProperty; @@ -42,6 +43,8 @@ public class PxyHttpLog extends LogEntity { @ApiModelProperty(value="域名", required=true) protected String website; + protected String searchUrl; //url查询条件a + protected String searchWebsite; //website查询条件 public String getUrl() { return url; } @@ -127,4 +130,29 @@ public class PxyHttpLog extends LogEntity { public void setWebsite(String website) { this.website = website; } + + /** + * @return the searchUrl + */ + + @JsonIgnore + public String getSearchUrl() { + return searchUrl; + } + + /** + * @param searchUrl the searchUrl to set + */ + public void setSearchUrl(String searchUrl) { + this.searchUrl = searchUrl; + } + + @JsonIgnore + public String getSearchWebsite() { + return searchWebsite; + } + + public void setSearchWebsite(String searchWebsite) { + this.searchWebsite = searchWebsite; + } } diff --git a/src/main/java/com/nis/web/controller/restful/SystemHomePageController.java b/src/main/java/com/nis/web/controller/restful/SystemHomePageController.java index c7e6b63..bf0973c 100644 --- a/src/main/java/com/nis/web/controller/restful/SystemHomePageController.java +++ b/src/main/java/com/nis/web/controller/restful/SystemHomePageController.java @@ -49,8 +49,9 @@ public class SystemHomePageController extends BaseRestController { @RequestMapping(value = "/log/v1/trafficAreaStat", method = RequestMethod.GET) @ApiOperation(value = "地域流量获取", httpMethod = "GET", notes = "对地域流量获取服务信息进行查询", response = Map.class) - public Map trafficAreaStat(String searchReportStartTime, String searchReportEndTime, - HttpServletRequest request, HttpServletResponse response) { + public Map trafficAreaStat(NtcAreaHomeReport ntcAreaHomeReport, HttpServletRequest request, HttpServletResponse response) { + /*public Map trafficAreaStat(String searchReportStartTime, String searchReportEndTime, + HttpServletRequest request, HttpServletResponse response) {*/ long start = System.currentTimeMillis(); AuditLogThread saveLogThread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, @@ -58,9 +59,7 @@ public class SystemHomePageController extends BaseRestController { Page trafficAreaStatPage = null; try { - trafficAreaStatPage = systemHomePageService.getTrafficAreaStat(searchReportStartTime, searchReportEndTime, - request, response); - + trafficAreaStatPage = systemHomePageService.getTrafficAreaStat(ntcAreaHomeReport); } catch (Exception e) { saveLogThread.setExceptionInfo(e.getMessage() + " " + e.getCause()); e.printStackTrace(); @@ -125,19 +124,19 @@ public class SystemHomePageController extends BaseRestController { @RequestMapping(value = "/log/v1/blockAndDropStat", method = RequestMethod.GET) @ApiOperation(value = "丢弃量获取", httpMethod = "GET", notes = "对阻断和丢弃量进行查询", response = Map.class) - public Map blockAndDropStat(String searchReportStartTime, String searchReportEndTime, + /*public Map blockAndDropStat(String searchReportStartTime, String searchReportEndTime, int searchBusinessType, HttpServletRequest request, + HttpServletResponse response) {*/ + public Map blockAndDropStat(DropInfo dropInfo, HttpServletRequest request, HttpServletResponse response) { long start = System.currentTimeMillis(); AuditLogThread saveLogThread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, null); - Page dropInfo = null; - if(searchBusinessType == 0)searchBusinessType = 1; + //if(searchBusinessType == 0)searchBusinessType = 1; + Page dropInfoList=null; try { - dropInfo = systemHomePageService.getBlockAndDropStat(searchReportStartTime, searchReportEndTime, - searchBusinessType, request, response); - + dropInfoList = systemHomePageService.getBlockAndDropStat(dropInfo, request, response); } catch (Exception e) { saveLogThread.setExceptionInfo(e.getMessage() + " " + e.getCause()); e.printStackTrace(); @@ -150,7 +149,7 @@ public class SystemHomePageController extends BaseRestController { } } - return serviceLogResponse(saveLogThread, System.currentTimeMillis() - start, request, "获取丢弃量成功", dropInfo, 0); + return serviceLogResponse(saveLogThread, System.currentTimeMillis() - start, request, "获取丢弃量成功", dropInfoList, 0); } diff --git a/src/main/java/com/nis/web/controller/restful/TestDate.java b/src/main/java/com/nis/web/controller/restful/TestDate.java index fade936..fb296ac 100644 --- a/src/main/java/com/nis/web/controller/restful/TestDate.java +++ b/src/main/java/com/nis/web/controller/restful/TestDate.java @@ -890,16 +890,16 @@ public class TestDate{//VeDate { //System.out.print(Integer.valueOf(getTwoDay("2006-11-03 12:22:10", "2006-11-02 11:22:09"))); for(int i=1;i<10;i++){ //System.out.println(Long.valueOf(String.format("%d", Math.random()*5+94))); - /* double te = Math.random()*0.2+0.9; + double te = Math.random()*0.2+0.9; System.out.println( te); System.out.println(Math.floor( 10000*(te))); - System.out.println(Math.round( 10000*(te)));*/ + System.out.println(Math.round( 10000*(te))); - String sTime = "2018-12-18 00:00:00"; + /* String sTime = "2018-12-18 00:00:00"; String eTime = "2018-12-19 00:00:00"; long startTimes = DateUtils.strToDate(sTime,"yyyy-MM-dd HH:mm:ss").getTime(); long endTimes = DateUtils.strToDate(eTime,"yyyy-MM-dd HH:mm:ss").getTime(); - System.out.println(endTimes-startTimes); + System.out.println(endTimes-startTimes);*/ } } catch (Exception e) { throw new Exception(); diff --git a/src/main/java/com/nis/web/dao/SystemHomePageDao.java b/src/main/java/com/nis/web/dao/SystemHomePageDao.java index 17a7d27..7af2ecb 100644 --- a/src/main/java/com/nis/web/dao/SystemHomePageDao.java +++ b/src/main/java/com/nis/web/dao/SystemHomePageDao.java @@ -12,14 +12,17 @@ import com.nis.domain.restful.NtcAreaHomeReport; @MyBatisDao public interface SystemHomePageDao { - List getTrafficAreaStatList(@Param("startTime") Date searchReportStartTime, - @Param("endTime") Date searchReportEndTime); - + /*List getTrafficAreaStatList(@Param("startTime") Date searchReportStartTime, + @Param("endTime") Date searchReportEndTime);*/ + List findTrafficAreaStatList(NtcAreaHomeReport ntcAreaHomeReport); + //List getCfgSortLogStatList(@Param("startTime") Date startTime, @Param("endTime") Date endTime); - List getCfgSortLogStatList(CfgLogInfo cfgLogInfo); + List findCfgSortLogStatList(CfgLogInfo cfgLogInfo); - List getBlockAndDropStatListAll(@Param("startTime") Date startTime, @Param("endTime") Date endTime); + //List getBlockAndDropStatListAll(@Param("startTime") Date startTime, @Param("endTime") Date endTime); + List findBlockAndDropStatListAll(DropInfo dropInfo); - List getBlockAndDropStatListMinute(@Param("startTime") Date startTime, @Param("endTime") Date endTime); + //List getBlockAndDropStatListMinute(@Param("startTime") Date startTime, @Param("endTime") Date endTime); + List findBlockAndDropStatListMinute(DropInfo dropInfo); } diff --git a/src/main/java/com/nis/web/dao/SystemHomePageDao.xml b/src/main/java/com/nis/web/dao/SystemHomePageDao.xml index fc99bda..7bfae2c 100644 --- a/src/main/java/com/nis/web/dao/SystemHomePageDao.xml +++ b/src/main/java/com/nis/web/dao/SystemHomePageDao.xml @@ -11,7 +11,7 @@ - + - -