From 6a5f0032e2903c64966a68dd3639b049c7a40b85 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 28 四月 2025 09:21:48 +0800
Subject: [PATCH] 手册，海康接口调整
---
ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 1650 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 1,169 insertions(+), 481 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 0c418f5..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
@@ -1,7 +1,7 @@
package com.ycl.platform.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
@@ -9,7 +9,7 @@
import com.mongodb.client.MongoCollection;
import com.mongodb.client.MongoDatabase;
import com.ycl.platform.domain.entity.*;
-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.*;
import com.ycl.platform.domain.result.SYS.TMonitorResult;
@@ -17,22 +17,23 @@
import com.ycl.platform.domain.vo.DataCenter.BigPicUsefulVO;
import com.ycl.platform.domain.vo.DataCenter.MonitorQualifyResultVO;
import com.ycl.platform.domain.vo.DataCenter.SnapClockVO;
-import com.ycl.platform.domain.vo.PointDetailVO;
-import com.ycl.platform.domain.vo.home.HomeFaceVO;
+import com.ycl.platform.domain.vo.DynamicColumnVO;
+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.*;
import enumeration.general.AreaDeptEnum;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.bson.Document;
import org.springframework.data.domain.Sort;
@@ -40,9 +41,9 @@
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;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.DecimalFormat;
@@ -59,6 +60,7 @@
*/
@Service
@RequiredArgsConstructor
+@Slf4j
public class DataCenterServiceImpl implements DataCenterService {
private final MongoTemplate mongoTemplate;
@@ -67,11 +69,473 @@
private final ICheckIndexVideoService checkIndexVideoService;
private final ICheckIndexCarService checkIndexCarService;
private final ICheckIndexFaceService checkIndexFaceService;
+ private final DynamicColumnMapper dynamicColumnMapper;
+
private final static String TIME_FIELD = "mongoCreateTime";
private static DecimalFormat DF = new DecimalFormat("#.####");
+
+ @Override
+ public void recordingAvailabilityExport(HttpServletResponse response,DataCenterQuery params) throws IOException {
+ List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
+ Query query = MongoUtil.getQuery(params, "createTime", likeFileds, null);
+ //涓嬫媺妗嗗綍鍍忔儏鍐垫煡璇㈡潯浠�
+ if (params.getOption() != null) {
+ query.addCriteria(Criteria.where("recordStatus").is(params.getOption()));
+ }
+ List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
+ //缈昏瘧琛屾斂鍖哄煙
+ 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(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(TableNameConstants.COLUMN_NAME_VIDEO);
+
+ //娣诲姞鍔ㄦ�佽〃澶�
+ if (!org.springframework.util.CollectionUtils.isEmpty(dynamicsHeaders)) {
+ //浣跨敤閾捐〃淇濊瘉鍚庣画琛ュ厖鏁版嵁鏃惰幏鍙栨暟鎹『搴忎竴鑷�
+ headersList.addAll(dynamicsHeaders);
+ headers.addAll(headersList);
+ }
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ SimpleDateFormat dateFormat2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+ List<List<Object>> data = new ArrayList<>();
+ for (RecordMetaDSumResult result : resultList){
+ List<Object> row = new ArrayList<>();
+ row.add(result.getArealayername());
+ row.add(result.getArealayerno());
+ row.add(dateFormat2.format(result.getCreateTime()));
+ row.add(result.getDeviceId());
+ row.add(result.getMissDuration());
+ row.add(result.getPlatId());
+ row.add(result.getRecordDuration());
+ row.add(result.getRecordStatusText());
+ row.add(dateFormat2.format(result.getCreateTime()));
+ //娣诲姞鍔ㄦ�佸垪鏁版嵁
+ for (String header : headersList){
+ boolean flag = false;
+ List<DynamicColumnVO> columnVOS = groupByRefStringIdMap.get(result.getId());
+ 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 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
+ public Result updateDynamicValue(UpdateDynamicValueForm form) {
+ List<DynamicColumnVO> list = form.getDynamicColumnVOList();
+
+ if (CollectionUtils.isEmpty(list) || StringUtils.isEmpty(form.getId())) {
+ throw new RuntimeException("淇敼鑷畾涔夊垪鐨勪紶鍏ュ�间负null鎴栦紶鍏d涓簄ull");
+ }
+ List<DynamicColumnValue> updateList = new ArrayList<>();
+ List<DynamicColumnValue> addList = new ArrayList<>();
+
+ for (DynamicColumnVO dynamicColumnVO : list){
+ if(dynamicColumnVO.getColumnValue() == null){
+ continue;
+ }
+ DynamicColumnValue dynamicColumnValue = new DynamicColumnValue();
+ dynamicColumnValue.setColumnValue(dynamicColumnVO.getColumnValue());
+ dynamicColumnValue.setDynamicColumnId(dynamicColumnVO.getId());
+ dynamicColumnValue.setRefStringId(form.getId());
+ dynamicColumnValue.setRefId(0);
+ if(dynamicColumnVO.getValueId() == null){
+ addList.add(dynamicColumnValue);
+ }else {
+ dynamicColumnValue.setId(dynamicColumnVO.getValueId());
+ updateList.add(dynamicColumnValue);
+ }
+ }
+ log.error("addList:{}",addList);
+ log.error("updateList:{}",updateList);
+ if (CollectionUtils.isNotEmpty(addList)){
+ dynamicColumnMapper.saveBatch(addList);
+ }
+ if (CollectionUtils.isNotEmpty(updateList)) {
+ dynamicColumnMapper.updateBatch(updateList);
+ }
+ return Result.ok("淇敼鎴愬姛");
+
+
+
+ }
/**
* 瑙嗛锛氱偣浣嶅湪绾跨巼
@@ -99,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("鏈煡");
@@ -115,14 +580,18 @@
item.setOnlineStr("鏈煡");
}
List<String> offLineTime = item.getOffLineTimeStr();
- if(!CollectionUtils.isEmpty(offLineTime)) {
- //鍚庣画鍙互鏀规垚閰嶇疆鐨勭绾挎鏁�(鎻愬彇鍓峮娆★紝n涓洪厤缃殑绂荤嚎娆℃暟)
+ if (!CollectionUtils.isEmpty(offLineTime)) {
if (offLineTime.size() > 1) {
- offLineTime = offLineTime.subList(0, 2);
+ offLineTime = offLineTime.subList(offLineTime.size() - 2, offLineTime.size());
}
item.setOffLineTimeStr(offLineTime);
}
+ //娣诲姞鍔ㄦ�佹暟鎹�
+ List<DynamicColumnVO> list = dynamicColumnMapper.getDynamicColumnByTable(TableNameConstants.COLUMN_NAME_VIDEO_POINT,item.getNo());
+ item.setDynamicColumnList(list);
});
+
+
params.setDeptTag(-1);
params.setDeviceType(1);
@@ -160,20 +629,24 @@
onlineCount = (Integer) result.getOrDefault("onlineCount", 0L);
totalCount = offlineCount + unknownCount + onlineCount;
}
- /** 鏌ヨ褰撳ぉ鍦ㄧ嚎鐜� */
- List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
- .select(CheckIndexVideo::getSiteOnline)
- .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
- .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
- .between(CheckIndexVideo::getCreateTime, params.getStartTime(), params.getEndTime())
- .list();
-
BigDecimal onlineRate = BigDecimal.ZERO;
- if (CollectionUtils.isNotEmpty(videoList)) {
- BigDecimal sum = videoList.stream().map(CheckIndexVideo::getSiteOnline).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal count = BigDecimal.valueOf(videoList.size());
- onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+ if (totalCount!=0) {
+ onlineRate = new BigDecimal(onlineCount).divide(new BigDecimal(totalCount), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
}
+// /** 鏌ヨ褰撳ぉ鍦ㄧ嚎鐜� */
+// List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
+// .select(CheckIndexVideo::getSiteOnline)
+// .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
+// .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
+// .between(CheckIndexVideo::getCreateTime, params.getStartTime(), params.getEndTime())
+// .list();
+//
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// if (CollectionUtils.isNotEmpty(videoList)) {
+// BigDecimal sum = videoList.stream().map(CheckIndexVideo::getSiteOnline).reduce(BigDecimal.ZERO, BigDecimal::add);
+// BigDecimal count = BigDecimal.valueOf(videoList.size());
+// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+// }
HashMap<String, Object> map = new HashMap<>();
map.put("count", Arrays.asList(totalCount + "", onlineCount + "", offlineCount + "", unknownCount + "", this.remove0(onlineRate)));
map.put("list", resultList);
@@ -255,21 +728,24 @@
onlineCount = (Integer) result.getOrDefault("onlineCount", 0L);
totalCount = offlineCount + unknownCount + onlineCount;
}
-
- params.setDeptTag(1);
- params.setDeviceType(1);
- List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
- .select(CheckIndexVideo::getMinistrySiteOnline)
- .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
- .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
- .between(CheckIndexVideo::getCreateTime, params.getStartTime(), params.getEndTime())
- .list();
BigDecimal onlineRate = BigDecimal.ZERO;
- if (CollectionUtils.isNotEmpty(videoList)) {
- BigDecimal sum = videoList.stream().map(CheckIndexVideo::getMinistrySiteOnline).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal count = BigDecimal.valueOf(videoList.size());
- onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+ if (totalCount!=0) {
+ onlineRate = new BigDecimal(onlineCount).divide(new BigDecimal(totalCount), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
}
+// params.setDeptTag(1);
+// params.setDeviceType(1);
+// List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
+// .select(CheckIndexVideo::getMinistrySiteOnline)
+// .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
+// .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
+// .between(CheckIndexVideo::getCreateTime, params.getStartTime(), params.getEndTime())
+// .list();
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// if (CollectionUtils.isNotEmpty(videoList)) {
+// BigDecimal sum = videoList.stream().map(CheckIndexVideo::getMinistrySiteOnline).reduce(BigDecimal.ZERO, BigDecimal::add);
+// BigDecimal count = BigDecimal.valueOf(videoList.size());
+// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+// }
HashMap<String, Object> map = new HashMap<>();
map.put("count", Arrays.asList(totalCount + "", onlineCount + "", offlineCount + "", unknownCount + "", this.remove0(onlineRate)));
map.put("list", resultList);
@@ -329,6 +805,7 @@
// 娣诲姞鍥哄畾鏉′欢
criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
+ criteriaList.add(Criteria.where("importantTag").is(Boolean.TRUE));
// 鏍规嵁dataType鍔ㄦ�佹坊鍔犳潯浠�
if (params.getDataType() == 1) {
criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE));
@@ -353,18 +830,22 @@
onlineCount = (Integer) result.getOrDefault("onlineCount", 0L);
totalCount = offlineCount + unknownCount + onlineCount;
}
- List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
- .select(CheckIndexVideo::getKeySiteOnline)
- .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
- .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
- .between(CheckIndexVideo::getCreateTime, params.getStartTime(), params.getEndTime())
- .list();
BigDecimal onlineRate = BigDecimal.ZERO;
- if (CollectionUtils.isNotEmpty(videoList)) {
- BigDecimal sum = videoList.stream().map(CheckIndexVideo::getKeySiteOnline).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal count = BigDecimal.valueOf(videoList.size());
- onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+ if (totalCount!=0) {
+ onlineRate = new BigDecimal(onlineCount).divide(new BigDecimal(totalCount), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
}
+// List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
+// .select(CheckIndexVideo::getKeySiteOnline)
+// .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
+// .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
+// .between(CheckIndexVideo::getCreateTime, params.getStartTime(), params.getEndTime())
+// .list();
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// if (CollectionUtils.isNotEmpty(videoList)) {
+// BigDecimal sum = videoList.stream().map(CheckIndexVideo::getKeySiteOnline).reduce(BigDecimal.ZERO, BigDecimal::add);
+// BigDecimal count = BigDecimal.valueOf(videoList.size());
+// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+// }
HashMap<String, Object> map = new HashMap<>();
map.put("count", Arrays.asList(totalCount + "", onlineCount + "", offlineCount + "", unknownCount + "", this.remove0(onlineRate)));
map.put("list", resultList);
@@ -425,6 +906,7 @@
// 娣诲姞鍥哄畾鏉′欢
criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
+ criteriaList.add(Criteria.where("importantCommandImageTag").is(Boolean.TRUE));
// 鏍规嵁dataType鍔ㄦ�佹坊鍔犳潯浠�
if (params.getDataType() == 1) {
criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE));
@@ -449,19 +931,22 @@
onlineCount = (Integer) result.getOrDefault("onlineCount", 0L);
totalCount = offlineCount + unknownCount + onlineCount;
}
-
- List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
- .select(CheckIndexVideo::getKeyCommandImageOnline)
- .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
- .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
- .between(CheckIndexVideo::getCreateTime, params.getStartTime(), params.getEndTime())
- .list();
BigDecimal onlineRate = BigDecimal.ZERO;
- if (CollectionUtils.isNotEmpty(videoList)) {
- BigDecimal sum = videoList.stream().map(CheckIndexVideo::getKeyCommandImageOnline).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal count = BigDecimal.valueOf(videoList.size());
- onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+ if (totalCount!=0) {
+ onlineRate = new BigDecimal(onlineCount).divide(new BigDecimal(totalCount), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
}
+// List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
+// .select(CheckIndexVideo::getKeyCommandImageOnline)
+// .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
+// .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
+// .between(CheckIndexVideo::getCreateTime, params.getStartTime(), params.getEndTime())
+// .list();
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// if (CollectionUtils.isNotEmpty(videoList)) {
+// BigDecimal sum = videoList.stream().map(CheckIndexVideo::getKeyCommandImageOnline).reduce(BigDecimal.ZERO, BigDecimal::add);
+// BigDecimal count = BigDecimal.valueOf(videoList.size());
+// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+// }
HashMap<String, Object> map = new HashMap<>();
map.put("count", Arrays.asList(totalCount + "", onlineCount + "", offlineCount + "", unknownCount + "", this.remove0(onlineRate)));
map.put("list", resultList);
@@ -480,10 +965,10 @@
List<Criteria> andCriteria = MongoUtil.getAndCriteria(params, TIME_FIELD, likeFileds, null);
Query query = new Query();
Criteria and = new Criteria();
- if(params.getOption()!=null){
- if(params.getOption() ==1){
+ if (params.getOption() != null) {
+ if (params.getOption() == 1) {
andCriteria.add(Criteria.where("newDevice").is(Boolean.TRUE));
- }else if(params.getOption() ==-1){
+ } else if (params.getOption() == -1) {
andCriteria.add(Criteria.where("newDevice").is(Boolean.FALSE));
}
}
@@ -503,12 +988,12 @@
//鎬绘暟
List<Document> dList1 = new ArrayList<>(2);
setTag(params, dList1);
- Document totalFilter = new Document("$and",dList1);
+ Document totalFilter = new Document("$and", dList1);
//鏂拌澶囨暟
List<Document> dList2 = new ArrayList<>(2);
setTag(params, dList2);
- dList2.add(new Document("newDevice",Boolean.TRUE));
- Document newFilter = new Document("$and",dList2);
+ dList2.add(new Document("newDevice", Boolean.TRUE));
+ Document newFilter = new Document("$and", dList2);
List<Document> lists = Arrays.asList(totalFilter, newFilter);
List<String> rList = lists.stream().map(filter -> {
@@ -529,19 +1014,23 @@
return uniqueDeviceIdCount + "";
}).collect(Collectors.toList());
- List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
- .select(CheckIndexVideo::getMonitorRegistration)
- .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
- .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
- .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
- .list();
- BigDecimal onlineRate = BigDecimal.ZERO;
- if (CollectionUtils.isNotEmpty(videoList)) {
- BigDecimal sum = videoList.stream().map(CheckIndexVideo::getMonitorRegistration).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal count = BigDecimal.valueOf(videoList.size());
- onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+// List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
+// .select(CheckIndexVideo::getMonitorRegistration)
+// .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
+// .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
+// .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
+// .list();
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// if (CollectionUtils.isNotEmpty(videoList)) {
+// BigDecimal sum = videoList.stream().map(CheckIndexVideo::getMonitorRegistration).reduce(BigDecimal.ZERO, BigDecimal::add);
+// BigDecimal count = BigDecimal.valueOf(videoList.size());
+// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+// }
+ BigDecimal rate = BigDecimal.ZERO;
+ if (!StringUtils.isEmpty(rList.get(0)) && !"0".equals(rList.get(0))) {
+ rate = new BigDecimal(rList.get(0)).subtract(new BigDecimal(rList.get(1))).divide(new BigDecimal(rList.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
}
- rList.add(this.remove0(onlineRate));
+ rList.add(this.remove0(rate));
HashMap<String, Object> map = new HashMap<>();
map.put("count", rList);
map.put("list", resultVOS);
@@ -562,8 +1051,8 @@
Criteria and = new Criteria();
and.andOperator(andCriteria);
query = Query.query(and);
- if(params.getOption()!=null){
- if(params.getOption() ==1){
+ if (params.getOption() != null) {
+ if (params.getOption() == 1) {
andCriteria.add(Criteria.where("serialNumber.error").is(Boolean.FALSE));
andCriteria.add(Criteria.where("name.error").is(Boolean.FALSE));
andCriteria.add(Criteria.where("civilCode.error").is(Boolean.FALSE));
@@ -579,7 +1068,7 @@
Criteria and2 = new Criteria();
and2.andOperator(andCriteria);
query = Query.query(and2);
- }else if(params.getOption() ==-1){
+ } else if (params.getOption() == -1) {
Criteria c1 = Criteria.where("serialNumber.error").is(Boolean.TRUE);
Criteria c2 = Criteria.where("name.error").is(Boolean.TRUE);
Criteria c3 = Criteria.where("civilCode.error").is(Boolean.TRUE);
@@ -612,26 +1101,26 @@
//鎬绘暟
List<Document> dList1 = new ArrayList<>(2);
setTag(params, dList1);
- Document totalFilter = new Document("$and",dList1);
+ Document totalFilter = new Document("$and", dList1);
//鍚堟牸鏁�
List<Document> dList2 = new ArrayList<>(2);
- dList2.add(new Document("serialNumber.error",Boolean.FALSE));
- dList2.add(new Document("name.error",Boolean.FALSE));
- dList2.add(new Document("civilCode.error",Boolean.FALSE));
- dList2.add(new Document("integrated_device.error",Boolean.FALSE));
- dList2.add(new Document("jkdwlx.error",Boolean.FALSE));
- dList2.add(new Document("latitude.error",Boolean.FALSE));
- dList2.add(new Document("longitude.error",Boolean.FALSE));
- dList2.add(new Document("macdz.error",Boolean.FALSE));
- dList2.add(new Document("name.error",Boolean.FALSE));
- dList2.add(new Document("sbzt.error",Boolean.FALSE));
- dList2.add(new Document("sxjcjqy.error",Boolean.FALSE));
- dList2.add(new Document("sxjgnlx.error",Boolean.FALSE));
- setTag(params,dList2);
- Document qualifyFilter = new Document("$and",dList2);
+ dList2.add(new Document("serialNumber.error", Boolean.FALSE));
+ dList2.add(new Document("name.error", Boolean.FALSE));
+ dList2.add(new Document("civilCode.error", Boolean.FALSE));
+ dList2.add(new Document("integrated_device.error", Boolean.FALSE));
+ dList2.add(new Document("jkdwlx.error", Boolean.FALSE));
+ dList2.add(new Document("latitude.error", Boolean.FALSE));
+ dList2.add(new Document("longitude.error", Boolean.FALSE));
+ dList2.add(new Document("macdz.error", Boolean.FALSE));
+ dList2.add(new Document("name.error", Boolean.FALSE));
+ dList2.add(new Document("sbzt.error", Boolean.FALSE));
+ dList2.add(new Document("sxjcjqy.error", Boolean.FALSE));
+ dList2.add(new Document("sxjgnlx.error", Boolean.FALSE));
+ setTag(params, dList2);
+ Document qualifyFilter = new Document("$and", dList2);
//涓嶅悎鏍兼暟
- List<Document> dList3 = new ArrayList<>(2);
- setTag(params,dList3);
+ List<Document> dList3 = new ArrayList<>(2);
+ setTag(params, dList3);
List<Document> errorConditions = new ArrayList<>();
errorConditions.add(new Document("serialNumber.error", new Document("$eq", Boolean.TRUE)));
errorConditions.add(new Document("name.error", new Document("$eq", Boolean.TRUE)));
@@ -667,19 +1156,22 @@
}
return uniqueDeviceIdCount + "";
}).collect(Collectors.toList());
-
- List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
- .select(CheckIndexVideo::getMonitorQualification)
- .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
- .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
- .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
- .list();
BigDecimal onlineRate = BigDecimal.ZERO;
- if (CollectionUtils.isNotEmpty(videoList)) {
- BigDecimal sum = videoList.stream().map(CheckIndexVideo::getMonitorQualification).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal count = BigDecimal.valueOf(videoList.size());
- onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+ if (!StringUtils.isEmpty(rList.get(0)) && !"0".equals(rList.get(0))) {
+ onlineRate = new BigDecimal(rList.get(1)).divide(new BigDecimal(rList.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
}
+// List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
+// .select(CheckIndexVideo::getMonitorQualification)
+// .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
+// .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
+// .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
+// .list();
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// if (CollectionUtils.isNotEmpty(videoList)) {
+// BigDecimal sum = videoList.stream().map(CheckIndexVideo::getMonitorQualification).reduce(BigDecimal.ZERO, BigDecimal::add);
+// BigDecimal count = BigDecimal.valueOf(videoList.size());
+// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+// }
rList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
map.put("count", rList);
@@ -692,6 +1184,7 @@
* 妗ｆ鐣欏瓨鎬婚噺锛歮ongo瀛樼殑鎵�鏈夊幓閲嶅悗鐨勬。妗�
* 褰撴棩妗ｆ锛氬綋鏃ョ殑妗ｆ
* 妗ｆ鑰冩牳姣� = 褰撴棩妗ｆ/妗ｆ鐣欏瓨鎬婚噺
+ *
* @param params
* @return1
*/
@@ -717,14 +1210,14 @@
//鎬绘暟
List<Document> dList1 = new ArrayList<>(2);
DataCenterQuery totalParams = new DataCenterQuery();
- BeanUtils.copyProperties(params,totalParams);
+ BeanUtils.copyProperties(params, totalParams);
totalParams.setStartTime(null);
setTag(totalParams, dList1);
- Document totalFilter = new Document("$and",dList1);
+ Document totalFilter = new Document("$and", dList1);
//褰撴棩妗ｆ鏁�
List<Document> dList2 = new ArrayList<>(2);
setTag(params, dList2);
- Document newFilter = new Document("$and",dList2);
+ Document newFilter = new Document("$and", dList2);
List<Document> lists = Arrays.asList(totalFilter, newFilter);
List<String> rList = lists.stream().map(filter -> {
@@ -744,19 +1237,22 @@
}
return uniqueDeviceIdCount + "";
}).collect(Collectors.toList());
-
- List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
- .select(CheckIndexVideo::getArchivesRate)
- .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
- .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
- .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
- .list();
BigDecimal onlineRate = BigDecimal.ZERO;
- if (CollectionUtils.isNotEmpty(videoList)) {
- BigDecimal sum = videoList.stream().map(CheckIndexVideo::getArchivesRate).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal count = BigDecimal.valueOf(videoList.size());
- onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+ if (!StringUtils.isEmpty(rList.get(0)) && !"0".equals(rList.get(0))) {
+ onlineRate = new BigDecimal(rList.get(1)).divide(new BigDecimal(rList.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
}
+// List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
+// .select(CheckIndexVideo::getArchivesRate)
+// .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
+// .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
+// .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
+// .list();
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// if (CollectionUtils.isNotEmpty(videoList)) {
+// BigDecimal sum = videoList.stream().map(CheckIndexVideo::getArchivesRate).reduce(BigDecimal.ZERO, BigDecimal::add);
+// BigDecimal count = BigDecimal.valueOf(videoList.size());
+// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+// }
rList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
map.put("count", rList);
@@ -764,6 +1260,7 @@
return Result.ok().data(map).total(total);
}
+ private final ISysConfigService configService;
/**
* 瑙嗛锛氬綍鍍忓彲鐢ㄧ巼
*
@@ -771,7 +1268,19 @@
* @return
*/
@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("閰嶇疆鐨勫垹闄ゆ椂闂磋寖鍥存牸寮忎笉姝ｇ‘: {}", dictLabel, e);
+ recordingMinTime = 12.0; // 榛樿 12 灏忔椂锛堜互灏忔椂涓哄崟浣嶏級
+ }
+
List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
Query query = MongoUtil.getQuery(params, "createTime", likeFileds, null);
//涓嬫媺妗嗗綍鍍忔儏鍐垫煡璇㈡潯浠�
@@ -781,11 +1290,18 @@
long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
MongoUtil.setPage(query, params, "createTime");
List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
+ //鏌ヨ鍔ㄦ�佸垪鏁版嵁
+ //鏌ヨ鍔ㄦ�佸垪鏁版嵁鏇村叿id鏌ヨ
+// List<DynamicColumnVO> dynamicColumnNames = dynamicColumnMapper.getDynamicColumnByTableName("uy_record_meta_d_sum");
//缈昏瘧琛屾斂鍖哄煙
- resultList.forEach(item->{
+ resultList.forEach(item -> {
String areaCode = item.getArealayername().substring(0, 6);
AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromCode(areaCode);
- if(areaDeptEnum!=null) item.setArealayername(areaDeptEnum.getName());
+ if (areaDeptEnum != null) item.setArealayername(areaDeptEnum.getName());
+
+ List<DynamicColumnVO> list = dynamicColumnMapper.getDynamicColumnByTable(TableNameConstants.COLUMN_NAME_VIDEO,item.getId());
+ item.setDynamicColumnList(list);
+
});
// 缁熻鏁伴噺
MongoDatabase database = mongoTemplate.getDb();
@@ -812,18 +1328,44 @@
}
return uniqueDeviceIdCount + "";
}).collect(Collectors.toList());
- List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
- .select(CheckIndexVideo::getVideoAvailable)
- .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
- .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
- .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
- .list();
- BigDecimal onlineRate = BigDecimal.ZERO;
- if (CollectionUtils.isNotEmpty(videoList)) {
- BigDecimal sum = videoList.stream().map(CheckIndexVideo::getVideoAvailable).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal count = BigDecimal.valueOf(videoList.size());
- onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+
+ //璁＄畻褰曞儚鍙敤鐜�
+ 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)
+// .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
+// .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
+// .list();
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// if (CollectionUtils.isNotEmpty(videoList)) {
+// BigDecimal sum = videoList.stream().map(CheckIndexVideo::getVideoAvailable).reduce(BigDecimal.ZERO, BigDecimal::add);
+// BigDecimal count = BigDecimal.valueOf(videoList.size());
+// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+// }
//鍔犱竴涓�绘暟
int totalCount = 0;
for (String s : resultCount) {
@@ -831,6 +1373,12 @@
}
resultCount.add(0, totalCount + "");
+ BigDecimal onlineRate = BigDecimal.ZERO;
+// 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(uniqueDeviceIdCount), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
+ }
resultCount.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
@@ -857,10 +1405,10 @@
MongoUtil.setPage(query, params, "createTime");
List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
//缈昏瘧琛屾斂鍖哄煙
- resultList.forEach(item->{
+ resultList.forEach(item -> {
String areaCode = item.getArealayername().substring(0, 6);
AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromCode(areaCode);
- if(areaDeptEnum!=null) item.setArealayername(areaDeptEnum.getName());
+ if (areaDeptEnum != null) item.setArealayername(areaDeptEnum.getName());
});
// 缁熻鏁伴噺
MongoDatabase database = mongoTemplate.getDb();
@@ -889,24 +1437,28 @@
return uniqueDeviceIdCount + "";
}).collect(Collectors.toList());
- List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
- .select(CheckIndexVideo::getMinistryVideoAvailable)
- .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
- .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
- .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
- .list();
- BigDecimal onlineRate = BigDecimal.ZERO;
- if (CollectionUtils.isNotEmpty(videoList)) {
- BigDecimal sum = videoList.stream().map(CheckIndexVideo::getMinistryVideoAvailable).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal count = BigDecimal.valueOf(videoList.size());
- onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
- }
+// List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
+// .select(CheckIndexVideo::getMinistryVideoAvailable)
+// .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
+// .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
+// .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
+// .list();
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// if (CollectionUtils.isNotEmpty(videoList)) {
+// BigDecimal sum = videoList.stream().map(CheckIndexVideo::getMinistryVideoAvailable).reduce(BigDecimal.ZERO, BigDecimal::add);
+// BigDecimal count = BigDecimal.valueOf(videoList.size());
+// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+// }
//鍔犱竴涓�绘暟
int totalCount = 0;
for (String s : resultCount) {
totalCount += Integer.parseInt(s);
}
resultCount.add(0, totalCount + "");
+ BigDecimal onlineRate = BigDecimal.ZERO;
+ if (!StringUtils.isEmpty(resultCount.get(0)) && !"0".equals(resultCount.get(0))) {
+ onlineRate = new BigDecimal(resultCount.get(1)).divide(new BigDecimal(resultCount.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
+ }
resultCount.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
map.put("count", resultCount);
@@ -932,10 +1484,10 @@
MongoUtil.setPage(query, params, "createTime");
List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
//缈昏瘧琛屾斂鍖哄煙
- resultList.forEach(item->{
+ resultList.forEach(item -> {
String areaCode = item.getArealayername().substring(0, 6);
AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromCode(areaCode);
- if(areaDeptEnum!=null) item.setArealayername(areaDeptEnum.getName());
+ if (areaDeptEnum != null) item.setArealayername(areaDeptEnum.getName());
});
// 缁熻鏁伴噺
MongoDatabase database = mongoTemplate.getDb();
@@ -964,24 +1516,28 @@
return uniqueDeviceIdCount + "";
}).collect(Collectors.toList());
- List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
- .select(CheckIndexVideo::getKeyVideoAvailable)
- .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
- .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
- .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
- .list();
- BigDecimal onlineRate = BigDecimal.ZERO;
- if (CollectionUtils.isNotEmpty(videoList)) {
- BigDecimal sum = videoList.stream().map(CheckIndexVideo::getKeyVideoAvailable).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal count = BigDecimal.valueOf(videoList.size());
- onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
- }
+// List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
+// .select(CheckIndexVideo::getKeyVideoAvailable)
+// .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
+// .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
+// .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
+// .list();
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// if (CollectionUtils.isNotEmpty(videoList)) {
+// BigDecimal sum = videoList.stream().map(CheckIndexVideo::getKeyVideoAvailable).reduce(BigDecimal.ZERO, BigDecimal::add);
+// BigDecimal count = BigDecimal.valueOf(videoList.size());
+// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+// }
//鍔犱竴涓�绘暟
int totalCount = 0;
for (String s : resultCount) {
totalCount += Integer.parseInt(s);
}
resultCount.add(0, totalCount + "");
+ BigDecimal onlineRate = BigDecimal.ZERO;
+ if (!StringUtils.isEmpty(resultCount.get(0)) && !"0".equals(resultCount.get(0))) {
+ onlineRate = new BigDecimal(resultCount.get(1)).divide(new BigDecimal(resultCount.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
+ }
resultCount.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
map.put("count", resultCount);
@@ -1030,7 +1586,7 @@
query = Query.query(and);
//涓嬫媺妗嗘爣娉ㄦ纭煡璇㈡潯浠�
if (params.getOption() != null) {
- if(params.getOption()==1) {
+ if (params.getOption() == 1) {
andCriteria.add(Criteria.where("osdNameCorrect").is(1));
andCriteria.add(Criteria.where("osdTimeCorrect").is(1));
andCriteria.add(Criteria.where("osdProvinceCorrect").is(1));
@@ -1039,7 +1595,7 @@
Criteria and2 = new Criteria();
and2.andOperator(andCriteria);
query = Query.query(and2);
- }else if(params.getOption()==-1){
+ } else if (params.getOption() == -1) {
// 浣跨敤$or鏉′欢杩炴帴澶氫釜瀛楁妫�鏌ワ紝姣忎釜瀛楁妫�鏌ユ槸鍚︾瓑浜�-1
Criteria c1 = Criteria.where("osdNameCorrect").is(-1);
Criteria c2 = Criteria.where("osdTimeCorrect").is(-1);
@@ -1049,7 +1605,7 @@
Criteria orOperator = new Criteria().orOperator(c1, c2, c3, c4, c5);
orOperator.andOperator(andCriteria);
query = Query.query(orOperator);
- }else {
+ } else {
Criteria c1 = Criteria.where("osdNameCorrect").is(0);
Criteria c2 = Criteria.where("osdTimeCorrect").is(0);
Criteria c3 = Criteria.where("osdProvinceCorrect").is(0);
@@ -1086,7 +1642,7 @@
Document osdCorrectFilter = new Document("$and", dList1);
//寮傚父鏁�
List<Document> dList2 = new ArrayList<>(2);
- setTag(params,dList2);
+ setTag(params, dList2);
Document importantTagCondition = new Document("importantTag", Boolean.TRUE);
dList2.add(importantTagCondition);
List<Document> errorConditions = new ArrayList<>();
@@ -1100,7 +1656,7 @@
Document osdErrorFilter = new Document("$and", dList2);
//鏈煡鏁�
List<Document> dList3 = new ArrayList<>(2);
- setTag(params,dList3);
+ setTag(params, dList3);
dList3.add(importantTagCondition);
List<Document> unknownConditions = new ArrayList<>();
unknownConditions.add(new Document("osdNameCorrect", new Document("$eq", 0)));
@@ -1113,7 +1669,7 @@
dList3.add(unknownFilter);
Document osdUnknownFilter = new Document("$and", dList3);
- List<Document> lists = Arrays.asList(osdFilter, osdCorrectFilter, osdErrorFilter,osdUnknownFilter);
+ List<Document> lists = Arrays.asList(osdFilter, osdCorrectFilter, osdErrorFilter, osdUnknownFilter);
List<String> rList = lists.stream().map(filter -> {
// 鏋勫缓鑱氬悎绠￠亾
List<Document> pipeline = Arrays.asList(
@@ -1132,17 +1688,21 @@
return uniqueDeviceIdCount + "";
}).collect(Collectors.toList());
- List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
- .select(CheckIndexVideo::getKeyAnnotationAccuracy)
- .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
- .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
- .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
- .list();
+// List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
+// .select(CheckIndexVideo::getKeyAnnotationAccuracy)
+// .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
+// .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
+// .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
+// .list();
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// if (CollectionUtils.isNotEmpty(videoList)) {
+// BigDecimal sum = videoList.stream().map(CheckIndexVideo::getKeyAnnotationAccuracy).reduce(BigDecimal.ZERO, BigDecimal::add);
+// BigDecimal count = BigDecimal.valueOf(videoList.size());
+// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+// }
BigDecimal onlineRate = BigDecimal.ZERO;
- if (CollectionUtils.isNotEmpty(videoList)) {
- BigDecimal sum = videoList.stream().map(CheckIndexVideo::getKeyAnnotationAccuracy).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal count = BigDecimal.valueOf(videoList.size());
- onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+ if (!StringUtils.isEmpty(rList.get(0)) && !"0".equals(rList.get(0))) {
+ onlineRate = new BigDecimal(rList.get(1)).divide(new BigDecimal(rList.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
}
rList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
@@ -1161,7 +1721,7 @@
query = Query.query(and);
//涓嬫媺妗嗘爣娉ㄦ纭煡璇㈡潯浠�
if (params.getOption() != null) {
- if(params.getOption()==1) {
+ if (params.getOption() == 1) {
andCriteria.add(Criteria.where("osdNameCorrect").is(1));
andCriteria.add(Criteria.where("osdTimeCorrect").is(1));
andCriteria.add(Criteria.where("osdProvinceCorrect").is(1));
@@ -1170,7 +1730,7 @@
Criteria and2 = new Criteria();
and2.andOperator(andCriteria);
query = Query.query(and2);
- }else if(params.getOption()==-1){
+ } else if (params.getOption() == -1) {
// 浣跨敤$or鏉′欢杩炴帴澶氫釜瀛楁妫�鏌ワ紝姣忎釜瀛楁妫�鏌ユ槸鍚︾瓑浜�-1
Criteria c1 = Criteria.where("osdNameCorrect").is(-1);
Criteria c2 = Criteria.where("osdTimeCorrect").is(-1);
@@ -1180,7 +1740,7 @@
Criteria orOperator = new Criteria().orOperator(c1, c2, c3, c4, c5);
orOperator.andOperator(andCriteria);
query = Query.query(orOperator);
- }else {
+ } else {
Criteria c1 = Criteria.where("osdNameCorrect").is(0);
Criteria c2 = Criteria.where("osdTimeCorrect").is(0);
Criteria c3 = Criteria.where("osdProvinceCorrect").is(0);
@@ -1194,6 +1754,16 @@
List<OsdCheckResult> resultList = mongoTemplate.find(query, OsdCheckResult.class);
for (OsdCheckResult osdCheckResult : resultList) {
OsdCheckResult.getError(osdCheckResult);
+ StringBuilder tag = new StringBuilder("" +
+ (osdCheckResult.getProvinceTag() ? "鐪佸巺銆�" : "") +
+ (osdCheckResult.getImportantTag() ? "閲嶇偣鐐逛綅銆�" : "") +
+ (osdCheckResult.getImportantCommandImageTag() ? "閲嶇偣鎸囨尌鍥惧儚銆�" : "") +
+ (osdCheckResult.getDeptTag() ? "閮ㄧ骇銆�" : ""));
+ // 鍒犻櫎瀛楃涓叉湯灏剧殑"銆�"
+ if (tag.toString().endsWith("銆�")) {
+ tag = new StringBuilder(tag.substring(0, tag.length() - 1));
+ }
+ osdCheckResult.setTagStr(tag.toString());
}
ExcelUtil<OsdCheckResult> util = new ExcelUtil<>(OsdCheckResult.class);
String sheetName = "OSD鏍囨敞";
@@ -1202,7 +1772,7 @@
}
/**
- * 瑙嗛锛氭牎鏃舵纭巼
+ * 瑙嗛锛氭牎鏃舵纭巼(鍋滅敤)
*
* @param params
* @return
@@ -1239,11 +1809,11 @@
Query query = MongoUtil.getQuery(params, "checkTime", likeFileds, null);
//涓嬫媺妗嗘爣娉ㄦ纭煡璇㈡潯浠�
if (params.getOption() != null) {
- if(params.getOption()==1) {
- query.addCriteria(Criteria.where("osdTimeCorrect").is(1));
- }else if(params.getOption()==-1){
+ if (params.getOption() == 1) {
+ query.addCriteria(Criteria.where("osdTimeCorrect").is(1));
+ } else if (params.getOption() == -1) {
query.addCriteria(Criteria.where("osdTimeCorrect").is(-1));
- }else {
+ } else {
query.addCriteria(Criteria.where("osdTimeCorrect").is(0));
}
}
@@ -1275,7 +1845,7 @@
Document osdCorrectFilter = new Document("$and", dList1);
//寮傚父鏁�
List<Document> dList2 = new ArrayList<>(2);
- setTag(params,dList2);
+ setTag(params, dList2);
Document importantTagCondition = new Document("importantTag", Boolean.TRUE);
dList2.add(importantTagCondition);
List<Document> errorConditions = new ArrayList<>();
@@ -1289,7 +1859,7 @@
Document osdErrorFilter = new Document("$and", dList2);
//鏈煡鏁�
List<Document> dList3 = new ArrayList<>(2);
- setTag(params,dList3);
+ setTag(params, dList3);
dList3.add(importantTagCondition);
List<Document> unknownConditions = new ArrayList<>();
unknownConditions.add(new Document("osdNameCorrect", new Document("$eq", 0)));
@@ -1302,7 +1872,7 @@
dList3.add(unknownFilter);
Document osdUnknownFilter = new Document("$and", dList3);
- List<Document> lists = Arrays.asList(osdFilter, osdCorrectFilter, osdErrorFilter,osdUnknownFilter);
+ List<Document> lists = Arrays.asList(osdFilter, osdCorrectFilter, osdErrorFilter, osdUnknownFilter);
List<String> rList = lists.stream().map(filter -> {
// 鏋勫缓鑱氬悎绠￠亾
List<Document> pipeline = Arrays.asList(
@@ -1321,17 +1891,21 @@
return uniqueDeviceIdCount + "";
}).collect(Collectors.toList());
- List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
- .select(CheckIndexVideo::getKeyTimingAccuracy)
- .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
- .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
- .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
- .list();
+// List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
+// .select(CheckIndexVideo::getKeyTimingAccuracy)
+// .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
+// .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
+// .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
+// .list();
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// if (CollectionUtils.isNotEmpty(videoList)) {
+// BigDecimal sum = videoList.stream().map(CheckIndexVideo::getKeyTimingAccuracy).reduce(BigDecimal.ZERO, BigDecimal::add);
+// BigDecimal count = BigDecimal.valueOf(videoList.size());
+// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+// }
BigDecimal onlineRate = BigDecimal.ZERO;
- if (CollectionUtils.isNotEmpty(videoList)) {
- BigDecimal sum = videoList.stream().map(CheckIndexVideo::getKeyTimingAccuracy).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal count = BigDecimal.valueOf(videoList.size());
- onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+ if (!StringUtils.isEmpty(rList.get(0)) && !"0".equals(rList.get(0))) {
+ onlineRate = new BigDecimal(rList.get(1)).divide(new BigDecimal(rList.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
}
rList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
@@ -1353,21 +1927,21 @@
Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
//鍔燚ataType涓鸿溅杈�
query.addCriteria(Criteria.where("dataType").is(ApiConstants.HK_DataType_CAR));
- if(params.getOption()!=null){
- if(ApiConstants.HK_SnapCount_ResultType_Normal.equals(params.getOption())) {
+ if (params.getOption() != null) {
+ if (ApiConstants.HK_SnapCount_ResultType_Normal.equals(params.getOption())) {
query.addCriteria(Criteria.where("resultType").is(ApiConstants.HK_SnapCount_ResultType_Normal));
- }else if(ApiConstants.HK_SnapCount_ResultType_Null.equals(params.getOption())){
+ } else if (ApiConstants.HK_SnapCount_ResultType_Null.equals(params.getOption())) {
query.addCriteria(Criteria.where("resultType").is(ApiConstants.HK_SnapCount_ResultType_Null));
- }else if(ApiConstants.HK_SnapCount_ResultType_Descent.equals(params.getOption())){
+ } else if (ApiConstants.HK_SnapCount_ResultType_Descent.equals(params.getOption())) {
query.addCriteria(Criteria.where("resultType").is(ApiConstants.HK_SnapCount_ResultType_Descent));
- }else if(ApiConstants.HK_SnapCount_ResultType_Low.equals(params.getOption())){
+ } else if (ApiConstants.HK_SnapCount_ResultType_Low.equals(params.getOption())) {
query.addCriteria(Criteria.where("resultType").is(ApiConstants.HK_SnapCount_ResultType_Low));
}
}
long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
List<SnapshotDataMonitorResult> resultList = mongoTemplate.find(query, SnapshotDataMonitorResult.class);
- resultList.forEach(item ->item.setResultTypeText(item.getResultTypeText()));
+ resultList.forEach(item -> item.setResultTypeText(item.getResultTypeText()));
// 缁熻鏁伴噺
MongoDatabase database = mongoTemplate.getDb();
MongoCollection<Document> collection = database.getCollection("hk_snapshot_data_monitor");
@@ -1380,10 +1954,19 @@
dList3.add(new Document("resultType", new Document("$eq", 2)));
dList3.add(new Document("dataType", new Document("$eq", ApiConstants.HK_DataType_CAR)));
setTag(params, dList3);
-
- Document noDataFilter = new Document("$and", dList2);
- Document trFilter = new Document("$and", dList3);
- List<Document> lists = Arrays.asList(noDataFilter, trFilter);
+ List<Document> dList4 = new ArrayList<>(2);
+ dList4.add(new Document("resultType", new Document("$eq", 3)));
+ dList4.add(new Document("dataType", new Document("$eq", ApiConstants.HK_DataType_CAR)));
+ setTag(params, dList4);
+ List<Document> dList5 = new ArrayList<>(2);
+ dList5.add(new Document("resultType", new Document("$eq", 4)));
+ dList5.add(new Document("dataType", new Document("$eq", ApiConstants.HK_DataType_CAR)));
+ setTag(params, dList5);
+ Document normalFilter = new Document("$and", dList2);
+ Document noDataFilter = new Document("$and", dList3);
+ Document downFilter = new Document("$and", dList4);
+ Document lessFilter = new Document("$and", dList5);
+ List<Document> lists = Arrays.asList(normalFilter, noDataFilter,downFilter,lessFilter);
List<String> rList = lists.stream().map(filter -> {
// 鏋勫缓鑱氬悎绠￠亾
List<Document> pipeline = Arrays.asList(
@@ -1416,18 +1999,27 @@
for (Document doc : result) {
dataCount = doc.getInteger("dataCount");
}
- rList.add(0,dataCount+"");
- List<CheckIndexCar> carList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
- .select(CheckIndexCar::getViewConnectStability)
- .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
- .eq(params.getDataType().equals(2), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Dept)
- .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
- .list();
+ rList.add(0, dataCount + "");
+// List<CheckIndexCar> carList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
+// .select(CheckIndexCar::getViewConnectStability)
+// .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
+// .eq(params.getDataType().equals(2), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Dept)
+// .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
+// .list();
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// if (CollectionUtils.isNotEmpty(carList)) {
+// BigDecimal sum = carList.stream().map(CheckIndexCar::getViewConnectStability).reduce(BigDecimal.ZERO, BigDecimal::add);
+// BigDecimal count = BigDecimal.valueOf(carList.size());
+// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+// }
+ BigDecimal normal = new BigDecimal(rList.get(1));
+ BigDecimal noData = new BigDecimal(rList.get(2));
+ BigDecimal down = new BigDecimal(rList.get(3));
+ BigDecimal less = new BigDecimal(rList.get(4));
+ BigDecimal totalCount = normal.add(noData).add(down).add(less);
BigDecimal onlineRate = BigDecimal.ZERO;
- if (CollectionUtils.isNotEmpty(carList)) {
- BigDecimal sum = carList.stream().map(CheckIndexCar::getViewConnectStability).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal count = BigDecimal.valueOf(carList.size());
- onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+ if (totalCount.compareTo(BigDecimal.ZERO)>0) {
+ onlineRate = normal.divide(totalCount, 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
}
rList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
@@ -1481,13 +2073,16 @@
item.setOnlineStr("鏈煡");
}
List<String> offLineTime = item.getOffLineTimeStr();
- if(!CollectionUtils.isEmpty(offLineTime)) {
+ if (!CollectionUtils.isEmpty(offLineTime)) {
//鍚庣画鍙互鏀规垚閰嶇疆鐨勭绾挎鏁�(鎻愬彇鍓峮娆★紝n涓洪厤缃殑绂荤嚎娆℃暟)
if (offLineTime.size() > 1) {
offLineTime = offLineTime.subList(0, 2);
}
item.setOffLineTimeStr(offLineTime);
}
+ //娣诲姞鍔ㄦ�佹暟鎹�
+ List<DynamicColumnVO> list = dynamicColumnMapper.getDynamicColumnByTable(TableNameConstants.COLUMN_NAME_CAR_POINT,item.getNo());
+ item.setDynamicColumnList(list);
});
// 缁熻璁惧鏁伴噺
@@ -1526,17 +2121,21 @@
totalCount = offlineCount + unknownCount + onlineCount;
}
- List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
- .select(CheckIndexCar::getSiteOnline)
- .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
- .eq(params.getDataType().equals(2), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Dept)
- .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
- .list();
+// List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
+// .select(CheckIndexCar::getSiteOnline)
+// .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
+// .eq(params.getDataType().equals(2), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Dept)
+// .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
+// .list();
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// if (CollectionUtils.isNotEmpty(videoList)) {
+// BigDecimal sum = videoList.stream().map(CheckIndexCar::getSiteOnline).reduce(BigDecimal.ZERO, BigDecimal::add);
+// BigDecimal count = BigDecimal.valueOf(videoList.size());
+// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+// }
BigDecimal onlineRate = BigDecimal.ZERO;
- if (CollectionUtils.isNotEmpty(videoList)) {
- BigDecimal sum = videoList.stream().map(CheckIndexCar::getSiteOnline).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal count = BigDecimal.valueOf(videoList.size());
- onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+ if (totalCount!=0) {
+ onlineRate = new BigDecimal(onlineCount).divide(new BigDecimal(totalCount), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
}
HashMap<String, Object> map = new HashMap<>();
map.put("count", Arrays.asList(totalCount + "", onlineCount + "", offlineCount + "", unknownCount + "", this.remove0(onlineRate)));
@@ -1559,10 +2158,10 @@
andCriteria.add(Criteria.where("sxjgnlx.value").regex(pattern));
Query query = new Query();
Criteria and = new Criteria();
- if(params.getOption()!=null){
- if(params.getOption() ==1){
+ if (params.getOption() != null) {
+ if (params.getOption() == 1) {
andCriteria.add(Criteria.where("newDevice").is(Boolean.TRUE));
- }else if(params.getOption() ==-1){
+ } else if (params.getOption() == -1) {
andCriteria.add(Criteria.where("newDevice").is(Boolean.FALSE));
}
}
@@ -1583,13 +2182,13 @@
List<Document> dList1 = new ArrayList<>(2);
setTag(params, dList1);
dList1.add(new Document("sxjgnlx.value", new Document("$regex", ".*2.*")));
- Document totalFilter = new Document("$and",dList1);
+ Document totalFilter = new Document("$and", dList1);
//鏂拌澶囨暟
List<Document> dList2 = new ArrayList<>(2);
setTag(params, dList2);
dList2.add(new Document("sxjgnlx.value", new Document("$regex", ".*2.*")));
- dList2.add(new Document("newDevice",Boolean.TRUE));
- Document newFilter = new Document("$and",dList2);
+ dList2.add(new Document("newDevice", Boolean.TRUE));
+ Document newFilter = new Document("$and", dList2);
List<Document> lists = Arrays.asList(totalFilter, newFilter);
List<String> rList = lists.stream().map(filter -> {
@@ -1610,17 +2209,21 @@
return uniqueDeviceIdCount + "";
}).collect(Collectors.toList());
- List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
- .select(CheckIndexCar::getDeviceDirectoryConsistent)
- .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
- .eq(params.getDataType().equals(2), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Dept)
- .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
- .list();
+// List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
+// .select(CheckIndexCar::getDeviceDirectoryConsistent)
+// .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
+// .eq(params.getDataType().equals(2), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Dept)
+// .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
+// .list();
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// if (CollectionUtils.isNotEmpty(videoList)) {
+// BigDecimal sum = videoList.stream().map(CheckIndexCar::getDeviceDirectoryConsistent).reduce(BigDecimal.ZERO, BigDecimal::add);
+// BigDecimal count = BigDecimal.valueOf(videoList.size());
+// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+// }
BigDecimal onlineRate = BigDecimal.ZERO;
- if (CollectionUtils.isNotEmpty(videoList)) {
- BigDecimal sum = videoList.stream().map(CheckIndexCar::getDeviceDirectoryConsistent).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal count = BigDecimal.valueOf(videoList.size());
- onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+ if (!StringUtils.isEmpty(rList.get(0)) && !"0".equals(rList.get(0))) {
+ onlineRate = new BigDecimal(rList.get(0)).subtract(new BigDecimal(rList.get(1))).divide(new BigDecimal(rList.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
}
rList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
@@ -1643,11 +2246,11 @@
Criteria and = new Criteria();
and.andOperator(andCriteria);
query = Query.query(and);
- if(params.getOption()!=null){
- if(params.getOption() ==1){
+ if (params.getOption() != null) {
+ if (params.getOption() == 1) {
query.addCriteria(Criteria.where("lalType").is(ApiConstants.HK_Info_LayType_Normal));
query.addCriteria(Criteria.where("gbCodeType").is(ApiConstants.HK_Info_GbCodeType_Normal));
- }else if(params.getOption() ==-1){
+ } else if (params.getOption() == -1) {
Criteria lalType = Criteria.where("lalType").ne(ApiConstants.HK_Info_LayType_Normal);
Criteria gbCodeType = Criteria.where("gbCodeType").ne(ApiConstants.HK_Info_GbCodeType_Normal);
Criteria orOperator = new Criteria().orOperator(lalType, gbCodeType);
@@ -1673,9 +2276,9 @@
List<Document> dList3 = new ArrayList<>(2);
setTag(params, dList3);
List<Document> errorConditions = new ArrayList<>();
- errorConditions.add(new Document("lalType",new Document("$ne",1)));
- errorConditions.add(new Document("gbCodeType",new Document("$ne",1)));
- Document errorDoc = new Document("$or",errorConditions);
+ errorConditions.add(new Document("lalType", new Document("$ne", 1)));
+ errorConditions.add(new Document("gbCodeType", new Document("$ne", 1)));
+ Document errorDoc = new Document("$or", errorConditions);
dList3.add(errorDoc);
Document totalFilter = new Document("$and", dList1);
Document correctFilter = new Document("$and", dList2);
@@ -1700,17 +2303,21 @@
return uniqueDeviceIdCount + "";
}).collect(Collectors.toList());
- List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
- .select(CheckIndexCar::getVehicleInformationCollectionAccuracy)
- .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
- .eq(params.getDataType().equals(2), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Dept)
- .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
- .list();
+// List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
+// .select(CheckIndexCar::getVehicleInformationCollectionAccuracy)
+// .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
+// .eq(params.getDataType().equals(2), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Dept)
+// .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
+// .list();
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// if (CollectionUtils.isNotEmpty(videoList)) {
+// BigDecimal sum = videoList.stream().map(CheckIndexCar::getVehicleInformationCollectionAccuracy).reduce(BigDecimal.ZERO, BigDecimal::add);
+// BigDecimal count = BigDecimal.valueOf(videoList.size());
+// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+// }
BigDecimal onlineRate = BigDecimal.ZERO;
- if (CollectionUtils.isNotEmpty(videoList)) {
- BigDecimal sum = videoList.stream().map(CheckIndexCar::getVehicleInformationCollectionAccuracy).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal count = BigDecimal.valueOf(videoList.size());
- onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+ if (!StringUtils.isEmpty(rList.get(0)) && !"0".equals(rList.get(0))) {
+ onlineRate = new BigDecimal(rList.get(1)).divide(new BigDecimal(rList.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
}
rList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
@@ -1729,11 +2336,11 @@
public Result vehicleCollectionDataIntegrity(DataCenterQuery params) {
List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
- if(params.getOption()!=null){
+ if (params.getOption() != null) {
//涓昏灞炴�т笉瀹屾暣
- if(params.getOption()==1){
- query.addCriteria(Criteria.where("noIntegrityCount").gt(0));
- }else if(params.getOption()==-1){
+ if (params.getOption() == 1) {
+ query.addCriteria(Criteria.where("noIntegrityCount").gt(0));
+ } else if (params.getOption() == -1) {
//灞炴�т笉瀹屾暣
query.addCriteria(Criteria.where("mainNoIntegrityCount").gt(0));
}
@@ -1768,22 +2375,26 @@
mainNoIntegrityCount = doc.getInteger("mainNoIntegrityCount");
}
- List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
- .select(CheckIndexCar::getVehicleCaptureIntegrity)
- .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
- .eq(params.getDataType().equals(2), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Dept)
- .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
- .list();
- BigDecimal onlineRate = BigDecimal.ZERO;
- if (CollectionUtils.isNotEmpty(videoList)) {
- BigDecimal sum = videoList.stream().map(CheckIndexCar::getVehicleCaptureIntegrity).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal count = BigDecimal.valueOf(videoList.size());
- onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
- }
+// List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
+// .select(CheckIndexCar::getVehicleCaptureIntegrity)
+// .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
+// .eq(params.getDataType().equals(2), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Dept)
+// .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
+// .list();
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// if (CollectionUtils.isNotEmpty(videoList)) {
+// BigDecimal sum = videoList.stream().map(CheckIndexCar::getVehicleCaptureIntegrity).reduce(BigDecimal.ZERO, BigDecimal::add);
+// BigDecimal count = BigDecimal.valueOf(videoList.size());
+// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+// }
List<String> countList = new ArrayList<>();
- countList.add(dataCount+"");
- countList.add(noIntegrityCount+"");
- countList.add(mainNoIntegrityCount+"");
+ countList.add(dataCount + "");
+ countList.add(noIntegrityCount + "");
+ countList.add(mainNoIntegrityCount + "");
+ BigDecimal onlineRate = BigDecimal.ZERO;
+ if (dataCount!=0) {
+ onlineRate = new BigDecimal(dataCount-noIntegrityCount).divide(new BigDecimal(dataCount), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
+ }
countList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
map.put("count", countList);
@@ -1801,11 +2412,11 @@
public Result vehicleCollectionDataCaptured(DataCenterQuery params) {
List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
- if(params.getOption()!=null){
+ if (params.getOption() != null) {
//涓昏灞炴�т笉涓�鑷�
- if(params.getOption()==1){
+ if (params.getOption() == 1) {
query.addCriteria(Criteria.where("majorDiffCount").gt(0));
- }else if(params.getOption()==-1){
+ } else if (params.getOption() == -1) {
//閲嶈灞炴�т笉涓�鑷�
query.addCriteria(Criteria.where("importantDiffCount").gt(0));
}
@@ -1839,23 +2450,27 @@
importantDiffCount = doc.getInteger("importantDiffCount");
}
- List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
- .select(CheckIndexCar::getVehicleCaptureAccuracy)
- .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
- .eq(params.getDataType().equals(2), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Dept)
- .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
- .list();
- BigDecimal onlineRate = BigDecimal.ZERO;
- if (CollectionUtils.isNotEmpty(videoList)) {
- BigDecimal sum = videoList.stream().map(CheckIndexCar::getVehicleCaptureAccuracy).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal count = BigDecimal.valueOf(videoList.size());
- onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
- }
+// List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
+// .select(CheckIndexCar::getVehicleCaptureAccuracy)
+// .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
+// .eq(params.getDataType().equals(2), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Dept)
+// .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
+// .list();
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// if (CollectionUtils.isNotEmpty(videoList)) {
+// BigDecimal sum = videoList.stream().map(CheckIndexCar::getVehicleCaptureAccuracy).reduce(BigDecimal.ZERO, BigDecimal::add);
+// BigDecimal count = BigDecimal.valueOf(videoList.size());
+// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+// }
List<String> countList = new ArrayList<>();
- countList.add(sampleCount+"");
- countList.add(majorDiffCount+"");
- countList.add(importantDiffCount+"");
+ countList.add(sampleCount + "");
+ countList.add(majorDiffCount + "");
+ countList.add(importantDiffCount + "");
+ BigDecimal onlineRate = BigDecimal.ZERO;
+ if (sampleCount!=0) {
+ onlineRate = new BigDecimal(sampleCount-majorDiffCount).divide(new BigDecimal(sampleCount), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
+ }
countList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
map.put("count", countList);
@@ -1873,11 +2488,11 @@
public Result vehicleClockAccuracy(DataCenterQuery params) {
List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
- if(params.getOption()!=null){
+ if (params.getOption() != null) {
//褰撴棩鏃堕挓寮傚父
- if(params.getOption()==1){
+ if (params.getOption() == 1) {
query.addCriteria(Criteria.where("majorDiffCount").gt(0));
- }else if(params.getOption()==-1){
+ } else if (params.getOption() == -1) {
//鍏ㄩ儴鏃堕挓寮傚父
query.addCriteria(Criteria.where("importantDiffCount").gt(0));
}
@@ -1886,7 +2501,7 @@
MongoUtil.setPage(query, params, TIME_FIELD);
List<VehicleDeviceInspectionResult> resultList = mongoTemplate.find(query, VehicleDeviceInspectionResult.class);
List<SnapClockVO> resultVos = new ArrayList<>();
- resultList.forEach(item->{
+ resultList.forEach(item -> {
SnapClockVO vo = VehicleDeviceInspectionResult.getVO(item);
resultVos.add(vo);
});
@@ -1912,7 +2527,7 @@
Document allFilter = new Document("$and", dList3);
Document allErrFilter = new Document("$and", dList4);
- List<Document> lists = Arrays.asList(todayFilter, todayErrFilter, allFilter,allErrFilter);
+ List<Document> lists = Arrays.asList(todayFilter, todayErrFilter, allFilter, allErrFilter);
List<String> rList = lists.stream().map(filter -> {
// 鏋勫缓鑱氬悎绠￠亾
List<Document> pipeline = Arrays.asList(
@@ -1931,17 +2546,24 @@
return uniqueDeviceIdCount + "";
}).collect(Collectors.toList());
- List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
- .select(CheckIndexCar::getVehicleTimingAccuracy)
- .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
- .eq(params.getDataType().equals(2), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Dept)
- .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
- .list();
+// List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
+// .select(CheckIndexCar::getVehicleTimingAccuracy)
+// .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
+// .eq(params.getDataType().equals(2), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Dept)
+// .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
+// .list();
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// if (CollectionUtils.isNotEmpty(videoList)) {
+// BigDecimal sum = videoList.stream().map(CheckIndexCar::getVehicleTimingAccuracy).reduce(BigDecimal.ZERO, BigDecimal::add);
+// BigDecimal count = BigDecimal.valueOf(videoList.size());
+// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+// }
BigDecimal onlineRate = BigDecimal.ZERO;
- if (CollectionUtils.isNotEmpty(videoList)) {
- BigDecimal sum = videoList.stream().map(CheckIndexCar::getVehicleTimingAccuracy).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal count = BigDecimal.valueOf(videoList.size());
- onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+ BigDecimal normal = new BigDecimal(rList.get(0));
+ BigDecimal abnormal = new BigDecimal(rList.get(1));
+ BigDecimal totalCount = normal.add(abnormal);
+ if (totalCount.compareTo(BigDecimal.ZERO)>0) {
+ onlineRate = normal.divide(totalCount, 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
}
rList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
@@ -1961,11 +2583,11 @@
List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
query.addCriteria(Criteria.where("dataType").is(ApiConstants.HK_DataType_CAR));
- if(params.getOption()!=null){
+ if (params.getOption() != null) {
//姝ｅ父
- if(params.getOption()==1){
+ if (params.getOption() == 1) {
query.addCriteria(Criteria.where("delayCount").is(0));
- }else if(params.getOption()==-1){
+ } else if (params.getOption() == -1) {
//寤惰繜
query.addCriteria(Criteria.where("delayCount").gt(0));
}
@@ -1979,15 +2601,15 @@
List<Document> dList1 = new ArrayList<>(2);
setTag(params, dList1);
- dList1.add(new Document("dataType" ,new Document("$eq",ApiConstants.HK_DataType_CAR)));
+ dList1.add(new Document("dataType", new Document("$eq", ApiConstants.HK_DataType_CAR)));
Document allFilter = new Document("$and", dList1);
List<Document> dList2 = new ArrayList<>(2);
- dList2.add(new Document("dataType" ,new Document("$eq",ApiConstants.HK_DataType_CAR)));
+ dList2.add(new Document("dataType", new Document("$eq", ApiConstants.HK_DataType_CAR)));
dList2.add(new Document("delayCount", new Document("$gt", 0)));
setTag(params, dList2);
Document delayFilter = new Document("$and", dList2);
- List<Document> lists = Arrays.asList(allFilter,delayFilter);
+ List<Document> lists = Arrays.asList(allFilter, delayFilter);
List<String> rList = lists.stream().map(filter -> {
// 鏋勫缓鑱氬悎绠￠亾
List<Document> pipeline = Arrays.asList(
@@ -2007,17 +2629,21 @@
}).collect(Collectors.toList());
- List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
- .select(CheckIndexCar::getVehicleUploadTimeliness)
- .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
- .eq(params.getDataType().equals(2), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Dept)
- .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
- .list();
+// List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
+// .select(CheckIndexCar::getVehicleUploadTimeliness)
+// .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
+// .eq(params.getDataType().equals(2), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Dept)
+// .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
+// .list();
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// if (CollectionUtils.isNotEmpty(videoList)) {
+// BigDecimal sum = videoList.stream().map(CheckIndexCar::getVehicleUploadTimeliness).reduce(BigDecimal.ZERO, BigDecimal::add);
+// BigDecimal count = BigDecimal.valueOf(videoList.size());
+// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+// }
BigDecimal onlineRate = BigDecimal.ZERO;
- if (CollectionUtils.isNotEmpty(videoList)) {
- BigDecimal sum = videoList.stream().map(CheckIndexCar::getVehicleUploadTimeliness).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal count = BigDecimal.valueOf(videoList.size());
- onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+ if (!StringUtils.isEmpty(rList.get(0)) && !"0".equals(rList.get(0))) {
+ onlineRate = new BigDecimal(rList.get(0)).subtract(new BigDecimal(rList.get(1))).divide(new BigDecimal(rList.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
}
rList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
@@ -2036,10 +2662,10 @@
public Result vehicleUrlAccuracy(DataCenterQuery params) {
List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
- if(params.getOption()!=null){
- if(params.getOption()==1){
+ if (params.getOption() != null) {
+ if (params.getOption() == 1) {
query.addCriteria(Criteria.where("expCount").is(0));
- }else if(params.getOption()==-1){
+ } else if (params.getOption() == -1) {
query.addCriteria(Criteria.where("expCount").gt(0));
}
}
@@ -2082,8 +2708,8 @@
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
List<String> rList = new ArrayList<>();
- rList.add(sampleCount+"");
- rList.add(expCount+"");
+ rList.add(sampleCount + "");
+ rList.add(expCount + "");
rList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
@@ -2102,10 +2728,10 @@
public Result vehicleBigImgAccuracy(DataCenterQuery params) {
List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
- if(params.getOption()!=null){
- if(params.getOption()==1){
+ if (params.getOption() != null) {
+ if (params.getOption() == 1) {
query.addCriteria(Criteria.where("bigUseful.bigPicExpCount").is(0));
- }else if(params.getOption()==-1){
+ } else if (params.getOption() == -1) {
query.addCriteria(Criteria.where("bigUseful.bigPicExpCount").gt(0));
}
}
@@ -2114,7 +2740,7 @@
query.with(Sort.by(Sort.Order.desc("bigUseful.bigPicExpCount")));
List<VehicleDeviceSamplingResult> resultList = mongoTemplate.find(query, VehicleDeviceSamplingResult.class);
List<BigPicUsefulVO> voList = new ArrayList<>();
- resultList.forEach(item->{
+ resultList.forEach(item -> {
BigPicUsefulVO picVO = VehicleDeviceSamplingResult.getPicVO(item);
voList.add(picVO);
});
@@ -2139,20 +2765,24 @@
expCount = doc.getInteger("expCount");
}
List<String> countList = new ArrayList<>();
- List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
- .select(CheckIndexCar::getVehiclePictureAvailability)
- .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
- .eq(params.getDataType().equals(2), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Dept)
- .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
- .list();
+// List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
+// .select(CheckIndexCar::getVehiclePictureAvailability)
+// .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
+// .eq(params.getDataType().equals(2), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Dept)
+// .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
+// .list();
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// if (CollectionUtils.isNotEmpty(videoList)) {
+// BigDecimal sum = videoList.stream().map(CheckIndexCar::getVehiclePictureAvailability).reduce(BigDecimal.ZERO, BigDecimal::add);
+// BigDecimal count = BigDecimal.valueOf(videoList.size());
+// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+// }
+ countList.add(sampleCount + "");
+ countList.add(expCount + "");
BigDecimal onlineRate = BigDecimal.ZERO;
- if (CollectionUtils.isNotEmpty(videoList)) {
- BigDecimal sum = videoList.stream().map(CheckIndexCar::getVehiclePictureAvailability).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal count = BigDecimal.valueOf(videoList.size());
- onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+ if (sampleCount!=0) {
+ onlineRate = new BigDecimal(sampleCount-expCount).divide(new BigDecimal(sampleCount), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
}
- countList.add(sampleCount+"");
- countList.add(expCount+"");
countList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
map.put("count", countList);
@@ -2172,21 +2802,21 @@
Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
//鍔燚ataType涓鸿溅杈�
query.addCriteria(Criteria.where("dataType").is(ApiConstants.HK_DataType_FACE));
- if(params.getOption()!=null){
- if(ApiConstants.HK_SnapCount_ResultType_Normal.equals(params.getOption())) {
+ if (params.getOption() != null) {
+ if (ApiConstants.HK_SnapCount_ResultType_Normal.equals(params.getOption())) {
query.addCriteria(Criteria.where("resultType").is(ApiConstants.HK_SnapCount_ResultType_Normal));
- }else if(ApiConstants.HK_SnapCount_ResultType_Null.equals(params.getOption())){
+ } else if (ApiConstants.HK_SnapCount_ResultType_Null.equals(params.getOption())) {
query.addCriteria(Criteria.where("resultType").is(ApiConstants.HK_SnapCount_ResultType_Null));
- }else if(ApiConstants.HK_SnapCount_ResultType_Descent.equals(params.getOption())){
+ } else if (ApiConstants.HK_SnapCount_ResultType_Descent.equals(params.getOption())) {
query.addCriteria(Criteria.where("resultType").is(ApiConstants.HK_SnapCount_ResultType_Descent));
- }else if(ApiConstants.HK_SnapCount_ResultType_Low.equals(params.getOption())){
+ } else if (ApiConstants.HK_SnapCount_ResultType_Low.equals(params.getOption())) {
query.addCriteria(Criteria.where("resultType").is(ApiConstants.HK_SnapCount_ResultType_Low));
}
}
long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
List<SnapshotDataMonitorResult> resultList = mongoTemplate.find(query, SnapshotDataMonitorResult.class);
- resultList.forEach(item ->item.setResultTypeText(item.getResultTypeText()));
+ resultList.forEach(item -> item.setResultTypeText(item.getResultTypeText()));
// 缁熻鏁伴噺
MongoDatabase database = mongoTemplate.getDb();
MongoCollection<Document> collection = database.getCollection("hk_snapshot_data_monitor");
@@ -2200,9 +2830,19 @@
dList3.add(new Document("dataType", new Document("$eq", ApiConstants.HK_DataType_CAR)));
setTag(params, dList3);
- Document noDataFilter = new Document("$and", dList2);
- Document trFilter = new Document("$and", dList3);
- List<Document> lists = Arrays.asList(noDataFilter, trFilter);
+ List<Document> dList4 = new ArrayList<>(2);
+ dList4.add(new Document("resultType", new Document("$eq", 3)));
+ dList4.add(new Document("dataType", new Document("$eq", ApiConstants.HK_DataType_CAR)));
+ setTag(params, dList4);
+ List<Document> dList5 = new ArrayList<>(2);
+ dList5.add(new Document("resultType", new Document("$eq", 4)));
+ dList5.add(new Document("dataType", new Document("$eq", ApiConstants.HK_DataType_CAR)));
+ setTag(params, dList5);
+ Document normalFilter = new Document("$and", dList2);
+ Document noDataFilter = new Document("$and", dList3);
+ Document downFilter = new Document("$and", dList4);
+ Document lessFilter = new Document("$and", dList5);
+ List<Document> lists = Arrays.asList(normalFilter, noDataFilter,downFilter,lessFilter);
List<String> rList = lists.stream().map(filter -> {
// 鏋勫缓鑱氬悎绠￠亾
List<Document> pipeline = Arrays.asList(
@@ -2236,18 +2876,27 @@
for (Document doc : result) {
dataCount = doc.getInteger("dataCount");
}
- rList.add(0,dataCount+"");
- List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
- .select(CheckIndexFace::getViewConnectStability)
- .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
- .eq(params.getDataType().equals(2), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Dept)
- .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
- .list();
+ rList.add(0, dataCount + "");
+// List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
+// .select(CheckIndexFace::getViewConnectStability)
+// .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
+// .eq(params.getDataType().equals(2), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Dept)
+// .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
+// .list();
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// if (CollectionUtils.isNotEmpty(videoList)) {
+// BigDecimal sum = videoList.stream().map(CheckIndexFace::getViewConnectStability).reduce(BigDecimal.ZERO, BigDecimal::add);
+// BigDecimal count = BigDecimal.valueOf(videoList.size());
+// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+// }
+ BigDecimal normal = new BigDecimal(rList.get(1));
+ BigDecimal noData = new BigDecimal(rList.get(2));
+ BigDecimal down = new BigDecimal(rList.get(3));
+ BigDecimal less = new BigDecimal(rList.get(4));
+ BigDecimal totalCount = normal.add(noData).add(down).add(less);
BigDecimal onlineRate = BigDecimal.ZERO;
- if (CollectionUtils.isNotEmpty(videoList)) {
- BigDecimal sum = videoList.stream().map(CheckIndexFace::getViewConnectStability).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal count = BigDecimal.valueOf(videoList.size());
- onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+ if (totalCount.compareTo(BigDecimal.ZERO)>0) {
+ onlineRate = normal.divide(totalCount, 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
}
rList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
@@ -2298,13 +2947,16 @@
item.setOnlineStr("鏈煡");
}
List<String> offLineTime = item.getOffLineTimeStr();
- if(!CollectionUtils.isEmpty(offLineTime)) {
+ if (!CollectionUtils.isEmpty(offLineTime)) {
//鍚庣画鍙互鏀规垚閰嶇疆鐨勭绾挎鏁�(鎻愬彇鍓峮娆★紝n涓洪厤缃殑绂荤嚎娆℃暟)
if (offLineTime.size() > 1) {
offLineTime = offLineTime.subList(0, 2);
}
item.setOffLineTimeStr(offLineTime);
}
+ //娣诲姞鍔ㄦ�佹暟鎹�
+ List<DynamicColumnVO> list = dynamicColumnMapper.getDynamicColumnByTable(TableNameConstants.COLUMN_NAME_FACE_POINT,item.getNo());
+ item.setDynamicColumnList(list);
});
params.setDeptTag(-1);
params.setDeviceType(3);
@@ -2344,19 +2996,22 @@
onlineCount = (Integer) result.getOrDefault("onlineCount", 0L);
totalCount = offlineCount + unknownCount + onlineCount;
}
- List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
- .select(CheckIndexFace::getSiteOnline)
- .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
- .eq(params.getDataType().equals(2), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Dept)
- .between(CheckIndexFace::getCreateTime, params.getStartTime(), params.getEndTime())
- .list();
+// List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
+// .select(CheckIndexFace::getSiteOnline)
+// .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
+// .eq(params.getDataType().equals(2), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Dept)
+// .between(CheckIndexFace::getCreateTime, params.getStartTime(), params.getEndTime())
+// .list();
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// if (CollectionUtils.isNotEmpty(videoList)) {
+// BigDecimal sum = videoList.stream().map(CheckIndexFace::getSiteOnline).reduce(BigDecimal.ZERO, BigDecimal::add);
+// BigDecimal count = BigDecimal.valueOf(videoList.size());
+// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+// }
BigDecimal onlineRate = BigDecimal.ZERO;
- if (CollectionUtils.isNotEmpty(videoList)) {
- BigDecimal sum = videoList.stream().map(CheckIndexFace::getSiteOnline).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal count = BigDecimal.valueOf(videoList.size());
- onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+ if (totalCount!=0) {
+ onlineRate = new BigDecimal(onlineCount).divide(new BigDecimal(totalCount), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
}
-
HashMap<String, Object> map = new HashMap<>();
map.put("count", Arrays.asList(totalCount + "", onlineCount + "", offlineCount + "", unknownCount + "", this.remove0(onlineRate)));
map.put("list", resultList);
@@ -2378,10 +3033,10 @@
andCriteria.add(Criteria.where("sxjgnlx.value").regex(pattern));
Query query = new Query();
Criteria and = new Criteria();
- if(params.getOption()!=null){
- if(params.getOption() ==1){
+ if (params.getOption() != null) {
+ if (params.getOption() == 1) {
andCriteria.add(Criteria.where("newDevice").is(Boolean.TRUE));
- }else if(params.getOption() ==-1){
+ } else if (params.getOption() == -1) {
andCriteria.add(Criteria.where("newDevice").is(Boolean.FALSE));
}
}
@@ -2402,13 +3057,13 @@
List<Document> dList1 = new ArrayList<>(2);
setTag(params, dList1);
dList1.add(new Document("sxjgnlx.value", new Document("$regex", ".*3.*")));
- Document totalFilter = new Document("$and",dList1);
+ Document totalFilter = new Document("$and", dList1);
//鏂拌澶囨暟
List<Document> dList2 = new ArrayList<>(2);
setTag(params, dList2);
dList2.add(new Document("sxjgnlx.value", new Document("$regex", ".*3.*")));
- dList2.add(new Document("newDevice",Boolean.TRUE));
- Document newFilter = new Document("$and",dList2);
+ dList2.add(new Document("newDevice", Boolean.TRUE));
+ Document newFilter = new Document("$and", dList2);
List<Document> lists = Arrays.asList(totalFilter, newFilter);
List<String> rList = lists.stream().map(filter -> {
@@ -2429,17 +3084,21 @@
return uniqueDeviceIdCount + "";
}).collect(Collectors.toList());
- List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
- .select(CheckIndexFace::getDeviceDirectoryConsistent)
- .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
- .eq(params.getDataType().equals(2), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Dept)
- .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
- .list();
+// List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
+// .select(CheckIndexFace::getDeviceDirectoryConsistent)
+// .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
+// .eq(params.getDataType().equals(2), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Dept)
+// .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
+// .list();
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// if (CollectionUtils.isNotEmpty(videoList)) {
+// BigDecimal sum = videoList.stream().map(CheckIndexFace::getDeviceDirectoryConsistent).reduce(BigDecimal.ZERO, BigDecimal::add);
+// BigDecimal count = BigDecimal.valueOf(videoList.size());
+// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+// }
BigDecimal onlineRate = BigDecimal.ZERO;
- if (CollectionUtils.isNotEmpty(videoList)) {
- BigDecimal sum = videoList.stream().map(CheckIndexFace::getDeviceDirectoryConsistent).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal count = BigDecimal.valueOf(videoList.size());
- onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+ if (!StringUtils.isEmpty(rList.get(0)) && !"0".equals(rList.get(0))) {
+ onlineRate = new BigDecimal(rList.get(0)).subtract(new BigDecimal(rList.get(1))).divide(new BigDecimal(rList.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
}
rList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
@@ -2462,11 +3121,11 @@
Criteria and = new Criteria();
and.andOperator(andCriteria);
query = Query.query(and);
- if(params.getOption()!=null){
- if(params.getOption() ==1){
+ if (params.getOption() != null) {
+ if (params.getOption() == 1) {
query.addCriteria(Criteria.where("lalType").is(ApiConstants.HK_Info_LayType_Normal));
query.addCriteria(Criteria.where("gbCodeType").is(ApiConstants.HK_Info_GbCodeType_Normal));
- }else if(params.getOption() ==-1){
+ } else if (params.getOption() == -1) {
Criteria lalType = Criteria.where("lalType").ne(ApiConstants.HK_Info_LayType_Normal);
Criteria gbCodeType = Criteria.where("gbCodeType").ne(ApiConstants.HK_Info_GbCodeType_Normal);
Criteria orOperator = new Criteria().orOperator(lalType, gbCodeType);
@@ -2492,9 +3151,9 @@
List<Document> dList3 = new ArrayList<>(2);
setTag(params, dList3);
List<Document> errorConditions = new ArrayList<>();
- errorConditions.add(new Document("lalType",new Document("$ne",1)));
- errorConditions.add(new Document("gbCodeType",new Document("$ne",1)));
- Document errorDoc = new Document("$or",errorConditions);
+ errorConditions.add(new Document("lalType", new Document("$ne", 1)));
+ errorConditions.add(new Document("gbCodeType", new Document("$ne", 1)));
+ Document errorDoc = new Document("$or", errorConditions);
dList3.add(errorDoc);
Document totalFilter = new Document("$and", dList1);
Document correctFilter = new Document("$and", dList2);
@@ -2519,17 +3178,21 @@
return uniqueDeviceIdCount + "";
}).collect(Collectors.toList());
- List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
- .select(CheckIndexFace::getFaceInformationCollectionAccuracy)
- .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
- .eq(params.getDataType().equals(2), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Dept)
- .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
- .list();
+// List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
+// .select(CheckIndexFace::getFaceInformationCollectionAccuracy)
+// .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
+// .eq(params.getDataType().equals(2), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Dept)
+// .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
+// .list();
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// if (CollectionUtils.isNotEmpty(videoList)) {
+// BigDecimal sum = videoList.stream().map(CheckIndexFace::getFaceInformationCollectionAccuracy).reduce(BigDecimal.ZERO, BigDecimal::add);
+// BigDecimal count = BigDecimal.valueOf(videoList.size());
+// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+// }
BigDecimal onlineRate = BigDecimal.ZERO;
- if (CollectionUtils.isNotEmpty(videoList)) {
- BigDecimal sum = videoList.stream().map(CheckIndexFace::getFaceInformationCollectionAccuracy).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal count = BigDecimal.valueOf(videoList.size());
- onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+ if (!StringUtils.isEmpty(rList.get(0)) && !"0".equals(rList.get(0))) {
+ onlineRate = new BigDecimal(rList.get(1)).divide(new BigDecimal(rList.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
}
rList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
@@ -2548,10 +3211,10 @@
public Result faceImgQualification(DataCenterQuery params) {
List<String> likeFileds = Arrays.asList("externalIndexCode", "cameraName");
Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
- if(params.getOption()!=null){
- if(params.getOption()==1){
+ if (params.getOption() != null) {
+ if (params.getOption() == 1) {
query.addCriteria(Criteria.where("faceEligibility.unfaceEligCount").is(0));
- }else if(params.getOption()==-1){
+ } else if (params.getOption() == -1) {
query.addCriteria(Criteria.where("faceEligibility.unfaceEligCount").gt(0));
}
}
@@ -2560,7 +3223,7 @@
MongoUtil.setPage(query, params, TIME_FIELD);
List<FaceDeviceSamplingResult> resultList = mongoTemplate.find(query, FaceDeviceSamplingResult.class);
List<BigPicUsefulVO> voList = new ArrayList<>();
- resultList.forEach(item->{
+ resultList.forEach(item -> {
BigPicUsefulVO picVO = FaceDeviceSamplingResult.getEligeVO(item);
voList.add(picVO);
});
@@ -2587,20 +3250,24 @@
}
List<String> countList = new ArrayList<>();
- List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
- .select(CheckIndexFace::getFacePictureQualification)
- .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
- .eq(params.getDataType().equals(2), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Dept)
- .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
- .list();
+// List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
+// .select(CheckIndexFace::getFacePictureQualification)
+// .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
+// .eq(params.getDataType().equals(2), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Dept)
+// .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
+// .list();
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// if (CollectionUtils.isNotEmpty(videoList)) {
+// BigDecimal sum = videoList.stream().map(CheckIndexFace::getFacePictureQualification).reduce(BigDecimal.ZERO, BigDecimal::add);
+// BigDecimal count = BigDecimal.valueOf(videoList.size());
+// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+// }
+ countList.add(sampleCount + "");
+ countList.add(expCount + "");
BigDecimal onlineRate = BigDecimal.ZERO;
- if (CollectionUtils.isNotEmpty(videoList)) {
- BigDecimal sum = videoList.stream().map(CheckIndexFace::getFacePictureQualification).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal count = BigDecimal.valueOf(videoList.size());
- onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+ if (sampleCount!=0) {
+ onlineRate = new BigDecimal(sampleCount-expCount).divide(new BigDecimal(sampleCount), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
}
- countList.add(sampleCount+"");
- countList.add(expCount+"");
countList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
map.put("count", countList);
@@ -2618,11 +3285,11 @@
public Result faceCapturesImagesAccuracy(DataCenterQuery params) {
List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
- if(params.getOption()!=null){
+ if (params.getOption() != null) {
//褰撴棩鏃堕挓寮傚父
- if(params.getOption()==1){
+ if (params.getOption() == 1) {
query.addCriteria(Criteria.where("majorDiffCount").gt(0));
- }else if(params.getOption()==-1){
+ } else if (params.getOption() == -1) {
//鍏ㄩ儴鏃堕挓寮傚父
query.addCriteria(Criteria.where("importantDiffCount").gt(0));
}
@@ -2631,7 +3298,7 @@
MongoUtil.setPage(query, params, TIME_FIELD);
List<FaceDeviceInspectionResult> resultList = mongoTemplate.find(query, FaceDeviceInspectionResult.class);
List<SnapClockVO> resultVos = new ArrayList<>();
- resultList.forEach(item->{
+ resultList.forEach(item -> {
SnapClockVO vo = FaceDeviceInspectionResult.getVO(item);
resultVos.add(vo);
});
@@ -2658,7 +3325,7 @@
Document allErrFilter = new Document("$and", dList4);
- List<Document> lists = Arrays.asList(todayFilter, todayErrFilter, allFilter,allErrFilter);
+ List<Document> lists = Arrays.asList(todayFilter, todayErrFilter, allFilter, allErrFilter);
List<String> rList = lists.stream().map(filter -> {
// 鏋勫缓鑱氬悎绠￠亾
List<Document> pipeline = Arrays.asList(
@@ -2677,17 +3344,24 @@
return uniqueDeviceIdCount + "";
}).collect(Collectors.toList());
- List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
- .select(CheckIndexFace::getFaceTimingAccuracy)
- .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
- .eq(params.getDataType().equals(2), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Dept)
- .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
- .list();
+// List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
+// .select(CheckIndexFace::getFaceTimingAccuracy)
+// .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
+// .eq(params.getDataType().equals(2), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Dept)
+// .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
+// .list();
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// if (CollectionUtils.isNotEmpty(videoList)) {
+// BigDecimal sum = videoList.stream().map(CheckIndexFace::getFaceTimingAccuracy).reduce(BigDecimal.ZERO, BigDecimal::add);
+// BigDecimal count = BigDecimal.valueOf(videoList.size());
+// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+// }
BigDecimal onlineRate = BigDecimal.ZERO;
- if (CollectionUtils.isNotEmpty(videoList)) {
- BigDecimal sum = videoList.stream().map(CheckIndexFace::getFaceTimingAccuracy).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal count = BigDecimal.valueOf(videoList.size());
- onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+ BigDecimal normal = new BigDecimal(rList.get(0));
+ BigDecimal abnormal = new BigDecimal(rList.get(1));
+ BigDecimal totalCount = normal.add(abnormal);
+ if (totalCount.compareTo(BigDecimal.ZERO)>0) {
+ onlineRate = normal.divide(totalCount, 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
}
rList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
@@ -2707,11 +3381,11 @@
List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
query.addCriteria(Criteria.where("dataType").is(ApiConstants.HK_DataType_FACE));
- if(params.getOption()!=null){
+ if (params.getOption() != null) {
//姝ｅ父
- if(params.getOption()==1){
+ if (params.getOption() == 1) {
query.addCriteria(Criteria.where("delayCount").is(0));
- }else if(params.getOption()==-1){
+ } else if (params.getOption() == -1) {
//寤惰繜
query.addCriteria(Criteria.where("delayCount").gt(0));
}
@@ -2725,15 +3399,15 @@
List<Document> dList1 = new ArrayList<>(2);
setTag(params, dList1);
- dList1.add(new Document("dataType" ,new Document("$eq",ApiConstants.HK_DataType_FACE)));
+ dList1.add(new Document("dataType", new Document("$eq", ApiConstants.HK_DataType_FACE)));
Document allFilter = new Document("$and", dList1);
List<Document> dList2 = new ArrayList<>(2);
- dList2.add(new Document("dataType" ,new Document("$eq",ApiConstants.HK_DataType_FACE)));
+ dList2.add(new Document("dataType", new Document("$eq", ApiConstants.HK_DataType_FACE)));
dList2.add(new Document("delayCount", new Document("$gt", 0)));
setTag(params, dList2);
Document delayFilter = new Document("$and", dList2);
- List<Document> lists = Arrays.asList(allFilter,delayFilter);
+ List<Document> lists = Arrays.asList(allFilter, delayFilter);
List<String> rList = lists.stream().map(filter -> {
// 鏋勫缓鑱氬悎绠￠亾
List<Document> pipeline = Arrays.asList(
@@ -2753,17 +3427,21 @@
}).collect(Collectors.toList());
- List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
- .select(CheckIndexFace::getFaceUploadTimeliness)
- .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
- .eq(params.getDataType().equals(2), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Dept)
- .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
- .list();
+// List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
+// .select(CheckIndexFace::getFaceUploadTimeliness)
+// .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
+// .eq(params.getDataType().equals(2), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Dept)
+// .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
+// .list();
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// if (CollectionUtils.isNotEmpty(videoList)) {
+// BigDecimal sum = videoList.stream().map(CheckIndexFace::getFaceUploadTimeliness).reduce(BigDecimal.ZERO, BigDecimal::add);
+// BigDecimal count = BigDecimal.valueOf(videoList.size());
+// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+// }
BigDecimal onlineRate = BigDecimal.ZERO;
- if (CollectionUtils.isNotEmpty(videoList)) {
- BigDecimal sum = videoList.stream().map(CheckIndexFace::getFaceUploadTimeliness).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal count = BigDecimal.valueOf(videoList.size());
- onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+ if (!StringUtils.isEmpty(rList.get(0)) && !"0".equals(rList.get(0))) {
+ onlineRate = new BigDecimal(rList.get(0)).subtract(new BigDecimal(rList.get(1))).divide(new BigDecimal(rList.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
}
rList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
@@ -2782,10 +3460,10 @@
public Result faceAvailabilityOfLargeImg(DataCenterQuery params) {
List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
- if(params.getOption()!=null){
- if(params.getOption()==1){
+ if (params.getOption() != null) {
+ if (params.getOption() == 1) {
query.addCriteria(Criteria.where("bigUseful.bigPicExpCount").is(0));
- }else if(params.getOption()==-1){
+ } else if (params.getOption() == -1) {
query.addCriteria(Criteria.where("bigUseful.bigPicExpCount").gt(0));
}
}
@@ -2794,7 +3472,7 @@
query.with(Sort.by(Sort.Order.desc("bigUseful.bigPicExpCount")));
List<FaceDeviceSamplingResult> resultList = mongoTemplate.find(query, FaceDeviceSamplingResult.class);
List<BigPicUsefulVO> voList = new ArrayList<>();
- resultList.forEach(item->{
+ resultList.forEach(item -> {
BigPicUsefulVO picVO = FaceDeviceSamplingResult.getPicVO(item);
voList.add(picVO);
});
@@ -2818,24 +3496,34 @@
sampleCount = doc.getInteger("sampleCount");
expCount = doc.getInteger("expCount");
}
+
+
+ //鏂版瀯寤鸿仛鍚堟煡璇㈢绾挎椂闂�
+
List<String> countList = new ArrayList<>();
// 缁熻鏁�
- List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
- .select(CheckIndexFace::getFacePictureAvailability)
- .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
- .eq(params.getDataType().equals(2), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Dept)
- .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
- .list();
+// List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
+// .select(CheckIndexFace::getFacePictureAvailability)
+// .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
+// .eq(params.getDataType().equals(2), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Dept)
+// .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
+// .list();
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// if (CollectionUtils.isNotEmpty(videoList)) {
+// BigDecimal sum = videoList.stream().map(CheckIndexFace::getFacePictureAvailability).reduce(BigDecimal.ZERO, BigDecimal::add);
+// BigDecimal count = BigDecimal.valueOf(videoList.size());
+// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+// }
+ countList.add(sampleCount + "");
+ countList.add(expCount + "");
BigDecimal onlineRate = BigDecimal.ZERO;
- if (CollectionUtils.isNotEmpty(videoList)) {
- BigDecimal sum = videoList.stream().map(CheckIndexFace::getFacePictureAvailability).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal count = BigDecimal.valueOf(videoList.size());
- onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+ if (sampleCount!=0) {
+ onlineRate = new BigDecimal(sampleCount-expCount).divide(new BigDecimal(sampleCount), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
}
- countList.add(sampleCount+"");
- countList.add(expCount+"");
countList.add(this.remove0(onlineRate));
+
+
HashMap<String, Object> map = new HashMap<>();
map.put("count", countList);
map.put("list", voList);
@@ -2885,8 +3573,8 @@
dList.add(new Document("deptTag", new Document("$eq", Boolean.TRUE)));
}
Document mongoCreateTimeRange = new Document();
- if (params.getStartTime()!=null) mongoCreateTimeRange.append("$gte", params.getStartTime());
- if (params.getEndTime()!=null) mongoCreateTimeRange .append("$lt", params.getEndTime());
+ if (params.getStartTime() != null) mongoCreateTimeRange.append("$gte", params.getStartTime());
+ if (params.getEndTime() != null) mongoCreateTimeRange.append("$lt", params.getEndTime());
dList.add(new Document("mongoCreateTime", mongoCreateTimeRange));
}
}
--
Gitblit v1.8.0