From 5dccf0dc687dfef1c91936af3cea06fe0609b918 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期三, 11 十二月 2024 17:31:11 +0800 Subject: [PATCH] osd时间bug、离线工单bug等 --- ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 5 +++-- 1 files changed, 3 insertions(+), 2 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 781bf2b..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)); @@ -1094,7 +1095,7 @@ Document errorFilter = new Document("$or", errorConditions); dList2.add(errorFilter); Document osdErrorFilter = new Document("$and", dList2); - //TODO锛氭湭鐭ユ暟 鏂板0鐨勭姸鎬� + //鏈煡鏁� List<Document> dList3 = new ArrayList<>(2); setTag(params,dList3); dList3.add(importantTagCondition); @@ -1233,7 +1234,7 @@ Document errorFilter = new Document("$or", errorConditions); dList2.add(errorFilter); Document osdErrorFilter = new Document("$and", dList2); - //TODO锛氭湭鐭ユ暟 鏂板0鐨勭姸鎬� + //鏈煡鏁� List<Document> dList3 = new ArrayList<>(2); setTag(params,dList3); dList3.add(importantTagCondition); -- Gitblit v1.8.0