Commit c6fb8c18 by admin

检测机制和移除机制进行修改

parent 96b8afa5
......@@ -57,7 +57,9 @@ public interface MessageDao {
* @param pt
* @return
*/
public boolean delete(List<String> MessageId, String pt);
public boolean delete(List<String> MessageId);
public boolean delete(String id);
/**
* 获取数据条数
......
......@@ -79,7 +79,7 @@ public class MessageDaoImpl implements MessageDao {
}
@Override
public boolean delete(List<String> messageId, String pt) {
public boolean delete(List<String> messageId) {
WriteResult wr = mongo.remove(Query.query(Criteria.where("_id").in(messageId)), Message.class);
if (wr.getN() == 0) {
return false;
......@@ -88,6 +88,15 @@ public class MessageDaoImpl implements MessageDao {
}
@Override
public boolean delete(String id) {
WriteResult wr = mongo.remove(Query.query(Criteria.where("_id").is(id)), Message.class);
if (wr.getN() == 0) {
return false;
}
return true;
}
@Override
public int allCount(String pt) {
return (int) mongo.count(
Query.query(Criteria.where("pt").is(pt).andOperator(Criteria.where("handle").is(false))),
......
......@@ -275,8 +275,8 @@ public class MainThread extends Thread {
}
}
// 有数据了,移除错误信息
messageService.delete(needRemovePm, "平媒");
messageService.delete(needRemoveWm, "网媒");
messageService.delete(needRemovePm);
messageService.delete(needRemoveWm);
} catch (Exception e) {
e.printStackTrace();
}
......
......@@ -76,9 +76,7 @@ public class Task implements Runnable {
} else {
Message msg = messageService.findMsg(ping.getTempName(), "url");
if (msg != null) {
List<String> list = new ArrayList<>();
list.add(msg.getMessageId());
messageService.delete(list, ping.getPt());
messageService.delete(msg.getMessageId());
}
}
} catch (Exception e) {
......@@ -117,9 +115,7 @@ public class Task implements Runnable {
} else {
Message msg = messageService.findMsg(ping.getTempName(), "url");
if (msg != null) {
List<String> list = new ArrayList<>();
list.add(msg.getMessageId());
messageService.delete(list, ping.getPt());
messageService.delete(msg.getMessageId());
}
}
} catch (Exception e) {
......@@ -223,6 +219,10 @@ public class Task implements Runnable {
messageService.update(msg, delayed.getPt());
} else {
Message msg = null;
msg = messageService.findMsg(delayed.getTempName(), "count2");
if (msg != null) {
messageService.delete(msg.getMessageId());
}
double delay = 0;
List<Double> dNum = new ArrayList<Double>();
for (Map<String, Object> map : list) {
......@@ -282,7 +282,7 @@ public class Task implements Runnable {
if (msg != null) {
List<String> ids = new ArrayList<>();
ids.add(msg.getMessageId());
messageService.delete(ids, delayed.getPt());
messageService.delete(ids);
}
}
}
......
......@@ -57,7 +57,9 @@ public interface MessageService {
* @param pt
* @return
*/
public boolean delete(List<String> MessageId, String pt);
public boolean delete(List<String> MessageId);
public boolean delete(String id);
/**
* 分页查询模板名信息
......
......@@ -70,8 +70,13 @@ public class MessageServiceImpl implements MessageService {
}
@Override
public boolean delete(List<String> MessageId, String pt) {
return messageDao.delete(MessageId, pt);
public boolean delete(List<String> MessageId) {
return messageDao.delete(MessageId);
}
@Override
public boolean delete(String id) {
return messageDao.delete(id);
}
@Override
......
......@@ -83,8 +83,7 @@ public class MessageConteoller {
@ResponseBody
public String delete(@RequestBody Map<String, Object> map) {
List<String> messageId = (List<String>) map.get("messageId");
String pt = (String) map.get("pt");
msgService.delete(messageId, pt);
msgService.delete(messageId);
JsonResult result = new JsonResult(true, 200, "删除成功", "");
return JSON.toJSONString(result);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment