From 2587568bec69f9b9956851da73d626c39bc720db Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期一, 09 十二月 2024 10:45:58 +0800 Subject: [PATCH] 点位ping任务调整 --- ycl-server/src/main/java/com/ycl/task/HKTask.java | 2 ++ ycl-server/src/main/java/com/ycl/task/UYTask.java | 5 ++--- ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java index c676cab..ae7b2ce 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java +++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java @@ -227,6 +227,7 @@ // 娣诲姞鍥哄畾鏉′欢 criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*")); criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime())); + criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE)); // 鏍规嵁dataType鍔ㄦ�佹坊鍔犳潯浠� if (params.getDataType() == 1) { criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE)); diff --git a/ycl-server/src/main/java/com/ycl/task/HKTask.java b/ycl-server/src/main/java/com/ycl/task/HKTask.java index 0ff1351..784d9cf 100644 --- a/ycl-server/src/main/java/com/ycl/task/HKTask.java +++ b/ycl-server/src/main/java/com/ycl/task/HKTask.java @@ -168,6 +168,8 @@ Map<String, TMonitor> map = monitorMapper.selectList(new QueryWrapper<TMonitor>().in("serial_number", numbers)) .stream().collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity())); Date now = new Date(); + //杩囨护 + totalResult = totalResult.stream().filter(item -> map.get(item.getExternalIndexCode()) != null).collect(Collectors.toList()); totalResult.forEach(item->{ TMonitor monitor = map.get(item.getExternalIndexCode()); item.setIp(monitor.getIp()); 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 227626a..40c57fc 100644 --- a/ycl-server/src/main/java/com/ycl/task/UYTask.java +++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java @@ -247,10 +247,9 @@ List<String> offLineList = new ArrayList<>(); List<String> onLineList = new ArrayList<>(); //鏌ュ嚭鏁版嵁搴撶函杞﹁締鎴栫函浜鸿劯璁惧 - List<String> serialNumbers = monitorMapper.selectCarOrFace().stream().map(TMonitor::getSerialNumber).collect(Collectors.toList()); +// List<String> serialNumbers = monitorMapper.selectCarOrFace().stream().map(TMonitor::getSerialNumber).collect(Collectors.toList()); dataList.forEach(item->{ - //鏇存柊绾溅杈嗘垨绾汉鑴哥殑璁惧鐨勫湪绾跨姸鎬�(杩欓儴鍒嗚澶囦笉浼氭媺娴佹娴�) - if(item.getPingOnline() && !CollectionUtils.isEmpty(serialNumbers) && serialNumbers.contains(item.getNo())) { + if(item.getPingOnline()) { onLineList.add(item.getIp()); } else if(!item.getPingOnline()) { //绛涢�夊嚭ping绂荤嚎鐨勮澶囷紝鏇存敼鏁版嵁搴撲负绂荤嚎 -- Gitblit v1.8.0