From feb01cf9c5f7c4e4b83605d96c8add55a3f5948f Mon Sep 17 00:00:00 2001
From: landong2015 <hanshaofeng@lymsh.com>
Date: Tue, 31 May 2016 14:50:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9A=E6=97=B6=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E6=8E=A8=E9=80=81=E6=98=AF=E6=97=A9=E4=B8=8A10?=
 =?UTF-8?q?=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/lymsh/yimiao/main/data/util/JPushUtil.java | 9 ++++++++-
 .../java/com/lyms/yimiao/web/controller/v1/KidsController.java   | 1 +
 webApi/src/main/resources/spring/applicationContext.xml          | 6 +++---
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/util/JPushUtil.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/util/JPushUtil.java
index 0478a4e..b2ea4fc 100644
--- a/mainData/src/main/java/com/lymsh/yimiao/main/data/util/JPushUtil.java
+++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/util/JPushUtil.java
@@ -3,6 +3,7 @@ package com.lymsh.yimiao.main.data.util;
 import cn.jpush.api.push.model.Platform;
 import cn.jpush.api.push.model.PushPayload;
 import cn.jpush.api.push.model.audience.Audience;
+import cn.jpush.api.push.model.notification.IosNotification;
 import cn.jpush.api.push.model.notification.Notification;
 import org.springframework.stereotype.Service;
 
@@ -22,7 +23,13 @@ public class JPushUtil {
         return PushPayload.newBuilder()
                 .setPlatform(Platform.all())
                 .setAudience(Audience.alias(alias))
-                .setNotification(Notification.alert(alert))
+//                .setNotification(Notification.alert(alert))
+                .setNotification(Notification.newBuilder()
+                        .addPlatformNotification(IosNotification.newBuilder()
+                                .setAlert(alert)
+                                .setBadge(1)
+                                .build())
+                        .build())
                 .build();
     }
 }
diff --git a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java
index b2f936a..0812d74 100644
--- a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java
+++ b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java
@@ -350,6 +350,7 @@ public class KidsController extends BaseController {
                                 if (data.getIoVaccineId().equals(records.getVaccineNameId())) {
                                     if (records.getJiCi() < sum) {
                                         jiCi = jiCi + records.getJiCi();
+                                        break;
                                     }
                                 }
                             }
diff --git a/webApi/src/main/resources/spring/applicationContext.xml b/webApi/src/main/resources/spring/applicationContext.xml
index 606c28e..8bfec39 100644
--- a/webApi/src/main/resources/spring/applicationContext.xml
+++ b/webApi/src/main/resources/spring/applicationContext.xml
@@ -100,9 +100,9 @@
 	</bean>
 
 	<!-- 定时发送接种消息 -->
-	<!--<task:scheduled-tasks>-->
-		<!--<task:scheduled ref="pushTaskService" method="pushTask" cron="0 0 23 * * ?"/>-->
-	<!--</task:scheduled-tasks>-->
+	<task:scheduled-tasks>
+		<task:scheduled ref="pushTaskService" method="pushTask" cron="0 0 10 * * ?"/>
+	</task:scheduled-tasks>
 
 
 
-- 
1.8.3.1