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
96b8afa5
Commit
96b8afa5
authored
May 31, 2018
by
admin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
预警检测修改逻辑
parent
836e6681
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
19 deletions
+28
-19
src/main/java/com/zhiwei/manage/handle/MainThread.java
+16
-4
src/main/java/com/zhiwei/manage/servlet/ServerController.java
+12
-15
No files found.
src/main/java/com/zhiwei/manage/handle/MainThread.java
View file @
96b8afa5
...
@@ -220,8 +220,8 @@ public class MainThread extends Thread {
...
@@ -220,8 +220,8 @@ public class MainThread extends Thread {
}
}
}
}
Set
<
String
>
keys
=
allTmp
.
keySet
();
Set
<
String
>
keys
=
allTmp
.
keySet
();
List
<
Message
>
needRemoveWm
=
new
ArrayList
<>();
List
<
String
>
needRemoveWm
=
new
ArrayList
<>();
List
<
Message
>
needRemovePm
=
new
ArrayList
<>();
List
<
String
>
needRemovePm
=
new
ArrayList
<>();
for
(
Iterator
<
String
>
it
=
keys
.
iterator
();
it
.
hasNext
();)
{
for
(
Iterator
<
String
>
it
=
keys
.
iterator
();
it
.
hasNext
();)
{
String
key
=
it
.
next
();
String
key
=
it
.
next
();
Template
tmp
=
allTmp
.
get
(
key
);
Template
tmp
=
allTmp
.
get
(
key
);
...
@@ -253,18 +253,30 @@ public class MainThread extends Thread {
...
@@ -253,18 +253,30 @@ public class MainThread extends Thread {
Message
msg
=
messageService
.
findMsg
(
tmp
.
getTempName
(),
null
);
Message
msg
=
messageService
.
findMsg
(
tmp
.
getTempName
(),
null
);
if
(
msg
!=
null
)
{
if
(
msg
!=
null
)
{
if
(
msg
.
getPt
().
equals
(
"网媒"
))
{
if
(
msg
.
getPt
().
equals
(
"网媒"
))
{
needRemoveWm
.
add
(
msg
);
needRemoveWm
.
add
(
msg
.
getMessageId
()
);
}
else
{
}
else
{
needRemovePm
.
add
(
msg
);
needRemovePm
.
add
(
msg
.
getMessageId
()
);
}
}
}
}
}
}
}
else
{
Message
msg
=
messageService
.
findMsg
(
tmp
.
getTempName
(),
null
);
if
(
msg
!=
null
)
{
if
(
msg
.
getPt
().
equals
(
"网媒"
))
{
needRemoveWm
.
add
(
msg
.
getMessageId
());
}
else
{
needRemovePm
.
add
(
msg
.
getMessageId
());
}
}
}
}
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
error
(
tmp
.
getTempName
()
+
"入库出错,错误信息{}"
,
e
);
log
.
error
(
tmp
.
getTempName
()
+
"入库出错,错误信息{}"
,
e
);
}
}
}
}
}
}
// 有数据了,移除错误信息
messageService
.
delete
(
needRemovePm
,
"平媒"
);
messageService
.
delete
(
needRemoveWm
,
"网媒"
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
e
.
printStackTrace
();
}
}
...
...
src/main/java/com/zhiwei/manage/servlet/ServerController.java
View file @
96b8afa5
...
@@ -104,21 +104,18 @@ public class ServerController {
...
@@ -104,21 +104,18 @@ public class ServerController {
return
JSON
.
toJSONString
(
result
);
return
JSON
.
toJSONString
(
result
);
}
}
// /**
/**
// * 更改平台
* 更改平台
// *
*
// * @param map
* @param map
// * @return
* @return
// */
*/
// @RequestMapping(value = "/changePt", produces =
@RequestMapping
(
value
=
"/changePt"
,
produces
=
"application/json;charset=utf-8"
)
// "application/json;charset=utf-8")
@ResponseBody
// @ResponseBody
public
String
changePt
(
@RequestBody
Map
<
String
,
Object
>
map
)
{
// public String changePt(@RequestBody Map<String, Object> map) {
JsonResult
result
=
new
JsonResult
(
true
,
200
,
"源改变成功"
);
// String pt = (String) map.get("pt");
return
JSON
.
toJSONString
(
result
);
// ss.findPt(pt);
}
// JsonResult result = new JsonResult(true, 200, "源改变成功");
// return JSON.toJSONString(result);
// }
/**
/**
* 插入渠道信息
* 插入渠道信息
...
...
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