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/task/FaceTask.java | 4 ycl-server/src/main/java/com/ycl/platform/service/impl/UYErrorTypeCheckServiceImpl.java | 40 ++-- ycl-server/src/main/java/com/ycl/task/CarTask.java | 8 ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 47 +++--- ycl-server/src/main/java/com/ycl/task/UYTask.java | 21 +- ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 236 ++++++++++++++++++++------------- ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 8 ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java | 8 + 8 files changed, 214 insertions(+), 158 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 */ diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java index 713fc0b..931cac4 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java +++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java @@ -1099,7 +1099,13 @@ for (TMonitorResult monitorResult : onlineResult) { int dayOfMonth = monitorResult.getMongoCreateTime().getDayOfMonth(); String online = ""; - online += monitorResult.getPingOnline() ? "鍦ㄧ嚎" : "绂荤嚎"; + if(ApiConstants.UY_OnlineSite_Online.equals(monitorResult.getOnline())){ + online +="鍦ㄧ嚎"; + }else if(ApiConstants.UY_OnlineSite_Offline.equals(monitorResult.getOnline())){ + online +="绂荤嚎"; + }else { + online +="鏈煡"; + } //鍙嶅皠璧嬪�硷紝瀛楁缁熶竴瀹氫箟涓篸ay+1锛�2锛�3... Field field = videoDailyExp.getClass().getDeclaredField("day" + dayOfMonth); field.setAccessible(true); diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/UYErrorTypeCheckServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/UYErrorTypeCheckServiceImpl.java index 6b09c17..5d6f54d 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/impl/UYErrorTypeCheckServiceImpl.java +++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/UYErrorTypeCheckServiceImpl.java @@ -45,30 +45,30 @@ if (-1 == item.getSigna1() ) { this.genWorkOrder(workOrder, ErrorType.SIGNAL_LOSS, item.getDeviceId()); } - // 鐢婚潰鍋忚壊 - if (-1 == item.getColor()) { - this.genWorkOrder(workOrder, ErrorType.SCREEN_COLOR_DEVIATION, item.getDeviceId()); - } - // 闆姳骞叉壈 - if (-1 == item.getSnow()) { - this.genWorkOrder(workOrder, ErrorType.SNOW_STORM, item.getDeviceId()); - } - // 鏉$汗骞叉壈 - if (-1 == item.getStripe()) { - this.genWorkOrder(workOrder, ErrorType.STRIPE_INTERFERENCE, item.getDeviceId()); - } +// // 鐢婚潰鍋忚壊 +// if (-1 == item.getColor()) { +// this.genWorkOrder(workOrder, ErrorType.SCREEN_COLOR_DEVIATION, item.getDeviceId()); +// } +// // 闆姳骞叉壈 +// if (-1 == item.getSnow()) { +// this.genWorkOrder(workOrder, ErrorType.SNOW_STORM, item.getDeviceId()); +// } +// // 鏉$汗骞叉壈 +// if (-1 == item.getStripe()) { +// this.genWorkOrder(workOrder, ErrorType.STRIPE_INTERFERENCE, item.getDeviceId()); +// } // 鐢婚潰閬尅 if (-1 == item.getShade()) { this.genWorkOrder(workOrder, ErrorType.SCREEN_OCCLUSION, item.getDeviceId()); } - // 娓呮櫚搴﹀紓甯� - if (-1 == item.getBlur()) { - this.genWorkOrder(workOrder, ErrorType.ABNORMAL_CLARITY, item.getDeviceId()); - } - // 浜害寮傚父 - if (-1 == item.getLight()) { - this.genWorkOrder(workOrder, ErrorType.ABNORMAL_BRIGHTNESS, item.getDeviceId()); - } +// // 娓呮櫚搴﹀紓甯� +// if (-1 == item.getBlur()) { +// this.genWorkOrder(workOrder, ErrorType.ABNORMAL_CLARITY, item.getDeviceId()); +// } +// // 浜害寮傚父 +// if (-1 == item.getLight()) { +// this.genWorkOrder(workOrder, ErrorType.ABNORMAL_BRIGHTNESS, item.getDeviceId()); +// } return workOrder; }).collect(Collectors.toList()); workOrderService.innerAddWorkOrder(workOrderList); diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java index 0438581..dba4383 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java +++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java @@ -211,6 +211,25 @@ List<WorkOrder> notAddList = new ArrayList<>(); //鏌edis浠婃棩宸ュ崟鏁伴噺 int workOrderNum = 0; + for (WorkOrder workOrder : waitAddList) { + YwPoint point = pointMapping.get(workOrder.getSerialNumber()); + if (Objects.isNull(point)) { + notAddList.add(workOrder); + continue; + } + if (Objects.nonNull(point.getUnitId())) { + workOrder.setUnitId(Math.toIntExact(point.getUnitId())); + } + if (point.getImportantTag() || point.getImportantCommandImageTag()) { + workOrder.setProcessingPeriod(Integer.valueOf(important.getConfigValue())); + } else { + workOrder.setProcessingPeriod(Integer.valueOf(normal.getConfigValue())); + } + } + waitAddList.removeAll(notAddList); + if (CollectionUtils.isEmpty(waitAddList)) { + return Boolean.TRUE; + } //UUID浣滀负value锛屼繚璇佷笂閿佺殑绾跨▼鑷繁瑙i攣 String requestId = IdUtils.fastSimpleUUID(); try { @@ -234,20 +253,11 @@ log.error("鑾峰彇閿佸紓甯�"); return Boolean.FALSE; } + //璁板綍宸ュ崟鏁�,琛ュ厖宸ュ崟鍙� for (WorkOrder workOrder : waitAddList) { - YwPoint point = pointMapping.get(workOrder.getSerialNumber()); - if (Objects.isNull(point)) { - notAddList.add(workOrder); - continue; - } - if (Objects.nonNull(point.getUnitId())) { - workOrder.setUnitId(Math.toIntExact(point.getUnitId())); - } - if (point.getImportantTag() || point.getImportantCommandImageTag()) { - workOrder.setProcessingPeriod(Integer.valueOf(important.getConfigValue())); - } else { - workOrder.setProcessingPeriod(Integer.valueOf(normal.getConfigValue())); - } + //鏁板瓧鍓嶉潰琛�0 + workOrderNum++; + workOrder.setWorkOrderNo(IdUtils.workOrderNO(now, String.format("%05d", workOrderNum))); // 淇濆瓨閿欒绫诲瀷 for (String errorType : workOrder.getErrorTypeList()) { WorkOrderErrorType workOrderErrorType = new WorkOrderErrorType(); @@ -257,16 +267,7 @@ workOrderErrorType.setErrorName(errorType); waitAddErrorTypeList.add(workOrderErrorType); } - } - waitAddList.removeAll(notAddList); - if (CollectionUtils.isEmpty(waitAddList)) { - return Boolean.TRUE; - } - //璁板綍宸ュ崟鏁�,琛ュ厖宸ュ崟鍙� - for (WorkOrder workOrder : waitAddList) { - //鏁板瓧鍓嶉潰琛�0 - workOrderNum++; - workOrder.setWorkOrderNo(IdUtils.workOrderNO(now, String.format("%05d", workOrderNum))); + log.info("鍗冲皢鐢熸垚鐨勫伐鍗�:{}",workOrder); } redisCache.setCacheObject(RedisConstant.WORKORDER_NUM, workOrderNum); redisCache.releaseLock(RedisConstant.WORKORDER_NUM_LOCK, requestId); diff --git a/ycl-server/src/main/java/com/ycl/task/CarTask.java b/ycl-server/src/main/java/com/ycl/task/CarTask.java index ee018f5..47b66a5 100644 --- a/ycl-server/src/main/java/com/ycl/task/CarTask.java +++ b/ycl-server/src/main/java/com/ycl/task/CarTask.java @@ -45,21 +45,21 @@ public void siteOnlineTask() { log.info("寮�濮嬭绠楃偣浣嶅湪绾跨巼"); Date yesterday = DateUtils.addDays(new Date(), -1); - //璁$畻鐐逛綅鍦ㄧ嚎鐜囧拰瑙嗗浘搴撳鎺ョǔ瀹氭�� + //璁$畻鐐逛綅鍦ㄧ嚎鐜� Query query = new Query(); query.addCriteria(Criteria - .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())) + .where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday)) .and("dataType").is(ApiConstants.HK_DataType_CAR)); List<SnapshotDataMonitorResult> results = mongoTemplate.find(query, SnapshotDataMonitorResult.class); CalculationStrategy<SnapshotDataMonitorResult> calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Car_SiteOnline); calculator.calculate(results); - log.info("缁撴潫璁$畻瑙嗗浘搴撳鎺ョǔ瀹氭��"); + log.info("缁撴潫璁$畻鐐逛綅鍦ㄧ嚎鐜�"); } public void viewConnectTask() { log.info("寮�濮嬭绠楄鍥惧簱瀵规帴绋冲畾鎬�"); Date yesterday = DateUtils.addDays(new Date(), -1); - //璁$畻鐐逛綅鍦ㄧ嚎鐜囧拰瑙嗗浘搴撳鎺ョǔ瀹氭�� + //璁$畻瑙嗗浘搴撳鎺ョǔ瀹氭�� Query query = new Query(); query.addCriteria(Criteria .where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday)) diff --git a/ycl-server/src/main/java/com/ycl/task/FaceTask.java b/ycl-server/src/main/java/com/ycl/task/FaceTask.java index 2cf1baf..eed92f2 100644 --- a/ycl-server/src/main/java/com/ycl/task/FaceTask.java +++ b/ycl-server/src/main/java/com/ycl/task/FaceTask.java @@ -49,7 +49,7 @@ List<SnapshotDataMonitorResult> results = mongoTemplate.find(query, SnapshotDataMonitorResult.class); CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Face_SiteOnline); calculator.calculate(results); - log.info("缁撴潫璁$畻瑙嗗浘搴撳鎺ョǔ瀹氭��"); + log.info("缁撴潫璁$畻鐐逛綅鍦ㄧ嚎鐜�"); } public void viewConnectTask() { log.info("寮�濮嬭绠楄鍥惧簱瀵规帴绋冲畾鎬�"); @@ -62,7 +62,7 @@ List<SnapshotDataMonitorResult> results = mongoTemplate.find(query, SnapshotDataMonitorResult.class); CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Face_ViewStability); calculator.calculate(results); - log.info("缁撴潫璁$畻浜鸿劯鐐逛綅鍦ㄧ嚎鐜囧拰瑙嗗浘搴撳鎺ョǔ瀹氭��"); + log.info("缁撴潫璁$畻瑙嗗浘搴撳鎺ョǔ瀹氭��"); } 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 49ea8ea..f25c89e 100644 --- a/ycl-server/src/main/java/com/ycl/task/UYTask.java +++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java @@ -186,7 +186,7 @@ } else { log.error("璇烽厤缃绾挎鏁帮紝姝ゆ璁剧疆涓洪粯璁ゅ��2"); } - // 鍏堟煡鍑哄湪绾跨殑璁惧IP闆嗗悎,鍓旈櫎鎺夊湪绾挎儏鍐垫槸鏈煡鐨�,骞朵笖鍙娴嬫鍦ㄨ�冩牳鐨勮澶囬伩鍏嶅浣欏伐鍗� + // 鍏堟煡鍑鸿澶嘔P闆嗗悎,鍓旈櫎鎺夊湪绾挎儏鍐垫槸鏈煡鐨�,骞朵笖鍙娴嬫鍦ㄨ�冩牳鐨勮澶囬伩鍏嶅浣欏伐鍗� List<TMonitorResult> monitorList = monitorMapper.getDistinctIP(); List<TMonitorResult> dataList = new ArrayList<>(48); Integer time = times; @@ -196,6 +196,7 @@ return thread.call(); // 鍋囪 OnlineCheckThread 瀹炵幇浜� Callable 鎺ュ彛 }, executorService) .orTimeout(60, TimeUnit.SECONDS) + //鍑虹幇寮傚父 .exceptionally(ex -> { if (ex instanceof TimeoutException) { log.error("浠诲姟鎵ц瓒呮椂:"+monitor.getIp()); @@ -245,20 +246,12 @@ Date now = new Date(); List<UpdateOnlineVO> willUpdateList = dataList.stream().filter(result->!result.getPingOnline()).map(item -> { UpdateOnlineVO vo = new UpdateOnlineVO(); - vo.setOnline(item.getPingOnline()?ApiConstants.UY_OnlineSite_Online:ApiConstants.UY_OnlineSite_Offline); + vo.setOnline(ApiConstants.UY_OnlineSite_Offline); vo.setIp(item.getIp()); vo.setUpdateTime(now); return vo; }).collect(Collectors.toList()); monitorMapper.updateOnline(willUpdateList); - //宸ュ崟 - List<WorkOrder> workOrderList = dataList.stream() - .filter(item -> Objects.nonNull(item.getWorkOrder())) - .map(TMonitorResult::getWorkOrder) - .collect(Collectors.toList()); - if (!CollectionUtils.isEmpty(workOrderList)) { - workOrderService.innerAddWorkOrder(workOrderList); - } //瀛樻斁鍒癿ongo if (!CollectionUtils.isEmpty(dataList)) { //濡傛灉瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎 @@ -267,6 +260,14 @@ //瀛樻斁鍦╩ongo涓� mongoTemplate.insertAll(dataList); } + //宸ュ崟 + List<WorkOrder> workOrderList = dataList.stream() + .filter(item -> Objects.nonNull(item.getWorkOrder())) + .map(TMonitorResult::getWorkOrder) + .collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(workOrderList)) { + workOrderService.innerAddWorkOrder(workOrderList); + } log.info("鐐逛綅鍦ㄧ嚎鐩戞祴瀹屾垚"); } diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml index 9f45051..2597489 100644 --- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml +++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml @@ -369,7 +369,8 @@ IFNULL(SUM(IF(p.online = 1, 1, 0)), 0) AS totalMembers, IFNULL(SUM(IF(p.online = -1, 1, 0)), 0) AS postsPercentage, IFNULL(SUM(IF(p.online = 0, 1, 0)), 0) AS unknownNumbers, - IFNULL(ROUND(SUM(IF(p.online = 1 , 1, 0)) / count(*) * 100, 2), 0) as viewsPercentage FROM t_monitor m + IFNULL(ROUND(SUM(IF(p.online = 1 , 1, 0)) / count(*) * 100, 2), 0) as viewsPercentage + FROM t_monitor m left join t_yw_point p on m.serial_number = p.serial_number left join sys_dept d on p.dept_id = d.dept_id and d.del_flag = 0 <where> @@ -389,7 +390,10 @@ IFNULL(SUM(IF(p.online = 1, 1, 0)), 0) AS totalMembers, IFNULL(SUM(IF(p.online = -1, 1, 0)), 0) AS postsPercentage, IFNULL(SUM(IF(p.online = 0, 1, 0)), 0) AS unknownNumbers, - IFNULL(ROUND(SUM(IF(p.online = 1 , 1, 0)) / count(*) * 100, 2), 0) as viewsPercentage FROM t_monitor m + IFNULL(ROUND(SUM(IF(p.online = 1 , 1, 0)) / count(*) * 100, 2), 0) as viewsPercentage + FROM t_monitor m + left join t_yw_point p on m.serial_number = p.serial_number + left join sys_dept d on p.dept_id = d.dept_id and d.del_flag = 0 <where> p.examine_status = 1 <!-- (p.recovery = 1 OR TIMESTAMPDIFF(DAY, p.recovery_time, NOW()) <![CDATA[<=]]> #{time}) --> -- Gitblit v1.8.0