add channel name

src/main/java/com/reyun/service/impl/ComplicatedEventsServiceImpl.java

@@ -341,14 +341,15 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{
             Map<String, String> campaignMap = new HashMap<>();
             Map<String, String> channelMap = new HashMap<>();
 
-            /*//group by _cid or group by _campaignid
+            //group by _cid or group by _campaignid
             if (groupArray.toString().contains(FIELD_CID) || groupArray.toString().contains(FIELD_CAMPAIGN_ID)) {
                 Account account = accountRepository.findOne(accountId);
                 App app = appRepository.findOne(appId);
+                try {
                     String url = Constant.trackingUrl + "/api/"+ app.getId() +"/channel/findchannelcamp4io?appkey=" + app.getAppkey() + "&email=" + account.getEmail();
                     String response = HttpClientUtil.doHttpGetRequest(url, "io");
                     if (!StringUtil.isEmpty(response)) {
-                    try {
+
                             JSONObject ob = JSONObject.fromObject(response);
                             JSONObject content = ob.getJSONObject("content");
                             if (groupArray.toString().contains(FIELD_CID)) {
@@ -362,14 +363,15 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{
                                 campaignMap = mapper.readValue(campObject.toString(), Map.class);
                             }
 
+
+
+                    }
                 } catch (Exception e) {
                     logger.error("fail to get channel or campaign name");
                 }
 
             }
 
-            }*/
-
             //翻译处理
             for (Object valElement : responseValueArray) {
 
@@ -1035,7 +1037,7 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{
             //val
             if (!CollectionUtils.isEmpty(responseValueArray)) {
 
-                /*System.out.println("start to get channel name from tracking");
+                System.out.println("start to get channel name from tracking");
 
                 //cid,campaignid数据转换
                 Map<String, String> campaignMap = new HashMap<>();
@@ -1070,7 +1072,7 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{
                     }
 
                 }
-                System.out.println("end to get channel name from tracking");*/
+                System.out.println("end to get channel name from tracking");
 
                 //1,处理日期合并(给每个日期的第一行加标注,firstDateRow标示第一行,rowNum标示相同日期行数)
                 String firstValueDate = "";

src/main/java/com/reyun/util/HttpClientUtil.java

@@ -24,9 +24,9 @@ public class HttpClientUtil {
     private static final Log log = LogFactory.getLog(HttpClientUtil.class);
   
     // 读取超时  
-    private final static int SOCKET_TIMEOUT = 10000;
+    private final static int SOCKET_TIMEOUT = 6000;
     // 连接超时  
-    private final static int CONNECTION_TIMEOUT = 60000;  
+    private final static int CONNECTION_TIMEOUT = 6000;
     // 每个HOST的最大连接数量  
     private final static int MAX_CONN_PRE_HOST = 20;  
     // 连接池的最大连接数