Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
manager
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
manager
Commits
6952916c
Commit
6952916c
authored
7 years ago
by
manxiaoqiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
location
parent
0df998dc
master
…
0727_bugfix
1082_bugfix
1151_bugfix
1209_bugfix
1315_bugfix
1439_bugfix
1608_bugfix
1608_from_1619
1619_bugfix
1990_bugfix
20180328_sale
20180411
20180525_adi
20180530_bpu
2578_bugfix
2580_fix
31762_2_bugfix
31762_bugfix
31969_bugfix
32400_fix
32599_bugfix
649_bugfix
back_version
back_version2
bigfix_20201028
bugfix_1608_new
bugfix_1760
bugfix_master_1760
change_double
contract_rela
develper
feature_20180116_new
liushaowei
manager_new
master_mv
mobvista_master
month_flow
No related merge requests found
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
workspace.xml
.idea/workspace.xml
+0
-0
ReportCallable.java
src/main/java/common/task/ReportCallable.java
+2
-1
applicationContext-schedule.xml
src/main/resources/spring/applicationContext-schedule.xml
+2
-2
No files found.
.idea/workspace.xml
View file @
6952916c
This diff is collapsed.
Click to expand it.
src/main/java/common/task/ReportCallable.java
View file @
6952916c
...
...
@@ -104,7 +104,7 @@ public class ReportCallable
}
public
String
generateSql
(
AppInfo
appInfo
,
int
pageNum
,
int
pageSize
,
String
sortString
,
Integer
isASC
,
String
searchString
,
String
startDate
,
String
endDate
,
boolean
isTotal
)
{
String
sql
=
"select t1.`name`,t1.reyun,t1.pkg_name,t1.company,t1.first_cate,t1.logo_url,t1.os,t1.second_cate, sum(t2.dev_num) as num \n"
+
String
sql
=
"select t1.
location, t1.
`name`,t1.reyun,t1.pkg_name,t1.company,t1.first_cate,t1.logo_url,t1.os,t1.second_cate, sum(t2.dev_num) as num \n"
+
"from (\n"
+
"select * from app_info \n"
+
"%s %s\n"
+
...
...
@@ -189,6 +189,7 @@ public class ReportCallable
app
.
setLogoUrl
(
rs
.
getString
(
"logo_url"
));
app
.
setOs
(
rs
.
getString
(
"os"
));
app
.
setSecondCate
(
rs
.
getString
(
"second_cate"
));
app
.
setLocation
(
rs
.
getString
(
"location"
));
list
.
add
(
app
);
}
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/spring/applicationContext-schedule.xml
View file @
6952916c
...
...
@@ -38,8 +38,8 @@
<task:scheduled-tasks>
<!--//定时同步短链数据(每5分钟执行一次)-->
<task:scheduled
ref=
"SyncAppDataTask"
method=
"syncAppInfo"
cron=
"0
21 11
* * ?"
/>
<task:scheduled
ref=
"SyncAppDataTask"
method=
"syncAppDeviceNum"
cron=
"0
0 11
* * ?"
/>
<task:scheduled
ref=
"SyncAppDataTask"
method=
"syncAppInfo"
cron=
"0
31 8
* * ?"
/>
<task:scheduled
ref=
"SyncAppDataTask"
method=
"syncAppDeviceNum"
cron=
"0
11 8
* * ?"
/>
</task:scheduled-tasks>
...
...
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