Browse Source

后台的媒体数据报表的更新

Signed-off-by: you.chen <you.chen@cloudcross.com>
you.chen 9 years ago
parent
commit
20c9703b9d

+ 2 - 32
src/main/java/com/cloudcross/ssp/web/back/main/ad/operator/OperatorReportController.java

@@ -158,7 +158,7 @@ public class OperatorReportController extends SimpleController {
 		if (startDate.equals(endDate)) {
 		if (startDate.equals(endDate)) {
 			// 先找到这一天改运营商每一个小时所有广告位的pv,uv,曝光数等等
 			// 先找到这一天改运营商每一个小时所有广告位的pv,uv,曝光数等等
 			List<RptZoneHour> rptZoneHourList = null;
 			List<RptZoneHour> rptZoneHourList = null;
-			rptZoneHourList = rptZoneHourService.findEveryHourData(paramMap);
+			rptZoneHourList = rptZoneHourService.findEveryHourDataBack(paramMap);
 
 
 			// 如果查询到的集合大小为0则表名没有符合条件的数据则给24个小时加0
 			// 如果查询到的集合大小为0则表名没有符合条件的数据则给24个小时加0
 			if (rptZoneHourList.size() == 0) {
 			if (rptZoneHourList.size() == 0) {
@@ -231,7 +231,7 @@ public class OperatorReportController extends SimpleController {
 	}
 	}
 	
 	
 	/**
 	/**
-	 * 返回个OperatorReport的集合,用来在媒体数据报表列表页的图表显示
+	 * 返回个OperatorReport的集合,用来在媒体数据报表列表页的图表显示
 	 * 前端要传递三个参数给后端,分别是媒体的id(变量名selectedOperatorId),广告位的id(变量名selectedZoneId
 	 * 前端要传递三个参数给后端,分别是媒体的id(变量名selectedOperatorId),广告位的id(变量名selectedZoneId
 	 * )和日期dateRangePicker,如果没有传递则为默认的值,媒体的默认值为全部的媒体,这时operatorId设为
 	 * )和日期dateRangePicker,如果没有传递则为默认的值,媒体的默认值为全部的媒体,这时operatorId设为
 	 * null就行,广告位id和媒体类似,时间默认的是昨天
 	 * null就行,广告位id和媒体类似,时间默认的是昨天
@@ -479,9 +479,6 @@ public class OperatorReportController extends SimpleController {
 	public String position(Model model,
 	public String position(Model model,
 			@RequestParam HashMap<String, Object> paramMap,
 			@RequestParam HashMap<String, Object> paramMap,
 			@RequestParam(defaultValue = "1") int page) {
 			@RequestParam(defaultValue = "1") int page) {
-		// 这里还没传值,自己设定个日期的值
-		//paramMap.put("dateRangePicker", "2015-09-01 to 2015-10-30");
-		//paramMap.put("selectedOperatorId", "1");
 
 
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		String startDate = null;
 		String startDate = null;
@@ -562,10 +559,6 @@ public class OperatorReportController extends SimpleController {
 			@RequestParam HashMap<String, Object> paramMap,
 			@RequestParam HashMap<String, Object> paramMap,
 			@RequestParam(defaultValue = "1") int page) {
 			@RequestParam(defaultValue = "1") int page) {
 
 
-		// 这里还没传值,自己设定个日期的值
-		//paramMap.put("dateRangePicker", "2015-09-01 to 2015-10-30");
-		//paramMap.put("selectedOperatorId", "1");
-
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		String startDate = null;
 		String startDate = null;
 		String endDate = null;
 		String endDate = null;
@@ -607,7 +600,6 @@ public class OperatorReportController extends SimpleController {
 		paramMap.put("startDate", startDate);
 		paramMap.put("startDate", startDate);
 		paramMap.put("endDate", endDate);
 		paramMap.put("endDate", endDate);
 		int totalRow = operatorReportService.countBySystem(paramMap);
 		int totalRow = operatorReportService.countBySystem(paramMap);
-		System.out.println("bbbreport" + totalRow);
 		Pager pager = new Pager();
 		Pager pager = new Pager();
 		pager.setPage(page);
 		pager.setPage(page);
 		pager.setTotalRow(totalRow);
 		pager.setTotalRow(totalRow);
@@ -646,10 +638,6 @@ public class OperatorReportController extends SimpleController {
 			@RequestParam HashMap<String, Object> paramMap,
 			@RequestParam HashMap<String, Object> paramMap,
 			@RequestParam(defaultValue = "1") int page) {
 			@RequestParam(defaultValue = "1") int page) {
 
 
-		// 这里还没传值,自己设定个日期的值
-		//paramMap.put("dateRangePicker", "2015-09-01 to 2015-10-30");
-		//paramMap.put("selectedOperatorId", "1");
-
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		String startDate = null;
 		String startDate = null;
 		String endDate = null;
 		String endDate = null;
@@ -721,10 +709,6 @@ public class OperatorReportController extends SimpleController {
 			@RequestParam HashMap<String, Object> paramMap,
 			@RequestParam HashMap<String, Object> paramMap,
 			@RequestParam(defaultValue = "1") int page) {
 			@RequestParam(defaultValue = "1") int page) {
 
 
-		// 这里还没传值,自己设定个日期的值
-	//	paramMap.put("dateRangePicker", "2015-09-01 to 2015-10-30");
-		// paramMap.put("selectedOperatorId", "1");
-
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		String startDate = null;
 		String startDate = null;
 		String endDate = null;
 		String endDate = null;
@@ -799,17 +783,11 @@ public class OperatorReportController extends SimpleController {
 	@RequestMapping("/city")
 	@RequestMapping("/city")
 	public @ResponseBody List<OperatorReport> arealCtiy(Model model,
 	public @ResponseBody List<OperatorReport> arealCtiy(Model model,
 			@RequestParam HashMap<String, Object> paramMap) {
 			@RequestParam HashMap<String, Object> paramMap) {
-		System.out.println("nishicat"+paramMap);
-		// 这里还没传值,自己设定个日期的值
-		//paramMap.put("dateRangePicker", "2015-09-01 to 2015-10-30");
-		//paramMap.put("cn", "上海");
-		// paramMap.put("selectedOperatorId", "1");
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		String startDate = null;
 		String startDate = null;
 		String endDate = null;
 		String endDate = null;
 		Long operatorId = null;
 		Long operatorId = null;
 		
 		
-		
 		if (!paramMap.containsKey("dateRangePicker")) {
 		if (!paramMap.containsKey("dateRangePicker")) {
 			// 说明要按默认时间
 			// 说明要按默认时间
 			startDate = endDate = sdf.format(new Date((new Date()).getTime()
 			startDate = endDate = sdf.format(new Date((new Date()).getTime()
@@ -865,10 +843,6 @@ public class OperatorReportController extends SimpleController {
 	public String place(Model model,
 	public String place(Model model,
 			@RequestParam HashMap<String, Object> paramMap,
 			@RequestParam HashMap<String, Object> paramMap,
 			@RequestParam(defaultValue = "1") int page) {
 			@RequestParam(defaultValue = "1") int page) {
-		// 这里还没传值,自己设定个日期的值
-		//paramMap.put("dateRangePicker", "2015-09-01 to 2015-10-30");
-		//paramMap.put("selectedOperatorId", "1");
-
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		String startDate = null;
 		String startDate = null;
 		String endDate = null;
 		String endDate = null;
@@ -947,10 +921,6 @@ public class OperatorReportController extends SimpleController {
 			HttpServletResponse response,
 			HttpServletResponse response,
 			@RequestParam Map<String, Object> paramMap) {
 			@RequestParam Map<String, Object> paramMap) {
 
 
-		// 这里还没传值,自己设定个日期的值
-		//paramMap.put("dateRangePicker", "2015-09-01 to 2015-10-30");
-		//paramMap.put("selectedOperatorId", "1");
-		
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		String startDate = null;
 		String startDate = null;
 		String endDate = null;
 		String endDate = null;