修复每日及每小时统计

src/main/java/com/zhiwei/manage/handle/MainThread.java

@@ -21,8 +21,10 @@ 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;
@@ -30,7 +32,9 @@ import com.zhiwei.manage.service.DataServiceImpl;
 import com.zhiwei.manage.service.MessageServiceImpl;
 import com.zhiwei.manage.service.ServerServiceImpl;
 import com.zhiwei.manage.service.TemplateServiceImpl;
+import com.zhiwei.manage.util.Config;
 import com.zhiwei.manage.util.ESUtil;
+import com.zhiwei.manage.util.SendMailUtil;
 import com.zhiwei.manage.util.TimeUtil;
 
 /**
@@ -175,9 +179,9 @@ public class MainThread extends Thread {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH");
 		List<Channel> channel = serverService.findDisChannel();
 		/**初始化模版列表***/
-		if(allTmp==null) {
-			templateService.findAll();
-		}
+//		if(allTmp==null) {
+//			templateService.findAll();
+//		}
 		
 		Calendar loop = Calendar.getInstance();
 		while (true) {
@@ -193,8 +197,37 @@ public class MainThread extends Thread {
 				start.set(Calendar.HOUR_OF_DAY, 0);
 				start.setTime(sdf.parse(sdf.format(start.getTime())));
 				end.setTime(sdf.parse(sdf.format(end.getTime())));
+				int count = 0;
+				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);
 				
-				Thread.sleep(1000 * 10);
 				Set<String> keys = allTmp.keySet();
 				System.out.println("keys size is :::"+ keys.size());
 				List<String> needRemove = new ArrayList<>();