log

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

@@ -1033,7 +1033,7 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{
                 Map<String, String> channelMap = new HashMap<>();
 
                 //group by _cid or group by _campaignid
-                /*if (groupArray.toString().contains(FIELD_CID) || groupArray.toString().contains(FIELD_CAMPAIGN_ID)) {
+                if (groupArray.toString().contains(FIELD_CID) || groupArray.toString().contains(FIELD_CAMPAIGN_ID)) {
                     Account account = accountRepository.findOne(accountId);
                     try {
                         String url = Constant.trackingUrl + "/api/"+ app.getId() +"/channel/findchannelcamp4io?appkey=" + app.getAppkey() + "&email=" + account.getEmail();
@@ -1060,7 +1060,7 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{
                         logger.error("fail to get channel or campaign name");
                     }
 
-                }*/
+                }
 
 
                 //1,处理日期合并(给每个日期的第一行加标注,firstDateRow标示第一行,rowNum标示相同日期行数)

src/main/java/com/reyun/taskexecute/EventReportCallable.java

@@ -84,6 +84,7 @@ public class EventReportCallable implements Callable<Map<String, List>> {
             result = new HashMap<>();
             result.put("totalval",totalValue);
         }
+        System.out.println(result.get("val"));
         return result;
     }
 }