拆分网媒了今日头条和客户端的数据统计

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

@@ -162,11 +162,13 @@ public class MainThread extends Thread {
 		CrawTemplateServiceImpl crawService = BeanFactory.getBean(CrawTemplateServiceImpl.class);
 		DataServiceImpl dataService = BeanFactory.getBean(DataServiceImpl.class);
 		ServerServiceImpl serverService = BeanFactory.getBean(ServerServiceImpl.class);
-		MessageServiceImpl msgService = BeanFactory.getBean(MessageServiceImpl.class);
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH");
 		List<Channel> channel = serverService.findDisChannel();
 		while (true) {
 			Calendar start = Calendar.getInstance();
+			if (start.get(Calendar.HOUR_OF_DAY) < 1) {
+				start.add(Calendar.DATE, -1);
+			}
 			Calendar end = Calendar.getInstance();
 			try {
 				start.set(Calendar.HOUR_OF_DAY, 0);

src/main/java/com/zhiwei/manage/service/DataServiceImpl.java

@@ -17,8 +17,6 @@ public class DataServiceImpl implements DataService {
 
 	@Autowired
 	private DataDao dataDao;
-	@Autowired
-	private CrawTemplateDao crd;
 
 	@Override
 	public void insert(Data data) {

src/main/java/com/zhiwei/manage/util/ESUtil.java

@@ -160,10 +160,22 @@ public class ESUtil {
 			srb.setPostFilter(QueryBuilders.rangeQuery("insert_at").gte(sendTime(startTime)).lt(sendTime(endTime)));
 		} else if (pt.equals("微信全量")) {
 			srb.setPostFilter(QueryBuilders.rangeQuery("time").gte(sendTime(startTime)).lt(sendTime(endTime)));
+		} else if (pt.equals("今日头条")) {
+			srb.setPostFilter(QueryBuilders.rangeQuery("time").gte(sendTime(startTime)).lt(sendTime(endTime)));
+			QueryBuilder matchQuery = QueryBuilders.matchPhraseQuery("type", pt);
+			bb.should(matchQuery);
+		} else if (pt.equals("客户端")) {
+			srb.setPostFilter(QueryBuilders.rangeQuery("time").gte(sendTime(startTime)).lt(sendTime(endTime)));
+			QueryBuilder matchQuery = QueryBuilders.wildcardQuery("type", "*客户端");
+			QueryBuilder matchQuery2 = QueryBuilders.wildcardQuery("type", "脉脉");
+			bb.should(matchQuery2);
+			bb.should(matchQuery);
 		} else {
 			srb.setPostFilter(QueryBuilders.rangeQuery("time").gte(sendTime(startTime)).lt(sendTime(endTime)));
 			QueryBuilder matchQuery = QueryBuilders.matchPhraseQuery("pt", pt);
+			QueryBuilder matchQuery2 = QueryBuilders.matchPhraseQuery("type", pt);
 			bb.should(matchQuery);
+			bb.should(matchQuery2);
 		}
 	}
 

src/main/resources/mongo.properties

@@ -29,5 +29,7 @@ pingmei.indexName=mediaspider*
 luntan.indexName=mediaspider*
 tieba.indexName=mediaspider*
 wechat.indexName=mediaspider*
+mobile.indexName=mediaspider*
+toutiao.indexName=mediaspider*
 ###########################################
 count_mail=shenjinzhu999@163.com
\ No newline at end of file