delete log

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

@@ -211,18 +211,13 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{
         String demoApps = configParamService.getConfigParamByKey("demo_appkey");
         List<String> demoAppList = Arrays.asList(demoApps.split(","));
         String url = "";
-        System.out.println(demoApps);
-        System.out.println(app.getAppkey());
         if (demoAppList.contains(app.getAppkey())) {
             url = Constant.demoUrl + "/api/trackingio/eventstats/complicated/" + app.getAppkey() + "/" + viewType;
-            System.out.println("........................."+url+".........................");
         }
 
 
         //母账号、管理员、子账号管理员
         querySql = querySql.replace("$campaign","");
-        System.out.println(1111);
-        System.out.println(querySql);
         Map<String, String> conditions = buildQueryPrestoCondition(querySql, app.getAppkey());
 
         ExecutorService pool = Executors.newFixedThreadPool(2);
@@ -256,7 +251,6 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{
     @Override
     public List<JSONObject> queryDistinctTotalData(Long appId, Long accountId, String startDate, String endDate, String eventCondition, String viewType) {
 
-        System.out.println("start total calculate");
 
         List<JSONObject> result = new ArrayList<>();
 
@@ -298,10 +292,7 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{
 
         Map<String, List> responseJson = new HashMap<>();
         if (demoAppList.contains(app.getAppkey())) {
-            System.out.println("start to get demo data");
             String url = Constant.demoUrl + "/api/trackingio/eventstats/complicated/total/" + app.getAppkey();
-
-            System.out.println(url);
             try {
                 String responseStr = HttpClientUtil.doHttpPostRequest(url, "trackingio", conditions);
                 ObjectMapper mapper = new ObjectMapper();
@@ -309,7 +300,6 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{
             } catch (Exception e) {
                 logger.error("fail to get demo data......");
             }
-            System.out.println("end to get demo data");
         } else {
             responseJson = reportService.reportBySql(conditions);
         }
@@ -323,8 +313,6 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{
      */
     private List<JSONObject> formatTotalValueDate(Long appId, Long accountId, Map<String, List> responseJson, JSONArray groupArray, List<String> selectFieldList) {
 
-        System.out.println("start tp format total value");
-
         List<JSONObject> result = new ArrayList<>();
 
         //处理数据
@@ -392,7 +380,6 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{
 
             result = calculateTotalPercent(result, selectFieldList);
         }
-        System.out.println("end to calculate total value");
 
         return result;
     }
@@ -1037,8 +1024,6 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{
             //val
             if (!CollectionUtils.isEmpty(responseValueArray)) {
 
-                System.out.println("start to get channel name from tracking");
-
                 //cid,campaignid数据转换
                 Map<String, String> campaignMap = new HashMap<>();
                 Map<String, String> channelMap = new HashMap<>();
@@ -1072,8 +1057,6 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{
                     }
 
                 }
-                System.out.println("end to get channel name from tracking");
-
                 //1,处理日期合并(给每个日期的第一行加标注,firstDateRow标示第一行,rowNum标示相同日期行数)
                 String firstValueDate = "";
                 JSONObject firstVal = null;
@@ -1130,8 +1113,6 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{
                     valueResult.add(val);
                 }
 
-                System.out.println("1111111111111111111111111111111111111");
-
                 //处理最后一个日期
                 if (null != firstVal) {
                     firstVal.put("firstDateRow", true);
@@ -1158,7 +1139,6 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{
                     //替换日期
                     value.put(FIELD_DS, dateStringMap.get(value.getString(FIELD_DS)));
                 }
-                System.out.println("222222222222222222222222222222222");
             }
 
             //columnKey
@@ -1185,7 +1165,6 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{
                     nameList.add(commonEventProperties.containsKey(key) ? commonEventProperties.get(key).getAttrAlias() : groupField);
                 }
             }
-            System.out.println("3333333333333333333333333333333333333");
 
             //指标列
             if (!CollectionUtils.isEmpty(selectFieldList)) {

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

@@ -75,19 +75,15 @@ public class EventReportCallable implements Callable<Map<String, List>> {
             }
             //获取时间范围内按照时间粒度的所有日期
             Map<String, String> dateStringMap = eventStatsService.getDateMapByViewFlag(startDate, endDate, viewType);
-            System.out.println("format................");
             //格式化数据
             result = eventStatsService.formatComplicatedEventResponse(app, accountid, responseJson, dateStringMap, groupJsonArray, selectList);
-            System.out.println("after format..........................");
 
         }else{
             //查询合计
             List<JSONObject> totalValue = eventStatsService.queryDistinctTotalData(app.getId(), accountid, startDate, endDate, eventCondition, viewType);
-            System.out.println("after total calculate...................");
             result = new HashMap<>();
             result.put("totalval",totalValue);
         }
-        System.out.println(result.get("columnkey"));
         return result;
     }
 }