From 2150b0b87de4ec80a9d3f968c6de947f361ca19f Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 15 十一月 2024 11:36:06 +0800
Subject: [PATCH] 在线监测对于纯车辆人脸可以恢复在线状态
---
ycl-server/src/main/java/com/ycl/task/UYTask.java | 13 ++++++++-----
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 16 ++++++++++++----
2 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/task/UYTask.java b/ycl-server/src/main/java/com/ycl/task/UYTask.java
index f788121..7527055 100644
--- a/ycl-server/src/main/java/com/ycl/task/UYTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java
@@ -175,7 +175,6 @@
/**
* 鐐逛綅鍦ㄧ嚎PING妫�娴�
*/
- //TODO锛氱偣浣嶅湪绾匡紙淇敼閫昏緫鍙拡瀵瑰伐鍗曪級
public void pointOnline() throws ExecutionException, InterruptedException {
log.info("寮�濮嬫娴嬬偣浣嶅湪绾�");
Integer times = 2;
@@ -263,16 +262,20 @@
.map(CompletableFuture::join)
.filter(Objects::nonNull)
.collect(Collectors.toList());
- //绛涢�夊嚭ping绂荤嚎鐨勮澶囷紝鏇存敼鏁版嵁搴撲负绂荤嚎
+ //绛涢�夊嚭ping绂荤嚎鐨勮澶囷紝鏇存敼鏁版嵁搴撲负绂荤嚎锛屽苟涓旀洿鏂扮函杞﹁締鎴栫函浜鸿劯鐨勮澶囩殑鍦ㄧ嚎鐘舵��(杩欓儴鍒嗚澶囦笉浼氭媺娴佹娴�)
Date now = new Date();
- List<UpdateOnlineVO> willUpdateList = dataList.stream().filter(result->!result.getPingOnline()).map(item -> {
+ List<UpdateOnlineVO> onlineUpdateList = dataList.stream().map(item -> {
UpdateOnlineVO vo = new UpdateOnlineVO();
- vo.setOnline(ApiConstants.UY_OnlineSite_Offline);
+ if(item.getPingOnline()) {
+ vo.setOnline(ApiConstants.UY_OnlineSite_Online);
+ }else if(!item.getPingOnline()){
+ vo.setOnline(ApiConstants.UY_OnlineSite_Offline);
+ }
vo.setIp(item.getIp());
vo.setUpdateTime(now);
return vo;
}).collect(Collectors.toList());
- monitorMapper.updateOnline(willUpdateList);
+ monitorMapper.updateOnline(onlineUpdateList);
//瀛樻斁鍒癿ongo
if (!CollectionUtils.isEmpty(dataList)) {
//濡傛灉瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index fb72b26..5a297d8 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -689,12 +689,20 @@
<update id="updateOnline">
<foreach collection="onlineList" item="online" separator=";">
UPDATE
- t_yw_point
+ t_yw_point
SET
- online = #{online.online},
- update_time = #{online.updateTime}
+ online = #{online.online},
+ update_time = #{online.updateTime}
WHERE
- EXISTS (SELECT 1 FROM t_monitor WHERE ip = #{online.ip} AND t_monitor.serial_number = t_yw_point.serial_number )
+ EXISTS (SELECT 1 FROM t_monitor
+ <where>
+ ip = #{online.ip} AND t_monitor.serial_number = t_yw_point.serial_number
+ <if test="online.online!=null and online.online">
+ and t_monitor.camera_fun_type = '2' or t_monitor.camera_fun_type = '3'
+ </if>
+ </where>
+ )
</foreach>
</update>
+
</mapper>
--
Gitblit v1.8.0