diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/PushTaskServiceImpl.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/PushTaskServiceImpl.java index 6042034..c2ba868 100644 --- a/mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/PushTaskServiceImpl.java +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/PushTaskServiceImpl.java @@ -87,8 +87,9 @@ public class PushTaskServiceImpl implements PushTaskService{ List usersList = ymUsersService.queryYmUsers(usersQuery); if (CollectionUtils.isNotEmpty(usersList)) { YmUsers users = usersList.get(0); - PushPayload pushPayload = JPushUtil.buildPushObject_all_alias_alert(ALIAS + users.getPhone(), ALERT); - if (pushPayload != null) { + PushPayload ios = JPushUtil.buildPushObjectAllAliasAlertIos(ALIAS + users.getPhone(), ALERT); + PushPayload android = JPushUtil.buildPushObjectAllAliasAlertAndroid(ALIAS + users.getPhone(), ALERT); + if (ios != null || android != null) { YmPushMessages messages = new YmPushMessages(); messages.setCreated(new Date()); messages.setContent((medKids == null ? "" : medKids.getName() == null ? "" : medKids.getName()) + "小朋友按计划3天后将会接种" + @@ -99,7 +100,8 @@ public class PushTaskServiceImpl implements PushTaskService{ //成功后推送提示消息 try { - jPushClient.sendPush(pushPayload); + jPushClient.sendPush(ios); + jPushClient.sendPush(android); } catch (Exception e) { } @@ -138,8 +140,9 @@ public class PushTaskServiceImpl implements PushTaskService{ List usersList = ymUsersService.queryYmUsers(usersQuery); if (CollectionUtils.isNotEmpty(usersList)) { YmUsers users = usersList.get(0); - PushPayload pushPayload = JPushUtil.buildPushObject_all_alias_alert(ALIAS + users.getPhone(), ALERT); - if (pushPayload != null) { + PushPayload ios = JPushUtil.buildPushObjectAllAliasAlertIos(ALIAS + users.getPhone(), ALERT); + PushPayload android = JPushUtil.buildPushObjectAllAliasAlertAndroid(ALIAS + users.getPhone(), ALERT); + if (ios != null || android != null) { YmPushMessages messages = new YmPushMessages(); messages.setCreated(new Date()); messages.setContent((medKids == null ? "" : medKids.getName() == null ? "" : medKids.getName()) + "小朋友按计划1天后将会接种" + @@ -150,7 +153,8 @@ public class PushTaskServiceImpl implements PushTaskService{ //成功后推送提示消息 try { - jPushClient.sendPush(pushPayload); + jPushClient.sendPush(ios); + jPushClient.sendPush(android); } catch (Exception e) { } 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 b2ea4fc..880ed65 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 @@ -14,16 +14,15 @@ import org.springframework.stereotype.Service; public class JPushUtil { /** - * 所有平台 + * ios平台 * alias 别名 * alert 内容 * @return */ - public static PushPayload buildPushObject_all_alias_alert(String alias,String alert) { + public static PushPayload buildPushObjectAllAliasAlertIos(String alias,String alert) { return PushPayload.newBuilder() - .setPlatform(Platform.all()) + .setPlatform(Platform.ios()) .setAudience(Audience.alias(alias)) -// .setNotification(Notification.alert(alert)) .setNotification(Notification.newBuilder() .addPlatformNotification(IosNotification.newBuilder() .setAlert(alert) @@ -32,4 +31,14 @@ public class JPushUtil { .build()) .build(); } + + public static PushPayload buildPushObjectAllAliasAlertAndroid(String alias,String alert) { + return PushPayload.newBuilder() + .setPlatform(Platform.android()) + .setAudience(Audience.alias(alias)) + .setNotification(Notification.alert(alert)) + .build(); + } + + }