From 2f3bbf0372e5c1f8b6b1426db2c14b3595cb0968 Mon Sep 17 00:00:00 2001 From: zxl <763096477@qq.com> Date: 星期三, 30 四月 2025 17:10:52 +0800 Subject: [PATCH] 订单下发,订单下发定时任务处理 --- ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 428 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 401 insertions(+), 27 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 65358a2..0be079c 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 @@ -2,8 +2,6 @@ import com.alibaba.excel.EasyExcel; import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; @@ -11,8 +9,6 @@ import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoDatabase; import com.ycl.platform.domain.entity.*; -import com.ycl.platform.domain.excel.RecordingAvailabilityExport; -import com.ycl.platform.domain.excel.TMonitorExp; import com.ycl.platform.domain.form.UpdateDynamicValueForm; import com.ycl.platform.domain.query.DataCenterQuery; import com.ycl.platform.domain.result.HK.*; @@ -22,22 +18,18 @@ import com.ycl.platform.domain.vo.DataCenter.MonitorQualifyResultVO; import com.ycl.platform.domain.vo.DataCenter.SnapClockVO; import com.ycl.platform.domain.vo.DynamicColumnVO; -import com.ycl.platform.domain.vo.PointDetailVO; -import com.ycl.platform.domain.vo.home.HomeFaceVO; import com.ycl.platform.mapper.DynamicColumnMapper; import com.ycl.platform.mapper.ImageResourceSecurityDetailMapper; import com.ycl.platform.mapper.YwPointMapper; import com.ycl.platform.service.*; import com.ycl.system.Result; -import com.ycl.system.page.PageUtil; +import com.ycl.system.service.ISysConfigService; import com.ycl.utils.DateUtils; import com.ycl.utils.MongoUtil; import com.ycl.utils.StringUtils; import com.ycl.utils.bean.BeanUtils; import com.ycl.utils.poi.ExcelUtil; -import constant.ApiConstants; -import constant.CheckConstants; -import constant.RecordingAvailability; +import constant.*; import enumeration.general.AreaDeptEnum; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; @@ -49,7 +41,6 @@ import org.springframework.data.mongodb.core.aggregation.*; import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; -import org.springframework.data.mongodb.core.query.TextCriteria; import org.springframework.stereotype.Service; import java.io.IOException; @@ -95,28 +86,28 @@ query.addCriteria(Criteria.where("recordStatus").is(params.getOption())); } List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class); - List<DynamicColumnVO> dynamicColumnVOList = dynamicColumnMapper.getDynamicColumnByTableName("uy_record_meta_d_sum"); //缈昏瘧琛屾斂鍖哄煙 resultList.forEach(item -> { String areaCode = item.getArealayername().substring(0, 6); AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromCode(areaCode); if (areaDeptEnum != null) item.setArealayername(areaDeptEnum.getName()); }); + List<DynamicColumnVO> dynamicColumnVOList = dynamicColumnMapper.getDynamicColumnByTableName(TableNameConstants.COLUMN_NAME_VIDEO); Map<String,List<DynamicColumnVO>> groupByRefStringIdMap = dynamicColumnVOList.stream().collect(Collectors.groupingBy(DynamicColumnVO::getRefStringId)); - //鎻愰偅瀹跺浐瀹氳〃澶� + //鍥哄畾琛ㄥご LinkedHashSet<String> headers = new LinkedHashSet<>(); - headers.add(RecordingAvailability.arealayername); - headers.add(RecordingAvailability.arealayerno); - headers.add(RecordingAvailability.createTime); - headers.add(RecordingAvailability.deviceId); - headers.add(RecordingAvailability.missDuration); - headers.add(RecordingAvailability.platId); - headers.add(RecordingAvailability.recordDuration); - headers.add(RecordingAvailability.recordStatusText); - headers.add(RecordingAvailability.statTime); + headers.add(RecordingAvailabilityHeaders.arealayername); + headers.add(RecordingAvailabilityHeaders.arealayerno); + headers.add(RecordingAvailabilityHeaders.createTime); + headers.add(RecordingAvailabilityHeaders.deviceId); + headers.add(RecordingAvailabilityHeaders.missDuration); + headers.add(RecordingAvailabilityHeaders.platId); + headers.add(RecordingAvailabilityHeaders.recordDuration); + headers.add(RecordingAvailabilityHeaders.recordStatusText); + headers.add(RecordingAvailabilityHeaders.statTime); List<String> headersList = new LinkedList<>(); - List<String> dynamicsHeaders = dynamicColumnMapper.getHeader("uy_record_meta_d_sum"); + List<String> dynamicsHeaders = dynamicColumnMapper.getHeader(TableNameConstants.COLUMN_NAME_VIDEO); //娣诲姞鍔ㄦ�佽〃澶� if (!org.springframework.util.CollectionUtils.isEmpty(dynamicsHeaders)) { @@ -168,8 +159,342 @@ } @Override - public void pointOnlineExport(HttpServletResponse response,DataCenterQuery query) throws IOException { + public void pointOnlineFaceExport(HttpServletResponse response, DataCenterQuery params) throws IOException { + List<String> likeFileds = Arrays.asList("name", "no", "ip"); + Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); + //鏌ヤ汉鑴歌澶� + query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Face + ".*")); + //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠� + if (params.getOption() != null) { + query.addCriteria(Criteria.where("online").is(params.getOption())); + } + Sort sort = Sort.by( + Sort.Order.asc("pingOnline"), // 棣栧厛鎸夌収 pingOnline 鍗囧簭鎺掑簭 + Sort.Order.desc("offLineCount") // 棣栧厛鎸夌収 pingOnline 鍗囧簭鎺掑簭 + ); + // 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈� + query.with(sort); + MongoUtil.setNoPage(query, params, TIME_FIELD); + //鍒嗛〉鏁伴噺 + List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class); + resultList.forEach(item -> { + if (item.getPingOnline() == null) { + item.setPingOnlineStr("鏈煡"); + } else if (item.getPingOnline()) { + item.setPingOnlineStr("鍦ㄧ嚎"); + } else if (!item.getPingOnline()) { + item.setPingOnlineStr("绂荤嚎"); + } + if (1 == item.getOnline()) { + item.setOnlineStr("鍦ㄧ嚎"); + } else if (-1 == item.getOnline()) { + item.setOnlineStr("绂荤嚎"); + } else { + item.setOnlineStr("鏈煡"); + } + List<String> offLineTime = item.getOffLineTimeStr(); + if (!CollectionUtils.isEmpty(offLineTime)) { + //鍚庣画鍙互鏀规垚閰嶇疆鐨勭绾挎鏁�(鎻愬彇鍓峮娆★紝n涓洪厤缃殑绂荤嚎娆℃暟) + if (offLineTime.size() > 1) { + offLineTime = offLineTime.subList(0, 2); + } + item.setOffLineTimeStr(offLineTime); + } + }); + List<DynamicColumnVO> dynamicColumnVOList = dynamicColumnMapper.getDynamicColumnByTableName(TableNameConstants.COLUMN_NAME_FACE_POINT); + Map<String,List<DynamicColumnVO>> groupByRefStringIdMap = dynamicColumnVOList.stream().collect(Collectors.groupingBy(DynamicColumnVO::getRefStringId)); + //鍥哄畾琛ㄥご + LinkedHashSet<String> headers = new LinkedHashSet<>(); + headers.add(PointOnlineHeaders.no); + headers.add(PointOnlineHeaders.name); + headers.add(PointOnlineHeaders.ip); + headers.add(PointOnlineHeaders.onlineStr); + headers.add(PointOnlineHeaders.pingOnlineStr); + headers.add(PointOnlineHeaders.checkCount); + headers.add(PointOnlineHeaders.offLineCount); + headers.add(PointOnlineHeaders.offLineTimeStr); + headers.add(PointOnlineHeaders.mongoCreateTime); + List<String> headersList = new LinkedList<>(); + List<String> dynamicsHeaders = dynamicColumnMapper.getHeader(TableNameConstants.COLUMN_NAME_FACE_POINT); + + //娣诲姞鍔ㄦ�佽〃澶� + if (!org.springframework.util.CollectionUtils.isEmpty(dynamicsHeaders)) { + //浣跨敤閾捐〃淇濊瘉鍚庣画琛ュ厖鏁版嵁鏃惰幏鍙栨暟鎹『搴忎竴鑷� + headersList.addAll(dynamicsHeaders); + headers.addAll(headersList); + } + + List<List<Object>> data = new ArrayList<>(); + for (TMonitorResult result : resultList){ + List<Object> row = new ArrayList<>(); + row.add(result.getNo()); + row.add(result.getName()); + row.add(result.getIp()); + row.add(result.getOnlineStr()); + row.add(result.getPingOnlineStr()); + row.add(result.getCheckCount()); + row.add(result.getOffLineCount()); + if (CollectionUtils.isEmpty(result.getOffLineTimeStr())){ + row.add(null); + }else { + row.add(result.getOffLineTimeStr().toString()); + } + row.add(result.getMongoCreateTime()); + //娣诲姞鍔ㄦ�佸垪鏁版嵁 + for (String header : headersList){ + boolean flag = false; + List<DynamicColumnVO> columnVOS = groupByRefStringIdMap.get(result.getNo()); + if (!CollectionUtils.isEmpty(columnVOS)) { + for (DynamicColumnVO columnVO : columnVOS) { + if (header.equals(columnVO.getLabelValue())) { + row.add(columnVO.getColumnValue()); + flag = true; + } + } + } + //娌℃壘鍒扮敤绌轰覆鍗犱綅 + if (!flag) row.add(""); + } + data.add(row); + } + + List<List<String>> headList = new ArrayList<>(); + for (String header : headers) { + headList.add(Collections.singletonList(header)); + } + + EasyExcel.write(response.getOutputStream()) + .head(headList) // 璁剧疆琛ㄥご + .sheet("浜鸿劯鐐逛綅鍦ㄧ嚎鐜�") // 璁剧疆sheet鍚嶇О + .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) + .doWrite(data); // 鍐欏叆鏁版嵁 + } + + @Override + public void pointOnlineVideoExport(HttpServletResponse response, DataCenterQuery params) throws IOException { + List<String> likeFileds = Arrays.asList("name", "no", "ip"); + Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); + //鏌ヨ棰戣澶� + query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*")); + //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠� + if (params.getOption() != null) { + query.addCriteria(Criteria.where("online").is(params.getOption())); + } + Sort sort = Sort.by( + Sort.Order.asc("pingOnline"), // 棣栧厛鎸夌収 pingOnline 鍗囧簭鎺掑簭 + Sort.Order.desc("offLineCount") // 棣栧厛鎸夌収 pingOnline 鍗囧簭鎺掑簭 + ); + // 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈� + query.with(sort); + MongoUtil.setNoPage(query, params, TIME_FIELD); + List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class); + resultList.forEach(item -> { + if (item.getPingOnline() == null) { + item.setPingOnlineStr("鏈煡"); + } else if (item.getPingOnline()) { + item.setPingOnlineStr("鍦ㄧ嚎"); + } else if (!item.getPingOnline()) { + item.setPingOnlineStr("绂荤嚎"); + } + if (1 == item.getOnline()) { + item.setOnlineStr("鍦ㄧ嚎"); + } else if (-1 == item.getOnline()) { + item.setOnlineStr("绂荤嚎"); + } else { + item.setOnlineStr("鏈煡"); + } + List<String> offLineTime = item.getOffLineTimeStr(); + if (!CollectionUtils.isEmpty(offLineTime)) { + if (offLineTime.size() > 1) { + offLineTime = offLineTime.subList(offLineTime.size() - 2, offLineTime.size()); + } + item.setOffLineTimeStr(offLineTime); + } + }); + List<DynamicColumnVO> dynamicColumnVOList = dynamicColumnMapper.getDynamicColumnByTableName(TableNameConstants.COLUMN_NAME_VIDEO_POINT); + Map<String,List<DynamicColumnVO>> groupByRefStringIdMap = dynamicColumnVOList.stream().collect(Collectors.groupingBy(DynamicColumnVO::getRefStringId)); + //鍥哄畾琛ㄥご + LinkedHashSet<String> headers = new LinkedHashSet<>(); + headers.add(PointOnlineHeaders.no); + headers.add(PointOnlineHeaders.name); + headers.add(PointOnlineHeaders.ip); + headers.add(PointOnlineHeaders.onlineStr); + headers.add(PointOnlineHeaders.pingOnlineStr); + headers.add(PointOnlineHeaders.checkCount); + headers.add(PointOnlineHeaders.offLineCount); + headers.add(PointOnlineHeaders.offLineTimeStr); + headers.add(PointOnlineHeaders.mongoCreateTime); + + List<String> headersList = new LinkedList<>(); + List<String> dynamicsHeaders = dynamicColumnMapper.getHeader(TableNameConstants.COLUMN_NAME_VIDEO_POINT); + + //娣诲姞鍔ㄦ�佽〃澶� + if (!org.springframework.util.CollectionUtils.isEmpty(dynamicsHeaders)) { + //浣跨敤閾捐〃淇濊瘉鍚庣画琛ュ厖鏁版嵁鏃惰幏鍙栨暟鎹『搴忎竴鑷� + headersList.addAll(dynamicsHeaders); + headers.addAll(headersList); + } + + List<List<Object>> data = new ArrayList<>(); + for (TMonitorResult result : resultList){ + List<Object> row = new ArrayList<>(); + row.add(result.getNo()); + row.add(result.getName()); + row.add(result.getIp()); + row.add(result.getOnlineStr()); + row.add(result.getPingOnlineStr()); + row.add(result.getCheckCount()); + row.add(result.getOffLineCount()); + if (CollectionUtils.isEmpty(result.getOffLineTimeStr())){ + row.add(null); + }else { + row.add(result.getOffLineTimeStr().toString()); + } + row.add(result.getMongoCreateTime()); + //娣诲姞鍔ㄦ�佸垪鏁版嵁 + for (String header : headersList){ + boolean flag = false; + List<DynamicColumnVO> columnVOS = groupByRefStringIdMap.get(result.getNo()); + if (!CollectionUtils.isEmpty(columnVOS)) { + for (DynamicColumnVO columnVO : columnVOS) { + if (header.equals(columnVO.getLabelValue())) { + row.add(columnVO.getColumnValue()); + flag = true; + } + } + } + //娌℃壘鍒扮敤绌轰覆鍗犱綅 + if (!flag) row.add(""); + } + data.add(row); + } + + List<List<String>> headList = new ArrayList<>(); + for (String header : headers) { + headList.add(Collections.singletonList(header)); + } + + EasyExcel.write(response.getOutputStream()) + .head(headList) // 璁剧疆琛ㄥご + .sheet("瑙嗛鐐逛綅鍦ㄧ嚎鐜�") // 璁剧疆sheet鍚嶇О + .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) + .doWrite(data); // 鍐欏叆鏁版嵁 + + + } + + @Override + public void pointOnlineCarExport(HttpServletResponse response, DataCenterQuery params) throws IOException { + List<String> likeFileds = Arrays.asList("name", "no", "ip"); + Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); + //鏌ヨ溅杈嗚澶� + query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Car + ".*")); + //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠� + if (params.getOption() != null) { + query.addCriteria(Criteria.where("online").is(params.getOption())); + } + Sort sort = Sort.by( + Sort.Order.asc("pingOnline"), // 棣栧厛鎸夌収 pingOnline 鍗囧簭鎺掑簭 + Sort.Order.desc("offLineCount") // 棣栧厛鎸夌収 pingOnline 鍗囧簭鎺掑簭 + ); + // 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈� + query.with(sort); + //鍒嗛〉鏁伴噺 + //绯荤粺ping鐨勭粨鏋� + List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class); + resultList.forEach(item -> { + if (item.getPingOnline() == null) { + item.setPingOnlineStr("鏈煡"); + } else if (item.getPingOnline()) { + item.setPingOnlineStr("鍦ㄧ嚎"); + } else if (!item.getPingOnline()) { + item.setPingOnlineStr("绂荤嚎"); + } + if (1 == item.getOnline()) { + item.setOnlineStr("鍦ㄧ嚎"); + } else if (-1 == item.getOnline()) { + item.setOnlineStr("绂荤嚎"); + } else { + item.setOnlineStr("鏈煡"); + } + List<String> offLineTime = item.getOffLineTimeStr(); + if (!CollectionUtils.isEmpty(offLineTime)) { + //鍚庣画鍙互鏀规垚閰嶇疆鐨勭绾挎鏁�(鎻愬彇鍓峮娆★紝n涓洪厤缃殑绂荤嚎娆℃暟) + if (offLineTime.size() > 1) { + offLineTime = offLineTime.subList(0, 2); + } + item.setOffLineTimeStr(offLineTime); + } + }); + List<DynamicColumnVO> dynamicColumnVOList = dynamicColumnMapper.getDynamicColumnByTableName(TableNameConstants.COLUMN_NAME_CAR_POINT); + Map<String,List<DynamicColumnVO>> groupByRefStringIdMap = dynamicColumnVOList.stream().collect(Collectors.groupingBy(DynamicColumnVO::getRefStringId)); + //鍥哄畾琛ㄥご + LinkedHashSet<String> headers = new LinkedHashSet<>(); + headers.add(PointOnlineHeaders.no); + headers.add(PointOnlineHeaders.name); + headers.add(PointOnlineHeaders.ip); + headers.add(PointOnlineHeaders.onlineStr); + headers.add(PointOnlineHeaders.pingOnlineStr); + headers.add(PointOnlineHeaders.checkCount); + headers.add(PointOnlineHeaders.offLineCount); + headers.add(PointOnlineHeaders.offLineTimeStr); + headers.add(PointOnlineHeaders.mongoCreateTime); + + List<String> headersList = new LinkedList<>(); + List<String> dynamicsHeaders = dynamicColumnMapper.getHeader(TableNameConstants.COLUMN_NAME_CAR_POINT); + + //娣诲姞鍔ㄦ�佽〃澶� + if (!org.springframework.util.CollectionUtils.isEmpty(dynamicsHeaders)) { + //浣跨敤閾捐〃淇濊瘉鍚庣画琛ュ厖鏁版嵁鏃惰幏鍙栨暟鎹『搴忎竴鑷� + headersList.addAll(dynamicsHeaders); + headers.addAll(headersList); + } + + List<List<Object>> data = new ArrayList<>(); + for (TMonitorResult result : resultList){ + List<Object> row = new ArrayList<>(); + row.add(result.getNo()); + row.add(result.getName()); + row.add(result.getIp()); + row.add(result.getOnlineStr()); + row.add(result.getPingOnlineStr()); + row.add(result.getCheckCount()); + row.add(result.getOffLineCount()); + if (CollectionUtils.isEmpty(result.getOffLineTimeStr())){ + row.add(null); + }else { + row.add(result.getOffLineTimeStr().toString()); + } + row.add(result.getMongoCreateTime()); + //娣诲姞鍔ㄦ�佸垪鏁版嵁 + for (String header : headersList){ + boolean flag = false; + List<DynamicColumnVO> columnVOS = groupByRefStringIdMap.get(result.getNo()); + if (!CollectionUtils.isEmpty(columnVOS)) { + for (DynamicColumnVO columnVO : columnVOS) { + if (header.equals(columnVO.getLabelValue())) { + row.add(columnVO.getColumnValue()); + flag = true; + } + } + } + //娌℃壘鍒扮敤绌轰覆鍗犱綅 + if (!flag) row.add(""); + } + data.add(row); + } + + List<List<String>> headList = new ArrayList<>(); + for (String header : headers) { + headList.add(Collections.singletonList(header)); + } + + EasyExcel.write(response.getOutputStream()) + .head(headList) // 璁剧疆琛ㄥご + .sheet("杞﹁締鐐逛綅鍦ㄧ嚎鐜�") // 璁剧疆sheet鍚嶇О + .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) + .doWrite(data); // 鍐欏叆鏁版嵁 } @Override @@ -238,6 +563,7 @@ 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 (item.getPingOnline() == null) { item.setPingOnlineStr("鏈煡"); @@ -260,7 +586,12 @@ } item.setOffLineTimeStr(offLineTime); } + //娣诲姞鍔ㄦ�佹暟鎹� + List<DynamicColumnVO> list = dynamicColumnMapper.getDynamicColumnByTable(TableNameConstants.COLUMN_NAME_VIDEO_POINT,item.getNo()); + item.setDynamicColumnList(list); }); + + params.setDeptTag(-1); params.setDeviceType(1); @@ -929,6 +1260,7 @@ return Result.ok().data(map).total(total); } + private final ISysConfigService configService; /** * 瑙嗛锛氬綍鍍忓彲鐢ㄧ巼 * @@ -938,6 +1270,17 @@ @Override public Result videoAvailabilityRate(DataCenterQuery params) { + //鑾峰彇绯荤粺鍙傛暟 + String dictLabel = configService.selectConfigByKey("recording_min_time"); + + double recordingMinTime; + try { + recordingMinTime = Double.parseDouble(dictLabel) / 60; // 濡傛灉 dictLabel 鏄互灏忔椂涓哄崟浣嶏紝鍒欐棤闇�闄や互 60 + } catch (Exception e) { + log.error("閰嶇疆鐨勫垹闄ゆ椂闂磋寖鍥存牸寮忎笉姝g‘: {}", dictLabel, e); + recordingMinTime = 12.0; // 榛樿 12 灏忔椂锛堜互灏忔椂涓哄崟浣嶏級 + } + List<String> likeFileds = Arrays.asList("deviceId", "deviceName"); Query query = MongoUtil.getQuery(params, "createTime", likeFileds, null); //涓嬫媺妗嗗綍鍍忔儏鍐垫煡璇㈡潯浠� @@ -956,7 +1299,7 @@ AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromCode(areaCode); if (areaDeptEnum != null) item.setArealayername(areaDeptEnum.getName()); - List<DynamicColumnVO> list = dynamicColumnMapper.getDynamicColumnByTable("uy_record_meta_d_sum",item.getId()); + List<DynamicColumnVO> list = dynamicColumnMapper.getDynamicColumnByTable(TableNameConstants.COLUMN_NAME_VIDEO,item.getId()); item.setDynamicColumnList(list); }); @@ -985,6 +1328,32 @@ } return uniqueDeviceIdCount + ""; }).collect(Collectors.toList()); + + //璁$畻褰曞儚鍙敤鐜� + MongoDatabase databaes2 = mongoTemplate.getDb(); + MongoCollection<Document> collection2 = databaes2.getCollection("uy_record_meta_d_sum"); + + double finalRecordingMinTime = recordingMinTime; + + List<Document> documentList = new ArrayList<>(3); + setTag(params, documentList); + Document recording = new Document("recordDuration",new Document("$gte", finalRecordingMinTime)); + documentList.add(recording); + Document filter = new Document("$and", documentList); + // 鏋勫缓鑱氬悎绠¢亾 + List<Document> pipeline = Arrays.asList( + new Document("$match", filter), + // $group 鍘婚噸 + new Document("$group", new Document("_id", "$deviceId")), + new Document("$count", "uniqueDeviceIds") + ); + AggregateIterable<Document> result = collection2.aggregate(pipeline); + Integer uniqueDeviceIdCount = 0; + for (Document doc : result) { + uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds"); + break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋� + } + log.error("鎵撳嵃锛歿}",uniqueDeviceIdCount); // List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper()) // .select(CheckIndexVideo::getVideoAvailable) // .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province) @@ -1008,12 +1377,11 @@ // 1锛氬畬鏁� 0锛氶棿姝� -1锛氬紓甯� | if (!StringUtils.isEmpty(resultCount.get(0)) && !"0".equals(resultCount.get(0))) { //resultCount.get(0) - onlineRate = new BigDecimal(resultCount.get(1)).divide(new BigDecimal(resultCount.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100")); + onlineRate = new BigDecimal(resultCount.get(1)).divide(new BigDecimal(uniqueDeviceIdCount), 3,RoundingMode.DOWN).multiply(new BigDecimal("100")); } resultCount.add(this.remove0(onlineRate)); HashMap<String, Object> map = new HashMap<>(); - log.error("resultCount:{}",resultCount.get(3)); map.put("count", resultCount); map.put("list", resultList); return Result.ok().data(map).total(total); @@ -1712,6 +2080,9 @@ } item.setOffLineTimeStr(offLineTime); } + //娣诲姞鍔ㄦ�佹暟鎹� + List<DynamicColumnVO> list = dynamicColumnMapper.getDynamicColumnByTable(TableNameConstants.COLUMN_NAME_CAR_POINT,item.getNo()); + item.setDynamicColumnList(list); }); // 缁熻璁惧鏁伴噺 @@ -2583,6 +2954,9 @@ } item.setOffLineTimeStr(offLineTime); } + //娣诲姞鍔ㄦ�佹暟鎹� + List<DynamicColumnVO> list = dynamicColumnMapper.getDynamicColumnByTable(TableNameConstants.COLUMN_NAME_FACE_POINT,item.getNo()); + item.setDynamicColumnList(list); }); params.setDeptTag(-1); params.setDeviceType(3); -- Gitblit v1.8.0