admin
2020-07-14 eec7e789a87863c25d92c10ad5dfc22ad80c448d
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/PushController.java
@@ -114,7 +114,7 @@
   @RequestMapping(value = "callback", method = RequestMethod.POST)
   public void callback(AcceptData acceptData, String pushId, PrintWriter out) {
      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
            acceptData.getPackages());
            acceptData.getPackages(),acceptData.getSystem());
      if (system == null) {
         out.print(JsonUtil.loadFalseResult("不存在该系统"));
         return;
@@ -229,10 +229,10 @@
      // 设备注册时间
      Date createTime = deviceActive.getCreateTime();
      count = pushGoodsService.countHistoryByPushTime(uid, createTime);
      count = pushGoodsService.countHistoryByPushTime(uid, createTime,acceptData.getSystem());
      int pageSize = Constant.PAGE_SIZE;
      List<PushGoods> list = pushGoodsService.listHistoryByPushTime((page - 1) * pageSize, pageSize, uid, createTime);
      List<PushGoods> list = pushGoodsService.listHistoryByPushTime((page - 1) * pageSize, pageSize, uid, createTime,acceptData.getSystem());
      if (list == null)
         list = new ArrayList<>();