diff --git a/src/main/java/com/nis/web/controller/report/NtcDestIpReportController.java b/src/main/java/com/nis/web/controller/report/NtcDestIpReportController.java index b55bae988..9474a0d6d 100644 --- a/src/main/java/com/nis/web/controller/report/NtcDestIpReportController.java +++ b/src/main/java/com/nis/web/controller/report/NtcDestIpReportController.java @@ -1,5 +1,6 @@ package com.nis.web.controller.report; +import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; @@ -58,43 +59,13 @@ public class NtcDestIpReportController extends BaseController { bean.setPageSize(-1); bean.setFields("destCountry,sum,reportTime"); - String format=Constants.SEARCH_DATEFORMAT; - SimpleDateFormat sdf=new SimpleDateFormat(format); - Date date=new Date(); - bean.setSearchReportEndTime(sdf.format(date)); - - // 时间处理 小时报/日报/月报 - Calendar cal=Calendar.getInstance(); - cal.set(Calendar.MINUTE, 0); - cal.set(Calendar.SECOND, 0); - cal.set(Calendar.MILLISECOND, 0); - if(bean.getReportType()==Constants.REPORT_TYPE_HOUR){ - cal.set(Calendar.HOUR_OF_DAY, 0); - }else if(bean.getReportType()==Constants.REPORT_TYPE_DAY){ - cal.set(Calendar.HOUR_OF_DAY, 0); - cal.set(Calendar.DAY_OF_MONTH, 1); - }else if(bean.getReportType()==Constants.REPORT_TYPE_MONTH){ - cal.set(Calendar.HOUR_OF_DAY, 0); - cal.set(Calendar.DAY_OF_MONTH, 1); - cal.set(Calendar.MONTH, 0); - } - logger.info("search start time "+sdf.format(cal.getTime())); - logger.info("search end time "+sdf.format(date)); - bean.setSearchReportStartTime(sdf.format(cal.getTime())); - List titles=new ArrayList(); - while(cal.getTime().getTime() titles=this.getDateTitiles(bean); model.addAttribute("titles", titles); HashMap> showData=new LinkedHashMap<>();//构造数据展示集合 diff --git a/src/main/java/com/nis/web/controller/report/NtcEntranceReportController.java b/src/main/java/com/nis/web/controller/report/NtcEntranceReportController.java index cdcc3a3ba..d77f52e2b 100644 --- a/src/main/java/com/nis/web/controller/report/NtcEntranceReportController.java +++ b/src/main/java/com/nis/web/controller/report/NtcEntranceReportController.java @@ -1,5 +1,6 @@ package com.nis.web.controller.report; +import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; @@ -57,44 +58,14 @@ public class NtcEntranceReportController extends BaseController { // 调用服务接口... bean.setPageSize(-1); - bean.setFields("destCountry,sum,reportTime"); - String format=Constants.SEARCH_DATEFORMAT; - SimpleDateFormat sdf=new SimpleDateFormat(format); - Date date=new Date(); - bean.setSearchReportEndTime(sdf.format(date)); - - // 时间处理 小时报/日报/月报 - Calendar cal=Calendar.getInstance(); - cal.set(Calendar.MINUTE, 0); - cal.set(Calendar.SECOND, 0); - cal.set(Calendar.MILLISECOND, 0); - if(bean.getReportType()==Constants.REPORT_TYPE_HOUR){ - cal.set(Calendar.HOUR_OF_DAY, 0); - }else if(bean.getReportType()==Constants.REPORT_TYPE_DAY){ - cal.set(Calendar.HOUR_OF_DAY, 0); - cal.set(Calendar.DAY_OF_MONTH, 1); - }else if(bean.getReportType()==Constants.REPORT_TYPE_MONTH){ - cal.set(Calendar.HOUR_OF_DAY, 0); - cal.set(Calendar.DAY_OF_MONTH, 1); - cal.set(Calendar.MONTH, 0); - } - logger.info("search start time "+sdf.format(cal.getTime())); - logger.info("search end time "+sdf.format(date)); - bean.setSearchReportStartTime(sdf.format(cal.getTime())); - List titles=new ArrayList(); - while(cal.getTime().getTime() titles=this.getDateTitiles(bean); model.addAttribute("titles", titles); HashMap> showData=new LinkedHashMap<>();//构造数据展示集合 diff --git a/src/main/java/com/nis/web/controller/report/NtcLwhhReportController.java b/src/main/java/com/nis/web/controller/report/NtcLwhhReportController.java index 334438b64..1721ef8e9 100644 --- a/src/main/java/com/nis/web/controller/report/NtcLwhhReportController.java +++ b/src/main/java/com/nis/web/controller/report/NtcLwhhReportController.java @@ -1,5 +1,6 @@ package com.nis.web.controller.report; +import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; @@ -57,41 +58,13 @@ public class NtcLwhhReportController extends BaseController { StringBuffer url=new StringBuffer(Constants.LOG_BASE_URL+Constants.NTC_SERVICE_REPORT+"?"); bean.setPageSize(-1); bean.setFields("lwhh,sum,reportTime"); - String format=Constants.SEARCH_DATEFORMAT; - SimpleDateFormat sdf=new SimpleDateFormat(format); - Date date=new Date(); - bean.setSearchReportEndTime(sdf.format(date)); - Calendar cal=Calendar.getInstance(); - cal.set(Calendar.MINUTE, 0); - cal.set(Calendar.SECOND, 0); - cal.set(Calendar.MILLISECOND, 0); - if(bean.getReportType()==Constants.REPORT_TYPE_HOUR){ - cal.set(Calendar.HOUR_OF_DAY, 0); - }else if(bean.getReportType()==Constants.REPORT_TYPE_DAY){ - cal.set(Calendar.HOUR_OF_DAY, 0); - cal.set(Calendar.DAY_OF_MONTH, 1); - }else if(bean.getReportType()==Constants.REPORT_TYPE_MONTH){ - cal.set(Calendar.HOUR_OF_DAY, 0); - cal.set(Calendar.DAY_OF_MONTH, 1); - cal.set(Calendar.MONTH, 0); - } - logger.info("search start time "+sdf.format(cal.getTime())); - logger.info("search end time "+sdf.format(date)); - bean.setSearchReportStartTime(sdf.format(cal.getTime())); - List titles=new ArrayList(); - while(cal.getTime().getTime() titles=this.getDateTitiles(bean); model.addAttribute("titles", titles); // try { // result=result.getReport(url.toString(), bean); diff --git a/src/main/java/com/nis/web/controller/report/NtcTagReportController.java b/src/main/java/com/nis/web/controller/report/NtcTagReportController.java index ac2a68260..7dbc41a6d 100644 --- a/src/main/java/com/nis/web/controller/report/NtcTagReportController.java +++ b/src/main/java/com/nis/web/controller/report/NtcTagReportController.java @@ -1,5 +1,6 @@ package com.nis.web.controller.report; +import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; @@ -57,41 +58,13 @@ public class NtcTagReportController extends BaseController { StringBuffer url=new StringBuffer(Constants.LOG_BASE_URL+Constants.NTC_SERVICE_REPORT+"?"); bean.setPageSize(-1); bean.setFields("tag,sum,reportTime"); - String format=Constants.SEARCH_DATEFORMAT; - SimpleDateFormat sdf=new SimpleDateFormat(format); - Date date=new Date(); - bean.setSearchReportEndTime(sdf.format(date)); - Calendar cal=Calendar.getInstance(); - cal.set(Calendar.MINUTE, 0); - cal.set(Calendar.SECOND, 0); - cal.set(Calendar.MILLISECOND, 0); - if(bean.getReportType()==Constants.REPORT_TYPE_HOUR){ - cal.set(Calendar.HOUR_OF_DAY, 0); - }else if(bean.getReportType()==Constants.REPORT_TYPE_DAY){ - cal.set(Calendar.HOUR_OF_DAY, 0); - cal.set(Calendar.DAY_OF_MONTH, 1); - }else if(bean.getReportType()==Constants.REPORT_TYPE_MONTH){ - cal.set(Calendar.HOUR_OF_DAY, 0); - cal.set(Calendar.DAY_OF_MONTH, 1); - cal.set(Calendar.MONTH, 0); - } - logger.info("search start time "+sdf.format(cal.getTime())); - logger.info("search end time "+sdf.format(date)); - bean.setSearchReportStartTime(sdf.format(cal.getTime())); - List titles=new ArrayList(); - while(cal.getTime().getTime() titles=this.getDateTitiles(bean); model.addAttribute("titles", titles); // try { // result=result.getReport(url.toString(), bean); diff --git a/src/main/java/com/nis/web/controller/report/NtcXzReportController.java b/src/main/java/com/nis/web/controller/report/NtcXzReportController.java index c02a3e595..9e8fbc9fe 100644 --- a/src/main/java/com/nis/web/controller/report/NtcXzReportController.java +++ b/src/main/java/com/nis/web/controller/report/NtcXzReportController.java @@ -1,5 +1,6 @@ package com.nis.web.controller.report; +import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; @@ -58,43 +59,13 @@ public class NtcXzReportController extends BaseController { bean.setPageSize(-1); bean.setFields("attrType,sum,reportTime"); - String format=Constants.SEARCH_DATEFORMAT; - SimpleDateFormat sdf=new SimpleDateFormat(format); - Date date=new Date(); - bean.setSearchReportEndTime(sdf.format(date)); - - // 时间处理 小时报/日报/月报 - Calendar cal=Calendar.getInstance(); - cal.set(Calendar.MINUTE, 0); - cal.set(Calendar.SECOND, 0); - cal.set(Calendar.MILLISECOND, 0); - if(bean.getReportType()==Constants.REPORT_TYPE_HOUR){ - cal.set(Calendar.HOUR_OF_DAY, 0); - }else if(bean.getReportType()==Constants.REPORT_TYPE_DAY){ - cal.set(Calendar.HOUR_OF_DAY, 0); - cal.set(Calendar.DAY_OF_MONTH, 1); - }else if(bean.getReportType()==Constants.REPORT_TYPE_MONTH){ - cal.set(Calendar.HOUR_OF_DAY, 0); - cal.set(Calendar.DAY_OF_MONTH, 1); - cal.set(Calendar.MONTH, 0); - } - logger.info("search start time "+sdf.format(cal.getTime())); - logger.info("search end time "+sdf.format(date)); - bean.setSearchReportStartTime(sdf.format(cal.getTime())); - List titles=new ArrayList(); - while(cal.getTime().getTime() titles=this.getDateTitiles(bean); model.addAttribute("titles", titles); HashMap> showData=new LinkedHashMap<>();//构造数据展示集合