渠道数据量修改

src/main/java/com/zhiwei/manage/servlet/DataController.java

@@ -194,16 +194,17 @@ public class DataController {
 
 	@RequestMapping(value = "/getDayDataByChannel", produces = "application/json;charset=utf-8")
 	@ResponseBody
-	public String getDayData(@RequestBody Map<String, Object> map) {
+	public String getDayDataByChannel(@RequestBody Map<String, Object> map) {
 		long start = (long) map.get("start");
 		long end = (long) map.get("end");
 		String pt = String.valueOf(map.get("pt")) ;
 		try {
-			System.out.println(start);
+			Calendar nows=Calendar.getInstance();
 			Calendar startTime = Calendar.getInstance();
 			startTime.setTimeInMillis(start);
 			Calendar endTime = Calendar.getInstance();
 			endTime.setTimeInMillis(end);
+			endTime.set(Calendar.HOUR_OF_DAY, nows.get(Calendar.HOUR_OF_DAY));
 			System.out.println(new SimpleDateFormat("yyyy-MM-dd").format(endTime.getTime()));
 			System.out.println(new SimpleDateFormat("yyyy-MM-dd").format(startTime.getTime()));
 			System.out.println(pt);