From b5df1cee65f3e9dcf554efcd3f1642a8c79d1e76 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期一, 30 九月 2024 02:12:24 +0800 Subject: [PATCH] 点位监测更换对象+存入mongo+提取utils --- ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 248 ++++++++++++++----------------------------------- 1 files changed, 72 insertions(+), 176 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 7d463d4..ed9dc88 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 @@ -214,24 +214,16 @@ List<Document> dList1 = new ArrayList<>(2); dList1.add(new Document("ip.error", new Document("$eq", Boolean.TRUE))); - if (params.getDataType().equals(1)) { - dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList1); List<Document> dList2 = new ArrayList<>(2); dList2.add(new Document("macdz.error", new Document("$eq", Boolean.TRUE))); - if (params.getDataType().equals(1)) { - dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList2); List<Document> dList3 = new ArrayList<>(2); dList3.add(new Document("latitude.error", new Document("$eq", Boolean.TRUE))); - if (params.getDataType().equals(1)) { - dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList3); List<Document> dList4 = new ArrayList<>(2); dList4.add(new Document("longitude.error", new Document("$eq", Boolean.TRUE))); - if (params.getDataType().equals(1)) { - dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList4); Document ipErrFilter = new Document("$and", dList1); Document macdzErrFilter = new Document("$and", dList2); Document latitudeErrFilter = new Document("$and", dList3); @@ -296,24 +288,16 @@ List<Document> dList1 = new ArrayList<>(2); dList1.add(new Document("ip.error", new Document("$eq", Boolean.TRUE))); - if (params.getDataType().equals(1)) { - dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList1); List<Document> dList2 = new ArrayList<>(2); dList2.add(new Document("macdz.error", new Document("$eq", Boolean.TRUE))); - if (params.getDataType().equals(1)) { - dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList2); List<Document> dList3 = new ArrayList<>(2); dList3.add(new Document("latitude.error", new Document("$eq", Boolean.TRUE))); - if (params.getDataType().equals(1)) { - dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList3); List<Document> dList4 = new ArrayList<>(2); dList4.add(new Document("longitude.error", new Document("$eq", Boolean.TRUE))); - if (params.getDataType().equals(1)) { - dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList4); Document ipErrFilter = new Document("$and", dList1); Document macdzErrFilter = new Document("$and", dList2); Document latitudeErrFilter = new Document("$and", dList3); @@ -365,7 +349,6 @@ */ @Override public Result videoAssessmentFileRatio(DataCenterQuery params) { - // TODO 鏂板涓�寮犺〃璁板綍姣忔鐨勬。妗堣�冩牳 List<String> likeFileds = Arrays.asList("ip.showValue", "name.showValue", "serialNumber.showValue"); Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); @@ -379,24 +362,16 @@ List<Document> dList1 = new ArrayList<>(2); dList1.add(new Document("ip.error", new Document("$eq", Boolean.TRUE))); - if (params.getDataType().equals(1)) { - dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList1); List<Document> dList2 = new ArrayList<>(2); dList2.add(new Document("macdz.error", new Document("$eq", Boolean.TRUE))); - if (params.getDataType().equals(1)) { - dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList2); List<Document> dList3 = new ArrayList<>(2); dList3.add(new Document("latitude.error", new Document("$eq", Boolean.TRUE))); - if (params.getDataType().equals(1)) { - dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList3); List<Document> dList4 = new ArrayList<>(2); dList4.add(new Document("longitude.error", new Document("$eq", Boolean.TRUE))); - if (params.getDataType().equals(1)) { - dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList4); Document ipErrFilter = new Document("$and", dList1); Document macdzErrFilter = new Document("$and", dList2); Document latitudeErrFilter = new Document("$and", dList3); @@ -450,9 +425,7 @@ List<String> resultCount = status.stream().map(item -> { List<Document> dList = new ArrayList<>(2); dList.add(new Document("recordStatus", new Document("$eq", item))); - if (params.getDataType().equals(1)) { - dList.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params, dList); Document filter = new Document("$and", dList); // 鏋勫缓鑱氬悎绠¢亾 List<Document> pipeline = Arrays.asList( @@ -513,9 +486,7 @@ List<Document> dList = new ArrayList<>(4); dList.add(new Document("deptTag", new Document("$eq", Boolean.TRUE))); dList.add(new Document("recordStatus", new Document("$eq", item))); - if (params.getDataType().equals(1)) { - dList.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList); Document filter = new Document("$and", dList); // 鏋勫缓鑱氬悎绠¢亾 List<Document> pipeline = Arrays.asList( @@ -576,9 +547,7 @@ List<Document> dList = new ArrayList<>(4); dList.add(new Document("importantTag", new Document("$eq", Boolean.TRUE))); dList.add(new Document("recordStatus", new Document("$eq", item))); - if (params.getDataType().equals(1)) { - dList.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList); Document filter = new Document("$and", dList); // 鏋勫缓鑱氬悎绠¢亾 List<Document> pipeline = Arrays.asList( @@ -594,7 +563,7 @@ uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds"); break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋� } - return uniqueDeviceIdCount + "%"; + return uniqueDeviceIdCount + ""; }).collect(Collectors.toList()); Date now = new Date(); @@ -663,27 +632,19 @@ List<Document> dList1 = new ArrayList<>(2); dList1.add(new Document("importantTag", Boolean.TRUE)); dList1.add(new Document("osdNameCorrect", new Document("$eq", 1))); - if (params.getDataType().equals(1)) { - dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList1); List<Document> dList2 = new ArrayList<>(2); dList2.add(new Document("importantTag", Boolean.TRUE)); dList2.add(new Document("osdNameCorrect", new Document("$eq", -1))); - if (params.getDataType().equals(1)) { - dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList2); List<Document> dList3 = new ArrayList<>(2); dList3.add(new Document("importantTag", Boolean.TRUE)); dList3.add(new Document("osdTimeCorrect", new Document("$eq", 1))); - if (params.getDataType().equals(1)) { - dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList3); List<Document> dList4 = new ArrayList<>(2); dList4.add(new Document("importantTag", Boolean.TRUE)); dList4.add(new Document("osdTimeCorrect", new Document("$eq", -1))); - if (params.getDataType().equals(1)) { - dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList4); Document osdNameFilter = new Document("$and", dList1); Document osdNameErrFilter = new Document("$and", dList2); Document osdTimeFilter = new Document("$and", dList3); @@ -775,15 +736,11 @@ List<Document> dList1 = new ArrayList<>(2); dList1.add(new Document("importantTag", Boolean.TRUE)); dList1.add(new Document("osdTimeCorrect", new Document("$eq", 1))); - if (params.getDataType().equals(1)) { - dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList1); List<Document> dList2 = new ArrayList<>(2); dList2.add(new Document("importantTag", Boolean.TRUE)); dList2.add(new Document("osdTimeCorrect", new Document("$eq", -1))); - if (params.getDataType().equals(1)) { - dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList2); Document osdTimeFilter = new Document("$and", dList1); Document osdTimeErrFilter = new Document("$and", dList2); List<Document> lists = Arrays.asList(osdTimeFilter, osdTimeErrFilter); @@ -847,27 +804,19 @@ List<Document> dList1 = new ArrayList<>(2); dList1.add(new Document("importantTag", Boolean.TRUE)); dList1.add(new Document("resultType", new Document("$eq", 1))); - if (params.getDataType().equals(1)) { - dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList1); List<Document> dList2 = new ArrayList<>(2); dList2.add(new Document("importantTag", Boolean.TRUE)); dList2.add(new Document("resultType", new Document("$eq", 2))); - if (params.getDataType().equals(1)) { - dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList2); List<Document> dList3 = new ArrayList<>(2); dList3.add(new Document("importantTag", Boolean.TRUE)); dList3.add(new Document("resultType", new Document("$eq", 3))); - if (params.getDataType().equals(1)) { - dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList3); List<Document> dList4 = new ArrayList<>(2); dList4.add(new Document("importantTag", Boolean.TRUE)); dList4.add(new Document("resultType", new Document("$eq", 4))); - if (params.getDataType().equals(1)) { - dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList4); Document normalFilter = new Document("$and", dList1); Document noDataFilter = new Document("$and", dList2); Document trFilter = new Document("$and", dList3); @@ -965,24 +914,16 @@ List<Document> dList1 = new ArrayList<>(2); dList1.add(new Document("ip.error", new Document("$eq", Boolean.TRUE))); - if (params.getDataType().equals(1)) { - dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList1); List<Document> dList2 = new ArrayList<>(2); dList2.add(new Document("macdz.error", new Document("$eq", Boolean.TRUE))); - if (params.getDataType().equals(1)) { - dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList2); List<Document> dList3 = new ArrayList<>(2); dList3.add(new Document("latitude.error", new Document("$eq", Boolean.TRUE))); - if (params.getDataType().equals(1)) { - dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList3); List<Document> dList4 = new ArrayList<>(2); dList4.add(new Document("longitude.error", new Document("$eq", Boolean.TRUE))); - if (params.getDataType().equals(1)) { - dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList4); Document ipErrFilter = new Document("$and", dList1); Document macdzErrFilter = new Document("$and", dList2); Document latitudeErrFilter = new Document("$and", dList3); @@ -1046,24 +987,16 @@ List<Document> dList1 = new ArrayList<>(2); dList1.add(new Document("lalType", new Document("$eq", 1))); - if (params.getDataType().equals(1)) { - dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList1); List<Document> dList2 = new ArrayList<>(2); dList2.add(new Document("lalType", new Document("$eq", 2))); - if (params.getDataType().equals(1)) { - dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList2); List<Document> dList3 = new ArrayList<>(2); dList3.add(new Document("lalType", new Document("$eq", 3))); - if (params.getDataType().equals(1)) { - dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList3); List<Document> dList4 = new ArrayList<>(2); dList4.add(new Document("lalType", new Document("$eq", 4))); - if (params.getDataType().equals(1)) { - dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList4); Document ipErrFilter = new Document("$and", dList1); Document macdzErrFilter = new Document("$and", dList2); Document latitudeErrFilter = new Document("$and", dList3); @@ -1200,19 +1133,13 @@ List<Document> dList1 = new ArrayList<>(2); dList1.add(new Document("snapResult", new Document("$eq", 1))); - if (params.getDataType().equals(1)) { - dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList1); List<Document> dList2 = new ArrayList<>(2); dList2.add(new Document("snapResult", new Document("$eq", 2))); - if (params.getDataType().equals(1)) { - dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList2); List<Document> dList3 = new ArrayList<>(2); dList3.add(new Document("snapResult", new Document("$eq", 4))); - if (params.getDataType().equals(1)) { - dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList3); Document ipErrFilter = new Document("$and", dList1); Document macdzErrFilter = new Document("$and", dList2); Document longitudeErrFilter = new Document("$and", dList3); @@ -1378,24 +1305,16 @@ List<Document> dList1 = new ArrayList<>(2); dList1.add(new Document("resultType", new Document("$eq", 1))); - if (params.getDataType().equals(1)) { - dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList1); List<Document> dList2 = new ArrayList<>(2); dList2.add(new Document("resultType", new Document("$eq", 2))); - if (params.getDataType().equals(1)) { - dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList2); List<Document> dList3 = new ArrayList<>(2); dList3.add(new Document("resultType", new Document("$eq", 3))); - if (params.getDataType().equals(1)) { - dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList3); List<Document> dList4 = new ArrayList<>(2); dList4.add(new Document("resultType", new Document("$eq", 4))); - if (params.getDataType().equals(1)) { - dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList4); Document normalFilter = new Document("$and", dList1); Document noDataFilter = new Document("$and", dList2); Document trFilter = new Document("$and", dList3); @@ -1496,24 +1415,16 @@ List<Document> dList1 = new ArrayList<>(2); dList1.add(new Document("ip.error", new Document("$eq", Boolean.TRUE))); - if (params.getDataType().equals(1)) { - dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList1); List<Document> dList2 = new ArrayList<>(2); dList2.add(new Document("macdz.error", new Document("$eq", Boolean.TRUE))); - if (params.getDataType().equals(1)) { - dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList2); List<Document> dList3 = new ArrayList<>(2); dList3.add(new Document("latitude.error", new Document("$eq", Boolean.TRUE))); - if (params.getDataType().equals(1)) { - dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList3); List<Document> dList4 = new ArrayList<>(2); dList4.add(new Document("longitude.error", new Document("$eq", Boolean.TRUE))); - if (params.getDataType().equals(1)) { - dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList4); Document ipErrFilter = new Document("$and", dList1); Document macdzErrFilter = new Document("$and", dList2); Document latitudeErrFilter = new Document("$and", dList3); @@ -1577,24 +1488,16 @@ List<Document> dList1 = new ArrayList<>(2); dList1.add(new Document("lalType", new Document("$eq", 1))); - if (params.getDataType().equals(1)) { - dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList1); List<Document> dList2 = new ArrayList<>(2); dList2.add(new Document("lalType", new Document("$eq", 2))); - if (params.getDataType().equals(1)) { - dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList2); List<Document> dList3 = new ArrayList<>(2); dList3.add(new Document("lalType", new Document("$eq", 3))); - if (params.getDataType().equals(1)) { - dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList3); List<Document> dList4 = new ArrayList<>(2); dList4.add(new Document("lalType", new Document("$eq", 4))); - if (params.getDataType().equals(1)) { - dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList4); Document ipErrFilter = new Document("$and", dList1); Document macdzErrFilter = new Document("$and", dList2); Document latitudeErrFilter = new Document("$and", dList3); @@ -1658,24 +1561,16 @@ List<Document> dList1 = new ArrayList<>(2); dList1.add(new Document("lalType", new Document("$eq", 1))); - if (params.getDataType().equals(1)) { - dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList1); List<Document> dList2 = new ArrayList<>(2); dList2.add(new Document("lalType", new Document("$eq", 2))); - if (params.getDataType().equals(1)) { - dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList2); List<Document> dList3 = new ArrayList<>(2); dList3.add(new Document("lalType", new Document("$eq", 3))); - if (params.getDataType().equals(1)) { - dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList3); List<Document> dList4 = new ArrayList<>(2); dList4.add(new Document("lalType", new Document("$eq", 4))); - if (params.getDataType().equals(1)) { - dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList4); Document ipErrFilter = new Document("$and", dList1); Document macdzErrFilter = new Document("$and", dList2); Document latitudeErrFilter = new Document("$and", dList3); @@ -1740,19 +1635,13 @@ List<Document> dList1 = new ArrayList<>(2); dList1.add(new Document("snapResult", new Document("$eq", 1))); - if (params.getDataType().equals(1)) { - dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList1); List<Document> dList2 = new ArrayList<>(2); dList2.add(new Document("snapResult", new Document("$eq", 2))); - if (params.getDataType().equals(1)) { - dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList2); List<Document> dList3 = new ArrayList<>(2); dList3.add(new Document("snapResult", new Document("$eq", 4))); - if (params.getDataType().equals(1)) { - dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList3); Document ipErrFilter = new Document("$and", dList1); Document macdzErrFilter = new Document("$and", dList2); Document longitudeErrFilter = new Document("$and", dList3); @@ -1816,19 +1705,13 @@ List<Document> dList1 = new ArrayList<>(2); dList1.add(new Document("snapResult", new Document("$eq", 1))); - if (params.getDataType().equals(1)) { - dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList1); List<Document> dList2 = new ArrayList<>(2); dList2.add(new Document("snapResult", new Document("$eq", 2))); - if (params.getDataType().equals(1)) { - dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList2); List<Document> dList3 = new ArrayList<>(2); dList3.add(new Document("snapResult", new Document("$eq", 4))); - if (params.getDataType().equals(1)) { - dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); - } + setTag(params,dList3); Document ipErrFilter = new Document("$and", dList1); Document macdzErrFilter = new Document("$and", dList2); Document longitudeErrFilter = new Document("$and", dList3); @@ -1933,4 +1816,17 @@ DF.setDecimalSeparatorAlwaysShown(false); return DF.format(rate) + "%"; } + + /** + * 璁剧疆鏍囩鎼滅储鏉′欢 + * @param params + * @param dList + */ + private void setTag(DataCenterQuery params, List<Document> dList) { + if (params.getDataType().equals(1)) { + dList.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } else if (params.getDataType().equals(2)) { + dList.add(new Document("deptTag", new Document("$eq", Boolean.TRUE))); + } + } } -- Gitblit v1.8.0