Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
datamanage
Overview
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
shenjinzhu
datamanage
Commits
e4aea5cf
Commit
e4aea5cf
authored
Jan 09, 2018
by
shenjinzhu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复停止修改未生效
parent
39c06e73
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
src/main/java/com/zhiwei/manage/handle/MainThread.java
+4
-3
src/main/java/com/zhiwei/manage/handle/Task.java
+1
-1
src/main/java/com/zhiwei/manage/servlet/DataController.java
+0
-1
No files found.
src/main/java/com/zhiwei/manage/handle/MainThread.java
View file @
e4aea5cf
...
@@ -117,7 +117,6 @@ public class MainThread extends Thread {
...
@@ -117,7 +117,6 @@ public class MainThread extends Thread {
*/
*/
public
static
boolean
removeMap
(
String
templateId
)
{
public
static
boolean
removeMap
(
String
templateId
)
{
try
{
try
{
// Template template = allTmp.get(templateId);
if
(
DelayedThread
.
runMap
.
get
(
templateId
)
!=
null
)
if
(
DelayedThread
.
runMap
.
get
(
templateId
)
!=
null
)
DelayedThread
.
runMap
.
remove
(
templateId
);
DelayedThread
.
runMap
.
remove
(
templateId
);
if
(
PingThread
.
runMap
.
get
(
templateId
)
!=
null
)
if
(
PingThread
.
runMap
.
get
(
templateId
)
!=
null
)
...
@@ -126,6 +125,8 @@ public class MainThread extends Thread {
...
@@ -126,6 +125,8 @@ public class MainThread extends Thread {
FieldThread
.
runMap
.
remove
(
templateId
);
FieldThread
.
runMap
.
remove
(
templateId
);
if
(
mainMap
.
get
(
templateId
)
!=
null
)
if
(
mainMap
.
get
(
templateId
)
!=
null
)
mainMap
.
remove
(
templateId
);
mainMap
.
remove
(
templateId
);
if
(
allTmp
.
get
(
templateId
)
!=
null
)
allTmp
.
remove
(
templateId
);
return
true
;
return
true
;
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
e
.
printStackTrace
();
...
@@ -175,8 +176,8 @@ public class MainThread extends Thread {
...
@@ -175,8 +176,8 @@ public class MainThread extends Thread {
// 每日的数据量入库(对应模板)
// 每日的数据量入库(对应模板)
System
.
out
.
println
(
list
.
size
());
System
.
out
.
println
(
list
.
size
());
for
(
CrawTemplate
cr
:
list
)
{
for
(
CrawTemplate
cr
:
list
)
{
count
=
(
int
)
dataService
.
finCountByDayData
(
start
.
getTime
(),
end
.
getTime
(),
count
=
(
int
)
dataService
.
finCountByDayData
(
start
.
getTime
(),
end
.
getTime
(),
cr
.
getPt
(),
cr
.
get
Pt
(),
cr
.
get
Id
());
cr
.
getId
());
Data
data
=
new
Data
();
Data
data
=
new
Data
();
data
.
setCount
(
count
);
data
.
setCount
(
count
);
data
.
setTempName
(
cr
.
getConfigName
());
data
.
setTempName
(
cr
.
getConfigName
());
...
...
src/main/java/com/zhiwei/manage/handle/Task.java
View file @
e4aea5cf
...
@@ -202,7 +202,7 @@ public class Task implements Runnable {
...
@@ -202,7 +202,7 @@ public class Task implements Runnable {
Template
tp
=
MainThread
.
mainMap
.
get
(
delayed
.
getTemplateId
());
Template
tp
=
MainThread
.
mainMap
.
get
(
delayed
.
getTemplateId
());
Message
msg
=
new
Message
();
Message
msg
=
new
Message
();
msg
.
setCreateDate
(
new
Date
());
msg
.
setCreateDate
(
new
Date
());
msg
.
setErrorMsg
(
"延时过高,延时检测为"
+
(
sum
/
1.0
/
1000
/
60
/
cutSize
)
+
"分"
);
msg
.
setErrorMsg
(
"延时过高,延时检测为"
+
sum
/
1.0
/
1000
/
60
/
cutSize
+
"分"
);
msg
.
setHandle
(
false
);
msg
.
setHandle
(
false
);
msg
.
setTemplateCreator
(
tp
.
getCreator
());
msg
.
setTemplateCreator
(
tp
.
getCreator
());
msg
.
setTemplateLv
(
tp
.
getTemplateLv
());
msg
.
setTemplateLv
(
tp
.
getTemplateLv
());
...
...
src/main/java/com/zhiwei/manage/servlet/DataController.java
View file @
e4aea5cf
...
@@ -96,7 +96,6 @@ public class DataController {
...
@@ -96,7 +96,6 @@ public class DataController {
List
<
EasyNews
>
newsList
=
new
ArrayList
<>();
List
<
EasyNews
>
newsList
=
new
ArrayList
<>();
if
(
method
.
equals
(
"type"
)){
if
(
method
.
equals
(
"type"
)){
source
=(
String
)
map
.
get
(
"type"
);
source
=(
String
)
map
.
get
(
"type"
);
System
.
out
.
println
(
source
);
newsList
=
dataService
.
findByAccurateType
(
startd
.
getTime
(),
endTime
.
getTime
(),
source
);
newsList
=
dataService
.
findByAccurateType
(
startd
.
getTime
(),
endTime
.
getTime
(),
source
);
}
else
{
}
else
{
if
(
method
.
equals
(
"source"
))
{
if
(
method
.
equals
(
"source"
))
{
...
...
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