Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
saasio
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
reyun
saasio
Commits
fe506cd7
Commit
fe506cd7
authored
6 years ago
by
carrieyzzhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
delete log
parent
1aa8ddf9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
25 deletions
+0
-25
ComplicatedEventsServiceImpl.java
.../com/reyun/service/impl/ComplicatedEventsServiceImpl.java
+0
-21
EventReportCallable.java
src/main/java/com/reyun/taskexecute/EventReportCallable.java
+0
-4
No files found.
src/main/java/com/reyun/service/impl/ComplicatedEventsServiceImpl.java
View file @
fe506cd7
...
...
@@ -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
))
{
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/reyun/taskexecute/EventReportCallable.java
View file @
fe506cd7
...
...
@@ -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
;
}
}
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment