Commit cc9752dd by carrieyzzhang

cancel log

parent 6c93818c
...@@ -300,7 +300,6 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{ ...@@ -300,7 +300,6 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{
System.out.println(url); System.out.println(url);
try { try {
String responseStr = HttpClientUtil.doHttpPostRequest(url, "trackingio", conditions); String responseStr = HttpClientUtil.doHttpPostRequest(url, "trackingio", conditions);
System.out.println(responseStr);
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
responseJson = mapper.readValue(responseStr, Map.class); responseJson = mapper.readValue(responseStr, Map.class);
} catch (Exception e) { } catch (Exception e) {
...@@ -1034,7 +1033,7 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{ ...@@ -1034,7 +1033,7 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{
Map<String, String> channelMap = 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)) { /*if (groupArray.toString().contains(FIELD_CID) || groupArray.toString().contains(FIELD_CAMPAIGN_ID)) {
Account account = accountRepository.findOne(accountId); Account account = accountRepository.findOne(accountId);
try { try {
String url = Constant.trackingUrl + "/api/"+ app.getId() +"/channel/findchannelcamp4io?appkey=" + app.getAppkey() + "&email=" + account.getEmail(); String url = Constant.trackingUrl + "/api/"+ app.getId() +"/channel/findchannelcamp4io?appkey=" + app.getAppkey() + "&email=" + account.getEmail();
...@@ -1061,7 +1060,7 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{ ...@@ -1061,7 +1060,7 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{
logger.error("fail to get channel or campaign name"); logger.error("fail to get channel or campaign name");
} }
} }*/
//1,处理日期合并(给每个日期的第一行加标注,firstDateRow标示第一行,rowNum标示相同日期行数) //1,处理日期合并(给每个日期的第一行加标注,firstDateRow标示第一行,rowNum标示相同日期行数)
......
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