From 36a00aa8bee92f62470fc1031c8c07f3de35910d Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期三, 15 一月 2025 17:53:25 +0800 Subject: [PATCH] osd不做筛选,检测全量 --- ycl-server/src/main/java/com/ycl/task/OsdTask.java | 4 +--- ycl-server/src/main/java/com/ycl/task/VideoTask.java | 5 ----- 2 files changed, 1 insertions(+), 8 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/task/OsdTask.java b/ycl-server/src/main/java/com/ycl/task/OsdTask.java index 2fab0ee..1e75898 100644 --- a/ycl-server/src/main/java/com/ycl/task/OsdTask.java +++ b/ycl-server/src/main/java/com/ycl/task/OsdTask.java @@ -98,9 +98,7 @@ //杩囨护鎺夋棤鏁坕p骞剁瓫閫夊嚭瑙嗛璁惧 monitors = monitors.stream() .filter(monitor -> !StringUtils.isEmpty(monitor.getIp()) && - !"127.0.0.1".equals(monitor.getIp()) && - monitor.getCameraFunType()!=null && - monitor.getCameraFunType().contains("1")) + !"127.0.0.1".equals(monitor.getIp())) .collect(Collectors.toList()); List<Future<OSDResult>> futureList = new ArrayList<>(48); List<OSDResult> osdResultList = new ArrayList<>(); diff --git a/ycl-server/src/main/java/com/ycl/task/VideoTask.java b/ycl-server/src/main/java/com/ycl/task/VideoTask.java index bb99e10..72c32a6 100644 --- a/ycl-server/src/main/java/com/ycl/task/VideoTask.java +++ b/ycl-server/src/main/java/com/ycl/task/VideoTask.java @@ -139,11 +139,6 @@ .where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday))); List<OsdCheckResult> results = mongoTemplate.find(query, OsdCheckResult.class); - //浼樹簯涓婃湁杞﹁締鍜屼汉鑴哥殑璁惧鏁版嵁锛岄渶瑕佽繃婊ゅ嚭瑙嗛璁惧 - List<String> videoIds = monitorMapper.getVideoIds(); - if(!CollectionUtils.isEmpty(results)){ - results = results.stream().filter(result -> videoIds.contains(result.getNo())).collect(Collectors.toList()); - } CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Video_OsdTime); calculator.calculate(results); log.info("缁撴潫璁$畻Osd鏍囨敞銆佹椂闂村噯纭巼"); -- Gitblit v1.8.0