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
fac593f1
Commit
fac593f1
authored
Mar 13, 2018
by
shenjinzhu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改insert为upset
parent
82204cf8
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
19 deletions
+21
-19
src/main/java/com/zhiwei/manage/dao/MessageDaoImpl.java
+12
-11
src/main/java/com/zhiwei/manage/handle/Task.java
+9
-8
No files found.
src/main/java/com/zhiwei/manage/dao/MessageDaoImpl.java
View file @
fac593f1
...
@@ -69,7 +69,7 @@ public class MessageDaoImpl implements MessageDao {
...
@@ -69,7 +69,7 @@ public class MessageDaoImpl implements MessageDao {
e
.
printStackTrace
();
e
.
printStackTrace
();
}
}
}
}
WriteResult
result
=
mongo
.
up
dateFirs
t
(
Query
.
query
(
Criteria
.
where
(
"_id"
).
is
(
message
.
getMessageId
())),
update
,
WriteResult
result
=
mongo
.
up
ser
t
(
Query
.
query
(
Criteria
.
where
(
"_id"
).
is
(
message
.
getMessageId
())),
update
,
Message
.
class
);
Message
.
class
);
if
(
result
.
getN
()
==
1
)
{
if
(
result
.
getN
()
==
1
)
{
return
"修改成功"
;
return
"修改成功"
;
...
@@ -80,11 +80,9 @@ public class MessageDaoImpl implements MessageDao {
...
@@ -80,11 +80,9 @@ public class MessageDaoImpl implements MessageDao {
@Override
@Override
public
List
<
Message
>
findAll
(
int
pageNo
,
int
pageSize
,
String
pt
)
{
public
List
<
Message
>
findAll
(
int
pageNo
,
int
pageSize
,
String
pt
)
{
return
mongo
.
find
(
return
mongo
.
find
(
Query
.
query
(
Criteria
.
where
(
"pt"
).
is
(
pt
).
andOperator
(
Criteria
.
where
(
"handle"
).
is
(
false
)))
Query
.
query
(
Criteria
.
where
(
"pt"
).
is
(
pt
).
andOperator
(
Criteria
.
where
(
"handle"
).
is
(
false
)))
.
skip
((
pageNo
-
1
)
*
pageSize
).
with
(
new
Sort
(
Sort
.
Direction
.
ASC
,
"templateLv"
))
.
skip
((
pageNo
-
1
)
*
pageSize
).
with
(
new
Sort
(
Sort
.
Direction
.
ASC
,
"templateLv"
))
.
with
(
new
Sort
(
Sort
.
Direction
.
DESC
,
"createDate"
)).
limit
(
pageSize
),
.
with
(
new
Sort
(
Sort
.
Direction
.
DESC
,
"createDate"
)).
limit
(
pageSize
),
Message
.
class
);
Message
.
class
);
}
}
@Override
@Override
...
@@ -118,11 +116,12 @@ public class MessageDaoImpl implements MessageDao {
...
@@ -118,11 +116,12 @@ public class MessageDaoImpl implements MessageDao {
@Override
@Override
public
List
<
Message
>
findByHandle
(
int
pageNo
,
int
pageSize
,
boolean
handle
,
String
tempName
,
String
pt
)
{
public
List
<
Message
>
findByHandle
(
int
pageNo
,
int
pageSize
,
boolean
handle
,
String
tempName
,
String
pt
)
{
return
mongo
.
find
(
Query
return
mongo
.
find
(
.
query
(
Criteria
.
where
(
"tempName"
).
regex
(
tempName
)
Query
.
query
(
Criteria
.
where
(
"tempName"
).
regex
(
tempName
)
.
andOperator
(
Criteria
.
where
(
"handle"
).
is
(
handle
).
andOperator
(
Criteria
.
where
(
"pt"
).
is
(
pt
))))
.
andOperator
(
Criteria
.
where
(
"handle"
).
is
(
handle
).
andOperator
(
Criteria
.
where
(
"pt"
).
is
(
pt
))))
.
skip
((
pageNo
-
1
)
*
pageSize
).
limit
(
pageSize
)
.
skip
((
pageNo
-
1
)
*
pageSize
).
limit
(
pageSize
)
.
with
(
new
Sort
(
Sort
.
Direction
.
DESC
,
"handleDate"
)),
Message
.
class
);
.
with
(
new
Sort
(
Sort
.
Direction
.
DESC
,
"handleDate"
)),
Message
.
class
);
}
}
@Override
@Override
...
@@ -134,8 +133,10 @@ public class MessageDaoImpl implements MessageDao {
...
@@ -134,8 +133,10 @@ public class MessageDaoImpl implements MessageDao {
}
}
@Override
@Override
public
Message
findMsg
(
String
tempName
,
String
errorType
)
{
public
Message
findMsg
(
String
tempName
,
String
errorType
)
{
return
mongo
.
findOne
(
Query
.
query
(
Criteria
.
where
(
"tempName"
).
is
(
tempName
)
return
mongo
.
findOne
(
.
andOperator
(
Criteria
.
where
(
"errotType"
).
is
(
errorType
))),
Message
.
class
);
Query
.
query
(
Criteria
.
where
(
"tempName"
).
is
(
tempName
).
andOperator
(
Criteria
.
where
(
"errotType"
).
is
(
errorType
))),
Message
.
class
);
}
}
}
}
src/main/java/com/zhiwei/manage/handle/Task.java
View file @
fac593f1
...
@@ -58,7 +58,8 @@ public class Task implements Runnable {
...
@@ -58,7 +58,8 @@ public class Task implements Runnable {
msg
.
setTempName
(
ping
.
getTempName
());
msg
.
setTempName
(
ping
.
getTempName
());
msg
.
setTemplateLv
(
tp
.
getTemplateLv
());
msg
.
setTemplateLv
(
tp
.
getTemplateLv
());
msg
.
setErrorType
(
"url"
);
msg
.
setErrorType
(
"url"
);
messageService
.
insert
(
msg
);
msg
.
setPt
(
ping
.
getPt
());
messageService
.
update
(
msg
,
ping
.
getPt
());
}
else
{
}
else
{
Message
msg
=
messageService
.
findMsg
(
ping
.
getTempName
(),
"url"
);
Message
msg
=
messageService
.
findMsg
(
ping
.
getTempName
(),
"url"
);
if
(
msg
!=
null
)
{
if
(
msg
!=
null
)
{
...
@@ -78,7 +79,7 @@ public class Task implements Runnable {
...
@@ -78,7 +79,7 @@ public class Task implements Runnable {
msg
.
setTemplateLv
(
1
);
msg
.
setTemplateLv
(
1
);
msg
.
setErrorType
(
"url"
);
msg
.
setErrorType
(
"url"
);
msg
.
setPt
(
ping
.
getPt
());
msg
.
setPt
(
ping
.
getPt
());
messageService
.
insert
(
msg
);
messageService
.
update
(
msg
,
ping
.
getPt
()
);
}
}
if
(
null
!=
ping
.
getPingUrlTwo
()
&&
!
ping
.
getPingUrlTwo
().
equals
(
""
))
if
(
null
!=
ping
.
getPingUrlTwo
()
&&
!
ping
.
getPingUrlTwo
().
equals
(
""
))
try
{
try
{
...
@@ -99,7 +100,7 @@ public class Task implements Runnable {
...
@@ -99,7 +100,7 @@ public class Task implements Runnable {
msg
.
setTemplateLv
(
tp
.
getTemplateLv
());
msg
.
setTemplateLv
(
tp
.
getTemplateLv
());
msg
.
setErrorType
(
"url"
);
msg
.
setErrorType
(
"url"
);
msg
.
setPt
(
ping
.
getPt
());
msg
.
setPt
(
ping
.
getPt
());
messageService
.
insert
(
msg
);
messageService
.
update
(
msg
,
ping
.
getPt
()
);
}
else
{
}
else
{
Message
msg
=
messageService
.
findMsg
(
ping
.
getTempName
(),
"url"
);
Message
msg
=
messageService
.
findMsg
(
ping
.
getTempName
(),
"url"
);
if
(
msg
!=
null
)
{
if
(
msg
!=
null
)
{
...
@@ -119,7 +120,7 @@ public class Task implements Runnable {
...
@@ -119,7 +120,7 @@ public class Task implements Runnable {
msg
.
setPt
(
ping
.
getPt
());
msg
.
setPt
(
ping
.
getPt
());
msg
.
setErrorType
(
"url"
);
msg
.
setErrorType
(
"url"
);
msg
.
setTemplateLv
(
tp
.
getTemplateLv
());
msg
.
setTemplateLv
(
tp
.
getTemplateLv
());
messageService
.
insert
(
msg
);
messageService
.
update
(
msg
,
ping
.
getPt
()
);
}
}
}
}
}
}
...
@@ -139,7 +140,7 @@ public class Task implements Runnable {
...
@@ -139,7 +140,7 @@ public class Task implements Runnable {
msg
.
setTemplateLv
(
tp
.
getTemplateLv
());
msg
.
setTemplateLv
(
tp
.
getTemplateLv
());
msg
.
setErrorType
(
"count2"
);
msg
.
setErrorType
(
"count2"
);
msg
.
setTempName
(
field
.
getTempName
());
msg
.
setTempName
(
field
.
getTempName
());
messageService
.
insert
(
msg
);
messageService
.
update
(
msg
,
field
.
getPt
()
);
}
else
{
}
else
{
Message
msg
=
messageService
.
findMsg
(
field
.
getTempName
(),
"count2"
);
Message
msg
=
messageService
.
findMsg
(
field
.
getTempName
(),
"count2"
);
if
(
msg
!=
null
)
{
if
(
msg
!=
null
)
{
...
@@ -173,7 +174,7 @@ public class Task implements Runnable {
...
@@ -173,7 +174,7 @@ public class Task implements Runnable {
msg
.
setTemplateCreator
(
tp
.
getCreator
());
msg
.
setTemplateCreator
(
tp
.
getCreator
());
msg
.
setTemplateLv
(
tp
.
getTemplateLv
());
msg
.
setTemplateLv
(
tp
.
getTemplateLv
());
msg
.
setTempName
(
field
.
getTempName
());
msg
.
setTempName
(
field
.
getTempName
());
messageService
.
insert
(
msg
);
messageService
.
update
(
msg
,
field
.
getPt
()
);
}
else
{
}
else
{
Message
msg
=
messageService
.
findMsg
(
field
.
getTempName
(),
"field"
);
Message
msg
=
messageService
.
findMsg
(
field
.
getTempName
(),
"field"
);
if
(
msg
!=
null
)
{
if
(
msg
!=
null
)
{
...
@@ -233,7 +234,7 @@ public class Task implements Runnable {
...
@@ -233,7 +234,7 @@ public class Task implements Runnable {
msg
.
setTemplateCreator
(
tp
.
getCreator
());
msg
.
setTemplateCreator
(
tp
.
getCreator
());
msg
.
setTemplateLv
(
tp
.
getTemplateLv
());
msg
.
setTemplateLv
(
tp
.
getTemplateLv
());
msg
.
setTempName
(
delayed
.
getTempName
());
msg
.
setTempName
(
delayed
.
getTempName
());
messageService
.
insert
(
msg
);
messageService
.
update
(
msg
,
delayed
.
getPt
()
);
}
}
}
}
Collections
.
sort
(
dNum
);
Collections
.
sort
(
dNum
);
...
@@ -253,7 +254,7 @@ public class Task implements Runnable {
...
@@ -253,7 +254,7 @@ public class Task implements Runnable {
msg
.
setTemplateLv
(
tp
.
getTemplateLv
());
msg
.
setTemplateLv
(
tp
.
getTemplateLv
());
msg
.
setPt
(
delayed
.
getPt
());
msg
.
setPt
(
delayed
.
getPt
());
msg
.
setTempName
(
delayed
.
getTempName
());
msg
.
setTempName
(
delayed
.
getTempName
());
messageService
.
insert
(
msg
);
messageService
.
update
(
msg
,
delayed
.
getPt
()
);
}
else
{
}
else
{
Message
msg
=
messageService
.
findMsg
(
delayed
.
getTempName
(),
"delayed"
);
Message
msg
=
messageService
.
findMsg
(
delayed
.
getTempName
(),
"delayed"
);
if
(
msg
!=
null
)
{
if
(
msg
!=
null
)
{
...
...
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