From 6221c8b5df5eb0ee62dce79048c9c3f0dc3d0fc1 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期六, 31 八月 2024 20:15:57 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java | 30 +++++++++++++++++------------- 1 files changed, 17 insertions(+), 13 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java b/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java index 24d8cdc..c071bdb 100644 --- a/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java +++ b/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java @@ -130,9 +130,9 @@ BigDecimal importantTotalSites = new BigDecimal((Integer) param.get("importantTotalSites")); BigDecimal integritySites = new BigDecimal((Integer) param.get("integritySites")); BigDecimal importantIntegritySites = new BigDecimal((Integer) param.get("importantIntegritySites")); - BigDecimal result = integritySites.divide(totalSites, 10, RoundingMode.HALF_UP) - .multiply(importantIntegritySites.divide(importantTotalSites, 10, RoundingMode.HALF_UP)); - return result.setScale(4, RoundingMode.HALF_UP); + BigDecimal total = BigDecimal.ZERO.compareTo(totalSites) == 0 ? BigDecimal.ZERO : integritySites.divide(totalSites, 10, RoundingMode.HALF_UP); + BigDecimal important = BigDecimal.ZERO.compareTo(importantTotalSites) == 0 ? BigDecimal.ZERO : importantIntegritySites.divide(importantTotalSites, 10, RoundingMode.HALF_UP); + return total.multiply(important).setScale(4, RoundingMode.HALF_UP); } //杞﹁締鏁版嵁瀹屾暣鎬� @@ -141,9 +141,9 @@ BigDecimal importantTotalSites = new BigDecimal((Integer) param.get("importantTotalSites")); BigDecimal accuracySites = new BigDecimal((Integer) param.get("accuracySites")); BigDecimal importantAccuracySites = new BigDecimal((Integer) param.get("importantAccuracySites")); - BigDecimal result = accuracySites.divide(totalSites, 10, RoundingMode.HALF_UP) - .add(importantAccuracySites.divide(importantTotalSites, 10, RoundingMode.HALF_UP)); - return result.setScale(4, RoundingMode.HALF_UP); + BigDecimal total = BigDecimal.ZERO.compareTo(totalSites) == 0 ? BigDecimal.ZERO : accuracySites.divide(totalSites, 10, RoundingMode.HALF_UP); + BigDecimal important = BigDecimal.ZERO.compareTo(importantTotalSites) == 0 ? BigDecimal.ZERO : importantAccuracySites.divide(importantTotalSites, 10, RoundingMode.HALF_UP); + return total.multiply(important).setScale(4, RoundingMode.HALF_UP); } //鏃堕挓鍑嗙‘鎬� @@ -183,28 +183,32 @@ //杩斿洖鐪佸巺鍥芥爣鐮侀泦鍚� public List<String> getProvince() { - List<YwPoint> province = pointMapper.selectByTag(null, Boolean.TRUE, null); + List<YwPoint> province = pointMapper.selectByTag(null, Boolean.TRUE, null, null); return CollectionUtils.isEmpty(province) ? new ArrayList<>() : province.stream().map(YwPoint::getSerialNumber).collect(Collectors.toList()); } //杩斿洖閲嶇偣鐐逛綅闆嗗悎 public List<String> getImportant() { - List<YwPoint> important = pointMapper.selectByTag(Boolean.TRUE, null, null); + List<YwPoint> important = pointMapper.selectByTag(Boolean.TRUE, null, null, null); return CollectionUtils.isEmpty(important) ? new ArrayList<>() : important.stream().map(YwPoint::getSerialNumber).collect(Collectors.toList()); } //杩斿洖閲嶇偣鎸囨尌鍥惧儚闆嗗悎 public List<String> getCommandImage() { - List<YwPoint> commandImages = pointMapper.selectByTag(null, null, Boolean.TRUE); + List<YwPoint> commandImages = pointMapper.selectByTag(null, null, Boolean.TRUE, null); + return CollectionUtils.isEmpty(commandImages) ? new ArrayList<>() : commandImages.stream().map(YwPoint::getSerialNumber).collect(Collectors.toList()); + } + + //杩斿洖閲嶇偣鎸囨尌鍥惧儚闆嗗悎 + public List<String> getDeptTag() { + List<YwPoint> commandImages = pointMapper.selectByTag(null, null, null, Boolean.TRUE); return CollectionUtils.isEmpty(commandImages) ? new ArrayList<>() : commandImages.stream().map(YwPoint::getSerialNumber).collect(Collectors.toList()); } //杩斿洖monitor - //TODO:鏃堕棿鍐欐浜� public List<String> getMonitorFromMongo() { - Date date = DateUtils.getDay(2024, 7, 13); - Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(date)).lt(DateUtils.getDayEnd(date))); -// Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); + Date yesterday = DateUtils.addDays(new Date(), -1); + Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday))); List<MonitorQualifyResult> oneMachineFileResults = mongoTemplate.find(query, MonitorQualifyResult.class); return CollectionUtils.isEmpty(oneMachineFileResults) ? new ArrayList<>() : oneMachineFileResults.stream().map(result -> result.getSerialNumber().getValue()).collect(Collectors.toList()); -- Gitblit v1.8.0