From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求

---
 fanli/src/main/java/com/yeshi/fanli/job/PushJob.java |   67 ++++++++++++++++++++++++++++++++-
 1 files changed, 64 insertions(+), 3 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..5a6edd1 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鐐规帹閫�)
 	 */
@@ -34,8 +48,8 @@
 		InputStream cer = null;
 
 		int p = deviceList.size() / 50 + 1;
-		JSONObject json = IOSPushFactory.createURLPush("https://0x9.me/TusaI", "杩斿埄鍒歌嫻鏋滅杩涜浜嗛噸澶ф洿鏂帮紒璇风珛鍗冲崌绾�",
-				"鏇村浼樻儬鍒革紝鏇撮珮杩斿埄锛屽敖鍦ㄦ柊鐗堣嫻鏋滅杩斿埄鍒革紒");
+		JSONObject json = IOSPushFactory.createURLPush("https://0x9.me/TusaI", "鏉挎牀蹇渷鑻规灉绔繘琛屼簡閲嶅ぇ鏇存柊锛佽绔嬪嵆鍗囩骇",
+				"鏇村浼樻儬鍒革紝鏇撮珮杩斿埄锛屽敖鍦ㄦ柊鐗堣嫻鏋滅鏉挎牀蹇渷锛�");
 		for (int i = 0; i < p; i++) {
 			cer = this.getClass().getClassLoader().getResourceAsStream("certificate/鑰佺増鏈�-鐢熶骇璇佷功.p12");
 			try {
@@ -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