From 44cd2d171062c9b07a0eb047cd0ac80d06188e8c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 16 十月 2024 11:58:18 +0800
Subject: [PATCH] 工单bug，数据中心在线率增加存ping状态
---
ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 236 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 140 insertions(+), 96 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 4dded27..f97323d 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
@@ -67,17 +67,24 @@
*/
@Override
public Result videoPointOnlineRate(DataCenterQuery params) {
- List<String> likeFileds = Arrays.asList("name", "no","ip");
- Query query = MongoUtil.getQuery(params,TIME_FIELD, likeFileds, null);
+ List<String> likeFileds = Arrays.asList("name", "no", "ip");
+ Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
//鍒嗛〉鏁伴噺
long total = mongoTemplate.count(query, TMonitorResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
- resultList.forEach(item->{
- if(null != item.getPingOnline() && item.getPingOnline()){
+ resultList.forEach(item -> {
+ if (null != item.getPingOnline() && item.getPingOnline()) {
item.setPingOnlineStr("鍦ㄧ嚎");
- }else {
+ } else {
item.setPingOnlineStr("绂荤嚎");
+ }
+ if(1== item.getOnline() ){
+ item.setOnlineStr("鍦ㄧ嚎");
+ }else if(-1==item.getOnline()){
+ item.setOnlineStr("绂荤嚎");
+ }else {
+ item.setOnlineStr("鏈煡");
}
});
params.setDeptTag(-1);
@@ -97,7 +104,7 @@
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
HashMap<String, Object> map = new HashMap<>();
- map.put("count", Arrays.asList(distinctCount + "",this.remove0(onlineRate)));
+ map.put("count", Arrays.asList(distinctCount + "", this.remove0(onlineRate)));
map.put("list", resultList);
return Result.ok().data(map).total(total);
}
@@ -110,17 +117,24 @@
*/
@Override
public Result deptVideoPointOnlineRate(DataCenterQuery params) {
- List<String> likeFileds = Arrays.asList("name", "no","ip");
- Query query = MongoUtil.getQuery(params,TIME_FIELD, likeFileds, null);
+ List<String> likeFileds = Arrays.asList("name", "no", "ip");
+ Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
//鍒嗛〉鏁伴噺
long total = mongoTemplate.count(query, TMonitorResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
- resultList.forEach(item->{
- if(null != item.getPingOnline() && item.getPingOnline()){
+ resultList.forEach(item -> {
+ if (null != item.getPingOnline() && item.getPingOnline()) {
item.setPingOnlineStr("鍦ㄧ嚎");
- }else {
+ } else {
item.setPingOnlineStr("绂荤嚎");
+ }
+ if (1 == item.getOnline()) {
+ item.setOnlineStr("鍦ㄧ嚎");
+ } else if (-1 == item.getOnline()) {
+ item.setOnlineStr("绂荤嚎");
+ } else {
+ item.setOnlineStr("鏈煡");
}
});
// 缁熻璁惧鏁伴噺
@@ -142,7 +156,7 @@
}
HashMap<String, Object> map = new HashMap<>();
map.put("count", Arrays.asList(distinctCount + "", this.remove0(onlineRate)));
- map.put("list",resultList);
+ map.put("list", resultList);
return Result.ok().data(map).total(total);
}
@@ -154,8 +168,8 @@
*/
@Override
public Result videoImportantPointOnlineRate(DataCenterQuery params) {
- List<String> likeFileds = Arrays.asList("name", "no","ip");
- Query query = MongoUtil.getQuery(params,TIME_FIELD, likeFileds, null);
+ List<String> likeFileds = Arrays.asList("name", "no", "ip");
+ Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
//鍒嗛〉鏁伴噺
long total = mongoTemplate.count(query, TMonitorResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
@@ -164,11 +178,18 @@
params.setDeviceType(1);
// 缁熻璁惧鏁伴噺
Integer distinctCount = pointMapper.distinctCount(params);
- resultList.forEach(item->{
- if(null != item.getPingOnline() && item.getPingOnline()){
+ resultList.forEach(item -> {
+ if (null != item.getPingOnline() && item.getPingOnline()) {
item.setPingOnlineStr("鍦ㄧ嚎");
- }else {
+ } else {
item.setPingOnlineStr("绂荤嚎");
+ }
+ if (1 == item.getOnline()) {
+ item.setOnlineStr("鍦ㄧ嚎");
+ } else if (-1 == item.getOnline()) {
+ item.setOnlineStr("绂荤嚎");
+ } else {
+ item.setOnlineStr("鏈煡");
}
});
Date now = new Date();
@@ -197,8 +218,8 @@
*/
@Override
public Result videoImportantPointImageOnlineRate(DataCenterQuery params) {
- List<String> likeFileds = Arrays.asList("name", "no","ip");
- Query query = MongoUtil.getQuery(params,TIME_FIELD, likeFileds, null);
+ List<String> likeFileds = Arrays.asList("name", "no", "ip");
+ Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
//鍒嗛〉鏁伴噺
long total = mongoTemplate.count(query, TMonitorResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
@@ -208,11 +229,18 @@
params.setDeviceType(1);
// 缁熻璁惧鏁伴噺
Integer distinctCount = pointMapper.distinctCount(params);
- resultList.forEach(item->{
- if(null != item.getPingOnline() && item.getPingOnline()){
+ resultList.forEach(item -> {
+ if (null != item.getPingOnline() && item.getPingOnline()) {
item.setPingOnlineStr("鍦ㄧ嚎");
- }else {
+ } else {
item.setPingOnlineStr("绂荤嚎");
+ }
+ if (1 == item.getOnline()) {
+ item.setOnlineStr("鍦ㄧ嚎");
+ } else if (-1 == item.getOnline()) {
+ item.setOnlineStr("绂荤嚎");
+ } else {
+ item.setOnlineStr("鏈煡");
}
});
Date now = new Date();
@@ -254,16 +282,16 @@
List<Document> dList1 = new ArrayList<>(2);
dList1.add(new Document("ip.error", new Document("$eq", Boolean.TRUE)));
- setTag(params,dList1);
+ setTag(params, dList1);
List<Document> dList2 = new ArrayList<>(2);
dList2.add(new Document("macdz.error", new Document("$eq", Boolean.TRUE)));
- setTag(params,dList2);
+ setTag(params, dList2);
List<Document> dList3 = new ArrayList<>(2);
dList3.add(new Document("latitude.error", new Document("$eq", Boolean.TRUE)));
- setTag(params,dList3);
+ setTag(params, dList3);
List<Document> dList4 = new ArrayList<>(2);
dList4.add(new Document("longitude.error", new Document("$eq", Boolean.TRUE)));
- setTag(params,dList4);
+ setTag(params, dList4);
Document ipErrFilter = new Document("$and", dList1);
Document macdzErrFilter = new Document("$and", dList2);
Document latitudeErrFilter = new Document("$and", dList3);
@@ -328,16 +356,16 @@
List<Document> dList1 = new ArrayList<>(2);
dList1.add(new Document("ip.error", new Document("$eq", Boolean.TRUE)));
- setTag(params,dList1);
+ setTag(params, dList1);
List<Document> dList2 = new ArrayList<>(2);
dList2.add(new Document("macdz.error", new Document("$eq", Boolean.TRUE)));
- setTag(params,dList2);
+ setTag(params, dList2);
List<Document> dList3 = new ArrayList<>(2);
dList3.add(new Document("latitude.error", new Document("$eq", Boolean.TRUE)));
- setTag(params,dList3);
+ setTag(params, dList3);
List<Document> dList4 = new ArrayList<>(2);
dList4.add(new Document("longitude.error", new Document("$eq", Boolean.TRUE)));
- setTag(params,dList4);
+ setTag(params, dList4);
Document ipErrFilter = new Document("$and", dList1);
Document macdzErrFilter = new Document("$and", dList2);
Document latitudeErrFilter = new Document("$and", dList3);
@@ -402,16 +430,16 @@
List<Document> dList1 = new ArrayList<>(2);
dList1.add(new Document("ip.error", new Document("$eq", Boolean.TRUE)));
- setTag(params,dList1);
+ setTag(params, dList1);
List<Document> dList2 = new ArrayList<>(2);
dList2.add(new Document("macdz.error", new Document("$eq", Boolean.TRUE)));
- setTag(params,dList2);
+ setTag(params, dList2);
List<Document> dList3 = new ArrayList<>(2);
dList3.add(new Document("latitude.error", new Document("$eq", Boolean.TRUE)));
- setTag(params,dList3);
+ setTag(params, dList3);
List<Document> dList4 = new ArrayList<>(2);
dList4.add(new Document("longitude.error", new Document("$eq", Boolean.TRUE)));
- setTag(params,dList4);
+ setTag(params, dList4);
Document ipErrFilter = new Document("$and", dList1);
Document macdzErrFilter = new Document("$and", dList2);
Document latitudeErrFilter = new Document("$and", dList3);
@@ -452,7 +480,7 @@
@Override
public Result videoAvailabilityRate(DataCenterQuery params) {
List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
- Query query = MongoUtil.getQuery(params,"createTime", likeFileds, null);
+ Query query = MongoUtil.getQuery(params, "createTime", likeFileds, null);
long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
MongoUtil.setPage(query, params, "createTime");
@@ -512,7 +540,7 @@
@Override
public Result deptVideoAvailabilityRate(DataCenterQuery params) {
List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
- Query query = MongoUtil.getQuery(params,"createTime", likeFileds, 1);
+ Query query = MongoUtil.getQuery(params, "createTime", likeFileds, 1);
long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
MongoUtil.setPage(query, params, "createTime");
@@ -525,8 +553,8 @@
List<String> resultCount = status.stream().map(item -> {
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)));
- setTag(params,dList);
+ dList.add(new Document("recordStatus", new Document("$eq", item)));
+ setTag(params, dList);
Document filter = new Document("$and", dList);
// 鏋勫缓鑱氬悎绠￠亾
List<Document> pipeline = Arrays.asList(
@@ -573,7 +601,7 @@
@Override
public Result videoImportantPointAvailabilityRate(DataCenterQuery params) {
List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
- Query query = MongoUtil.getQuery(params,"createTime", likeFileds, 3);
+ Query query = MongoUtil.getQuery(params, "createTime", likeFileds, 3);
long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
MongoUtil.setPage(query, params, "createTime");
@@ -587,7 +615,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)));
- setTag(params,dList);
+ setTag(params, dList);
Document filter = new Document("$and", dList);
// 鏋勫缓鑱氬悎绠￠亾
List<Document> pipeline = Arrays.asList(
@@ -659,7 +687,7 @@
@Override
public Result videoImportantPointLabelingAccuracy(DataCenterQuery params) {
List<String> likeFileds = Arrays.asList("deviceNo", "osdName");
- Query query = MongoUtil.getQuery(params,"checkTime", likeFileds, 3);
+ Query query = MongoUtil.getQuery(params, "checkTime", likeFileds, 3);
long total = mongoTemplate.count(query, OsdCheckResult.class);
MongoUtil.setPage(query, params, "checkTime");
@@ -672,19 +700,19 @@
List<Document> dList1 = new ArrayList<>(2);
dList1.add(new Document("importantTag", Boolean.TRUE));
dList1.add(new Document("osdNameCorrect", new Document("$eq", 1)));
- setTag(params,dList1);
+ 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)));
- setTag(params,dList2);
+ 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)));
- setTag(params,dList3);
+ 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)));
- setTag(params,dList4);
+ setTag(params, dList4);
Document osdNameFilter = new Document("$and", dList1);
Document osdNameErrFilter = new Document("$and", dList2);
Document osdTimeFilter = new Document("$and", dList3);
@@ -763,7 +791,7 @@
public Result videoImportantPointCheckTimeAccuracy(DataCenterQuery params) {
List<String> likeFileds = Arrays.asList("deviceNo", "osdName");
- Query query = MongoUtil.getQuery(params,"checkTime", likeFileds, 3);
+ Query query = MongoUtil.getQuery(params, "checkTime", likeFileds, 3);
long total = mongoTemplate.count(query, OsdCheckResult.class);
MongoUtil.setPage(query, params, "checkTime");
@@ -776,11 +804,11 @@
List<Document> dList1 = new ArrayList<>(2);
dList1.add(new Document("importantTag", Boolean.TRUE));
dList1.add(new Document("osdTimeCorrect", new Document("$eq", 1)));
- setTag(params,dList1);
+ 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)));
- setTag(params,dList2);
+ setTag(params, dList2);
Document osdTimeFilter = new Document("$and", dList1);
Document osdTimeErrFilter = new Document("$and", dList2);
List<Document> lists = Arrays.asList(osdTimeFilter, osdTimeErrFilter);
@@ -844,19 +872,19 @@
List<Document> dList1 = new ArrayList<>(2);
dList1.add(new Document("importantTag", Boolean.TRUE));
dList1.add(new Document("resultType", new Document("$eq", 1)));
- setTag(params,dList1);
+ 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)));
- setTag(params,dList2);
+ 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)));
- setTag(params,dList3);
+ 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)));
- setTag(params,dList4);
+ setTag(params, dList4);
Document normalFilter = new Document("$and", dList1);
Document noDataFilter = new Document("$and", dList2);
Document trFilter = new Document("$and", dList3);
@@ -907,23 +935,29 @@
*/
@Override
public Result vehiclePointOnlineRate(DataCenterQuery params) {
- List<String> likeFileds = Arrays.asList("name", "no","ip");
- Query query = MongoUtil.getQuery(params,TIME_FIELD, likeFileds, null);
+ List<String> likeFileds = Arrays.asList("name", "no", "ip");
+ Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
//鍒嗛〉鏁伴噺
long total = mongoTemplate.count(query, TMonitorResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
//绯荤粺ping鐨勭粨鏋�
List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
- //TODO锛氫紭浜戝湪绾跨粨鏋�
params.setDeptTag(-1);
params.setDeviceType(2);
// 缁熻璁惧鏁伴噺
Integer distinctCount = pointMapper.distinctCount(params);
- resultList.forEach(item->{
- if(null != item.getPingOnline() && item.getPingOnline()){
+ resultList.forEach(item -> {
+ if (null != item.getPingOnline() && item.getPingOnline()) {
item.setPingOnlineStr("鍦ㄧ嚎");
- }else {
+ } else {
item.setPingOnlineStr("绂荤嚎");
+ }
+ if (1 == item.getOnline()) {
+ item.setOnlineStr("鍦ㄧ嚎");
+ } else if (-1 == item.getOnline()) {
+ item.setOnlineStr("绂荤嚎");
+ } else {
+ item.setOnlineStr("鏈煡");
}
});
List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
@@ -964,16 +998,16 @@
List<Document> dList1 = new ArrayList<>(2);
dList1.add(new Document("ip.error", new Document("$eq", Boolean.TRUE)));
- setTag(params,dList1);
+ setTag(params, dList1);
List<Document> dList2 = new ArrayList<>(2);
dList2.add(new Document("macdz.error", new Document("$eq", Boolean.TRUE)));
- setTag(params,dList2);
+ setTag(params, dList2);
List<Document> dList3 = new ArrayList<>(2);
dList3.add(new Document("latitude.error", new Document("$eq", Boolean.TRUE)));
- setTag(params,dList3);
+ setTag(params, dList3);
List<Document> dList4 = new ArrayList<>(2);
dList4.add(new Document("longitude.error", new Document("$eq", Boolean.TRUE)));
- setTag(params,dList4);
+ setTag(params, dList4);
Document ipErrFilter = new Document("$and", dList1);
Document macdzErrFilter = new Document("$and", dList2);
Document latitudeErrFilter = new Document("$and", dList3);
@@ -1037,16 +1071,16 @@
List<Document> dList1 = new ArrayList<>(2);
dList1.add(new Document("lalType", new Document("$eq", 1)));
- setTag(params,dList1);
+ setTag(params, dList1);
List<Document> dList2 = new ArrayList<>(2);
dList2.add(new Document("lalType", new Document("$eq", 2)));
- setTag(params,dList2);
+ setTag(params, dList2);
List<Document> dList3 = new ArrayList<>(2);
dList3.add(new Document("lalType", new Document("$eq", 3)));
- setTag(params,dList3);
+ setTag(params, dList3);
List<Document> dList4 = new ArrayList<>(2);
dList4.add(new Document("lalType", new Document("$eq", 4)));
- setTag(params,dList4);
+ setTag(params, dList4);
Document ipErrFilter = new Document("$and", dList1);
Document macdzErrFilter = new Document("$and", dList2);
Document latitudeErrFilter = new Document("$and", dList3);
@@ -1183,13 +1217,13 @@
List<Document> dList1 = new ArrayList<>(2);
dList1.add(new Document("snapResult", new Document("$eq", 1)));
- setTag(params,dList1);
+ setTag(params, dList1);
List<Document> dList2 = new ArrayList<>(2);
dList2.add(new Document("snapResult", new Document("$eq", 2)));
- setTag(params,dList2);
+ setTag(params, dList2);
List<Document> dList3 = new ArrayList<>(2);
dList3.add(new Document("snapResult", new Document("$eq", 4)));
- setTag(params,dList3);
+ setTag(params, dList3);
Document ipErrFilter = new Document("$and", dList1);
Document macdzErrFilter = new Document("$and", dList2);
Document longitudeErrFilter = new Document("$and", dList3);
@@ -1355,16 +1389,16 @@
List<Document> dList1 = new ArrayList<>(2);
dList1.add(new Document("resultType", new Document("$eq", 1)));
- setTag(params,dList1);
+ setTag(params, dList1);
List<Document> dList2 = new ArrayList<>(2);
dList2.add(new Document("resultType", new Document("$eq", 2)));
- setTag(params,dList2);
+ setTag(params, dList2);
List<Document> dList3 = new ArrayList<>(2);
dList3.add(new Document("resultType", new Document("$eq", 3)));
- setTag(params,dList3);
+ setTag(params, dList3);
List<Document> dList4 = new ArrayList<>(2);
dList4.add(new Document("resultType", new Document("$eq", 4)));
- setTag(params,dList4);
+ setTag(params, dList4);
Document normalFilter = new Document("$and", dList1);
Document noDataFilter = new Document("$and", dList2);
Document trFilter = new Document("$and", dList3);
@@ -1415,17 +1449,24 @@
*/
@Override
public Result facePointOnlineRate(DataCenterQuery params) {
- List<String> likeFileds = Arrays.asList("name", "no","ip");
- Query query = MongoUtil.getQuery(params,TIME_FIELD, likeFileds, null);
+ List<String> likeFileds = Arrays.asList("name", "no", "ip");
+ Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
//鍒嗛〉鏁伴噺
long total = mongoTemplate.count(query, TMonitorResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
- resultList.forEach(item->{
- if(null != item.getPingOnline() && item.getPingOnline()){
+ resultList.forEach(item -> {
+ if (null != item.getPingOnline() && item.getPingOnline()) {
item.setOnlineStr("鍦ㄧ嚎");
- }else {
+ } else {
item.setOnlineStr("绂荤嚎");
+ }
+ if (1 == item.getOnline()) {
+ item.setOnlineStr("鍦ㄧ嚎");
+ } else if (-1 == item.getOnline()) {
+ item.setOnlineStr("绂荤嚎");
+ } else {
+ item.setOnlineStr("鏈煡");
}
});
params.setDeptTag(-1);
@@ -1475,16 +1516,16 @@
List<Document> dList1 = new ArrayList<>(2);
dList1.add(new Document("ip.error", new Document("$eq", Boolean.TRUE)));
- setTag(params,dList1);
+ setTag(params, dList1);
List<Document> dList2 = new ArrayList<>(2);
dList2.add(new Document("macdz.error", new Document("$eq", Boolean.TRUE)));
- setTag(params,dList2);
+ setTag(params, dList2);
List<Document> dList3 = new ArrayList<>(2);
dList3.add(new Document("latitude.error", new Document("$eq", Boolean.TRUE)));
- setTag(params,dList3);
+ setTag(params, dList3);
List<Document> dList4 = new ArrayList<>(2);
dList4.add(new Document("longitude.error", new Document("$eq", Boolean.TRUE)));
- setTag(params,dList4);
+ setTag(params, dList4);
Document ipErrFilter = new Document("$and", dList1);
Document macdzErrFilter = new Document("$and", dList2);
Document latitudeErrFilter = new Document("$and", dList3);
@@ -1548,16 +1589,16 @@
List<Document> dList1 = new ArrayList<>(2);
dList1.add(new Document("lalType", new Document("$eq", 1)));
- setTag(params,dList1);
+ setTag(params, dList1);
List<Document> dList2 = new ArrayList<>(2);
dList2.add(new Document("lalType", new Document("$eq", 2)));
- setTag(params,dList2);
+ setTag(params, dList2);
List<Document> dList3 = new ArrayList<>(2);
dList3.add(new Document("lalType", new Document("$eq", 3)));
- setTag(params,dList3);
+ setTag(params, dList3);
List<Document> dList4 = new ArrayList<>(2);
dList4.add(new Document("lalType", new Document("$eq", 4)));
- setTag(params,dList4);
+ setTag(params, dList4);
Document ipErrFilter = new Document("$and", dList1);
Document macdzErrFilter = new Document("$and", dList2);
Document latitudeErrFilter = new Document("$and", dList3);
@@ -1621,16 +1662,16 @@
List<Document> dList1 = new ArrayList<>(2);
dList1.add(new Document("lalType", new Document("$eq", 1)));
- setTag(params,dList1);
+ setTag(params, dList1);
List<Document> dList2 = new ArrayList<>(2);
dList2.add(new Document("lalType", new Document("$eq", 2)));
- setTag(params,dList2);
+ setTag(params, dList2);
List<Document> dList3 = new ArrayList<>(2);
dList3.add(new Document("lalType", new Document("$eq", 3)));
- setTag(params,dList3);
+ setTag(params, dList3);
List<Document> dList4 = new ArrayList<>(2);
dList4.add(new Document("lalType", new Document("$eq", 4)));
- setTag(params,dList4);
+ setTag(params, dList4);
Document ipErrFilter = new Document("$and", dList1);
Document macdzErrFilter = new Document("$and", dList2);
Document latitudeErrFilter = new Document("$and", dList3);
@@ -1695,13 +1736,13 @@
List<Document> dList1 = new ArrayList<>(2);
dList1.add(new Document("snapResult", new Document("$eq", 1)));
- setTag(params,dList1);
+ setTag(params, dList1);
List<Document> dList2 = new ArrayList<>(2);
dList2.add(new Document("snapResult", new Document("$eq", 2)));
- setTag(params,dList2);
+ setTag(params, dList2);
List<Document> dList3 = new ArrayList<>(2);
dList3.add(new Document("snapResult", new Document("$eq", 4)));
- setTag(params,dList3);
+ setTag(params, dList3);
Document ipErrFilter = new Document("$and", dList1);
Document macdzErrFilter = new Document("$and", dList2);
Document longitudeErrFilter = new Document("$and", dList3);
@@ -1765,13 +1806,13 @@
List<Document> dList1 = new ArrayList<>(2);
dList1.add(new Document("snapResult", new Document("$eq", 1)));
- setTag(params,dList1);
+ setTag(params, dList1);
List<Document> dList2 = new ArrayList<>(2);
dList2.add(new Document("snapResult", new Document("$eq", 2)));
- setTag(params,dList2);
+ setTag(params, dList2);
List<Document> dList3 = new ArrayList<>(2);
dList3.add(new Document("snapResult", new Document("$eq", 4)));
- setTag(params,dList3);
+ setTag(params, dList3);
Document ipErrFilter = new Document("$and", dList1);
Document macdzErrFilter = new Document("$and", dList2);
Document longitudeErrFilter = new Document("$and", dList3);
@@ -1848,6 +1889,7 @@
map.put("list", resultList);
return Result.ok().data(map).total(total);
}
+
/**
* 瑙嗛锛氳棰戝浘鍍忚祫婧愬畨鍏ㄧ鐞�
*
@@ -1869,6 +1911,7 @@
/**
* 鍒犻櫎灏鹃儴鐨�0
+ *
* @param rate
* @return
*/
@@ -1879,6 +1922,7 @@
/**
* 璁剧疆鏍囩鎼滅储鏉′欢
+ *
* @param params
* @param dList
*/
--
Gitblit v1.8.0