fanli-server.git

			@@ -41,7 +41,7 @@

			@Resource
			private UserCustomSettingsService userCustomSettingsService;


			@Override
			public void pushGoods(Long uid, Long auctionId, String title, String content) throws PushException {

			@@ -85,9 +85,9 @@
			*/
			} else {
			if (!validateNotDisturbSingle(uid)) {
			return; //通知免打扰(20:00-24:00 / 00:00 -08:00)
			return; // 通知免打扰(20:00-24:00 / 00:00 -08:00)
			}


			// IOS 单推
			List<DeviceTokenIOS> deviceTokenIosList = getDeviceTokenListByUid(uid);
			List<String> deviceTokenList = new ArrayList<>();
			@@ -143,9 +143,9 @@
			*/
			} else {
			if (!validateNotDisturbSingle(uid)) {
			return; //通知免打扰(20:00-24:00 / 00:00 -08:00)
			return; // 通知免打扰(20:00-24:00 / 00:00 -08:00)
			}


			List<DeviceTokenIOS> deviceTokenIosList = getDeviceTokenListByUid(uid);
			List<String> deviceTokenList = new ArrayList<>();
			if (deviceTokenIosList != null)
			@@ -206,13 +206,13 @@
			* } });
			*/
			} else if (msg != null) {

			if (uId !=null) {

			if (uId != null) {
			if (!validateNotDisturbSingle(uId)) {
			return; //通知免打扰(20:00-24:00 / 00:00 -08:00)
			return; // 通知免打扰(20:00-24:00 / 00:00 -08:00)
			}
			}


			// 插入推送记录
			PushRecord pushRecord = new PushRecord();
			info.setTitle(msg.getTitle());
			@@ -462,27 +462,27 @@

			String jsonContent = pushQueueRecord.getJsonContent();
			JSONObject json = JSONObject.fromObject(jsonContent);


			List<String> tokenList = new ArrayList<>();


			boolean ispush = false;
			List<Long> listNotPushId = null;


			Calendar now = Calendar.getInstance();
			int hour = now.get(Calendar.HOUR_OF_DAY);
			if (hour >= 8 && hour < 20) {
			ispush = true; // 可推送
			} else {
			} else {
			listNotPushId = validateNotDisturb();
			}


			for (DeviceTokenIOS ios : list) {


			if (!StringUtil.isNullOrEmpty(ios.getDeviceToken())) {
			if (!ispush && listNotPushId != null && listNotPushId.size() > 0) {
			Long uid = ios.getUid();
			if (uid != null && listNotPushId.contains(uid)) {
			continue; // 通知免打扰(20:00-24:00 / 00:00 -08:00)
			continue; // 通知免打扰(20:00-24:00 / 00:00 -08:00)
			}
			}
			tokenList.add(ios.getDeviceToken());
			@@ -564,16 +564,16 @@
			}
			}
			}


			/**
			* 通知免打扰(20:00-8:00)
			* 通知免打扰(20:00-8:00)
			*/
			public List<Long> validateNotDisturb() {
			return userCustomSettingsService.getCancelNoticeUsers();
			}


			/**
			* 通知免打扰(20:00-8:00)
			* 通知免打扰(20:00-8:00)
			*/
			public boolean validateNotDisturbSingle(Long uid) {
			Calendar now = Calendar.getInstance();
			@@ -582,12 +582,38 @@
			if (hour >= 8 && hour < 20) {
			ispush = true; // 可推送
			} else {
			// 自定义设置通知免打扰(20:00-24:00 / 00:00 -08:00)
			// 自定义设置通知免打扰(20:00-24:00 / 00:00 -08:00)
			ispush = userCustomSettingsService.validateCancelNoticeByUid(uid);
			}


			return ispush;
			}


			@Override
			public void pushWelfareCenter(Long uid, String title, String content) throws PushException {
			MessageInfo info = new MessageInfo();
			info.setTitle(title);
			info.setContent(content);
			info.setDescription(content);
			// IOS 全推
			if (uid == null \|\| uid == 0) {
			addPushIOSQueue(info, "", PushController.WELFARE_CENTER);
			} else {
			if (!validateNotDisturbSingle(uid)) {
			return;
			}
			List<DeviceTokenIOS> deviceTokenIosList = getDeviceTokenListByUid(uid);
			List<String> deviceTokenList = new ArrayList<>();
			if (deviceTokenIosList != null)
			for (DeviceTokenIOS ios : deviceTokenIosList) {
			deviceTokenList.add(ios.getDeviceToken());
			}
			try {
			IOSPushUtil.allPushIOS(deviceTokenList, info, "", PushController.WELFARE_CENTER);
			} catch (Exception e) {
			PushLogHelper.iosError(e);
			}
			}
			}

			}