金融删除微信微博部分

src/main/java/com/zhiwei/finance/ESUtil.java

@@ -101,11 +101,14 @@ public class ESUtil {
 		// path = doc.getString("url");
 		// }
 		// }
-		sources = new ReadExcel().getExcel(path);
+//		sources = new ReadExcel().getExcel(path);
 		Calendar cal = Calendar.getInstance();
-		cal.add(Calendar.HOUR_OF_DAY, -3);
-		List<NewsResult> list = new ESUtil().pushByKey(cal.getTime(), new Date(), sources, "weibo");
-		System.out.println(list.size());
+		cal.add(Calendar.HOUR_OF_DAY, -1);
+		List<NewsResult> list = new ESUtil().pushByKey(cal.getTime(), new Date(), sources, "wechat");
+		System.out.println(list);
+		list = new ESUtil().pushByKey(cal.getTime(), new Date(), sources, "wechat");
+		System.out.println(list);
+		
 	}
 
 	/**

src/main/java/com/zhiwei/finance/PushFinanceByTime.java

@@ -69,22 +69,18 @@ public class PushFinanceByTime extends Thread {
 					cal.add(Calendar.HOUR_OF_DAY, -16);
 					cal.set(Calendar.MINUTE, 0);
 					List<NewsResult> list = new ESUtil().pushByKey(cal.getTime(), new Date(), sources, "media");
-					List<NewsResult> wechat_ = new ESUtil().pushByKey(cal.getTime(), new Date(), wechat, "wechat");
-					List<NewsResult> weibo_ = new ESUtil().pushByKey(cal.getTime(), new Date(), weibo, "weibo");
 					String url = PushFinanceByTime.class.getClassLoader().getResource("/").getPath() + "/"
 							+ (int) (Math.random() * 5000) + "sends.xls";
 					cal.add(Calendar.HOUR_OF_DAY, 16);
-					sendsEmail(cal, list, wechat_, weibo_, url);
+					sendsEmail(cal, list, url);
 					sleep(1000 * 60 * 60);
 				} else if (cal.get(Calendar.HOUR_OF_DAY) == 11) {// 11
 					cal.add(Calendar.HOUR_OF_DAY, -3);
 					List<NewsResult> list = new ESUtil().pushByKey(cal.getTime(), new Date(), sources, "media");
-					List<NewsResult> wechat_ = new ESUtil().pushByKey(cal.getTime(), new Date(), wechat, "wechat");
-					List<NewsResult> weibo_ = new ESUtil().pushByKey(cal.getTime(), new Date(), weibo, "weibo");
 					String url = PushFinanceByTime.class.getClassLoader().getResource("/").getPath() + "/"
 							+ (int) (Math.random() * 5000) + "sends.xls";
 					cal.add(Calendar.HOUR_OF_DAY, 3);
-					sendsEmail(cal, list, wechat_, weibo_, url);
+					sendsEmail(cal, list, url);
 					sleep(1000 * 60 * 60);
 				}
 				if (cal.get(Calendar.DAY_OF_WEEK) == 1 || cal.get(Calendar.DAY_OF_WEEK) == 7) {
@@ -92,12 +88,10 @@ public class PushFinanceByTime extends Thread {
 						cal.add(Calendar.HOUR_OF_DAY, -5);
 						cal.set(Calendar.MINUTE, 0);
 						List<NewsResult> list = new ESUtil().pushByKey(cal.getTime(), new Date(), sources, "media");
-						List<NewsResult> wechat_ = new ESUtil().pushByKey(cal.getTime(), new Date(), wechat, "wechat");
-						List<NewsResult> weibo_ = new ESUtil().pushByKey(cal.getTime(), new Date(), weibo, "weibo");
 						String url = PushFinanceByTime.class.getClassLoader().getResource("/").getPath() + "/"
 								+ (int) (Math.random() * 5000) + "sends.xls";
 						cal.add(Calendar.HOUR_OF_DAY, 5);
-						sendsEmail(cal, list, wechat_, weibo_, url);
+						sendsEmail(cal, list,  url);
 						sleep(1000 * 60 * 60);
 					}
 				}
@@ -113,10 +107,10 @@ public class PushFinanceByTime extends Thread {
 		}
 	}
 
-	private void sendsEmail(Calendar cal, List<NewsResult> list, List<NewsResult> weixin, List<NewsResult> weibo,
+	private void sendsEmail(Calendar cal, List<NewsResult> list, 
 			String url) {
 		try {
-			new ExcelUtil().pushDataWithFinanceLong(list, weixin, weibo, cal.getTime(), url);
+			new ExcelUtil().pushDataWithFinanceLong(list,cal.getTime(), url);
 			SendMailUtil.sendMessage("949131080@qq.com", url, "金融");
 			SendMailUtil.sendMessage("yuhualong@zhiweidata.com", url, "金融");
 			SendMailUtil.sendMessage("ligaodie@zhiweidata.com", url, "金融");
@@ -124,7 +118,7 @@ public class PushFinanceByTime extends Thread {
 		} catch (Exception e) {
 			log.error("一号邮箱发送失败，尝试二号邮箱{}", e);
 			try {
-				new ExcelUtil().pushDataWithFinanceLong(list, weixin, weibo, cal.getTime(), url);
+				new ExcelUtil().pushDataWithFinanceLong(list,  cal.getTime(), url);
 				SendMailUtil.sendMessage2("949131080@qq.com", url, "金融");
 				SendMailUtil.sendMessage2("yuhualong@zhiweidata.com", url, "金融");
 				SendMailUtil.sendMessage2("ligaodie@zhiweidata.com", url, "金融");

src/main/java/com/zhiwei/util/ExcelUtil.java

@@ -137,7 +137,7 @@ public class ExcelUtil {
 		log.info("内容写入成功");
 	}
 
-	public void pushDataWithFinanceLong(List<NewsResult> list, List<NewsResult> wechat, List<NewsResult> weibo,
+	public void pushDataWithFinanceLong(List<NewsResult> list,
 			Date time, String fileName) throws Exception {
 		File tempFile = new File(fileName);
 		// 若是文件不存在就创建新文件
@@ -212,86 +212,86 @@ public class ExcelUtil {
 		sheet.setColumnView(column++, 22);
 		sheet.setColumnView(column++, 22);
 
-		WritableSheet sheet2 = workbook.createSheet("wechat", 1);
-		seq = 0;
-		sheet2.mergeCells(0, seq, 7, seq + 1);
-		l = new Label(0, seq, "", mainTitle);
-		sheet2.addCell(l);
-		seq += 2;
-		row = seq++;
-		l = new Label(0, row, "序号", titleFormat);
-		sheet2.addCell(l);
-		l = new Label(1, row, "标题", titleFormat);
-		sheet2.addCell(l);
-		l = new Label(2, row, "时间", titleFormat);
-		sheet2.addCell(l);
-		l = new Label(3, row, "来源", titleFormat);
-		sheet2.addCell(l);
-		num = 1;
-		for (NewsResult news : wechat) {
-			row = seq++;
-			l = new Label(0, row, String.valueOf(num++), detFormat);// 序号
-			sheet2.addCell(l);
-			try {
-				WritableHyperlink link = new WritableHyperlink(1, row, 1, row, new URL(news.getUrl()), news.getTitle());
-				sheet2.addHyperlink(link);
-			} catch (Exception e) {
-				System.out.println(news);
-				log.error("获取url失败，错误信息{}", e);
-			}
-			l = new Label(1, row, news.getTitle(), urlFormat);// 标题
-			sheet2.addCell(l);
-			l = new Label(2, row, news.getTime(), detFormat);// 时间
-			sheet2.addCell(l);
-			l = new Label(3, row, news.getSource(), detFormat);// 时间
-			sheet2.addCell(l);
-		}
-		column = 0;
-		sheet2.setColumnView(column++, 10);
-		sheet2.setColumnView(column++, 25);
-		sheet2.setColumnView(column++, 20);
-		sheet2.setColumnView(column++, 22);
-		sheet2.setColumnView(column++, 22);
-		WritableSheet sheet3 = workbook.createSheet("weibo", 2);
-		seq = 0;
-		sheet3.mergeCells(0, seq, 7, seq + 1);
-		l = new Label(0, seq, "", mainTitle);
-		sheet3.addCell(l);
-		seq += 2;
-		row = seq++;
-		l = new Label(0, row, "序号", titleFormat);
-		sheet3.addCell(l);
-		l = new Label(1, row, "标题", titleFormat);
-		sheet3.addCell(l);
-		l = new Label(2, row, "时间", titleFormat);
-		sheet3.addCell(l);
-		l = new Label(3, row, "来源", titleFormat);
-		sheet3.addCell(l);
-		num = 1;
-		for (NewsResult news : weibo) {
-			row = seq++;
-			l = new Label(0, row, String.valueOf(num++), detFormat);// 序号
-			sheet3.addCell(l);
-			try {
-				WritableHyperlink link = new WritableHyperlink(1, row, 1, row, new URL(news.getUrl()), news.getTitle());
-				sheet3.addHyperlink(link);
-			} catch (Exception e) {
-				System.out.println(news);
-				log.error("获取url失败，错误信息{}", e);
-			}
-			l = new Label(1, row, news.getTitle(), urlFormat);// 标题
-			sheet3.addCell(l);
-			l = new Label(2, row, news.getTime(), detFormat);// 时间
-			sheet3.addCell(l);
-			l = new Label(3, row, news.getSource(), detFormat);// 时间
-			sheet3.addCell(l);
-		}
-		column = 0;
-		sheet3.setColumnView(column++, 10);
-		sheet3.setColumnView(column++, 25);
-		sheet3.setColumnView(column++, 20);
-		sheet3.setColumnView(column++, 22);
-		sheet3.setColumnView(column++, 22);
+//		WritableSheet sheet2 = workbook.createSheet("wechat", 1);
+//		seq = 0;
+//		sheet2.mergeCells(0, seq, 7, seq + 1);
+//		l = new Label(0, seq, "", mainTitle);
+//		sheet2.addCell(l);
+//		seq += 2;
+//		row = seq++;
+//		l = new Label(0, row, "序号", titleFormat);
+//		sheet2.addCell(l);
+//		l = new Label(1, row, "标题", titleFormat);
+//		sheet2.addCell(l);
+//		l = new Label(2, row, "时间", titleFormat);
+//		sheet2.addCell(l);
+//		l = new Label(3, row, "来源", titleFormat);
+//		sheet2.addCell(l);
+//		num = 1;
+//		for (NewsResult news : wechat) {
+//			row = seq++;
+//			l = new Label(0, row, String.valueOf(num++), detFormat);// 序号
+//			sheet2.addCell(l);
+//			try {
+//				WritableHyperlink link = new WritableHyperlink(1, row, 1, row, new URL(news.getUrl()), news.getTitle());
+//				sheet2.addHyperlink(link);
+//			} catch (Exception e) {
+//				System.out.println(news);
+//				log.error("获取url失败，错误信息{}", e);
+//			}
+//			l = new Label(1, row, news.getTitle(), urlFormat);// 标题
+//			sheet2.addCell(l);
+//			l = new Label(2, row, news.getTime(), detFormat);// 时间
+//			sheet2.addCell(l);
+//			l = new Label(3, row, news.getSource(), detFormat);// 时间
+//			sheet2.addCell(l);
+//		}
+//		column = 0;
+//		sheet2.setColumnView(column++, 10);
+//		sheet2.setColumnView(column++, 25);
+//		sheet2.setColumnView(column++, 20);
+//		sheet2.setColumnView(column++, 22);
+//		sheet2.setColumnView(column++, 22);
+//		WritableSheet sheet3 = workbook.createSheet("weibo", 2);
+//		seq = 0;
+//		sheet3.mergeCells(0, seq, 7, seq + 1);
+//		l = new Label(0, seq, "", mainTitle);
+//		sheet3.addCell(l);
+//		seq += 2;
+//		row = seq++;
+//		l = new Label(0, row, "序号", titleFormat);
+//		sheet3.addCell(l);
+//		l = new Label(1, row, "标题", titleFormat);
+//		sheet3.addCell(l);
+//		l = new Label(2, row, "时间", titleFormat);
+//		sheet3.addCell(l);
+//		l = new Label(3, row, "来源", titleFormat);
+//		sheet3.addCell(l);
+//		num = 1;
+//		for (NewsResult news : weibo) {
+//			row = seq++;
+//			l = new Label(0, row, String.valueOf(num++), detFormat);// 序号
+//			sheet3.addCell(l);
+//			try {
+//				WritableHyperlink link = new WritableHyperlink(1, row, 1, row, new URL(news.getUrl()), news.getTitle());
+//				sheet3.addHyperlink(link);
+//			} catch (Exception e) {
+//				System.out.println(news);
+//				log.error("获取url失败，错误信息{}", e);
+//			}
+//			l = new Label(1, row, news.getTitle(), urlFormat);// 标题
+//			sheet3.addCell(l);
+//			l = new Label(2, row, news.getTime(), detFormat);// 时间
+//			sheet3.addCell(l);
+//			l = new Label(3, row, news.getSource(), detFormat);// 时间
+//			sheet3.addCell(l);
+//		}
+//		column = 0;
+//		sheet3.setColumnView(column++, 10);
+//		sheet3.setColumnView(column++, 25);
+//		sheet3.setColumnView(column++, 20);
+//		sheet3.setColumnView(column++, 22);
+//		sheet3.setColumnView(column++, 22);
 		workbook.write();
 		workbook.close();
 		log.info("内容写入成功");