Commit 6869def3 by admin

推送修改

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