|
@@ -6,6 +6,7 @@ import com.alibaba.fastjson2.JSONObject;
|
|
import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
|
|
import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
|
|
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
|
|
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
|
|
import com.baomidou.mybatisplus.core.toolkit.StringPool;
|
|
import com.baomidou.mybatisplus.core.toolkit.StringPool;
|
|
|
|
+import com.fjhx.jpush.code.JPushUtils;
|
|
import com.fjhx.socket.core.event.WebSocketUserOfflineEvent;
|
|
import com.fjhx.socket.core.event.WebSocketUserOfflineEvent;
|
|
import com.fjhx.socket.entity.push.po.PushInfo;
|
|
import com.fjhx.socket.entity.push.po.PushInfo;
|
|
import com.fjhx.socket.service.push.PushInfoService;
|
|
import com.fjhx.socket.service.push.PushInfoService;
|
|
@@ -16,8 +17,11 @@ import com.ruoyi.framework.mybatis.holder.TenantHolder;
|
|
import com.ruoyi.system.service.ISysUserService;
|
|
import com.ruoyi.system.service.ISysUserService;
|
|
import org.springframework.context.ApplicationContext;
|
|
import org.springframework.context.ApplicationContext;
|
|
|
|
|
|
|
|
+import java.util.Arrays;
|
|
|
|
+import java.util.Collections;
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
public class WebSocketPush {
|
|
public class WebSocketPush {
|
|
|
|
|
|
@@ -30,6 +34,8 @@ public class WebSocketPush {
|
|
*/
|
|
*/
|
|
public static void byUser(PushTypeEnum pushTypeEnum, Long userId, String title, Integer businessType) {
|
|
public static void byUser(PushTypeEnum pushTypeEnum, Long userId, String title, Integer businessType) {
|
|
byUser(pushTypeEnum, userId, title, businessType, StringPool.EMPTY);
|
|
byUser(pushTypeEnum, userId, title, businessType, StringPool.EMPTY);
|
|
|
|
+ //将消息推送到极光
|
|
|
|
+ JPushUtils.jPushSendMsg(title, Collections.singletonList(userId));
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -86,6 +92,9 @@ public class WebSocketPush {
|
|
for (SysUser sysUser : sysUserList) {
|
|
for (SysUser sysUser : sysUserList) {
|
|
byUser(pushTypeEnum, sysUser.getUserId(), title, businessType, businessData);
|
|
byUser(pushTypeEnum, sysUser.getUserId(), title, businessType, businessData);
|
|
}
|
|
}
|
|
|
|
+ //将消息推送到极光
|
|
|
|
+ List<Long> userIds = sysUserList.stream().map(SysUser::getUserId).collect(Collectors.toList());
|
|
|
|
+ JPushUtils.jPushSendMsg(title,userIds);
|
|
DynamicDataSourceContextHolder.poll();
|
|
DynamicDataSourceContextHolder.poll();
|
|
}
|
|
}
|
|
|
|
|