فهرست منبع

七个数据隔离 水源,救援设备,起降点,气象站,放火站,防火队,森林管理 经纬度 用户不验证Email Unique
非必填 APP 七个基础数据 修改用户登录状态判断

wangzhe 4 سال پیش
والد
کامیت
7fcfecbbfc
1فایلهای تغییر یافته به همراه10 افزوده شده و 6 حذف شده
  1. 10 6
      mybusiness/src/main/resources/mapper/grid/visualization/Visualization_Event_Mapper.xml

+ 10 - 6
mybusiness/src/main/resources/mapper/grid/visualization/Visualization_Event_Mapper.xml

@@ -764,11 +764,12 @@
                 U.PHONENUMBER,
                 U.STATUS,
                 U.CREATE_TIME,
-                IF(OL.STATUS='ON_LINE','1','0') OLSTATUS,
+--                 IF(OL.STATUS='ON_LINE','1','0') OLSTATUS,
+                IF(u.login_date > date_add(now(), interval -3 minute),'1','0') OLSTATUS,
                 IF(LE.END_TIME >= NOW() AND LE.LEAVE_STATUS = 'LEAVE_STATUS_2','1','0') LESTATUS
             FROM SYS_USER U
             LEFT JOIN SYS_DEPT DEPT ON U.DEPT_ID=DEPT.DEPT_ID
-            LEFT JOIN SYS_USER_ONLINE OL ON U.LOGIN_NAME = OL.LOGIN_NAME
+--             LEFT JOIN SYS_USER_ONLINE OL ON U.LOGIN_NAME = OL.LOGIN_NAME
             LEFT JOIN T_BUS_LEAVEINFO LE ON U.USER_ID=LE.USER_ID
             WHERE 1=1
             AND U.DEPT_ID IN (
@@ -789,10 +790,11 @@
             U.PHONENUMBER,
             U.STATUS,
             U.CREATE_TIME,
-            IF(OL.STATUS='ON_LINE',"1","0") OLSTATUS
+--             IF(OL.STATUS='ON_LINE',"1","0") OLSTATUS
+            IF(u.login_date > date_add(now(), interval -3 minute),"1","0") OLSTATUS
         FROM SYS_USER U
         LEFT JOIN SYS_DEPT DEPT ON U.DEPT_ID=DEPT.DEPT_ID
-        LEFT JOIN SYS_USER_ONLINE OL ON U.LOGIN_NAME = OL.LOGIN_NAME
+--         LEFT JOIN SYS_USER_ONLINE OL ON U.LOGIN_NAME = OL.LOGIN_NAME
         WHERE 1=1
         AND U.DEPT_ID IN (
         <include refid="Depts">
@@ -808,6 +810,7 @@
         <if test="DEPT_ID != null and DEPT_ID != ''">
             AND DEPT.DEPT_ID LIKE '%${DEPT_ID}%'
         </if>
+        order by OLSTATUS desc
     </select>
 
     <select id="getOne" parameterType="com.business.slfh.visualization.event.domain.Visualization_User"
@@ -823,11 +826,12 @@
             U.CREATE_TIME,
             T.LATITUDE,
             T.LONGITUDE,
-            IF(OL.STATUS='ON_LINE',"1","0") OLSTATUS,
+--             IF(OL.STATUS='ON_LINE',"1","0") OLSTATUS,
+            IF(u.login_date > date_add(now(), interval -3 minute),"1","0") OLSTATUS,
             T.REC_TIME
             FROM SYS_USER U
             LEFT JOIN SYS_DEPT DEPT ON U.DEPT_ID=DEPT.DEPT_ID
-            LEFT JOIN SYS_USER_ONLINE OL ON U.LOGIN_NAME = OL.LOGIN_NAME
+--             LEFT JOIN SYS_USER_ONLINE OL ON U.LOGIN_NAME = OL.LOGIN_NAME
             LEFT JOIN T_RES_TRAJECTORY T ON U.USER_ID=T.REC_ID
             WHERE 1=1
             AND T.REC_TYPE = 'REC_TYPE_3'