Commit e3ab1926 by shenjinzhu

对于检测部分,新的覆盖旧的

parent 187b5ec5
...@@ -24,4 +24,6 @@ public interface MessageDao { ...@@ -24,4 +24,6 @@ public interface MessageDao {
public int findByHandleCount(int pageNo,int pageSize,boolean handle,String tempName,String pt); public int findByHandleCount(int pageNo,int pageSize,boolean handle,String tempName,String pt);
public Message findMsg(String tempName,String errorType);
} }
...@@ -132,4 +132,10 @@ public class MessageDaoImpl implements MessageDao { ...@@ -132,4 +132,10 @@ public class MessageDaoImpl implements MessageDao {
.andOperator(Criteria.where("handle").is(handle).andOperator(Criteria.where("pt").is(pt)))), .andOperator(Criteria.where("handle").is(handle).andOperator(Criteria.where("pt").is(pt)))),
Message.class); Message.class);
} }
@Override
public Message findMsg(String tempName,String errorType) {
return mongo.findOne(Query.query(Criteria.where("tempName").is(tempName)
.andOperator(Criteria.where("errotType").is(errorType))), Message.class);
}
} }
...@@ -46,17 +46,24 @@ public class Task implements Runnable { ...@@ -46,17 +46,24 @@ public class Task implements Runnable {
HttpURLConnection conn = (HttpURLConnection) url.openConnection(); HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.setConnectTimeout(1000 * 10); conn.setConnectTimeout(1000 * 10);
int code = conn.getResponseCode(); int code = conn.getResponseCode();
if (code > 399 || code <200) { if (code > 399 || code < 200) {
Template tp = MainThread.mainMap.get(ping.getTemplateId()); Template tp = MainThread.mainMap.get(ping.getTemplateId());
Message msg = new Message(); Message msg = new Message();
msg.setCreateDate(new Date()); msg.setCreateDate(new Date());
msg.setErrorMsg(code == 0 ? "访问超时":ping.getPingUrlOne() + "访问失败,错误代码" + code ); msg.setErrorMsg(code == 0 ? "访问超时" : ping.getPingUrlOne() + "访问失败,错误代码" + code);
msg.setHandle(false); msg.setHandle(false);
msg.setTemplateCreator(tp.getCreator()); msg.setTemplateCreator(tp.getCreator());
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); messageService.insert(msg);
} 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());
}
} }
} catch (Exception e) { } catch (Exception e) {
Template tp = MainThread.mainMap.get(ping.getTemplateId()); Template tp = MainThread.mainMap.get(ping.getTemplateId());
...@@ -89,6 +96,13 @@ public class Task implements Runnable { ...@@ -89,6 +96,13 @@ public class Task implements Runnable {
msg.setErrorType("url"); msg.setErrorType("url");
msg.setPt(ping.getPt()); msg.setPt(ping.getPt());
messageService.insert(msg); messageService.insert(msg);
} 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());
}
} }
} catch (Exception e) { } catch (Exception e) {
Template tp = MainThread.mainMap.get(ping.getTemplateId()); Template tp = MainThread.mainMap.get(ping.getTemplateId());
...@@ -119,9 +133,16 @@ public class Task implements Runnable { ...@@ -119,9 +133,16 @@ public class Task implements Runnable {
msg.setPt(field.getPt()); msg.setPt(field.getPt());
msg.setTemplateCreator(tp.getCreator()); msg.setTemplateCreator(tp.getCreator());
msg.setTemplateLv(tp.getTemplateLv()); msg.setTemplateLv(tp.getTemplateLv());
msg.setErrorType("count"); msg.setErrorType("count2");
msg.setTempName(field.getTempName()); msg.setTempName(field.getTempName());
messageService.insert(msg); messageService.insert(msg);
} else {
Message msg = messageService.findMsg(field.getTempName(), "count2");
if (msg != null) {
List<String> ids = new ArrayList<>();
ids.add(msg.getMessageId());
messageService.delete(ids, field.getPt());
}
} }
String[] fields = field.getField().split(","); String[] fields = field.getField().split(",");
int count = list.size(); int count = list.size();
...@@ -149,6 +170,13 @@ public class Task implements Runnable { ...@@ -149,6 +170,13 @@ public class Task implements Runnable {
msg.setTemplateLv(tp.getTemplateLv()); msg.setTemplateLv(tp.getTemplateLv());
msg.setTempName(field.getTempName()); msg.setTempName(field.getTempName());
messageService.insert(msg); messageService.insert(msg);
} else {
Message msg = messageService.findMsg(field.getTempName(), "field");
if (msg != null) {
List<String> ids = new ArrayList<>();
ids.add(msg.getMessageId());
messageService.delete(ids, field.getPt());
}
} }
} }
} }
...@@ -166,11 +194,18 @@ public class Task implements Runnable { ...@@ -166,11 +194,18 @@ public class Task implements Runnable {
msg.setErrorMsg("延时检测发现库内的数据小于预设检测数量:" + delayed.getTestCount() + "条,实际数据量为" + list.size()); msg.setErrorMsg("延时检测发现库内的数据小于预设检测数量:" + delayed.getTestCount() + "条,实际数据量为" + list.size());
msg.setHandle(false); msg.setHandle(false);
msg.setPt(delayed.getPt()); msg.setPt(delayed.getPt());
msg.setErrorType("count"); msg.setErrorType("count2");
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.insert(msg);
} else {
Message msg = messageService.findMsg(delayed.getTempName(), "count2");
if (msg != null) {
List<String> ids = new ArrayList<>();
ids.add(msg.getMessageId());
messageService.delete(ids, delayed.getPt());
}
} }
double delay = 0; double delay = 0;
List<Double> dNum = new ArrayList<Double>(); List<Double> dNum = new ArrayList<Double>();
...@@ -188,6 +223,12 @@ public class Task implements Runnable { ...@@ -188,6 +223,12 @@ public class Task implements Runnable {
delay = savetime.getTime() - time.getTime(); delay = savetime.getTime() - time.getTime();
dNum.add(delay); dNum.add(delay);
sum += delay; sum += delay;
Message msg = messageService.findMsg(delayed.getTempName(), "delayed");
if (msg != null) {
List<String> ids = new ArrayList<>();
ids.add(msg.getMessageId());
messageService.delete(ids, delayed.getPt());
}
} else { } else {
Template tp = MainThread.mainMap.get(delayed.getTemplateId()); Template tp = MainThread.mainMap.get(delayed.getTemplateId());
Message msg = new Message(); Message msg = new Message();
...@@ -220,6 +261,13 @@ public class Task implements Runnable { ...@@ -220,6 +261,13 @@ public class Task implements Runnable {
msg.setPt(delayed.getPt()); msg.setPt(delayed.getPt());
msg.setTempName(delayed.getTempName()); msg.setTempName(delayed.getTempName());
messageService.insert(msg); messageService.insert(msg);
} else {
Message msg = messageService.findMsg(delayed.getTempName(), "delayed");
if (msg != null) {
List<String> ids = new ArrayList<>();
ids.add(msg.getMessageId());
messageService.delete(ids, delayed.getPt());
}
} }
} }
} }
......
...@@ -18,4 +18,6 @@ public interface MessageService { ...@@ -18,4 +18,6 @@ public interface MessageService {
public boolean delete(List<String> MessageId,String pt); public boolean delete(List<String> MessageId,String pt);
public PageEty findByHandle(int pageNo,int pageSize,boolean handle,String tempName,String pt); public PageEty findByHandle(int pageNo,int pageSize,boolean handle,String tempName,String pt);
public Message findMsg(String tempName,String errorType);
} }
...@@ -92,4 +92,9 @@ public class MessageServiceImpl implements MessageService { ...@@ -92,4 +92,9 @@ public class MessageServiceImpl implements MessageService {
return page; return page;
} }
@Override
public Message findMsg(String tempName,String errorType) {
return messageDao.findMsg(tempName,errorType);
}
} }
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