From 197a596d8787eaab061190dc66977e33b6bcee96 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 06 九月 2023 14:27:00 +0800
Subject: [PATCH] 优化电子围栏报警触发条件

---
 ard-work/src/main/java/com/ruoyi/app/position/service/impl/AppPositionPush.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 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 388a4ad..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
@@ -90,7 +91,9 @@
         //鑾峰彇鎵�鏈塧pp鐢ㄦ埛
         List<SysUser> list = sysUserService.selectAllAppUserList(new SysUser());
         for (SysUser sysUser : list) {
-            if(sysUser.getAppOnlineState().equals(0))
+            if(StringUtils.isNull(sysUser.getAppOnlineState()))
+            {continue;}
+            if(sysUser.getAppOnlineState().equals("0"))
             {continue; }
             IArdAppPositionService ardAppPositionService = SpringUtils.getBean(IArdAppPositionService.class);
             ArdAppPosition ardAppPosition = ardAppPositionService.selectLastArdAppPositionByUserId(sysUser.getUserId());

--
Gitblit v1.9.3