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
63c6ae0b
Commit
63c6ae0b
authored
May 18, 2018
by
admin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复入库错误
parent
1f779ff3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
8 deletions
+4
-8
src/main/java/com/zhiwei/manage/dao/DataDao.java
+0
-3
src/main/java/com/zhiwei/manage/handle/MainThread.java
+4
-3
src/main/java/com/zhiwei/manage/service/DataService.java
+0
-2
No files found.
src/main/java/com/zhiwei/manage/dao/DataDao.java
View file @
63c6ae0b
...
...
@@ -4,9 +4,6 @@ import java.util.Date;
import
java.util.List
;
import
com.zhiwei.manage.bean.Data
;
import
com.zhiwei.manage.bean.EasyNews
;
import
com.zhiwei.manage.bean.News
;
import
com.zhiwei.manage.bean.Template
;
public
interface
DataDao
{
...
...
src/main/java/com/zhiwei/manage/handle/MainThread.java
View file @
63c6ae0b
...
...
@@ -176,6 +176,9 @@ public class MainThread extends Thread {
start
.
add
(
Calendar
.
DATE
,
-
1
);
}
Calendar
end
=
Calendar
.
getInstance
();
Calendar
inTime
=
Calendar
.
getInstance
();
inTime
.
setTime
(
end
.
getTime
());
inTime
.
add
(
Calendar
.
HOUR_OF_DAY
,
-
1
);
try
{
start
.
set
(
Calendar
.
HOUR_OF_DAY
,
0
);
start
.
setTime
(
sdf
.
parse
(
sdf
.
format
(
start
.
getTime
())));
...
...
@@ -194,9 +197,7 @@ public class MainThread extends Thread {
data
.
setTime
(
start
.
getTime
());
dataService
.
insert
(
data
);
log
.
info
(
sdf
.
format
(
start
.
getTime
())
+
"|"
+
chan
.
getPt
()
+
"|入库"
);
start
.
setTime
(
end
.
getTime
());
start
.
add
(
Calendar
.
HOUR
,
-
1
);
count
=
es
.
getCountByPt
(
start
.
getTime
(),
end
.
getTime
(),
chan
.
getPt
(),
chan
.
getValue
(),
ser
);
//小时的数据量
count
=
es
.
getCountByPt
(
inTime
.
getTime
(),
end
.
getTime
(),
chan
.
getPt
(),
chan
.
getValue
(),
ser
);
//小时的数据量
if
(
counts
.
get
(
chan
.
getPt
())
!=
null
)
if
(
count
<
counts
.
get
(
chan
.
getPt
()))
{
Messages
m
=
new
Messages
();
...
...
src/main/java/com/zhiwei/manage/service/DataService.java
View file @
63c6ae0b
...
...
@@ -4,8 +4,6 @@ import java.util.Date;
import
java.util.List
;
import
com.zhiwei.manage.bean.Data
;
import
com.zhiwei.manage.bean.EasyNews
;
import
com.zhiwei.manage.bean.Template
;
public
interface
DataService
{
...
...
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