|
@@ -154,12 +154,10 @@
|
|
|
<if test="minWarningCount != null and minWarningCount != '' or minWarningCount == 0">
|
|
|
and t.warning_count >= #{minWarningCount}
|
|
|
</if>
|
|
|
- <if
|
|
|
- test="clientWebsocketStatus != null and clientWebsocketStatus != ''">
|
|
|
+ <if test="clientWebsocketStatus != null and clientWebsocketStatus != ''">
|
|
|
and t.client_websocket_status = #{clientWebsocketStatus}
|
|
|
</if>
|
|
|
- <if
|
|
|
- test="monitorStatusSource != null and monitorStatusSource != ''">
|
|
|
+ <if test="monitorStatusSource != null and monitorStatusSource != ''">
|
|
|
and t.monitor_status_source = #{monitorStatusSource}
|
|
|
</if>
|
|
|
and s.enable = 1
|
|
@@ -336,14 +334,12 @@
|
|
|
and teea.enable = 1
|
|
|
and tees.enable = 1
|
|
|
</where>
|
|
|
- ) t
|
|
|
+ ) t,(SELECT @i := 0) as i
|
|
|
<where>
|
|
|
- <if
|
|
|
- test="minMultipleFaceCount != null and minMultipleFaceCount != '' or minMultipleFaceCount == 0">
|
|
|
+ <if test="minMultipleFaceCount != null and minMultipleFaceCount != '' or minMultipleFaceCount == 0">
|
|
|
and t.multipleFaceCount <= #{minMultipleFaceCount}
|
|
|
</if>
|
|
|
- <if
|
|
|
- test="maxMultipleFaceCount != null and maxMultipleFaceCount != '' or maxMultipleFaceCount == 0">
|
|
|
+ <if test="maxMultipleFaceCount != null and maxMultipleFaceCount != '' or maxMultipleFaceCount == 0">
|
|
|
and t.multipleFaceCount >= #{maxMultipleFaceCount}
|
|
|
</if>
|
|
|
<if test="minExceptionCount != null and minExceptionCount != '' or minExceptionCount == 0">
|
|
@@ -353,7 +349,6 @@
|
|
|
and t.exceptionCount >= #{maxExceptionCount}
|
|
|
</if>
|
|
|
</where>
|
|
|
- ,(SELECT @i := 0) as i
|
|
|
order by t.roomCode
|
|
|
</select>
|
|
|
|