ycl-pojo/src/main/java/com/ycl/platform/domain/query/DataCenterQuery.java
@@ -17,13 +17,13 @@ */ @Data public class DataCenterQuery extends AbsQuery { @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private Date date; /** 开始时间 */ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private Date startTime; /** 结束时间 */ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private Date endTime; /** 关键词 */ @@ -43,11 +43,11 @@ public void setTime() { if (Objects.nonNull(this.startTime)) { this.startTime = DateUtils.getDayStart(this.startTime); if (Objects.nonNull(this.date)) { this.startTime = DateUtils.getDayStart(this.date); } if (Objects.nonNull(this.endTime)) { this.endTime = DateUtils.getDayEnd(this.endTime); if (Objects.nonNull(this.date)) { this.endTime = DateUtils.getDayEnd(this.date); } } ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
@@ -69,6 +69,7 @@ public Result videoPointOnlineRate(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("name", "no", "ip"); Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); System.out.println("查询条件"+query.toString()); //分页数量 long total = mongoTemplate.count(query, TMonitorResult.class); MongoUtil.setPage(query, params, TIME_FIELD); @@ -92,10 +93,9 @@ // 统计设备数量 Integer distinctCount = pointMapper.distinctCount(params); Date now = new Date(); List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper()) .select(CheckIndexVideo::getSiteOnline) .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now)) .between(CheckIndexVideo::getCreateTime, params.getStartTime(), params.getEndTime()) .list(); BigDecimal onlineRate = BigDecimal.ZERO; if (CollectionUtils.isNotEmpty(videoList)) { @@ -142,11 +142,10 @@ params.setDeviceType(1); Integer distinctCount = pointMapper.distinctCount(params); Date now = new Date(); List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper()) .select(CheckIndexVideo::getMinistrySiteOnline) .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province) .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now)) .between(CheckIndexVideo::getCreateTime, params.getStartTime(), params.getEndTime()) .list(); BigDecimal onlineRate = BigDecimal.ZERO; if (CollectionUtils.isNotEmpty(videoList)) { ycl-server/src/main/java/com/ycl/utils/CheckPointUtil.java
@@ -149,15 +149,20 @@ String status = ""; if (! webReachable) { status += "设备web访问失败;"; }else if(webReachable){ status += "设备web访问正常;"; } if (! pingReachable) { status += "设备ip未ping通;"; }else if(pingReachable){ status += "设备ipPing正常;"; } if (StringUtils.isEmpty(imgUrl)) { status += "未获取到图片"; } if (StringUtils.isEmpty(status)) { status += "设备正常"; }else { status += "获取图片正常"; } result.setStatus(status); return result;