Merge pull request #399 from zengwei0771/master

app data collect refactor

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

@@ -11,6 +11,7 @@ import java.util.Map.Entry;
 import org.unidal.helper.Threads.Task;
 
 import com.dianping.cat.Cat;
+import com.dianping.cat.app.AppDataCommand;
 import com.dianping.cat.config.app.AppDataService;
 
 public class BucketHandler implements Task {
@@ -126,10 +127,24 @@ public class BucketHandler implements Task {
 		Date period = new Date(m_startTime - minute * ONE_MINUTE);
 
 		try {
-			m_appDataService.insert(period, minute, appData.getCommand(), appData.getCity(), appData.getOperator(),
-			      appData.getNetwork(), appData.getVersion(), appData.getConnectType(), appData.getCode(),
-			      appData.getPlatform(), appData.getCount(), appData.getResponseTime(), appData.getResponseByte(),
-			      appData.getResponseByte());
+			AppDataCommand proto = new AppDataCommand();
+
+			proto.setPeriod(period);
+			proto.setMinuteOrder(minute);
+			proto.setCommandId(appData.getCommand());
+			proto.setCity(appData.getCity());
+			proto.setOperator(appData.getOperator());
+			proto.setNetwork(appData.getNetwork());
+			proto.setAppVersion(appData.getVersion());
+			proto.setConnnectType(appData.getConnectType());
+			proto.setCode(appData.getCode());
+			proto.setPlatform(appData.getPlatform());
+			proto.setAccessNumber(appData.getCount());
+			proto.setResponseSumTime(appData.getResponseTime());
+			proto.setRequestPackage(appData.getRequestByte());
+			proto.setResponsePackage(appData.getResponseByte());
+			proto.setCreationDate(new Date());
+			m_appDataService.insert(proto);
 		} catch (Exception e) {
 			Cat.logError(e);
 

cat-broker/src/main/java/com/dianping/cat/broker/api/page/batch/Handler.java

@@ -120,14 +120,17 @@ public class Handler implements PageHandler<Context>, LogEnabled {
 			String content = payload.getContent();
 			String records[] = content.split("\n");
 			IpInfo ipInfo = m_ipService.findIpInfoByString(userIp);
-			String province = ipInfo.getProvince();
-			String operatorStr = ipInfo.getChannel();
-			Integer cityId = m_appConfigManager.getCities().get(province);
-			Integer operatorId = m_appConfigManager.getOperators().get(operatorStr);
-
-			if (cityId != null && operatorId != null) {
-				for (String record : records) {
-					processOneRecord(cityId, operatorId, record);
+			
+			if (ipInfo != null) {
+				String province = ipInfo.getProvince();
+				String operatorStr = ipInfo.getChannel();
+				Integer cityId = m_appConfigManager.getCities().get(province);
+				Integer operatorId = m_appConfigManager.getOperators().get(operatorStr);
+
+				if (cityId != null && operatorId != null) {
+					for (String record : records) {
+						processOneRecord(cityId, operatorId, record);
+					}
 				}
 			}
 		} else {
@@ -158,7 +161,7 @@ public class Handler implements PageHandler<Context>, LogEnabled {
 					appData.setCity(cityId);
 					appData.setOperator(operatorId);
 					appData.setCount(1);
-					
+
 					m_appDataConsumer.enqueue(appData);
 				}
 			} catch (Exception e) {

cat-core/src/main/java/com/dianping/cat/config/app/AppDataService.java

@@ -32,27 +32,7 @@ public class AppDataService {
 
 	public static final String DELAY_AVG = "成功延时(ms)";
 
-	public void insert(Date period, int minute, int commandId, int city, int operator, int network, int appVersion,
-	      int connectType, int code, int platform, int count, int responseSumTime, int requestPackage,
-	      int responsePackage) throws DalException {
-		AppDataCommand proto = new AppDataCommand();
-
-		proto.setPeriod(period);
-		proto.setMinuteOrder(minute);
-		proto.setCommandId(commandId);
-		proto.setCity(city);
-		proto.setOperator(operator);
-		proto.setNetwork(network);
-		proto.setAppVersion(appVersion);
-		proto.setConnnectType(connectType);
-		proto.setCode(code);
-		proto.setPlatform(platform);
-		proto.setAccessNumber(count);
-		proto.setResponseSumTime(responseSumTime);
-		proto.setRequestPackage(requestPackage);
-		proto.setResponsePackage(responsePackage);
-		proto.setCreationDate(new Date());
-
+	public void insert(AppDataCommand proto) throws DalException {
 		m_dao.insertData(proto);
 	}