Commit c5074027 by carrieyzzhang

log

parent 1849586d
...@@ -1028,6 +1028,8 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{ ...@@ -1028,6 +1028,8 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{
//val //val
if (!CollectionUtils.isEmpty(responseValueArray)) { if (!CollectionUtils.isEmpty(responseValueArray)) {
System.out.println("start to get channel name from tracking");
//cid,campaignid数据转换 //cid,campaignid数据转换
Map<String, String> campaignMap = new HashMap<>(); Map<String, String> campaignMap = new HashMap<>();
Map<String, String> channelMap = new HashMap<>(); Map<String, String> channelMap = new HashMap<>();
...@@ -1061,7 +1063,7 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{ ...@@ -1061,7 +1063,7 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{
} }
} }
System.out.println("end to get channel name from tracking");
//1,处理日期合并(给每个日期的第一行加标注,firstDateRow标示第一行,rowNum标示相同日期行数) //1,处理日期合并(给每个日期的第一行加标注,firstDateRow标示第一行,rowNum标示相同日期行数)
String firstValueDate = ""; String firstValueDate = "";
...@@ -1119,6 +1121,8 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{ ...@@ -1119,6 +1121,8 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{
valueResult.add(val); valueResult.add(val);
} }
System.out.println("1111111111111111111111111111111111111");
//处理最后一个日期 //处理最后一个日期
if (null != firstVal) { if (null != firstVal) {
firstVal.put("firstDateRow", true); firstVal.put("firstDateRow", true);
...@@ -1145,6 +1149,7 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{ ...@@ -1145,6 +1149,7 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{
//替换日期 //替换日期
value.put(FIELD_DS, dateStringMap.get(value.getString(FIELD_DS))); value.put(FIELD_DS, dateStringMap.get(value.getString(FIELD_DS)));
} }
System.out.println("222222222222222222222222222222222");
} }
//columnKey //columnKey
...@@ -1171,6 +1176,7 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{ ...@@ -1171,6 +1176,7 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{
nameList.add(commonEventProperties.containsKey(key) ? commonEventProperties.get(key).getAttrAlias() : groupField); nameList.add(commonEventProperties.containsKey(key) ? commonEventProperties.get(key).getAttrAlias() : groupField);
} }
} }
System.out.println("3333333333333333333333333333333333333");
//指标列 //指标列
if (!CollectionUtils.isEmpty(selectFieldList)) { if (!CollectionUtils.isEmpty(selectFieldList)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment