From 2c217c4f9e01bd2e764c7b62da1aaa89018d76d8 Mon Sep 17 00:00:00 2001 From: yujian <yujian> Date: 星期一, 22 四月 2019 12:19:21 +0800 Subject: [PATCH] Merge branch 'div' --- fanli/src/main/java/com/yeshi/fanli/job/PushJob.java | 63 +++++++++++++++++++++++++++++++ 1 files changed, 62 insertions(+), 1 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/job/PushJob.java b/fanli/src/main/java/com/yeshi/fanli/job/PushJob.java index b951411..0e228d1 100644 --- a/fanli/src/main/java/com/yeshi/fanli/job/PushJob.java +++ b/fanli/src/main/java/com/yeshi/fanli/job/PushJob.java @@ -5,9 +5,16 @@ import java.util.List; import java.util.Scanner; +import javax.annotation.Resource; + import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; +import com.yeshi.fanli.entity.push.PushGoods; +import com.yeshi.fanli.entity.push.PushInfo; +import com.yeshi.fanli.log.LogHelper; +import com.yeshi.fanli.service.inter.push.PushGoodsService; +import com.yeshi.fanli.service.inter.push.PushInfoService; import com.yeshi.fanli.util.Constant; import com.yeshi.fanli.util.factory.IOSPushFactory; import com.yeshi.fanli.util.push.IOSPushUtil; @@ -16,7 +23,14 @@ @Component public class PushJob { - + + @Resource + private PushInfoService pushInfoService; + + @Resource + private PushGoodsService pushGoodsService; + + /** * 鎺ㄩ�佽�佺増鏈琁OS(姣忔櫄8鐐规帹閫�) */ @@ -49,4 +63,51 @@ } } + + + /** + * 瀹氭椂娑堟伅鎺ㄩ�佷换鍔� 姣忎釜30绉掔埇鍙� + */ + @Scheduled(cron = "30 * * * * ? ") + public void pushInfo() { + if (!Constant.IS_TASK) { + return; + } + + // 绔欏唴淇°�佺綉椤点�佺櫨宸� + try { + List<PushInfo> listTask = pushInfoService.listTask(); + if (listTask != null && listTask.size() > 0) { + for (PushInfo pushInfo: listTask) { + pushInfoService.taskPush(pushInfo); + } + } + } catch (Exception e) { + try { + LogHelper.errorDetailInfo(e); + } catch (Exception e1) { + e1.printStackTrace(); + } + } + + // 浠婃棩鎺ㄨ崘 + try { + List<PushGoods> listTask = pushGoodsService.listTask(); + if (listTask != null && listTask.size() > 0) { + for (PushGoods pushGoods: listTask) { + pushGoodsService.taskPush(pushGoods); + } + } + } catch (Exception e) { + try { + LogHelper.errorDetailInfo(e); + } catch (Exception e1) { + e1.printStackTrace(); + } + } + + } + + + } -- Gitblit v1.8.0