From f4495e2587c0ba7c2085d3db0cbaca0d3fa30489 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: Fri, 10 Nov 2023 15:27:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/app/position/service/impl/AppPositionPush.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/position/service/impl/AppPositionPush.java b/ard-work/src/main/java/com/ruoyi/app/position/service/impl/AppPositionPush.java
index 7464684..fc5f294 100644
--- a/ard-work/src/main/java/com/ruoyi/app/position/service/impl/AppPositionPush.java
+++ b/ard-work/src/main/java/com/ruoyi/app/position/service/impl/AppPositionPush.java
@@ -3,6 +3,7 @@
import com.ruoyi.app.position.domain.ArdAppPosition;
import com.ruoyi.app.position.service.IArdAppPositionService;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.utils.websocket.util.WebSocketUtils;
import com.ruoyi.system.service.ISysUserService;
@@ -22,7 +23,7 @@
import java.util.stream.Collectors;
/**
- * @Description: app位置推送
+ * @Description: app位置推送（弃用）
* @ClassName: AppPositionPush
* @Author: 刘苏义
* @Date: 2023年07月25日16:07:04
@@ -37,7 +38,6 @@
// 初始定时任务，根据用户设置的频率定期推送实时位置信息
public static void initPushTask(String userId, Session session, int pushFrequency) {
-
initDataMap.put(userId, getAppPositionList());
List<ArdAppPosition> appPositionList = initDataMap.get(userId);
if (appPositionList.size() == 0) {
@@ -91,9 +91,10 @@
//获取所有app用户
List<SysUser> list = sysUserService.selectAllAppUserList(new SysUser());
for (SysUser sysUser : list) {
- if (sysUser.getAppOnlineState().equals("0")) {
- continue;
- }
+ if(StringUtils.isNull(sysUser.getAppOnlineState()))
+ {continue;}
+ if(sysUser.getAppOnlineState().equals("0"))
+ {continue; }
IArdAppPositionService ardAppPositionService = SpringUtils.getBean(IArdAppPositionService.class);
ArdAppPosition ardAppPosition = ardAppPositionService.selectLastArdAppPositionByUserId(sysUser.getUserId());
ArdAppPositions.add(ardAppPosition);
--
Gitblit v1.9.3