Commit 3caa461a by admin

检测部分修改,提交

parent 7af303ba
......@@ -21,15 +21,19 @@ import com.zhiwei.manage.bean.Channel;
import com.zhiwei.manage.bean.Data;
import com.zhiwei.manage.bean.FieldIntegerity;
import com.zhiwei.manage.bean.Message;
import com.zhiwei.manage.bean.Messages;
import com.zhiwei.manage.bean.NewsDelayed;
import com.zhiwei.manage.bean.PingUrl;
import com.zhiwei.manage.bean.ServerBean;
import com.zhiwei.manage.bean.Template;
import com.zhiwei.manage.orm.BeanFactory;
import com.zhiwei.manage.service.CrawTemplateServiceImpl;
import com.zhiwei.manage.service.DataServiceImpl;
import com.zhiwei.manage.service.MessageServiceImpl;
import com.zhiwei.manage.service.ServerServiceImpl;
import com.zhiwei.manage.util.Config;
import com.zhiwei.manage.util.ESUtil;
import com.zhiwei.manage.util.SendMailUtil;
import com.zhiwei.manage.util.TimeUtil;
/**
......@@ -188,36 +192,34 @@ public class MainThread extends Thread {
end.setTime(sdf.parse(sdf.format(end.getTime())));
int count = 0;
channel = serverService.findDisChannel();
// for (Channel chan : channel) {
// map.put(chan.getPt(), chan.getValue());
// try {
// ServerBean ser = serverService.findServer(chan.getPt());
// count = es.getCountByPt(start.getTime(), end.getTime(), chan.getPt(),
// chan.getValue(), ser);// 当日的数据量
// System.out.println(count);
// Data data = new Data();
// data.setCount(count);
// data.setPt(chan.getPt());
// data.setTime(start.getTime());
// dataService.insert(data);
// log.info(sdf.format(start.getTime()) + "|" + chan.getPt() + "|入库");
// count = es.getCountByPt(inTime.getTime(), end.getTime(), chan.getPt(),
// chan.getValue(), ser);// 小时的数据量
// if (inTime.get(Calendar.HOUR_OF_DAY) > 6)
// if (counts.get(chan.getPt()) != null)
// if (count < counts.get(chan.getPt())) {
// Messages m = new Messages();
// m.setTitle("渠道低数据量预警{" + chan.getPt() + "}");
// m.setContent("1小时内的数据量为:" + count);
// m.setDate(sdf.format(start.getTime()));
// for (String mail : Config.getVal("count_mail").split(",")) {
// SendMailUtil.sendMessage(mail, m);
// }
// }
// } catch (Exception e) {
// log.error(chan.getPt() + "入库出错,错误信息{}", e);
// }
// }
for (Channel chan : channel) {
map.put(chan.getPt(), chan.getValue());
try {
ServerBean ser = serverService.findServer(chan.getPt());
count = es.getCountByPt(start.getTime(), end.getTime(), chan.getPt(), chan.getValue(), ser);// 当日的数据量
System.out.println(count);
Data data = new Data();
data.setCount(count);
data.setPt(chan.getPt());
data.setTime(start.getTime());
dataService.insert(data);
log.info(sdf.format(start.getTime()) + "|" + chan.getPt() + "|入库");
count = es.getCountByPt(inTime.getTime(), end.getTime(), chan.getPt(), chan.getValue(), ser);// 小时的数据量
if (inTime.get(Calendar.HOUR_OF_DAY) > 6)
if (counts.get(chan.getPt()) != null)
if (count < counts.get(chan.getPt())) {
Messages m = new Messages();
m.setTitle("渠道低数据量预警{" + chan.getPt() + "}");
m.setContent("1小时内的数据量为:" + count);
m.setDate(sdf.format(start.getTime()));
for (String mail : Config.getVal("count_mail").split(",")) {
SendMailUtil.sendMessage(mail, m);
}
}
} catch (Exception e) {
log.error(chan.getPt() + "入库出错,错误信息{}", e);
}
}
Thread.sleep(1000 * 120);
Set<String> keys = allTmp.keySet();
List<String> needRemove = new ArrayList<>();
......
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