饿了么绘图，添加口碑

admin

2020-05-19 744594ef1a2f530fc3e86ea9dc48b62247f79420

 fanli/src/main/java/com/yeshi/fanli/service/impl/push/HWPushServiceImpl.java

@@ -16,7 +16,7 @@
import com.yeshi.fanli.entity.bus.user.UserCustomSettings;

import com.yeshi.fanli.entity.bus.user.UserCustomSettings.UserSettingTypeEnum;

import com.yeshi.fanli.entity.push.DeviceTokenHW;

import com.yeshi.fanli.exception.PushException;

import com.yeshi.fanli.exception.push.PushException;

import com.yeshi.fanli.log.PushLogHelper;

import com.yeshi.fanli.service.inter.config.AppVersionService;

import com.yeshi.fanli.service.inter.push.DeviceTokenHWService;

@@ -105,6 +105,9 @@
   }



   private List<DeviceTokenHW> filterDeviceToken(List<DeviceTokenHW> hwDeviceList, int hour) {

      // TODO 暂时不处理消息免打扰

      if (1 > 0)

         return hwDeviceList;

      // 处理消息免打扰

      if (hour >= 20 || hour < 8) {

         Set<Long> uidSets = new HashSet<>();

@@ -142,10 +145,16 @@
    * @param webUrl

    * @param versionCodeList

    */

   private void push(PushTypeEnum type, Long uid, String title, String content, String url, String webUrl, Long goodsId,

         List<Integer> versionCodeList) throws PushException {

   private void push(PushTypeEnum type, Long uid, String title, String content, String url, String webUrl,

         Long goodsId, List<Integer> versionCodeList) throws PushException {

      int hour = Calendar.getInstance().get(Calendar.HOUR_OF_DAY);

      List<Integer> newVersionList = getVersionCodeList(versionCodeList);

      // 1.6.5后开始推送

      for (int i = 0; i < newVersionList.size(); i++) {

         if (newVersionList.get(i) < 47)

            newVersionList.remove(i--);

      }



      if (uid == null || uid == 0) {

         long deviceCount = deviceTokenHWService.countDeviceToken(newVersionList);

         int page = (int) (deviceCount % 100 == 0 ? deviceCount / 100 : deviceCount / 100 + 1);

@@ -157,27 +166,27 @@
            for (DeviceTokenHW token : hwDeviceList)

               tokenList.add(token.getDeviceToken());

            try {

               if (type==PushTypeEnum.goodsdetail) {// 商品详情

               if (type == PushTypeEnum.goodsdetail) {// 商品详情

                  if (goodsId == null)

                     throw new PushException(2, "参数不完整");

                  HWPushUtil.pushGoods(tokenList, title, content, 1, goodsId);

               } else if (type==PushTypeEnum.url) {// 链接

               } else if (type == PushTypeEnum.url) {// 链接

                  if (StringUtil.isNullOrEmpty(webUrl))

                     throw new PushException(2, "参数不完整");

                  HWPushUtil.pushUrl(tokenList, title, content, webUrl);

               } else if (type==PushTypeEnum.ZNX) {// 站内信

               } else if (type == PushTypeEnum.ZNX) {// 站内信

                  HWPushUtil.pushZNX(tokenList, title, content);

               } else if (type==PushTypeEnum.weex) {// weex

               } else if (type == PushTypeEnum.weex) {// weex

                  if (StringUtil.isNullOrEmpty(url))

                     throw new PushException(2, "参数不完整");

                  HWPushUtil.pushWEEX(tokenList, title, content, url);

               } else if (type==PushTypeEnum.baichuan) {// 百川链接

               } else if (type == PushTypeEnum.baichuan) {// 百川链接

                  if (StringUtil.isNullOrEmpty(webUrl))

                     throw new PushException(2, "参数不完整");

                  HWPushUtil.pushBaiChuanUrl(tokenList, title, content, webUrl);

               } else if (type==PushTypeEnum.welfare) {// 福利中心

               } else if (type == PushTypeEnum.welfare) {// 福利中心

                  HWPushUtil.pushWelfareCenter(tokenList, title, content);

               }else if (type==PushTypeEnum.signin) {// 签到

               } else if (type == PushTypeEnum.signin) {// 签到

                  HWPushUtil.pushUserSignInNotification(tokenList, title, content);

               }

            } catch (Exception e) {

@@ -198,27 +207,27 @@
            return;



         try {

            if (type==PushTypeEnum.goodsdetail) {// 商品详情

            if (type == PushTypeEnum.goodsdetail) {// 商品详情

               if (goodsId == null)

                  throw new PushException(2, "参数不完整");

               HWPushUtil.pushGoods(tokenList, title, content, 1, goodsId);

            } else if (type==PushTypeEnum.url) {// 链接

            } else if (type == PushTypeEnum.url) {// 链接

               if (StringUtil.isNullOrEmpty(webUrl))

                  throw new PushException(2, "参数不完整");

               HWPushUtil.pushUrl(tokenList, title, content, webUrl);

            } else if (type==PushTypeEnum.ZNX) {// 站内信

            } else if (type == PushTypeEnum.ZNX) {// 站内信

               HWPushUtil.pushZNX(tokenList, title, content);

            } else if (type==PushTypeEnum.weex) {// weex

            } else if (type == PushTypeEnum.weex) {// weex

               if (StringUtil.isNullOrEmpty(url))

                  throw new PushException(2, "参数不完整");

               HWPushUtil.pushWEEX(tokenList, title, content, url);

            } else if (type==PushTypeEnum.baichuan) {// 百川链接

            } else if (type == PushTypeEnum.baichuan) {// 百川链接

               if (StringUtil.isNullOrEmpty(webUrl))

                  throw new PushException(2, "参数不完整");

               HWPushUtil.pushBaiChuanUrl(tokenList, title, content, webUrl);

            } else if (type==PushTypeEnum.welfare) {// 福利中心

            } else if (type == PushTypeEnum.welfare) {// 福利中心

               HWPushUtil.pushWelfareCenter(tokenList, title, content);

            } else if (type==PushTypeEnum.signin) {// 签到

            } else if (type == PushTypeEnum.signin) {// 签到

               HWPushUtil.pushUserSignInNotification(tokenList, title, content);

            }

         } catch (Exception e) {