Merge pull request #421 from zengwei0771/master

app data collect time handle bug fix

cat-broker/src/main/java/com/dianping/cat/broker/api/app/BucketHandler.java

 package com.dianping.cat.broker.api.app;
 
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -15,10 +16,6 @@ import com.dianping.cat.config.app.AppDataService;
 
 public class BucketHandler implements Task {
 
-	private static int ONE_MINUTE = 60 * 1000;
-
-	private static int ONE_DAY = 24 * 60 * ONE_MINUTE;
-
 	private AppDataQueue m_appDataQueue;
 
 	private AppDataService m_appDataService;
@@ -37,8 +34,18 @@ public class BucketHandler implements Task {
 	}
 
 	private void end() {
-		int minute = (int) (m_startTime % ONE_DAY / ONE_MINUTE);
-		Date period = new Date(m_startTime - minute * ONE_MINUTE);
+		Calendar cal = Calendar.getInstance();
+		cal.setTimeInMillis(m_startTime);
+
+		int minute = cal.get(Calendar.HOUR_OF_DAY) * 60 + cal.get(Calendar.MINUTE);
+		minute = minute - minute % 5;
+		
+		cal.set(Calendar.MINUTE, 0);
+		cal.set(Calendar.MILLISECOND, 0);
+		cal.set(Calendar.SECOND, 0);
+		cal.set(Calendar.HOUR_OF_DAY, 0);
+		
+		Date period = new Date(cal.getTimeInMillis());
 		List<AppDataCommand> appDataCommands = new ArrayList<AppDataCommand>();
 		int batchSize = 100;
 

cat-broker/src/test/java/com/dianping/cat/broker/AppTest.java

@@ -2,16 +2,41 @@ package com.dianping.cat.broker;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLEncoder;
 import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
+import org.junit.Test;
+
 public class AppTest {
 	
-	public static void main(String[] args) throws UnsupportedEncodingException {
+	@Test
+	public void test() throws Exception {
+		long time = System.currentTimeMillis();
+		
+		Calendar cal = Calendar.getInstance();
+		cal.setTimeInMillis(time);
+
+		int minute = cal.get(Calendar.HOUR_OF_DAY) * 60 + cal.get(Calendar.MINUTE);
+		minute = minute - minute % 5;
+		
+		cal.set(Calendar.MINUTE, 0);
+		cal.set(Calendar.MILLISECOND, 0);
+		cal.set(Calendar.SECOND, 0);
+		cal.set(Calendar.HOUR_OF_DAY, 0);
+		
+		Date period = new Date(cal.getTimeInMillis());
+		
+		
+		System.out.println(minute);
+		System.out.println(period);
+	}
+	
+	public void SendData() throws Exception {
 		List<String> urls = new ArrayList<String>();
 		String url_pre = "http://localhost:2765/broker-service/api/batch";
 		long timestamp = System.currentTimeMillis();
@@ -26,7 +51,7 @@ public class AppTest {
 		}
 	}
 
-	public static String sendGet(String url) {
+	public String sendGet(String url) {
 		String result = "";
 		BufferedReader in = null;
 		try {