消息推送

hx-socket/src/main/java/com/fjhx/socket/core/WebSocketListener.java

@@ -64,7 +64,6 @@ public class WebSocketListener {
         List<SysUser> sysUserList = sysUserService.list();
         List<Long> userIdList = sysUserList.stream().map(SysUser::getUserId).collect(Collectors.toList());
         TenantHolder.setIgnore(oldIgnore);
-        DynamicDataSourceContextHolder.poll();
 
         Set<String> redisKeySet = redisCache.scan(PushAnnouncementServiceImpl.PUSH_ANNOUNCEMENT_REDIS_KEY + "*");
 
@@ -84,6 +83,7 @@ public class WebSocketListener {
 
             List<PushInfo> pushInfoList = userIdList.stream().map(item -> {
                 PushInfo pushInfo = new PushInfo();
+                pushInfo.setType(PushTypeEnum.ANNOUNCEMENT.getType());
                 pushInfo.setAnnouncementId(pushAnnouncementDto.getId());
                 pushInfo.setTitle(pushAnnouncementDto.getTitle());
                 pushInfo.setBusinessType(0);
@@ -112,6 +112,8 @@ public class WebSocketListener {
             }
         });
 
+
+        DynamicDataSourceContextHolder.poll();
     }
 
 }

hx-socket/src/main/java/com/fjhx/socket/core/WebSocketServer.java

@@ -162,7 +162,7 @@ public class WebSocketServer {
                         .eq(PushInfo::getType, PushTypeEnum.ANNOUNCEMENT.getType())
                         .eq(PushInfo::getPushUserId, pushParam.getUserId())
                         .eq(PushInfo::getPushRead, StatusConstant.NO)
-                        .and(s -> s.isNull(PushInfo::getFailureTime).or().le(PushInfo::getFailureTime, new Date()))
+                        .and(s -> s.isNull(PushInfo::getFailureTime).or().ge(PushInfo::getFailureTime, new Date()))
                 );
                 msg.put("list", list);
                 break;
@@ -171,7 +171,7 @@ public class WebSocketServer {
                         .eq(PushInfo::getType, PushTypeEnum.MESSAGE.getType())
                         .eq(PushInfo::getPushUserId, pushParam.getUserId())
                         .eq(PushInfo::getPushRead, StatusConstant.NO)
-                        .and(s -> s.isNull(PushInfo::getFailureTime).or().le(PushInfo::getFailureTime, new Date()))
+                        .and(s -> s.isNull(PushInfo::getFailureTime).or().ge(PushInfo::getFailureTime, new Date()))
                 );
                 msg.put("count", count);
                 break;