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..d31d973c2 100644 --- a/src/main/java/com/nis/web/controller/report/NtcTagReportController.java +++ b/src/main/java/com/nis/web/controller/report/NtcTagReportController.java @@ -1,9 +1,9 @@ package com.nis.web.controller.report; +import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; -import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.LinkedHashMap; @@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import com.nis.domain.FunctionServiceDict; -import com.nis.domain.Page; import com.nis.domain.basics.ServiceDictInfo; import com.nis.domain.log.SearchReport; import com.nis.domain.report.NtcTagReport; @@ -57,41 +56,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);