From 3b0516a2959e25576e4f3fda697a3b025d06c8c9 Mon Sep 17 00:00:00 2001 From: zxl <763096477@qq.com> Date: 星期二, 24 六月 2025 14:09:07 +0800 Subject: [PATCH] 每日录像可用指标添加日志,修改大屏为查看当前月平均 --- ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 683 ++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 603 insertions(+), 80 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 f2297b8..331ec29 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 @@ -20,12 +20,17 @@ import com.ycl.platform.domain.vo.DynamicColumnVO; import com.ycl.platform.mapper.DynamicColumnMapper; import com.ycl.platform.mapper.ImageResourceSecurityDetailMapper; +import com.ycl.platform.mapper.TMonitorMapper; import com.ycl.platform.mapper.YwPointMapper; import com.ycl.platform.service.*; import com.ycl.system.Result; +import com.ycl.system.entity.SysDept; +import com.ycl.system.model.LoginUser; import com.ycl.system.service.ISysConfigService; +import com.ycl.system.service.ISysDeptService; import com.ycl.utils.DateUtils; import com.ycl.utils.MongoUtil; +import com.ycl.utils.SecurityUtils; import com.ycl.utils.StringUtils; import com.ycl.utils.bean.BeanUtils; import com.ycl.utils.poi.ExcelUtil; @@ -66,7 +71,6 @@ private final MongoTemplate mongoTemplate; private final ImageResourceSecurityDetailMapper securityDetailMapper; private final YwPointMapper pointMapper; - private final ICheckIndexVideoService checkIndexVideoService; private final ICheckIndexCarService checkIndexCarService; private final ICheckIndexFaceService checkIndexFaceService; private final DynamicColumnMapper dynamicColumnMapper; @@ -77,23 +81,67 @@ private static DecimalFormat DF = new DecimalFormat("#.####"); + + + public Map<String,List<DynamicColumnVO>> getDynamicByConditions(DataCenterQuery params,List<DynamicColumnVO> list){ + //TODO 璇ヤ綅缃病鏈夎繃婊よ处鍙风殑閮ㄩ棬瀵瑰簲鐨勮澶囦俊鎭紝鑰屾槸鏇村叿鏉′欢鏌ヨ鐨勫叏閮� + //鑾峰緱鍒板搴攊d锛屼笖鍖呭惈浼犲叆瀛楃涓� 鍔ㄦ�佸垪闆嗗悎 + List<DynamicColumnVO> likeFieldDynamicColumnVOList = list.stream() + .filter(dynamicColumnVO -> + dynamicColumnVO.getLabelId().equals(params.getDyId()) && + dynamicColumnVO.getColumnValue().contains(params.getDyValue()) + ).collect(Collectors.toList()); + //鑾峰緱婊¤冻鏉′欢鐨刬d闆嗗悎 + List<String> ids = likeFieldDynamicColumnVOList.stream().map(DynamicColumnVO::getRefStringId).toList(); + Map<String,List<DynamicColumnVO>> groupByRefStringIdMap = list.stream().collect(Collectors.groupingBy(DynamicColumnVO::getRefStringId)); + Set<String> removeSet = new HashSet<>(ids); + //绉婚櫎鎺変笉绗﹀悎鏉′欢鐨刱ey + groupByRefStringIdMap.keySet().retainAll(removeSet); + + return groupByRefStringIdMap; + } + //褰曞儚鍙敤 @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())); } + SysDept sysDept = getSysDeptByLoginUser(); + if (sysDept !=null){ + AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId())); + if (areaDeptEnum != null){ + query.addCriteria(Criteria.where("no").regex("^" +areaDeptEnum.getCode())); + } + } + MongoUtil.setNoPage(query, params, TIME_FIELD); 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)); + + //鍒ゆ柇鏄惁鏈夋煡璇㈡潯浠� + boolean conditions = false; + Map<String,List<DynamicColumnVO>> groupByRefStringIdMap = new HashMap<>(); + if (params.getDyId() != null && StringUtils.isNotEmpty(params.getDyValue())){ + conditions = true; + //鑾峰緱鍔ㄦ�佸垪闆嗗悎涓寘鍚簡鐨勫瓧绗︿覆鍊肩殑闆嗗悎 鍖哄垎澶у皬鍐� + + groupByRefStringIdMap = getDynamicByConditions(params,dynamicColumnVOList); + }else{ + groupByRefStringIdMap = dynamicColumnVOList.stream().collect(Collectors.groupingBy(DynamicColumnVO::getRefStringId)); + } //鍥哄畾琛ㄥご LinkedHashSet<String> headers = new LinkedHashSet<>(); headers.add(RecordingAvailabilityHeaders.arealayername); @@ -115,21 +163,28 @@ headersList.addAll(dynamicsHeaders); headers.addAll(headersList); } - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); - SimpleDateFormat dateFormat2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - +// SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + //鏌ヨ鍒版湁鍔ㄦ�佸垪鏌ヨ鏉′欢 + //鑾峰緱瀵瑰簲鍔ㄦ�佸垪涓璻ef鐨勫璞d 涓� 鏌ヨ缁撴灉id杩囨护 + if (conditions){ + Map<String, List<DynamicColumnVO>> finalGroupByRefStringIdMap = groupByRefStringIdMap; + resultList = resultList.stream() + .filter(obj -> finalGroupByRefStringIdMap.containsKey(obj.getId())) + .collect(Collectors.toList()); + } + SimpleDateFormat dateFormat = 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(dateFormat.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())); + row.add(dateFormat.format(result.getCreateTime())); //娣诲姞鍔ㄦ�佸垪鏁版嵁 for (String header : headersList){ boolean flag = false; @@ -158,10 +213,21 @@ .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 query = null; + SysDept sysDept = getSysDeptByLoginUser(); + if (sysDept !=null){ + AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId())); + if (areaDeptEnum != null){ + query = MongoUtil.getQueryDataCenter(areaDeptEnum.getCode(),params,TIME_FIELD,likeFileds,null,"no"); + } + }else { + query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); + } //鏌ヤ汉鑴歌澶� query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Face + ".*")); //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠� @@ -201,8 +267,23 @@ 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)); + + + //鍒ゆ柇鏄惁鏈夋煡璇㈡潯浠� + boolean conditions = false; + Map<String,List<DynamicColumnVO>> groupByRefStringIdMap = new HashMap<>(); + if (params.getDyId() != null && StringUtils.isNotEmpty(params.getDyValue())){ + conditions = true; + //鑾峰緱鍔ㄦ�佸垪闆嗗悎涓寘鍚簡鐨勫瓧绗︿覆鍊肩殑闆嗗悎 鍖哄垎澶у皬鍐� + groupByRefStringIdMap = getDynamicByConditions(params,dynamicColumnVOList); + }else{ + groupByRefStringIdMap = dynamicColumnVOList.stream().collect(Collectors.groupingBy(DynamicColumnVO::getRefStringId)); + } + //鍥哄畾琛ㄥご LinkedHashSet<String> headers = new LinkedHashSet<>(); headers.add(PointOnlineHeaders.no); @@ -223,6 +304,13 @@ //浣跨敤閾捐〃淇濊瘉鍚庣画琛ュ厖鏁版嵁鏃惰幏鍙栨暟鎹『搴忎竴鑷� headersList.addAll(dynamicsHeaders); headers.addAll(headersList); + } + + if (conditions){ + Map<String, List<DynamicColumnVO>> finalGroupByRefStringIdMap = groupByRefStringIdMap; + resultList = resultList.stream() + .filter(obj -> finalGroupByRefStringIdMap.containsKey(obj.getNo())) + .collect(Collectors.toList()); } List<List<Object>> data = new ArrayList<>(); @@ -269,12 +357,34 @@ .sheet("浜鸿劯鐐逛綅鍦ㄧ嚎鐜�") // 璁剧疆sheet鍚嶇О .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) .doWrite(data); // 鍐欏叆鏁版嵁 - } + } private final ISysDeptService deptService; + + public SysDept getSysDeptByLoginUser(){ + LoginUser loginUser = SecurityUtils.getLoginUser(); + SysDept sysDept = null; + Long deptId =null; + if (loginUser.getDeptId() != null){ + deptId = loginUser.getDeptId(); + sysDept = deptService.selectDeptById(deptId); + } + return sysDept; + } + //瑙嗛鍗曚綅鍦ㄧ嚎 @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 query = null; + SysDept sysDept = getSysDeptByLoginUser(); + if (sysDept !=null){ + AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId())); + if (areaDeptEnum != null){ + query = MongoUtil.getQueryDataCenter(areaDeptEnum.getCode(),params,TIME_FIELD,likeFileds,null,"no"); + } + }else { + query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); + } + //鏌ヨ棰戣澶� query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*")); //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠� @@ -313,7 +423,16 @@ } }); List<DynamicColumnVO> dynamicColumnVOList = dynamicColumnMapper.getDynamicColumnByTableName(TableNameConstants.COLUMN_NAME_VIDEO_POINT); - Map<String,List<DynamicColumnVO>> groupByRefStringIdMap = dynamicColumnVOList.stream().collect(Collectors.groupingBy(DynamicColumnVO::getRefStringId)); + //鍒ゆ柇鏄惁鏈夋煡璇㈡潯浠� + boolean conditions = false; + Map<String,List<DynamicColumnVO>> groupByRefStringIdMap = new HashMap<>(); + if (params.getDyId() != null && StringUtils.isNotEmpty(params.getDyValue())){ + conditions = true; + //鑾峰緱鍔ㄦ�佸垪闆嗗悎涓寘鍚簡鐨勫瓧绗︿覆鍊肩殑闆嗗悎 鍖哄垎澶у皬鍐� + groupByRefStringIdMap = getDynamicByConditions(params,dynamicColumnVOList); + }else{ + groupByRefStringIdMap = dynamicColumnVOList.stream().collect(Collectors.groupingBy(DynamicColumnVO::getRefStringId)); + } //鍥哄畾琛ㄥご LinkedHashSet<String> headers = new LinkedHashSet<>(); headers.add(PointOnlineHeaders.no); @@ -334,6 +453,14 @@ //浣跨敤閾捐〃淇濊瘉鍚庣画琛ュ厖鏁版嵁鏃惰幏鍙栨暟鎹『搴忎竴鑷� headersList.addAll(dynamicsHeaders); headers.addAll(headersList); + } + + + if (conditions){ + Map<String, List<DynamicColumnVO>> finalGroupByRefStringIdMap = groupByRefStringIdMap; + resultList = resultList.stream() + .filter(obj -> finalGroupByRefStringIdMap.containsKey(obj.getNo())) + .collect(Collectors.toList()); } List<List<Object>> data = new ArrayList<>(); @@ -383,11 +510,20 @@ } - + //杞﹁締鐐逛綅鍦ㄧ嚎 @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 query = null; + SysDept sysDept = getSysDeptByLoginUser(); + if (sysDept !=null){ + AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId())); + if (areaDeptEnum != null){ + query = MongoUtil.getQueryDataCenter(areaDeptEnum.getCode(),params,TIME_FIELD,likeFileds,null,"no"); + } + }else { + query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); + } //鏌ヨ溅杈嗚澶� query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Car + ".*")); //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠� @@ -428,7 +564,16 @@ } }); List<DynamicColumnVO> dynamicColumnVOList = dynamicColumnMapper.getDynamicColumnByTableName(TableNameConstants.COLUMN_NAME_CAR_POINT); - Map<String,List<DynamicColumnVO>> groupByRefStringIdMap = dynamicColumnVOList.stream().collect(Collectors.groupingBy(DynamicColumnVO::getRefStringId)); + //鍒ゆ柇鏄惁鏈夋煡璇㈡潯浠� + boolean conditions = false; + Map<String,List<DynamicColumnVO>> groupByRefStringIdMap = new HashMap<>(); + if (params.getDyId() != null && StringUtils.isNotEmpty(params.getDyValue())){ + conditions = true; + //鑾峰緱鍔ㄦ�佸垪闆嗗悎涓寘鍚簡鐨勫瓧绗︿覆鍊肩殑闆嗗悎 鍖哄垎澶у皬鍐� + groupByRefStringIdMap = getDynamicByConditions(params,dynamicColumnVOList); + }else{ + groupByRefStringIdMap = dynamicColumnVOList.stream().collect(Collectors.groupingBy(DynamicColumnVO::getRefStringId)); + } //鍥哄畾琛ㄥご LinkedHashSet<String> headers = new LinkedHashSet<>(); headers.add(PointOnlineHeaders.no); @@ -449,6 +594,14 @@ //浣跨敤閾捐〃淇濊瘉鍚庣画琛ュ厖鏁版嵁鏃惰幏鍙栨暟鎹『搴忎竴鑷� headersList.addAll(dynamicsHeaders); headers.addAll(headersList); + } + + + if (conditions){ + Map<String, List<DynamicColumnVO>> finalGroupByRefStringIdMap = groupByRefStringIdMap; + resultList = resultList.stream() + .filter(obj -> finalGroupByRefStringIdMap.containsKey(obj.getNo())) + .collect(Collectors.toList()); } List<List<Object>> data = new ArrayList<>(); @@ -537,6 +690,8 @@ } + + /** * 瑙嗛锛氱偣浣嶅湪绾跨巼 * @@ -546,7 +701,21 @@ @Override public Result videoPointOnlineRate(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("name", "no", "ip"); - Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); + //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌 + Query query = null; + SysDept sysDept = getSysDeptByLoginUser(); + AreaDeptEnum areaDeptEnum = null; + if (sysDept !=null){ + areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId())); + if (areaDeptEnum != null){ + query = MongoUtil.getQueryDataCenter(areaDeptEnum.getCode(),params,TIME_FIELD,likeFileds,null,"no"); + + }else{ + query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); + } + }else { + query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); + } //鏌ヨ棰戣澶� query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*")); //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠� @@ -605,6 +774,10 @@ // 娣诲姞鍥哄畾鏉′欢 criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*")); criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime())); + //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌 + if (areaDeptEnum != null){ + criteriaList.add(Criteria.where("no").regex("^" +areaDeptEnum.getCode())); + } // 鏍规嵁dataType鍔ㄦ�佹坊鍔犳潯浠� if (params.getDataType() == 1) { criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE)); @@ -662,7 +835,21 @@ @Override public Result deptVideoPointOnlineRate(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("name", "no", "ip"); - Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); + //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌 + Query query = null; + SysDept sysDept = getSysDeptByLoginUser(); + AreaDeptEnum areaDeptEnum = null; + if (sysDept !=null){ + areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId())); + if (areaDeptEnum != null){ + query = MongoUtil.getQueryDataCenter(areaDeptEnum.getCode(),params,TIME_FIELD,likeFileds,null,"no"); + + }else{ + query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); + } + }else { + query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); + } //鏌ヨ棰戣澶� query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*")); query.addCriteria(Criteria.where("deptTag").is(Boolean.TRUE)); @@ -700,6 +887,10 @@ int unknownCount = 0; //鏋勫缓鏉′欢 List<Criteria> criteriaList = new ArrayList<>(); + //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌 + if (areaDeptEnum != null){ + criteriaList.add(Criteria.where("no").regex("^" +areaDeptEnum.getCode())); + } // 娣诲姞鍥哄畾鏉′欢 criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*")); criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime())); @@ -761,7 +952,21 @@ @Override public Result videoImportantPointOnlineRate(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("name", "no", "ip"); - Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); + //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌 + Query query = null; + SysDept sysDept = getSysDeptByLoginUser(); + AreaDeptEnum areaDeptEnum = null; + if (sysDept !=null){ + areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId())); + if (areaDeptEnum != null){ + query = MongoUtil.getQueryDataCenter(areaDeptEnum.getCode(),params,TIME_FIELD,likeFileds,null,"no"); + + }else{ + query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); + } + }else { + query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); + } //鏌ヨ棰戣澶� query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*")); query.addCriteria(Criteria.where("importantTag").is(Boolean.TRUE)); @@ -802,6 +1007,10 @@ int unknownCount = 0; //鏋勫缓鏉′欢 List<Criteria> criteriaList = new ArrayList<>(); + //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌 + if (areaDeptEnum != null){ + criteriaList.add(Criteria.where("no").regex("^" +areaDeptEnum.getCode())); + } // 娣诲姞鍥哄畾鏉′欢 criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*")); criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime())); @@ -861,7 +1070,21 @@ @Override public Result videoImportantPointImageOnlineRate(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("name", "no", "ip"); - Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); + //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌 + Query query = null; + SysDept sysDept = getSysDeptByLoginUser(); + AreaDeptEnum areaDeptEnum = null; + if (sysDept !=null){ + areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId())); + if (areaDeptEnum != null){ + query = MongoUtil.getQueryDataCenter(areaDeptEnum.getCode(),params,TIME_FIELD,likeFileds,null,"no"); + + }else{ + query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); + } + }else { + query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); + } //鏌ヨ棰戣澶� query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*")); query.addCriteria(Criteria.where("importantCommandImageTag").is(Boolean.TRUE)); @@ -903,6 +1126,10 @@ int unknownCount = 0; //鏋勫缓鏉′欢 List<Criteria> criteriaList = new ArrayList<>(); + //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌 + if (areaDeptEnum != null){ + criteriaList.add(Criteria.where("no").regex("^" +areaDeptEnum.getCode())); + } // 娣诲姞鍥哄畾鏉′欢 criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*")); criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime())); @@ -962,7 +1189,19 @@ @Override public Result videoOneMachineDocumentRegister(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("ip.showValue", "name.showValue", "serialNumber.showValue"); - List<Criteria> andCriteria = MongoUtil.getAndCriteria(params, TIME_FIELD, likeFileds, null); + SysDept sysDept = getSysDeptByLoginUser(); + List<Criteria> andCriteria; + AreaDeptEnum areaDeptEnum = null; + if (sysDept != null) { + areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId())); + if (areaDeptEnum != null) { + andCriteria = MongoUtil.getAndCriteriaDateCenter(areaDeptEnum.getCode(),params, TIME_FIELD, likeFileds, null); + }else { + andCriteria = MongoUtil.getAndCriteria(params, TIME_FIELD, likeFileds, null); + } + }else { + andCriteria = MongoUtil.getAndCriteria(params, TIME_FIELD, likeFileds, null); + } Query query = new Query(); Criteria and = new Criteria(); if (params.getOption() != null) { @@ -985,12 +1224,23 @@ // 缁熻鏁伴噺 MongoDatabase database = mongoTemplate.getDb(); MongoCollection<Document> collection = database.getCollection("uy_monitor_qualify"); + Document areDocument = null; + if (areaDeptEnum != null) { + String areaCodePrefix = areaDeptEnum.getCode(); + areDocument = new Document("deviceNo", new Document("$regex", "^" + areaCodePrefix)); + } //鎬绘暟 List<Document> dList1 = new ArrayList<>(2); + if(areDocument != null){ + dList1.add(areDocument); + } setTag(params, dList1); Document totalFilter = new Document("$and", dList1); //鏂拌澶囨暟 List<Document> dList2 = new ArrayList<>(2); + if(areDocument != null){ + dList1.add(areDocument); + } setTag(params, dList2); dList2.add(new Document("newDevice", Boolean.TRUE)); Document newFilter = new Document("$and", dList2); @@ -1046,7 +1296,20 @@ @Override public Result videoOneMachineDocumentQualified(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("ip.showValue", "name.showValue", "serialNumber.showValue"); - List<Criteria> andCriteria = MongoUtil.getAndCriteria(params, TIME_FIELD, likeFileds, null); + SysDept sysDept = getSysDeptByLoginUser(); + List<Criteria> andCriteria; + AreaDeptEnum areaDeptEnum = null; + if (sysDept != null) { + areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId())); + if (areaDeptEnum != null) { + andCriteria = MongoUtil.getAndCriteriaDateCenter(areaDeptEnum.getCode(),params, TIME_FIELD, likeFileds, null); + }else { + andCriteria = MongoUtil.getAndCriteria(params, TIME_FIELD, likeFileds, null); + } + }else { + andCriteria = MongoUtil.getAndCriteria(params, TIME_FIELD, likeFileds, null); + } + Query query = new Query(); Criteria and = new Criteria(); and.andOperator(andCriteria); @@ -1098,12 +1361,25 @@ // 缁熻鏁伴噺 MongoDatabase database = mongoTemplate.getDb(); MongoCollection<Document> collection = database.getCollection("uy_monitor_qualify"); + Document areDocument = null; + if (areaDeptEnum != null) { + String areaCodePrefix = areaDeptEnum.getCode(); + areDocument = new Document("deviceNo", new Document("$regex", "^" + areaCodePrefix)); + } //鎬绘暟 List<Document> dList1 = new ArrayList<>(2); + if (areDocument != null){ + dList1.add(areDocument); + } setTag(params, dList1); Document totalFilter = new Document("$and", dList1); + //list1 + //鍚堟牸鏁� List<Document> dList2 = new ArrayList<>(2); + if (areDocument != null){ + dList2.add(areDocument); + } dList2.add(new Document("serialNumber.error", Boolean.FALSE)); dList2.add(new Document("name.error", Boolean.FALSE)); dList2.add(new Document("civilCode.error", Boolean.FALSE)); @@ -1120,6 +1396,9 @@ Document qualifyFilter = new Document("$and", dList2); //涓嶅悎鏍兼暟 List<Document> dList3 = new ArrayList<>(2); + if (areDocument != null){ + dList3.add(areDocument); + } setTag(params, dList3); List<Document> errorConditions = new ArrayList<>(); errorConditions.add(new Document("serialNumber.error", new Document("$eq", Boolean.TRUE))); @@ -1275,6 +1554,7 @@ return recordingMinTime; } + private final TMonitorMapper tMonitorMapper; /** * 瑙嗛锛氬綍鍍忓彲鐢ㄧ巼 @@ -1284,12 +1564,25 @@ */ @Override public Result videoAvailabilityRate(DataCenterQuery params) { - - - - + List<String> noString = tMonitorMapper.getIdListVideo(); List<String> likeFileds = Arrays.asList("deviceId", "deviceName"); - Query query = MongoUtil.getQuery(params, "createTime", likeFileds, null); + SysDept sysDept = getSysDeptByLoginUser(); + AreaDeptEnum areaDeptEnum = null; + Query query = null; + if (sysDept !=null){ + areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId())); + if (areaDeptEnum != null){ + query = MongoUtil.getQueryDataCenter(areaDeptEnum.getCode(),params,"createTime",likeFileds,null,"no"); + }else{ + query = MongoUtil.getQuery(params, "createTime", likeFileds, null); + } + }else { + query = MongoUtil.getQuery(params, "createTime", likeFileds, null); + } + + if (CollectionUtils.isNotEmpty(noString)) { // 闃叉绌洪泦鍚堝紓甯� + query.addCriteria(Criteria.where("no").in(noString)); + } //涓嬫媺妗嗗綍鍍忔儏鍐垫煡璇㈡潯浠� if (params.getOption() != null) { query.addCriteria(Criteria.where("recordStatus").is(params.getOption())); @@ -1303,20 +1596,32 @@ //缈昏瘧琛屾斂鍖哄煙 resultList.forEach(item -> { String areaCode = item.getArealayername().substring(0, 6); - AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromCode(areaCode); - if (areaDeptEnum != null) item.setArealayername(areaDeptEnum.getName()); + AreaDeptEnum areaDeptEnumInfo = AreaDeptEnum.fromCode(areaCode); + if (areaDeptEnumInfo != null) item.setArealayername(areaDeptEnumInfo.getName()); List<DynamicColumnVO> list = dynamicColumnMapper.getDynamicColumnByTable(TableNameConstants.COLUMN_NAME_VIDEO,item.getId()); item.setDynamicColumnList(list); }); // 缁熻鏁伴噺 + MongoDatabase database = mongoTemplate.getDb(); MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum"); List<Integer> status = Arrays.asList(1, 0, -1); + AreaDeptEnum finalAreaDeptEnum = areaDeptEnum; List<String> resultCount = status.stream().map(item -> { List<Document> dList = new ArrayList<>(2); + dList.add(new Document("recordStatus", new Document("$eq", item))); + if(finalAreaDeptEnum != null){ + dList.add(new Document("$and", Arrays.asList( + new Document("no", new Document("$in", noString)), + new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode())) + ))); + }else { + dList.add(new Document("no", new Document("$in", noString))); + } + setTag(params, dList); Document filter = new Document("$and", dList); // 鏋勫缓鑱氬悎绠¢亾 @@ -1343,8 +1648,20 @@ double finalRecordingMinTime = getSySMinTime(); List<Document> documentList = new ArrayList<>(2); + if(finalAreaDeptEnum != null){ + documentList.add(new Document("$and", Arrays.asList( + new Document("no", new Document("$in", noString)), + new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode())) + ))); + }else { + documentList.add(new Document("no", new Document("$in", noString))); + } +// documentList.add(new Document("$and", Arrays.asList( +// new Document("no", new Document("$in", noString)), +// new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode())) +// ))); setTag(params, documentList); - Document recording = new Document("recordDuration",new Document("$gte", finalRecordingMinTime)); + Document recording = new Document("missDuration",new Document("$lte", finalRecordingMinTime)); documentList.add(recording); Document filter = new Document("$and", documentList); @@ -1356,25 +1673,14 @@ 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) { totalCount += Integer.parseInt(s); @@ -1382,8 +1688,6 @@ 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)鏄�绘暟 uniqueDeviceIdCount鏄洿鍏风郴缁熷弬鏁版煡璇㈠埌mongodb涓ぇ浜庣瓑浜� recordDuration瀛楁鐨勬�绘暟 @@ -1406,7 +1710,19 @@ @Override public Result deptVideoAvailabilityRate(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("deviceId", "deviceName"); - Query query = MongoUtil.getQuery(params, "createTime", likeFileds, 1); + SysDept sysDept = getSysDeptByLoginUser(); + AreaDeptEnum areaDeptEnum = null; + Query query = null; + if (sysDept !=null){ + areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId())); + if (areaDeptEnum != null){ + query = MongoUtil.getQueryDataCenter(areaDeptEnum.getCode(),params,"createTime",likeFileds,null,"no"); + }else{ + query = MongoUtil.getQuery(params, "createTime", likeFileds, null); + } + }else { + query = MongoUtil.getQuery(params, "createTime", likeFileds, null); + } //涓嬫媺妗嗗綍鍍忔儏鍐垫煡璇㈡潯浠� if (params.getOption() != null) { query.addCriteria(Criteria.where("recordStatus").is(params.getOption())); @@ -1417,18 +1733,25 @@ //缈昏瘧琛屾斂鍖哄煙 resultList.forEach(item -> { String areaCode = item.getArealayername().substring(0, 6); - AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromCode(areaCode); - if (areaDeptEnum != null) item.setArealayername(areaDeptEnum.getName()); + AreaDeptEnum areaDeptEnumInfo = AreaDeptEnum.fromCode(areaCode); + if (areaDeptEnumInfo != null) item.setArealayername(areaDeptEnumInfo.getName()); }); // 缁熻鏁伴噺 MongoDatabase database = mongoTemplate.getDb(); MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum"); List<Integer> status = Arrays.asList(1, 0, -1); + AreaDeptEnum finalAreaDeptEnum = areaDeptEnum; List<String> resultCount = status.stream().map(item -> { List<Document> dList = new ArrayList<>(4); dList.add(new Document("deptTag", new Document("$eq", Boolean.TRUE))); dList.add(new Document("recordStatus", new Document("$eq", item))); setTag(params, dList); + if (finalAreaDeptEnum != null){ + dList.add(new Document("$and", Arrays.asList( +// new Document("no", new Document("$in", noString)), + new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode())) + ))); + } Document filter = new Document("$and", dList); // 鏋勫缓鑱氬悎绠¢亾 List<Document> pipeline = Arrays.asList( @@ -1456,8 +1779,14 @@ List<Document> documentList = new ArrayList<>(4); documentList.add(new Document("deptTag", new Document("$eq", Boolean.TRUE))); setTag(params, documentList); - Document recording = new Document("recordDuration",new Document("$gte", finalRecordingMinTime)); + Document recording = new Document("missDuration",new Document("$lte", finalRecordingMinTime)); documentList.add(recording); + if (finalAreaDeptEnum != null){ + documentList.add(new Document("$and", Arrays.asList( +// new Document("no", new Document("$in", noString)), + new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode())) + ))); + } Document filter = new Document("$and", documentList); // 鏋勫缓鑱氬悎绠¢亾 List<Document> pipeline = Arrays.asList( @@ -1514,7 +1843,20 @@ @Override public Result videoImportantPointAvailabilityRate(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("deviceId", "deviceName"); - Query query = MongoUtil.getQuery(params, "createTime", likeFileds, 3); + SysDept sysDept = getSysDeptByLoginUser(); + AreaDeptEnum areaDeptEnum = null; + Query query = null; + if (sysDept !=null){ + areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId())); + if (areaDeptEnum != null){ + query = MongoUtil.getQueryDataCenter(areaDeptEnum.getCode(),params,"createTime",likeFileds,null,"no"); + }else{ + query = MongoUtil.getQuery(params, "createTime", likeFileds, null); + } + }else { + query = MongoUtil.getQuery(params, "createTime", likeFileds, null); + } + query.addCriteria(Criteria.where("importantTag").is(Boolean.TRUE)); //涓嬫媺妗嗗綍鍍忔儏鍐垫煡璇㈡潯浠� if (params.getOption() != null) { query.addCriteria(Criteria.where("recordStatus").is(params.getOption())); @@ -1525,18 +1867,25 @@ //缈昏瘧琛屾斂鍖哄煙 resultList.forEach(item -> { String areaCode = item.getArealayername().substring(0, 6); - AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromCode(areaCode); - if (areaDeptEnum != null) item.setArealayername(areaDeptEnum.getName()); + AreaDeptEnum areaDeptEnumInfo = AreaDeptEnum.fromCode(areaCode); + if (areaDeptEnumInfo != null) item.setArealayername(areaDeptEnumInfo.getName()); }); // 缁熻鏁伴噺 MongoDatabase database = mongoTemplate.getDb(); MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum"); List<Integer> status = Arrays.asList(1, 0, -1); + AreaDeptEnum finalAreaDeptEnum = areaDeptEnum; List<String> resultCount = status.stream().map(item -> { List<Document> dList = new ArrayList<>(4); dList.add(new Document("importantTag", new Document("$eq", Boolean.TRUE))); dList.add(new Document("recordStatus", new Document("$eq", item))); setTag(params, dList); + if (finalAreaDeptEnum != null){ + dList.add(new Document("$and", Arrays.asList( +// new Document("no", new Document("$in", noString)), + new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode())) + ))); + } Document filter = new Document("$and", dList); // 鏋勫缓鑱氬悎绠¢亾 List<Document> pipeline = Arrays.asList( @@ -1563,8 +1912,14 @@ List<Document> documentList = new ArrayList<>(4); documentList.add(new Document("importantTag", new Document("$eq", Boolean.TRUE))); setTag(params, documentList); - Document recording = new Document("recordDuration",new Document("$gte", finalRecordingMinTime)); + Document recording = new Document("missDuration",new Document("$lte", finalRecordingMinTime)); documentList.add(recording); + if (finalAreaDeptEnum != null){ + documentList.add(new Document("$and", Arrays.asList( +// new Document("no", new Document("$in", noString)), + new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode())) + ))); + } Document filter = new Document("$and", documentList); // 鏋勫缓鑱氬悎绠¢亾 List<Document> pipeline = Arrays.asList( @@ -1623,12 +1978,32 @@ long total = mongoTemplate.count(query, RecordMetaDSumResult.class); List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class); + Query nonNetworkQuery; + Query networkQuery; + Query videoQuery; + Query carQuery; + Query faceQuery; +// if (areaDeptEnum == null){ + nonNetworkQuery = new Query().addCriteria(Criteria.where("LWSX").is("0")); + networkQuery = new Query().addCriteria(Criteria.where("LWSX").is("1")); + videoQuery = new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*1.*")); + carQuery = new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*2.*")); + faceQuery = new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*3.*")); +// } +// else { +// nonNetworkQuery = new Query().addCriteria(Criteria.where("LWSX").is("0")).addCriteria(Criteria.where("no").regex("^" + Pattern.quote(areaDeptEnum.getCode()))); +// networkQuery = new Query().addCriteria(Criteria.where("LWSX").is("1")).addCriteria(Criteria.where("no").regex("^" + Pattern.quote(areaDeptEnum.getCode()))); +// videoQuery = new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*1.*")).addCriteria(Criteria.where("no").regex("^" + Pattern.quote(areaDeptEnum.getCode()))); +// carQuery = new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*2.*")).addCriteria(Criteria.where("no").regex("^" + Pattern.quote(areaDeptEnum.getCode()))); +// faceQuery = new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*3.*")).addCriteria(Criteria.where("no").regex("^" + Pattern.quote(areaDeptEnum.getCode()))); +// } + // 缁熻鏁� - long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), RecordMetaDSumResult.class); - long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), RecordMetaDSumResult.class); - long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*1.*")), RecordMetaDSumResult.class); - long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*2.*")), RecordMetaDSumResult.class); - long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*3.*")), RecordMetaDSumResult.class); + long nonNetwork = mongoTemplate.count(nonNetworkQuery, RecordMetaDSumResult.class); + long network = mongoTemplate.count(networkQuery, RecordMetaDSumResult.class); + long video = mongoTemplate.count(videoQuery, RecordMetaDSumResult.class); + long car = mongoTemplate.count(carQuery, RecordMetaDSumResult.class); + long face = mongoTemplate.count(faceQuery, RecordMetaDSumResult.class); HashMap<String, Object> map = new HashMap<>(); map.put("count", Arrays.asList(nonNetwork, network, video, car, face)); map.put("list", resultList); @@ -1644,12 +2019,26 @@ @Override public Result videoImportantPointLabelingAccuracy(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("deviceNo", "osdName"); - List<Criteria> andCriteria = MongoUtil.getAndCriteria(params, "checkTime", likeFileds, null); + SysDept sysDept = getSysDeptByLoginUser(); + List<Criteria> andCriteria; + AreaDeptEnum areaDeptEnum = null; + if (sysDept != null) { + areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId())); + if (areaDeptEnum != null) { + andCriteria = MongoUtil.getAndCriteriaDateCenter(areaDeptEnum.getCode(),params, "checkTime", likeFileds, null); + }else { + andCriteria = MongoUtil.getAndCriteria(params, "checkTime", likeFileds, null); + } + }else { + andCriteria = MongoUtil.getAndCriteria(params, "checkTime", likeFileds, null); + } + Query query = new Query(); Criteria and = new Criteria(); and.andOperator(andCriteria); query = Query.query(and); - //涓嬫媺妗嗘爣娉ㄦ纭煡璇㈡潯浠� + query.addCriteria(Criteria.where("importantTag").is(Boolean.TRUE)); + // 涓嬫媺妗嗘爣娉ㄦ纭煡璇㈡潯浠� if (params.getOption() != null) { if (params.getOption() == 1) { andCriteria.add(Criteria.where("osdNameCorrect").is(1)); @@ -1690,13 +2079,26 @@ // 缁熻鏁伴噺 MongoDatabase database = mongoTemplate.getDb(); MongoCollection<Document> collection = database.getCollection("osd_check_result"); - //鎬绘暟 + // 纭繚鍦ㄧ粺璁℃煡璇腑涔熷簲鐢ㄧ浉鍚岀殑杩囨护鏉′欢 + Document areDocument = null; + if (areaDeptEnum != null) { + String areaCodePrefix = areaDeptEnum.getCode(); + areDocument = new Document("deviceNo", new Document("$regex", "^" + areaCodePrefix)); + } + // 鎬绘暟 List<Document> dList = new ArrayList<>(2); + if (areDocument != null){ + dList.add(areDocument); + } dList.add(new Document("importantTag", Boolean.TRUE)); setTag(params, dList); + Document osdFilter = new Document("$and", dList); - //姝e父鏁� + // 姝e父鏁� List<Document> dList1 = new ArrayList<>(2); + if (areDocument != null){ + dList1.add(areDocument); + } dList1.add(new Document("importantTag", Boolean.TRUE)); dList1.add(new Document("osdNameCorrect", new Document("$eq", 1))); dList1.add(new Document("osdTimeCorrect", new Document("$eq", 1))); @@ -1704,9 +2106,13 @@ dList1.add(new Document("osdCityCorrect", new Document("$eq", 1))); dList1.add(new Document("osdPartCorrect", new Document("$eq", 1))); setTag(params, dList1); + Document osdCorrectFilter = new Document("$and", dList1); //寮傚父鏁� List<Document> dList2 = new ArrayList<>(2); + if (areDocument != null){ + dList2.add(areDocument); + } setTag(params, dList2); Document importantTagCondition = new Document("importantTag", Boolean.TRUE); dList2.add(importantTagCondition); @@ -1718,9 +2124,14 @@ errorConditions.add(new Document("osdPartCorrect", new Document("$eq", -1))); Document errorFilter = new Document("$or", errorConditions); dList2.add(errorFilter); + Document osdErrorFilter = new Document("$and", dList2); - //鏈煡鏁� + + // 鏈煡鏁� List<Document> dList3 = new ArrayList<>(2); + if (areDocument != null){ + dList3.add(areDocument); + } setTag(params, dList3); dList3.add(importantTagCondition); List<Document> unknownConditions = new ArrayList<>(); @@ -1729,9 +2140,9 @@ unknownConditions.add(new Document("osdProvinceCorrect", new Document("$eq", 0))); unknownConditions.add(new Document("osdCityCorrect", new Document("$eq", 0))); unknownConditions.add(new Document("osdPartCorrect", new Document("$eq", 0))); - // 浣跨敤$or閫昏緫缁勫悎鍓╀綑鐨勬潯浠� Document unknownFilter = new Document("$or", unknownConditions); dList3.add(unknownFilter); + Document osdUnknownFilter = new Document("$and", dList3); List<Document> lists = Arrays.asList(osdFilter, osdCorrectFilter, osdErrorFilter, osdUnknownFilter); @@ -1753,18 +2164,6 @@ 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(); -// 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 (!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")); @@ -1871,7 +2270,25 @@ @Override public Result videoImportantPointCheckTimeAccuracy(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("deviceNo", "osdName"); - Query query = MongoUtil.getQuery(params, "checkTime", likeFileds, null); + + SysDept sysDept = getSysDeptByLoginUser(); + List<Criteria> andCriteria; + AreaDeptEnum areaDeptEnum = null; + if (sysDept != null) { + areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId())); + if (areaDeptEnum != null) { + andCriteria = MongoUtil.getAndCriteriaDateCenter(areaDeptEnum.getCode(),params, "checkTime", likeFileds, null); + }else { + andCriteria = MongoUtil.getAndCriteria(params, "checkTime", likeFileds, null); + } + }else { + andCriteria = MongoUtil.getAndCriteria(params, "checkTime", likeFileds, null); + } + Query query = new Query(); + Criteria and = new Criteria(); + and.andOperator(andCriteria); + query = Query.query(and); + query.addCriteria(Criteria.where("importantTag").is(Boolean.TRUE)); //涓嬫媺妗嗘爣娉ㄦ纭煡璇㈡潯浠� if (params.getOption() != null) { if (params.getOption() == 1) { @@ -1886,6 +2303,11 @@ long total = mongoTemplate.count(query, OsdCheckResult.class); MongoUtil.setPage(query, params, "checkTime"); List<OsdCheckResult> resultList = mongoTemplate.find(query, OsdCheckResult.class); + Document areDocument = null; + if (areaDeptEnum != null) { + String areaCodePrefix = areaDeptEnum.getCode(); + areDocument = new Document("deviceNo", new Document("$regex", "^" + areaCodePrefix)); + } for (OsdCheckResult osdCheckResult : resultList) { OsdCheckResult.getError(osdCheckResult); @@ -1894,7 +2316,10 @@ MongoDatabase database = mongoTemplate.getDb(); MongoCollection<Document> collection = database.getCollection("osd_check_result"); //鎬绘暟 - List<Document> dList = new ArrayList<>(2); + List<Document> dList = new ArrayList<>(3); + if (areDocument != null){ + dList.add(areDocument); + } dList.add(new Document("importantTag", Boolean.TRUE)); setTag(params, dList); Document osdFilter = new Document("$and", dList); @@ -1906,10 +2331,16 @@ dList1.add(new Document("osdProvinceCorrect", new Document("$eq", 1))); dList1.add(new Document("osdCityCorrect", new Document("$eq", 1))); dList1.add(new Document("osdPartCorrect", new Document("$eq", 1))); + if (areDocument != null){ + dList1.add(areDocument); + } setTag(params, dList1); Document osdCorrectFilter = new Document("$and", dList1); //寮傚父鏁� List<Document> dList2 = new ArrayList<>(2); + if (areDocument != null){ + dList2.add(areDocument); + } setTag(params, dList2); Document importantTagCondition = new Document("importantTag", Boolean.TRUE); dList2.add(importantTagCondition); @@ -1924,6 +2355,9 @@ Document osdErrorFilter = new Document("$and", dList2); //鏈煡鏁� List<Document> dList3 = new ArrayList<>(2); + if (areDocument != null){ + dList3.add(areDocument); + } setTag(params, dList3); dList3.add(importantTagCondition); List<Document> unknownConditions = new ArrayList<>(); @@ -1989,7 +2423,20 @@ @Override public Result vehicleViewDockStable(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName"); - Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); + Query query = null; + SysDept sysDept = getSysDeptByLoginUser(); + AreaDeptEnum areaDeptEnum = null; + if (sysDept !=null){ + areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId())); + if (areaDeptEnum != null){ + query = MongoUtil.getQueryDataCenter(areaDeptEnum.getCode(),params,TIME_FIELD,likeFileds,null,"no"); + + }else{ + query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); + } + }else { + query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); + } //鍔燚ataType涓鸿溅杈� query.addCriteria(Criteria.where("dataType").is(ApiConstants.HK_DataType_CAR)); if (params.getOption() != null) { @@ -2007,23 +2454,41 @@ MongoUtil.setPage(query, params, TIME_FIELD); List<SnapshotDataMonitorResult> resultList = mongoTemplate.find(query, SnapshotDataMonitorResult.class); resultList.forEach(item -> item.setResultTypeText(item.getResultTypeText())); + Document areDocument = null; + if (areaDeptEnum != null) { + String areaCodePrefix = areaDeptEnum.getCode(); + areDocument = new Document("deviceNo", new Document("$regex", "^" + areaCodePrefix)); + } // 缁熻鏁伴噺 MongoDatabase database = mongoTemplate.getDb(); MongoCollection<Document> collection = database.getCollection("hk_snapshot_data_monitor"); List<Document> dList2 = new ArrayList<>(2); + if (areDocument != null){ + dList2.add(areDocument); + } dList2.add(new Document("resultType", new Document("$eq", 1))); dList2.add(new Document("dataType", new Document("$eq", ApiConstants.HK_DataType_CAR))); setTag(params, dList2); + List<Document> dList3 = new ArrayList<>(2); + if (areDocument != null){ + dList3.add(areDocument); + } dList3.add(new Document("resultType", new Document("$eq", 2))); dList3.add(new Document("dataType", new Document("$eq", ApiConstants.HK_DataType_CAR))); setTag(params, dList3); List<Document> dList4 = new ArrayList<>(2); + if (areDocument != null){ + dList4.add(areDocument); + } 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); + if (areDocument != null){ + dList5.add(areDocument); + } dList5.add(new Document("resultType", new Document("$eq", 4))); dList5.add(new Document("dataType", new Document("$eq", ApiConstants.HK_DataType_CAR))); setTag(params, dList5); @@ -2093,6 +2558,24 @@ return Result.ok().data(map).total(total); } + public Query buildQuery(DataCenterQuery params,List<String> likeFileds,String fileName){ + Query query = null; + SysDept sysDept = getSysDeptByLoginUser(); + AreaDeptEnum areaDeptEnum = null; + if (sysDept !=null){ + areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId())); + if (areaDeptEnum != null){ + query = MongoUtil.getQueryDataCenter(areaDeptEnum.getCode(),params,TIME_FIELD,likeFileds,null,"no"); + + }else{ + query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); + } + }else { + query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); + } + return query; + } + /** * 杞﹁締锛氱偣浣嶅湪绾跨巼 * @@ -2102,7 +2585,20 @@ @Override public Result vehiclePointOnlineRate(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("name", "no", "ip"); - Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); + Query query = null; + SysDept sysDept = getSysDeptByLoginUser(); + AreaDeptEnum areaDeptEnum = null; + if (sysDept !=null){ + areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId())); + if (areaDeptEnum != null){ + query = MongoUtil.getQueryDataCenter(areaDeptEnum.getCode(),params,TIME_FIELD,likeFileds,null,"no"); + + }else{ + query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); + } + }else { + query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); + } //鏌ヨ溅杈嗚澶� query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Car + ".*")); //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠� @@ -2158,6 +2654,9 @@ int unknownCount = 0; //鏋勫缓鏉′欢 List<Criteria> criteriaList = new ArrayList<>(); + if (areaDeptEnum != null){ + criteriaList.add(Criteria.where("no").regex("^" +areaDeptEnum.getCode())); + } // 娣诲姞鍥哄畾鏉′欢 criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Car + ".*")); criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime())); @@ -2217,7 +2716,19 @@ @Override public Result vehicleNetDeviceDirectoryConsistency(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("ip.showValue", "name.showValue", "serialNumber.showValue"); - List<Criteria> andCriteria = MongoUtil.getAndCriteria(params, TIME_FIELD, likeFileds, null); + SysDept sysDept = getSysDeptByLoginUser(); + List<Criteria> andCriteria; + AreaDeptEnum areaDeptEnum = null; + if (sysDept != null) { + areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId())); + if (areaDeptEnum != null) { + andCriteria = MongoUtil.getAndCriteriaDateCenter(areaDeptEnum.getCode(),params, "checkTime", likeFileds, null); + }else { + andCriteria = MongoUtil.getAndCriteria(params, "checkTime", likeFileds, null); + } + }else { + andCriteria = MongoUtil.getAndCriteria(params, "checkTime", likeFileds, null); + } // 1/2/3 瑙嗛/杞﹁締/浜鸿劯 Pattern pattern = Pattern.compile(".*2.*"); andCriteria.add(Criteria.where("sxjgnlx.value").regex(pattern)); @@ -2243,13 +2754,25 @@ //缁熻鏁伴噺 MongoDatabase database = mongoTemplate.getDb(); MongoCollection<Document> collection = database.getCollection("uy_monitor_qualify"); + Document areDocument = null; + if (areaDeptEnum != null) { + String areaCodePrefix = areaDeptEnum.getCode(); + areDocument = new Document("no", new Document("$regex", "^" + areaCodePrefix)); + } + //鎬绘暟 List<Document> dList1 = new ArrayList<>(2); + if (areDocument != null){ + dList1.add(areDocument); + } setTag(params, dList1); dList1.add(new Document("sxjgnlx.value", new Document("$regex", ".*2.*"))); Document totalFilter = new Document("$and", dList1); //鏂拌澶囨暟 List<Document> dList2 = new ArrayList<>(2); + if (areDocument != null){ + dList2.add(areDocument); + } setTag(params, dList2); dList2.add(new Document("sxjgnlx.value", new Document("$regex", ".*2.*"))); dList2.add(new Document("newDevice", Boolean.TRUE)); -- Gitblit v1.8.0