yujian
2019-10-29 9b55262bb45c81c997ab04e55e8de13e14b8ca7d
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/PushController.java
@@ -18,6 +18,7 @@
import com.yeshi.fanli.entity.goods.CommonGoods;
import com.yeshi.fanli.entity.push.DeviceActive;
import com.yeshi.fanli.entity.push.DeviceTokenOPPO;
import com.yeshi.fanli.entity.push.DeviceTokenVIVO;
import com.yeshi.fanli.entity.push.PushGoods;
import com.yeshi.fanli.entity.push.PushGoodsGroup;
import com.yeshi.fanli.entity.push.PushGoodsRecord;
@@ -29,6 +30,7 @@
import com.yeshi.fanli.service.inter.push.DeviceActiveService;
import com.yeshi.fanli.service.inter.push.DeviceTokenHWService;
import com.yeshi.fanli.service.inter.push.DeviceTokenOPPOService;
import com.yeshi.fanli.service.inter.push.DeviceTokenVIVOService;
import com.yeshi.fanli.service.inter.push.IOSPushService;
import com.yeshi.fanli.service.inter.push.PushGoodsGroupService;
import com.yeshi.fanli.service.inter.push.PushGoodsRecordService;
@@ -81,9 +83,12 @@
   @Resource(name = "taskExecutor")
   private TaskExecutor executor;
   @Resource
   private DeviceTokenOPPOService deviceTokenOPPOService;
   @Resource
   private DeviceTokenVIVOService deviceTokenVIVOService;
   @RequestMapping(value = "callback", method = RequestMethod.POST)
   public void callback(AcceptData acceptData, String pushId, PrintWriter out) {
@@ -341,8 +346,6 @@
      }
   }
   @RequestMapping("registerOppo")
   public void registerOppo(AcceptData acceptData, String registerId, Long uid, PrintWriter out) {
      DeviceActive deviceActive = deviceActiveService.getFirstActiveInfo(acceptData.getDevice());
@@ -356,4 +359,17 @@
      out.print(JsonUtil.loadTrueResult(""));
   }
   @RequestMapping("registerVivo")
   public void registerVivo(AcceptData acceptData, String regId, Long uid, PrintWriter out) {
      DeviceActive deviceActive = deviceActiveService.getFirstActiveInfo(acceptData.getDevice());
      if (deviceActive != null) {
         DeviceTokenVIVO vivo = new DeviceTokenVIVO();
         vivo.setDeviceActiveId(deviceActive.getId());
         vivo.setRegisterId(regId);
         vivo.setUid(uid);
         deviceTokenVIVOService.addDeviceTokenVIVO(vivo);
      }
      out.print(JsonUtil.loadTrueResult(""));
   }
}