From 97b1e0d4820606bef726f60e459b66afb1e8eab1 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 21 十一月 2025 11:50:51 +0800
Subject: [PATCH] 优化与日志
---
ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java | 797 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 484 insertions(+), 313 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
index e450615..bc7a065 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
@@ -6,6 +6,7 @@
import com.mongodb.client.AggregateIterable;
import com.mongodb.client.MongoCollection;
import com.mongodb.client.MongoDatabase;
+import com.ycl.platform.domain.entity.MonitorConstruction;
import com.ycl.platform.domain.entity.TMonitor;
import com.ycl.platform.domain.excel.*;
import com.ycl.platform.domain.form.VideoExportForm;
@@ -27,10 +28,8 @@
import com.ycl.platform.domain.vo.home.HomeVideoVO;
import com.ycl.platform.domain.vo.screen.MonitorRateVO;
import com.ycl.platform.domain.vo.screen.MonitorTotalVO;
-import com.ycl.platform.mapper.DynamicColumnMapper;
-import com.ycl.platform.mapper.TMonitorMapper;
-import com.ycl.platform.mapper.WorkOrderMapper;
-import com.ycl.platform.mapper.YwPointMapper;
+import com.ycl.platform.mapper.*;
+import com.ycl.platform.service.IMonitorConstructionService;
import com.ycl.platform.service.ITMonitorService;
import com.ycl.system.Result;
import com.ycl.system.entity.SysDictData;
@@ -71,7 +70,10 @@
import java.util.*;
import java.util.concurrent.*;
import java.util.function.Function;
+import java.util.regex.Pattern;
import java.util.stream.Collectors;
+
+import static com.ycl.utils.PageUtils.startPage;
/**
* 璁惧璧勪骇Service涓氬姟灞傚鐞�
@@ -98,7 +100,8 @@
private DynamicColumnMapper dynamicColumnMapper;
@Autowired
private ThreadPoolTaskExecutor threadPoolTaskExecutor;
-
+ @Autowired
+ private IMonitorConstructionService monitorConstructionService;
/**
* 鏌ヨ璁惧璧勪骇
*
@@ -128,156 +131,173 @@
}
tMonitor.setTime(time);
}
- List<TMonitorVO> monitors = tMonitorMapper.selectTMonitorList(tMonitor);
- // 寮傚父鎭㈠鐩戞帶
- if (Objects.equals(tMonitor.getRecovery(), 1L)) {
- //宸ュ崟鍙�
- List<String> orders = monitors.stream().map(TMonitorVO::getWorkOrderNo).collect(Collectors.toList());
- if (CollectionUtils.isEmpty(orders)) {
+ List<TMonitorVO> monitors = new ArrayList<>();
+ if (StringUtils.isNotBlank(tMonitor.getConstructionType())){
+ List<MonitorConstruction> list =
+ monitorConstructionService.getSerialNumberListByConstructionType(tMonitor.getConstructionType());
+ log.info("鎵撳嵃鏌ヨ璁惧鏍囩鏁�:{},寤鸿绫诲瀷鏍囩:{}",list.size(), tMonitor.getConstructionType() );
+ //鑾峰緱璁惧缂栧彿闆嗗悎 閫氳繃寤鸿绫诲瀷鏍囩
+ if(!CollectionUtils.isEmpty(list)){
+ tMonitor.setIds(
+ list.stream().map(MonitorConstruction::getSerialNumber).collect(Collectors.toList()));
+
+ startPage();
+ monitors = tMonitorMapper.selectTMonitorListAndIds(tMonitor);
+ }
+
+ }else{
+ startPage();
+ monitors = tMonitorMapper.selectTMonitorList(tMonitor);
+ }
+ // 寮傚父鎭㈠鐩戞帶
+ if (Objects.equals(tMonitor.getRecovery(), 1L)) {
+ //宸ュ崟鍙�
+ List<String> orders = monitors.stream().map(TMonitorVO::getWorkOrderNo).collect(Collectors.toList());
+ if (CollectionUtils.isEmpty(orders)) {
+ return monitors;
+ }
+ List<WorkOrderVO> voList = workOrderMapper.getRecoveryInfo(orders);
+ for (TMonitorVO monitor : monitors) {
+ if (!CollectionUtils.isEmpty(voList)) {
+ for (WorkOrderVO workOrderVO : voList) {
+ if (monitor.getWorkOrderNo() != null && monitor.getWorkOrderNo().equals(workOrderVO.getWorkOrderNo())) {
+ monitor.setUnitContact(workOrderVO.getUnitContact());
+ monitor.setUnitContactPhone(workOrderVO.getUnitContactPhone());
+ monitor.setYwPeopleName(workOrderVO.getYwPeopleName());
+ monitor.setErrorType(workOrderVO.getErrorType());
+ }
+ }
+ }
+ }
return monitors;
}
- List<WorkOrderVO> voList = workOrderMapper.getRecoveryInfo(orders);
- for (TMonitorVO monitor : monitors) {
- if (!CollectionUtils.isEmpty(voList)) {
- for (WorkOrderVO workOrderVO : voList) {
- if (monitor.getWorkOrderNo() != null && monitor.getWorkOrderNo().equals(workOrderVO.getWorkOrderNo())) {
- monitor.setUnitContact(workOrderVO.getUnitContact());
- monitor.setUnitContactPhone(workOrderVO.getUnitContactPhone());
- monitor.setYwPeopleName(workOrderVO.getYwPeopleName());
- monitor.setErrorType(workOrderVO.getErrorType());
+ //璁惧缂栧彿
+ List<String> numbers = monitors.stream().map(TMonitorVO::getSerialNumber).collect(Collectors.toList());
+ Query query = new Query();
+ Date now = new Date();
+ query.addCriteria(Criteria.where("no").in(numbers)
+ .and("mongoCreateTime").gte(DateUtils.getDayStart(now)).lt(DateUtils.getDayEnd(now))
+ );
+ //涓�鏈轰竴妗ｄ俊鎭�
+ List<MonitorQualifyResult> monitorQualifyResults = mongoTemplate.find(query, MonitorQualifyResult.class);
+ // 瑙嗛鐩戞帶璁惧
+ if (Objects.equals(tMonitor.getCameraFunType(), "1")) {
+ //OSD淇℃伅
+ List<OsdCheckResult> osdCheckResults = mongoTemplate.find(query, OsdCheckResult.class);
+ //褰曞儚鍙敤淇℃伅
+ List<RecordMetaDSumResult> videoResults = mongoTemplate.find(query, RecordMetaDSumResult.class);
+ for (TMonitorVO monitor : monitors) {
+ monitor.setMongoCreateTime(now);
+ //涓�鏈轰竴妗�
+ setOneFile(monitorQualifyResults, monitor);
+ //褰曞儚
+ if (!CollectionUtils.isEmpty(videoResults)) {
+ for (RecordMetaDSumResult videoResult : videoResults) {
+ if (monitor.getSerialNumber().equals(videoResult.getNo())) {
+ monitor.setVideoComplete(videoResult.getRecordStatus());
+ monitor.setVideoLoseTime(videoResult.getMissDuration());
+ }
+ }
+ }
+ //OSD
+ if (!CollectionUtils.isEmpty(osdCheckResults)) {
+ for (OsdCheckResult osdCheckResult : osdCheckResults) {
+ if (monitor.getSerialNumber().equals(osdCheckResult.getNo())) {
+ monitor.setOSD(OsdCheckResult.checkOsd(osdCheckResult));
+ monitor.setOSDTime(OsdCheckResult.checkTime(osdCheckResult));
+ }
}
}
}
}
- return monitors;
- }
- //璁惧缂栧彿
- List<String> numbers = monitors.stream().map(TMonitorVO::getSerialNumber).collect(Collectors.toList());
- Query query = new Query();
- Date now = new Date();
- query.addCriteria(Criteria.where("no").in(numbers)
- .and("mongoCreateTime").gte(DateUtils.getDayStart(now)).lt(DateUtils.getDayEnd(now))
- );
- //涓�鏈轰竴妗ｄ俊鎭�
- List<MonitorQualifyResult> monitorQualifyResults = mongoTemplate.find(query, MonitorQualifyResult.class);
- // 瑙嗛鐩戞帶璁惧
- if (Objects.equals(tMonitor.getCameraFunType(), "1")) {
- //OSD淇℃伅
- List<OsdCheckResult> osdCheckResults = mongoTemplate.find(query, OsdCheckResult.class);
- //褰曞儚鍙敤淇℃伅
- List<RecordMetaDSumResult> videoResults = mongoTemplate.find(query, RecordMetaDSumResult.class);
- for (TMonitorVO monitor : monitors) {
- monitor.setMongoCreateTime(now);
- //涓�鏈轰竴妗�
- setOneFile(monitorQualifyResults, monitor);
- //褰曞儚
- if (!CollectionUtils.isEmpty(videoResults)) {
- for (RecordMetaDSumResult videoResult : videoResults) {
- if (monitor.getSerialNumber().equals(videoResult.getNo())) {
- monitor.setVideoComplete(videoResult.getRecordStatus());
- monitor.setVideoLoseTime(videoResult.getMissDuration());
- }
- }
- }
- //OSD
- if (!CollectionUtils.isEmpty(osdCheckResults)) {
- for (OsdCheckResult osdCheckResult : osdCheckResults) {
- if (monitor.getSerialNumber().equals(osdCheckResult.getNo())) {
- monitor.setOSD(OsdCheckResult.checkOsd(osdCheckResult));
- monitor.setOSDTime(OsdCheckResult.checkTime(osdCheckResult));
- }
- }
- }
- }
- }
- // 杞﹁締鐩戞帶璁惧
- if (Objects.equals(tMonitor.getCameraFunType(), "2")) {
- //灞炴�т竴鑷寸巼銆佸ぇ鍥�
- List<VehicleDeviceSamplingResult> sampleResults = mongoTemplate.find(query, VehicleDeviceSamplingResult.class);
- List<PicAccessResult> picAccessResults = mongoTemplate.find(query, PicAccessResult.class);
- //鎶撴媿閲忋�佹椂閽熴�佷笂浼�
- List<VehicleDeviceInspectionResult> inspectResults = mongoTemplate.find(query, VehicleDeviceInspectionResult.class);
- for (TMonitorVO monitor : monitors) {
- monitor.setMongoCreateTime(now);
- //涓�鏈轰竴妗�
- setOneFile(monitorQualifyResults, monitor);
- //url
- if (!CollectionUtils.isEmpty(sampleResults)) {
- for (PicAccessResult picAccessResult : picAccessResults) {
- if (monitor.getSerialNumber().equals(picAccessResult.getNo())) {
- BigDecimal bigDecimal = PicAccessResult.calUrl(picAccessResult);
- monitor.setUrlPercent(bigDecimal);
- }
- }
- }
+ // 杞﹁締鐩戞帶璁惧
+ if (Objects.equals(tMonitor.getCameraFunType(), "2")) {
//灞炴�т竴鑷寸巼銆佸ぇ鍥�
- if (!CollectionUtils.isEmpty(sampleResults)) {
- for (VehicleDeviceSamplingResult sampleResult : sampleResults) {
- if (monitor.getSerialNumber().equals(sampleResult.getNo())) {
- if (sampleResult.getBigUseful() != null) {
- monitor.setBigUsefulPercent(sampleResult.getBigUseful().getBigUsefulPercent());
- }
- if (sampleResult.getVehDiff() != null) {
- monitor.setImportantConPercent(sampleResult.getVehDiff().getImportantConPercent());
- monitor.setMajorConPercent(sampleResult.getVehDiff().getMajorConPercent());
- }
- }
- }
- }
+ List<VehicleDeviceSamplingResult> sampleResults = mongoTemplate.find(query, VehicleDeviceSamplingResult.class);
+ List<PicAccessResult> picAccessResults = mongoTemplate.find(query, PicAccessResult.class);
//鎶撴媿閲忋�佹椂閽熴�佷笂浼�
- if (!CollectionUtils.isEmpty(inspectResults)) {
- for (VehicleDeviceInspectionResult inspectResult : inspectResults) {
- if (monitor.getSerialNumber().equals(inspectResult.getNo())) {
- monitor.setSnapResult(inspectResult.getSnapResult());
- monitor.setSnapCount(inspectResult.getDataCount());
- if (inspectResult.getSnapClock() != null)
- monitor.setClockPercent(inspectResult.getSnapClock().getClockPercent());
- if (inspectResult.getSnapTimely() != null)
- monitor.setUploadPercent(inspectResult.getSnapTimely().getTimelyPercent());
- }
- }
- }
- }
- }
- // 浜鸿劯鐩戞帶璁惧
- if (Objects.equals(tMonitor.getCameraFunType(), "3")) {
- //浜鸿劯鍚堟牸銆佸ぇ鍥俱�乽rl璁块棶寮傚父
- List<FaceDeviceSamplingResult> sampleResults = mongoTemplate.find(query, FaceDeviceSamplingResult.class);
- //鎶撴媿閲忋�佹椂閽熴�佷笂浼�
- List<FaceDeviceInspectionResult> inspectResults = mongoTemplate.find(query, FaceDeviceInspectionResult.class);
- for (TMonitorVO monitor : monitors) {
- monitor.setMongoCreateTime(now);
- //涓�鏈轰竴妗�
- setOneFile(monitorQualifyResults, monitor);
- //浜鸿劯鍚堟牸銆佸ぇ鍥�
- if (!CollectionUtils.isEmpty(sampleResults)) {
- for (FaceDeviceSamplingResult sampleResult : sampleResults) {
- if (monitor.getSerialNumber().equals(sampleResult.getNo())) {
- if (sampleResult.getBigUseful() != null) {
- monitor.setBigUsefulPercent(sampleResult.getBigUseful().getBigUsefulPercent());
+ List<VehicleDeviceInspectionResult> inspectResults = mongoTemplate.find(query, VehicleDeviceInspectionResult.class);
+ for (TMonitorVO monitor : monitors) {
+ monitor.setMongoCreateTime(now);
+ //涓�鏈轰竴妗�
+ setOneFile(monitorQualifyResults, monitor);
+ //url
+ if (!CollectionUtils.isEmpty(sampleResults)) {
+ for (PicAccessResult picAccessResult : picAccessResults) {
+ if (monitor.getSerialNumber().equals(picAccessResult.getNo())) {
+ BigDecimal bigDecimal = PicAccessResult.calUrl(picAccessResult);
+ monitor.setUrlPercent(bigDecimal);
}
- if (sampleResult.getFaceEligibility() != null)
- monitor.setFacePercent(sampleResult.getFaceEligibility().getFaceEligPercent());
}
}
- }
- //鎶撴媿閲忋�佹椂閽熴�佷笂浼犮�佸缓妯″け璐ョ巼
- if (!CollectionUtils.isEmpty(inspectResults)) {
- for (FaceDeviceInspectionResult inspectResult : inspectResults) {
- if (monitor.getSerialNumber().equals(inspectResult.getNo())) {
- monitor.setSnapResult(inspectResult.getSnapResult());
- monitor.setSnapCount(inspectResult.getDataCount());
- if (inspectResult.getSnapClock() != null)
- monitor.setClockPercent(inspectResult.getSnapClock().getClockPercent());
- if (inspectResult.getSnapTimely() != null)
- monitor.setUploadPercent(inspectResult.getSnapTimely().getTimelyPercent());
- if (inspectResult.getSnapValidity() != null)
- monitor.setFailPercent(inspectResult.getSnapValidity().getFailPercent());
+ //灞炴�т竴鑷寸巼銆佸ぇ鍥�
+ if (!CollectionUtils.isEmpty(sampleResults)) {
+ for (VehicleDeviceSamplingResult sampleResult : sampleResults) {
+ if (monitor.getSerialNumber().equals(sampleResult.getNo())) {
+ if (sampleResult.getBigUseful() != null) {
+ monitor.setBigUsefulPercent(sampleResult.getBigUseful().getBigUsefulPercent());
+ }
+ if (sampleResult.getVehDiff() != null) {
+ monitor.setImportantConPercent(sampleResult.getVehDiff().getImportantConPercent());
+ monitor.setMajorConPercent(sampleResult.getVehDiff().getMajorConPercent());
+ }
+ }
+ }
+ }
+ //鎶撴媿閲忋�佹椂閽熴�佷笂浼�
+ if (!CollectionUtils.isEmpty(inspectResults)) {
+ for (VehicleDeviceInspectionResult inspectResult : inspectResults) {
+ if (monitor.getSerialNumber().equals(inspectResult.getNo())) {
+ monitor.setSnapResult(inspectResult.getSnapResult());
+ monitor.setSnapCount(inspectResult.getDataCount());
+ if (inspectResult.getSnapClock() != null)
+ monitor.setClockPercent(inspectResult.getSnapClock().getClockPercent());
+ if (inspectResult.getSnapTimely() != null)
+ monitor.setUploadPercent(inspectResult.getSnapTimely().getTimelyPercent());
+ }
}
}
}
}
- }
+ // 浜鸿劯鐩戞帶璁惧
+ if (Objects.equals(tMonitor.getCameraFunType(), "3")) {
+ //浜鸿劯鍚堟牸銆佸ぇ鍥俱�乽rl璁块棶寮傚父
+ List<FaceDeviceSamplingResult> sampleResults = mongoTemplate.find(query, FaceDeviceSamplingResult.class);
+ //鎶撴媿閲忋�佹椂閽熴�佷笂浼�
+ List<FaceDeviceInspectionResult> inspectResults = mongoTemplate.find(query, FaceDeviceInspectionResult.class);
+ for (TMonitorVO monitor : monitors) {
+ monitor.setMongoCreateTime(now);
+ //涓�鏈轰竴妗�
+ setOneFile(monitorQualifyResults, monitor);
+ //浜鸿劯鍚堟牸銆佸ぇ鍥�
+ if (!CollectionUtils.isEmpty(sampleResults)) {
+ for (FaceDeviceSamplingResult sampleResult : sampleResults) {
+ if (monitor.getSerialNumber().equals(sampleResult.getNo())) {
+ if (sampleResult.getBigUseful() != null) {
+ monitor.setBigUsefulPercent(sampleResult.getBigUseful().getBigUsefulPercent());
+ }
+ if (sampleResult.getFaceEligibility() != null)
+ monitor.setFacePercent(sampleResult.getFaceEligibility().getFaceEligPercent());
+ }
+ }
+ }
+ //鎶撴媿閲忋�佹椂閽熴�佷笂浼犮�佸缓妯″け璐ョ巼
+ if (!CollectionUtils.isEmpty(inspectResults)) {
+ for (FaceDeviceInspectionResult inspectResult : inspectResults) {
+ if (monitor.getSerialNumber().equals(inspectResult.getNo())) {
+ monitor.setSnapResult(inspectResult.getSnapResult());
+ monitor.setSnapCount(inspectResult.getDataCount());
+ if (inspectResult.getSnapClock() != null)
+ monitor.setClockPercent(inspectResult.getSnapClock().getClockPercent());
+ if (inspectResult.getSnapTimely() != null)
+ monitor.setUploadPercent(inspectResult.getSnapTimely().getTimelyPercent());
+ if (inspectResult.getSnapValidity() != null)
+ monitor.setFailPercent(inspectResult.getSnapValidity().getFailPercent());
+ }
+ }
+ }
+ }
+ }
return monitors;
}
@@ -345,6 +365,13 @@
@Override
@DataScope(deptAlias = "d", userAlias = "u")
public Map<String, String> getVideoCount(TMonitorVO tMonitor) {
+
+ List<MonitorConstruction> list =
+ monitorConstructionService.getSerialNumberListByConstructionType(tMonitor.getConstructionType());
+ //鑾峰緱璁惧缂栧彿闆嗗悎 閫氳繃寤鸿绫诲瀷鏍囩
+ tMonitor.setIds(
+ list.stream().map(MonitorConstruction::getSerialNumber).collect(Collectors.toList()));
+
return tMonitorMapper.getVideoCount(tMonitor);
}
@@ -555,226 +582,272 @@
ExcelUtilManySheet<List<ExcelExp>> util = new ExcelUtilManySheet<>(mysheet);
util.exportExcelManySheet(response, mysheet);
}
-
-
/**
* 瀵煎嚭姣忔棩鍦ㄧ嚎鏁版嵁
*/
@Override
public void exportVideoOnline(HttpServletResponse response, VideoExportForm exportForm) throws IOException, NoSuchFieldException, IllegalAccessException {
- log.error("寮�濮嬪鍑烘暟鎹�");
- log.error("浼犲叆鐨勬湀浠�:{}",exportForm.getMonth());
- //榛樿鏌ユ墍鏈夐儴闂�
+ log.info("寮�濮嬪鍑烘暟鎹�");
+ log.info("浼犲叆鐨勬湀浠�:{}", exportForm.getMonth());
+
+ // 榛樿鏌ユ墍鏈夐儴闂�
if (CollectionUtils.isEmpty(exportForm.getDeptIds())) {
- List<Integer> deptIds = new ArrayList<>();
+ List<Integer> deptIds = new ArrayList<>(AreaDeptEnum.values().length);
for (AreaDeptEnum value : AreaDeptEnum.values()) {
deptIds.add(value.getDeptId());
}
exportForm.setDeptIds(deptIds);
}
- List<ExcelExp> sheet = new ArrayList<>();
- //閫氳繃Collections闈欐�佹柟娉曪紝鎶妉ist杞负绾跨▼瀹夊叏鐨刲ist
- List mysheet = Collections.synchronizedList(sheet);
+
+ // 浣跨敤绾跨▼瀹夊叏鐨凩ist锛岄鍏堟寚瀹氬閲�
+ List<ExcelExp> mysheet = Collections.synchronizedList(new ArrayList<>());
VideoExportForm.convertTags(exportForm);
- Query query = getQuery(exportForm);
- //鏈堜唤姣忔棩鍦ㄧ嚎鏁版嵁
+ Query query = getQuery(exportForm);//瑁呴厤鏉′欢
+ // 鏈堜唤姣忔棩鍦ㄧ嚎鏁版嵁
+
List<TMonitorResult> onlineResult = mongoTemplate.find(query, TMonitorResult.class);
- log.error("鏈堜唤鍦ㄧ嚎鏁版嵁:{}鏉℃暟",onlineResult.size());
- // 浣跨敤 Collectors.toMap 鍘婚噸锛屼繚鐣欐瘡涓� No 鐨勭涓�涓亣鍒扮殑鍏冪礌
- Map<String, TMonitorResult> uniqueResultsMap = onlineResult.stream()
+ log.info("澶у皬:{}",onlineResult.size());
+ //姝ゅ闇�瑕佽繃婊ゆ帀璁惧鍏ㄦ櫙鍦ㄧ嚎 缁嗚妭涓嶅湪绾跨殑鎯呭喌 鍙互鎸� point鍒嗙粍 鍒嗘垜璁稿缁勪箣鍚庡啀鍋氬鐞�
+// Map<String, List<TMonitorResult>> ipToDevices = onlineResult.stream()
+// .collect(Collectors.groupingBy(TMonitorResult::getIp)); //閲嶈鎿嶄綔 鎸塱p鍒嗙粍
+
+// onlineResult = ipToDevices.values().stream()
+// .map(devices -> {
+// // 妫�鏌ュ垎缁勪腑鏄惁鏈� online = true 鐨勮澶�
+// List<TMonitorResult> onlineDevices = devices.stream()
+// .filter(monitor -> monitor.getOnline() == 1) // 鍋囪online瀛楁鐨刧etter鏄痠sOnline()
+// .collect(Collectors.toList());
+//
+// if (!onlineDevices.isEmpty()) {
+// // 鑻ュ瓨鍦╫nline=true鐨勮澶囷紝鍙繚鐣欑涓�涓紙鎴栧彇浠绘剰涓�涓紝鎸夐渶璋冩暣锛�
+// return onlineDevices.get(0);
+// } else {
+// // 鑻ュ叏涓簅nline=false锛屽彧淇濈暀绗竴涓�
+// return devices.get(0);
+// }
+// })
+// .collect(Collectors.toList());
+
+
+
+ log.info("鏈堜唤鍦ㄧ嚎鏁版嵁:{}鏉℃暟", onlineResult.size());
+ // 浣跨敤Collectors.toMap鍘婚噸锛屼繚鐣欐瘡涓狽o鐨勭涓�涓亣鍒扮殑鍏冪礌
+ Map<String, TMonitorResult> fullDataMap = onlineResult.stream()
.collect(Collectors.toMap(
TMonitorResult::getNo, // keyMapper锛岃繖閲屽亣璁� getNo() 杩斿洖 No 瀛楁
Function.identity(), // valueMapper锛岀洿鎺ヤ娇鐢ㄥ璞℃湰韬�
(existing, replacement) -> existing // mergeFunction锛屽鏋滄湁閲嶅锛屼繚鐣欑涓�涓�
));
- // 灏� Map 杞崲涓� List
- List<TMonitorResult> tMonitorResults = new ArrayList<>(uniqueResultsMap.values());
- log.error("鍘婚噸鍚庡ぇ灏�:{}",tMonitorResults.size());
- //鑾峰彇鍔ㄦ�佸垪鏁版嵁
- List<Integer> pointIds = tMonitorResults.stream().map(TMonitorResult::getPointId).collect(Collectors.toList());
- List<DynamicColumnVO> dynamics = dynamicColumnMapper.getDynamicsByIds("t_yw_point", pointIds);
- //琛ュ厖鍔ㄦ�佸垪鏁版嵁
- if (!CollectionUtils.isEmpty(dynamics)) {
- Map<Integer, List<DynamicColumnVO>> map = dynamics.stream().collect(Collectors.groupingBy(DynamicColumnVO::getRefId));
- for (TMonitorResult tMonitorResult : tMonitorResults) {
- Integer pointId = tMonitorResult.getPointId();
- tMonitorResult.setDynamicColumnList(map.get(pointId));
+
+
+ // 灏� Map 杞崲涓� List 鍘婚噸鍚庡噺灏戞暟鎹簱娑堣��
+ List<TMonitorResult> tMonitorResults = new ArrayList<>(fullDataMap.values());
+// log.info("鍘婚噸鍚庡ぇ灏�:{}", tMonitorResults.size());
+
+ // 鑾峰彇鍔ㄦ�佸垪鏁版嵁骞舵瀯寤虹紦瀛楳ap
+ Map<Integer, List<DynamicColumnVO>> dynamicColumnMap = new HashMap<>();
+ if (!tMonitorResults.isEmpty()) {
+ //鑾峰彇ip闆嗗悎
+ List<Integer> pointIds = tMonitorResults.stream()
+ .map(TMonitorResult::getPointId)
+ .distinct() // 鍘婚噸锛屽噺灏戞暟鎹簱鏌ヨ
+ .collect(Collectors.toList());
+
+
+ //鑾峰彇闆嗗悎鐐逛綅鐨勮ˉ鍏呭垪淇℃伅
+ List<DynamicColumnVO> dynamics = dynamicColumnMapper.getDynamicsByIds("t_yw_point", pointIds);
+ if (!CollectionUtils.isEmpty(dynamics)) {
+ dynamicColumnMap = dynamics.stream()
+ .collect(Collectors.groupingBy(DynamicColumnVO::getRefId));
+ }
+
+ // 琛ュ厖鍔ㄦ�佸垪鏁版嵁
+ // 鍘婚噸鍚庣殑鍔ㄦ�佸垪淇℃伅
+ for (TMonitorResult result : tMonitorResults) {
+ result.setDynamicColumnList(dynamicColumnMap.getOrDefault(result.getPointId(), Collections.emptyList()));
}
}
- //瀛樻斁鍖哄煙 涓� 璁惧鍒楄〃 map key涓� 鍖哄煙
- Map<Integer, List<VideoDailyExp>> map = new HashMap<>();
- List<CompletableFuture<List<VideoDailyExp>>> futures = new ArrayList<>();
+ // 鎸夐儴闂ㄥ垎缁勶紝鍑忓皯鍚庣画寰幆涓殑杩囨护鎿嶄綔
+ Map<Integer, List<TMonitorResult>> deptMonitorMap = tMonitorResults.stream() //鍘婚噸鍚庢寚鍚� 姣忎釜璁惧鍙湁绗竴澶╃殑鏁版嵁
+ .collect(Collectors.groupingBy(TMonitorResult::getDeptId));
+
+ // 鎸夎澶囩紪鍙峰垎缁刼nlineResult锛屽姞閫熷悗缁煡鎵�
+ Map<String, List<TMonitorResult>> noToOnlineMap = onlineResult.stream() //杩欓噷鍊兼墍浠ユ暟鎹互璁惧鏍囧彿鍒嗙粍锛屽緱鍒板叾璇︽儏 濡� 1鍙峰埌31鍙风殑褰曞儚鎯呭喌
+ .collect(Collectors.groupingBy(TMonitorResult::getNo));
+
+ // 骞惰澶勭悊鍚勯儴闂ㄦ暟鎹�
+ List<CompletableFuture<ExcelExp>> futures = new ArrayList<>(exportForm.getDeptIds().size());//鎸夊墠绔紶鍏ョ殑 閮ㄩ棬缂栧彿 鏉ュ垽鏂渶瑕佸紑澶氬皯涓嚎绋�
+
+ Map<Integer, List<VideoDailyExp>> deptExpMap = new ConcurrentHashMap<>();
for (Integer deptId : exportForm.getDeptIds()) {
- CompletableFuture<List<VideoDailyExp>> future = CompletableFuture.supplyAsync(() -> {
- List<VideoDailyExp> videoDailyExps = new ArrayList<>();
- //绛涢�夐儴闂ㄦ暟鎹�
- List<TMonitorResult> monitors = tMonitorResults.stream()
- .filter(tMonitorResult -> deptId.equals(tMonitorResult.getDeptId()))
- .collect(Collectors.toList());
- if (CollectionUtils.isEmpty(monitors)) return videoDailyExps;
+ // 浣跨敤閮ㄩ棬ID鐨勬渶缁堝彉閲�
+ final Integer currentDeptId = deptId;
+ CompletableFuture<ExcelExp> future = CompletableFuture.supplyAsync(() -> {
+ // deptMonitorMap涓婇潰宸茬粡鍦ㄥ幓閲嶅悗鍒嗚繃缁勪簡锛堣繖閲屽彧鏄綋鐜颁簡鍘婚噸鐨勪綔鐢紝涓嬫柟姣忔棩鏁版嵁鏄�氳繃no鍦╪oToOnlineMap涓彇鍒扮殑锛�
- List<String> ids = monitors.stream()
- .map(BaseResult::getNo)
- .collect(Collectors.toList());
- //绛涢�塵ongo鍖哄幙鏁版嵁
- List<TMonitorResult> onlines = onlineResult.stream()
- .filter(result -> ids.contains(result.getNo()))
- .collect(Collectors.toList());
+ List<TMonitorResult> monitors = deptMonitorMap.getOrDefault(currentDeptId, Collections.emptyList());
- AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromDept(deptId);
+ if (monitors.isEmpty()) {
+ return null;
+ }
+ List<VideoDailyExp> videoDailyExps = new ArrayList<>(monitors.size());
+ AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromDept(currentDeptId);
+ String areaName = areaDeptEnum == null ? "鏈煡" : areaDeptEnum.getName();
+
for (TMonitorResult result : monitors) {
VideoDailyExp videoDailyExp = new VideoDailyExp();
videoDailyExp.setSerialNumber(result.getNo());
videoDailyExp.setDeviceName(result.getName());
videoDailyExp.setType(result.getMonitorType());
+ videoDailyExp.setArea(areaName);
- videoDailyExp.setArea(areaDeptEnum == null ? "鏈煡" : areaDeptEnum.getName());
+ // 鏋勫缓鏍囩瀛楃涓�
+ StringBuilder tag = new StringBuilder();
+ if (result.getProvinceTag()) tag.append("鐪佸巺銆�");
+ if (result.getImportantTag()) tag.append("閲嶇偣鐐逛綅銆�");
+ if (result.getImportantCommandImageTag()) tag.append("閲嶇偣鎸囨尌鍥惧儚銆�");
+ if (result.getDeptTag()) tag.append("閮ㄧ骇銆�");
- StringBuilder tag = new StringBuilder("" +
- (result.getProvinceTag() ? "鐪佸巺銆�" : "") +
- (result.getImportantTag() ? "閲嶇偣鐐逛綅銆�" : "") +
- (result.getImportantCommandImageTag() ? "閲嶇偣鎸囨尌鍥惧儚銆�" : "") +
- (result.getDeptTag() ? "閮ㄧ骇銆�" : ""));
-
- //鍔ㄦ�佸垪澶勭悊鍔犲湪鏍囩閲�
- if (!CollectionUtils.isEmpty(result.getDynamicColumnList())) {
- for (DynamicColumnVO dynamicColumnVO : result.getDynamicColumnList()) {
+ // 澶勭悊鍔ㄦ�佸垪
+ List<DynamicColumnVO> dynamicColumns = result.getDynamicColumnList();
+ if (!dynamicColumns.isEmpty()) {
+ for (DynamicColumnVO dynamicColumnVO : dynamicColumns) {
tag.append(dynamicColumnVO.getColumnValue()).append("銆�");
}
}
- // 鍒犻櫎瀛楃涓叉湯灏剧殑"銆�"
- if (tag.toString().endsWith("銆�")) {
- tag = new StringBuilder(tag.substring(0, tag.length() - 1));
+
+ // 绉婚櫎鏈熬鐨�"銆�"
+ if (tag.length() > 0) {
+ tag.setLength(tag.length() - 1);
}
videoDailyExp.setTag(tag.toString());
+ // 璁剧疆鍦ㄧ嚎鏁版嵁閲嶇偣浣嶇疆
try {
+ // 浠庨鏋勫缓鐨凪ap涓幏鍙栵紝閬垮厤姣忔杩囨护 姝ｇ‘鑾峰緱鍦ㄧ嚎鏁版嵁浣嶇疆
+ List<TMonitorResult> onlines = noToOnlineMap.getOrDefault(result.getNo(), Collections.emptyList());
+ // 閲嶇偣鏌ョ湅涓嬮潰杩欎釜鏂规硶 videoDailyExp 浼犲叆闇�瑕佺粍瑁呭璞＄殑 videoDailyExp 鍜� 鏁版嵁婧恟esult鍖呭惈鍔ㄦ�佸垪淇℃伅鐨勫璞� 鍜屼粬瀵瑰簲1鍒�31澶╃殑鍦ㄧ绾跨姸鎬�
setOnlineDaily(videoDailyExp, result, onlines);
} catch (Exception e) {
- log.error(e.getMessage());
+ log.error("璁剧疆鍦ㄧ嚎鏁版嵁寮傚父", e);
}
+//
videoDailyExps.add(videoDailyExp);
}
-
- ExcelExp excelExp = new ExcelExp(
- areaDeptEnum == null ? "鏈煡" : areaDeptEnum.getName(),
- videoDailyExps,
- VideoDailyExp.class
- );
- mysheet.add(excelExp);
-
-
- return videoDailyExps;
+//
+ // 瀛樺偍缁撴灉鍒扮嚎绋嬪畨鍏ㄧ殑Map 缁撴灉濡� 鎸夊尯鍒嗗垎缁� 瀵瑰簲璁惧鐨� 1鍒�31鏃ョ殑鍦ㄧ绾胯鎯�
+ deptExpMap.put(currentDeptId, videoDailyExps);
+//
+ return new ExcelExp(areaName, videoDailyExps, VideoDailyExp.class);
}, threadPoolTaskExecutor);
+
futures.add(future);
- map.put(deptId,future.join());
}
- // 鑾峰彇鍏ㄩ噺鏁版嵁
- List<VideoDailyExp> totalExps = futures.stream()
- .map(CompletableFuture::join)
+
+ // 绛夊緟鎵�鏈夊苟琛屼换鍔″畬鎴�
+ CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join();
+
+ // 鏀堕泦鎵�鏈夐儴闂ㄧ殑ExcelExp缁撴灉
+ for (CompletableFuture<ExcelExp> future : futures) {
+ ExcelExp excelExp = future.join();
+ if (excelExp != null) {
+ mysheet.add(excelExp);
+ }
+ }
+
+ // 鑾峰彇鍏ㄩ噺鏁版嵁骞舵坊鍔�"鍏ㄩ噺"sheet
+ List<VideoDailyExp> totalExps = deptExpMap.values().stream()
.flatMap(List::stream)
.collect(Collectors.toList());
- ExcelExp excelExp = new ExcelExp("鍏ㄩ噺", totalExps, VideoDailyExp.class);
- mysheet.add(excelExp);
- long face = totalExps.stream().filter(item -> item.getType().contains("1")).count();
- long car = totalExps.stream().filter(item -> item.getType().contains("2")).count();
- long video = totalExps.stream().filter(item -> item.getType().contains("3")).count();
- log.error("浜鸿劯鏁�:{}",face);
- log.error("car鏁�:{}",car);
- log.error("video鏁�:{}",video);
- //娣诲姞鏂扮殑sheet 绂荤嚎鏁扮粺璁¤〃
- List<VideoTypeOffOnlineExp> videoTypeOffOnlineExps = new ArrayList<>();
+ mysheet.add(new ExcelExp("鍏ㄩ噺", totalExps, VideoDailyExp.class));
- //鍦ㄧ嚎鐜囩粺璁¤〃
- List<VideoOnlineRateExp> videoOnlineRateExps = new ArrayList<>();
-
- for (Integer deptId : map.keySet()){
- List<VideoDailyExp> list = map.get(deptId);
- AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromDept(deptId);
- // 娣诲姞绂荤嚎琛ㄨ褰�
- //璁惧绫诲瀷 1浜鸿劯 2杞﹁締 3瑙嗛
- //浜鸿劯
- log.error("浼犲叆閮ㄩ棬闆嗗悎澶у皬:{} + 閮ㄩ棬id:{}" ,list.size(),deptId);
- VideoTypeOffOnlineExp faceVideoTypeOffOnlineExp = this.getListOfflineCountInfo(list,"1",areaDeptEnum);
- //鍗″彛
- VideoTypeOffOnlineExp carVideoTypeOffOnlineExp =this.getListOfflineCountInfo(list,"2",areaDeptEnum);
- //瑙嗛
- VideoTypeOffOnlineExp videoTypeOffOnlineExp = this.getListOfflineCountInfo(list,"3",areaDeptEnum);
-
- VideoOnlineRateExp faceVideoOnlineRateExp = this.getListOnLineCountInfo(list,"1",areaDeptEnum);
- //鍗″彛
- VideoOnlineRateExp carVideoOnlineRateExp =this.getListOnLineCountInfo(list,"2",areaDeptEnum);
- //瑙嗛
- VideoOnlineRateExp VideoOnlineRateExp = this.getListOnLineCountInfo(list,"3",areaDeptEnum);
-
-
- //灏嗚鍖哄煙绫讳笁绉嶈澶囩被鍨嬬殑 淇℃伅 鏀惧叆 excel瀵硅薄鍐�
- //鏀惧叆褰撳墠鍖哄煙鐨勪汉鑴歌澶囩浉鍏宠缁�
- videoTypeOffOnlineExps.add(faceVideoTypeOffOnlineExp);
- //鏀惧叆褰撳墠鍖哄煙鐨勮溅杈嗚澶囩浉鍏宠缁�
- videoTypeOffOnlineExps.add(carVideoTypeOffOnlineExp);
- //鏀惧叆褰撳墠鍖哄煙鐨勮棰戣澶囩浉鍏宠缁�
- videoTypeOffOnlineExps.add(videoTypeOffOnlineExp);
-
- videoOnlineRateExps.add(faceVideoOnlineRateExp);
- videoOnlineRateExps.add(carVideoOnlineRateExp);
- videoOnlineRateExps.add(VideoOnlineRateExp);
+ // 缁熻鍚勭被鍨嬭澶囨暟閲�
+ long face = 0, car = 0, video = 0;
+ for (VideoDailyExp exp : totalExps) {
+ String type = exp.getType();
+ if (type.contains("1")) face++;
+ if (type.contains("2")) car++;
+ if (type.contains("3")) video++;
}
- //璁＄畻鑷础甯傚悎璁�
- //鎻掑叆excel鏃剁‘淇濇暟鎹嚭鐜板湪鏈�鍚�
- List<VideoTypeOffOnlineExp> allVideoTypeOffOnlineExps = new ArrayList<>();
- //鎻掑叆excel鏃剁‘淇濇暟鎹嚭鐜板湪鏈�鍚�
- List<VideoOnlineRateExp> allVideoOnlineRateExps = new ArrayList<>();
+ log.info("浜鸿劯鏁�:{}", face);
+ log.info("car鏁�:{}", car);
+ log.info("video鏁�:{}", video);
- //鎵�鏈夌绾挎暟鎹腑锛屽悇鍖鸿澶囦负浜鸿劯鐨勫璞� 鍚堣瑁呴厤瀵硅薄
- VideoTypeOffOnlineExp allFaceVideosOffline = new VideoTypeOffOnlineExp();
- setAllVideoTypeOffOnlineExpCount(videoTypeOffOnlineExps,allFaceVideosOffline,"浜鸿劯");
+ // 绂荤嚎鏁扮粺璁�
+ List<VideoTypeOffOnlineExp> videoTypeOffOnlineExps = new ArrayList<>();
+ // 鍦ㄧ嚎鐜囩粺璁�
+ List<VideoOnlineRateExp> videoOnlineRateExps = new ArrayList<>();
- VideoTypeOffOnlineExp allCarVideosOffline = new VideoTypeOffOnlineExp();
- setAllVideoTypeOffOnlineExpCount(videoTypeOffOnlineExps,allCarVideosOffline,"鍗″彛");
+ for (Map.Entry<Integer, List<VideoDailyExp>> entry : deptExpMap.entrySet()) {
+ Integer deptId = entry.getKey();
+ List<VideoDailyExp> list = entry.getValue();
+ AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromDept(deptId);
- VideoTypeOffOnlineExp allVideosOffline = new VideoTypeOffOnlineExp();
- setAllVideoTypeOffOnlineExpCount(videoTypeOffOnlineExps,allVideosOffline,"瑙嗛");
+ // 鎵归噺澶勭悊涓夌璁惧绫诲瀷 姣忎釜璁惧1鍒�31鍙峰湪绂荤嚎鎯呭喌
+ addDeviceStats(list, areaDeptEnum, "1", "浜鸿劯", videoTypeOffOnlineExps, videoOnlineRateExps);
+ addDeviceStats(list, areaDeptEnum, "2", "鍗″彛", videoTypeOffOnlineExps, videoOnlineRateExps);
+ addDeviceStats(list, areaDeptEnum, "3", "瑙嗛", videoTypeOffOnlineExps, videoOnlineRateExps);
+ }
- allVideoTypeOffOnlineExps.add(allFaceVideosOffline);
- allVideoTypeOffOnlineExps.add(allCarVideosOffline);
- allVideoTypeOffOnlineExps.add(allVideosOffline);
+ // 璁＄畻鍚堣鏁版嵁
+ addTotalStats(videoTypeOffOnlineExps, videoOnlineRateExps, face, car, video);
- //鎵�鏈夊湪绾挎暟鎹� 鍚堣瑁呴厤瀵硅薄
- VideoOnlineRateExp allFaceVideosOnline = new VideoOnlineRateExp();
- setAllVideoTypeOnlineExpCount(face,videoOnlineRateExps,allFaceVideosOnline,"浜鸿劯");
+ // 娣诲姞缁熻sheet
+ mysheet.add(new ExcelExp("绂荤嚎鏁扮粺璁�", videoTypeOffOnlineExps, VideoTypeOffOnlineExp.class));
+ mysheet.add(new ExcelExp("鍦ㄧ嚎鐜囩粺璁�", videoOnlineRateExps, VideoOnlineRateExp.class));
-
- VideoOnlineRateExp allCarVideosOnline = new VideoOnlineRateExp();
- setAllVideoTypeOnlineExpCount(car,videoOnlineRateExps,allCarVideosOnline,"鍗″彛");
-
- VideoOnlineRateExp allVideosOnline = new VideoOnlineRateExp();
- setAllVideoTypeOnlineExpCount(video,videoOnlineRateExps,allVideosOnline,"瑙嗛");
-
-
- allVideoOnlineRateExps.add(allFaceVideosOnline);
- allVideoOnlineRateExps.add(allCarVideosOnline);
- allVideoOnlineRateExps.add(allVideosOnline);
-
- videoTypeOffOnlineExps.addAll(allVideoTypeOffOnlineExps);
- videoOnlineRateExps.addAll(allVideoOnlineRateExps);
- log.error("鎵撳嵃璁＄畻绂荤嚎鐨勪俊鎭�:{}" ,videoTypeOffOnlineExps );
- log.error("鎵撳嵃鍦ㄧ嚎鐨勪俊鎭�:{}" ,videoOnlineRateExps );
- //娣诲姞鍚堣鏁版嵁
-
- ExcelExp excelTypeOffLineExp = new ExcelExp("绂荤嚎鏁扮粺璁�", videoTypeOffOnlineExps, VideoTypeOffOnlineExp.class);
- mysheet.add(excelTypeOffLineExp);
-
- //娣诲姞鍦ㄧ嚎鐜囪〃
- ExcelExp excelOnlineRateExp = new ExcelExp("鍦ㄧ嚎鐜囩粺璁�",videoOnlineRateExps, VideoOnlineRateExp.class);
- mysheet.add(excelOnlineRateExp);
-
+ // 瀵煎嚭Excel
ExcelUtilManySheet<List<ExcelExp>> util = new ExcelUtilManySheet<>(mysheet);
util.exportExcelManySheet(response, mysheet);
- log.error("瀵煎嚭缁撴潫");
+ log.info("瀵煎嚭缁撴潫");
}
+
+ // 鏂板杈呭姪鏂规硶锛氭壒閲忔坊鍔犺澶囩粺璁′俊鎭�
+ private void addDeviceStats(List<VideoDailyExp> list, AreaDeptEnum areaDeptEnum,
+ String typeCode, String typeName,
+ List<VideoTypeOffOnlineExp> offLineList,
+ List<VideoOnlineRateExp> onlineList) {
+ offLineList.add(getListOfflineCountInfo(list, typeCode, areaDeptEnum));
+ onlineList.add(getListOnLineCountInfo(list, typeCode, areaDeptEnum));
+ }
+
+ // 鏂板杈呭姪鏂规硶锛氭坊鍔犲悎璁＄粺璁�
+ private void addTotalStats(List<VideoTypeOffOnlineExp> offLineList,
+ List<VideoOnlineRateExp> onlineList,
+ long face, long car, long video) throws NoSuchFieldException, IllegalAccessException {
+ // 绂荤嚎缁熻鍚堣
+ VideoTypeOffOnlineExp allFaceVideosOffline = new VideoTypeOffOnlineExp();
+ setAllVideoTypeOffOnlineExpCount(offLineList, allFaceVideosOffline, "浜鸿劯");
+
+ VideoTypeOffOnlineExp allCarVideosOffline = new VideoTypeOffOnlineExp();
+ setAllVideoTypeOffOnlineExpCount(offLineList, allCarVideosOffline, "鍗″彛");
+
+ VideoTypeOffOnlineExp allVideosOffline = new VideoTypeOffOnlineExp();
+ setAllVideoTypeOffOnlineExpCount(offLineList, allVideosOffline, "瑙嗛");
+
+ offLineList.add(allFaceVideosOffline);
+ offLineList.add(allCarVideosOffline);
+ offLineList.add(allVideosOffline);
+
+ // 鍦ㄧ嚎缁熻鍚堣
+ VideoOnlineRateExp allFaceVideosOnline = new VideoOnlineRateExp();
+ setAllVideoTypeOnlineExpCount(face, onlineList, allFaceVideosOnline, "浜鸿劯");
+
+ VideoOnlineRateExp allCarVideosOnline = new VideoOnlineRateExp();
+ setAllVideoTypeOnlineExpCount(car, onlineList, allCarVideosOnline, "鍗″彛");
+
+ VideoOnlineRateExp allVideosOnline = new VideoOnlineRateExp();
+ setAllVideoTypeOnlineExpCount(video, onlineList, allVideosOnline, "瑙嗛");
+
+ onlineList.add(allFaceVideosOnline);
+ onlineList.add(allCarVideosOnline);
+ onlineList.add(allVideosOnline);
+ }
+
+
+
//绂荤嚎璁惧鏁版嵁锛屽悎璁″璞★紝淇℃伅瑁呴厤
public void setAllVideoTypeOffOnlineExpCount(List<VideoTypeOffOnlineExp> videoTypeOffOnlineExps,
VideoTypeOffOnlineExp videoTypeOffOnlineExp,
@@ -818,7 +891,7 @@
videoTypeOffOnlineExp.setArea("鑷础甯�");
videoTypeOffOnlineExp.setType(type + "鍚堣");
}
- //鍦ㄧ嚎璁惧鏁版嵁锛屽悎璁″璞★紝淇℃伅瑁呴厤
+// 鍦ㄧ嚎璁惧鏁版嵁锛屽悎璁″璞★紝淇℃伅瑁呴厤
public void setAllVideoTypeOnlineExpCount(
long allVideoCount,List<VideoOnlineRateExp> videoOnlineRateExps,
VideoOnlineRateExp videoOnlineRateExp,
@@ -994,18 +1067,27 @@
String fieldName = "day" + i;
String countName = "count" + i;
for(VideoDailyExp videoDailyExp: videoDailyExps){
- // 鏋勯�犲瓧娈靛悕
- Field field = videoDailyExp.getClass().getDeclaredField(fieldName);
- // 纭繚瀛楁鏄鏈夌殑鍙互璁块棶
- field.setAccessible(true);
- // 鑾峰彇瀛楁鍊�
- String value = (String) field.get(videoDailyExp);
- if ("鍦ㄧ嚎".equals(value)) {
- count ++;
+ try {
+ // 鏋勯�犲瓧娈靛悕
+ Field field = videoDailyExp.getClass().getDeclaredField(fieldName);
+ // 纭繚瀛楁鏄鏈夌殑鍙互璁块棶
+ field.setAccessible(true);
+ // 鑾峰彇瀛楁鍊�
+ String value = (String) field.get(videoDailyExp);
+ if ("鍦ㄧ嚎".equals(value)) {
+ count ++;
+ }
+ } catch (NoSuchFieldException e) {
+ // 瀛楁涓嶅瓨鍦ㄦ椂璺宠繃褰撳墠寰幆锛岃褰曟棩蹇�
+ log.warn("VideoDailyExp 涓嶅瓨鍦ㄥ瓧娈�: {}", fieldName, e);
+ } catch (IllegalAccessException e) {
+ // 瀛楁璁块棶寮傚父鏃惰烦杩囷紝璁板綍鏃ュ織
+ log.error("璁块棶瀛楁 {} 澶辫触", fieldName, e);
}
}
//姣忔棩鍦ㄧ嚎鐜�
double rate = (double) count / videoDailyExps.size();
+ log.info("鎵撳嵃璁＄畻鍑虹殑count:{}",count);
//鍙嶅皠娣诲姞鍒板璞″睘鎬т腑
Field field = videoOnlineRateExp.getClass().getDeclaredField(fieldName);
Field countField = videoOnlineRateExp.getClass().getDeclaredField(countName);
@@ -1160,6 +1242,8 @@
exportForm.setDeptIds(deptIds);
}
Query query = getQuery(exportForm);
+
+
//鏈堜唤姣忔棩鍦ㄧ嚎鏁版嵁
List<TMonitorResult> onlineResult = mongoTemplate.find(query, TMonitorResult.class);
// 浣跨敤 Collectors.toMap 鍘婚噸锛屼繚鐣欐瘡涓� No 鐨勭涓�涓亣鍒扮殑鍏冪礌
@@ -1269,6 +1353,7 @@
@Override
public Map<String, Object> videoHome(HomeQuery monitorQuery) throws ParseException, InvocationTargetException, NoSuchMethodException, InstantiationException, IllegalAccessException {
List<HomeVideoVO> results = new ArrayList<>();
+
String month = monitorQuery.getDate();
if (StringUtils.isEmpty(month)) {
//濡傛灉涓虹┖鏌ユ湰鏈堢殑鏁版嵁
@@ -1285,23 +1370,60 @@
calendar.set(Calendar.DAY_OF_MONTH, 1);
// 鑾峰彇鏈堜唤绗竴澶╃殑Date
Date startDate = calendar.getTime();
+ log.info("棣栭〉鏌ヨ寮�濮嬫棩鏈�:{}",startDate);
// 璁剧疆Calendar涓烘湀浠界殑鏈�鍚庝竴澶╋紙閫氳繃澧炲姞涓�涓湀浠界劧鍚庡噺鍘讳竴澶╋級
calendar.add(Calendar.MONTH, 1);
calendar.add(Calendar.DAY_OF_MONTH, -1);
// 鑾峰彇鏈堜唤鏈�鍚庝竴澶╃殑Date
Date endDate = calendar.getTime();
-
+ log.info("棣栭〉鏌ヨ缁撴潫鏃ユ湡:{}",endDate);
+ String constructionType = monitorQuery.getConstructionType();
+ List<String> deviceNoList = new ArrayList<>();
+ if (StringUtils.isNotBlank(constructionType)){
+ List<MonitorConstruction> serialNumberListByConstructionType = monitorConstructionService.getSerialNumberListByConstructionType(constructionType);
+ if (!CollectionUtils.isEmpty(serialNumberListByConstructionType)){
+ deviceNoList = serialNumberListByConstructionType.stream().map(MonitorConstruction::getSerialNumber).collect(Collectors.toList());
+ }
+ }
+ if (StringUtils.isNotBlank(constructionType) && deviceNoList.isEmpty()) {
+ // 褰揷onstructionType鏈夊�间絾鏃犲搴旇澶囨椂锛岃繑鍥炲寘鍚┖鍒楄〃鐨凪ap
+ Map<String, Object> emptyResult = new HashMap<>();
+ emptyResult.put("list", results); // results姝ゆ椂涓虹┖鍒楄〃
+ emptyResult.put("baseLine", 0); // 鍙牴鎹笟鍔￠粯璁ゅ熀鍑嗙嚎鍊艰皟鏁�
+ return emptyResult;
+ }
//mongo鏌ュ綍鍍忕姸鎬�
MongoDatabase database = mongoTemplate.getDb();
MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum");
Integer examineTag = monitorQuery.getExamineTag();
+ String arealayerno = monitorQuery.getArea();
Document matchConditions = new Document("statTime", new Document("$gte", startDate).append("$lte", endDate));
+ if (!deviceNoList.isEmpty()) {
+ log.info("鎵撳嵃鍒嗗缓绫诲瀷no闆嗗悎:{}",deviceNoList);
+ matchConditions.append("no", new Document("$in", deviceNoList));
+ }
// 鏍规嵁examineTag鐨勫�煎姩鎬佹坊鍔犻澶栫殑鏉′欢
if (examineTag != null && examineTag.equals(1)) {
matchConditions.append("provinceTag", true);
} else if (examineTag != null && examineTag.equals(2)) {
matchConditions.append("deptTag", true);
+ } else if(StringUtils.isNotBlank(arealayerno)){
+ matchConditions.append("arealayerno",
+ new Document("$regex", "^" + arealayerno));
}
+ Document noExpr = new Document("$and", Arrays.asList(
+ new Document("$gte", Arrays.asList(new Document("$strLenCP", "$no"), 3)),
+ new Document("$ne", Arrays.asList(
+ new Document("$substrCP", Arrays.asList(
+ "$no",
+ new Document("$subtract", Arrays.asList(new Document("$strLenCP", "$no"), 3)),
+ 1
+ )),
+ "3"
+ ))
+ ));
+// 姝ｇ‘娣诲姞$expr鏉′欢锛堥敭涓�"$expr"锛屽�间负涓婇潰瀹氫箟鐨勬潯浠讹級
+ matchConditions.append("$expr", noExpr);
// 鏋勫缓鑱氬悎绠￠亾
List<Document> pipeline = Arrays.asList(
new Document("$match", matchConditions),
@@ -1337,6 +1459,7 @@
homeVideoVO.setIntegrityNum(doc.getInteger("normalCount"));
homeVideoVO.setLoseNum(doc.getInteger("loseCount"));
homeVideoVO.setErrNum(doc.getInteger("errCount"));
+
results.add(homeVideoVO);
}
@@ -1346,12 +1469,31 @@
List<Document> onlineMatch = new ArrayList<>();
onlineMatch.add(new Document("mongoCreateTime", new Document("$gte", startDate).append("$lte", endDate)));
onlineMatch.add(new Document("monitorType", new Document("$regex", "1")));
+ if (!deviceNoList.isEmpty()) {
+ onlineMatch.add(new Document("no", new Document("$in", deviceNoList)));
+ }
if (examineTag != null && examineTag.equals(1)) {
onlineMatch.add(new Document("provinceTag", true));
} else if (examineTag != null && examineTag.equals(2)) {
onlineMatch.add(new Document("deptTag", true));
- }
+ } else if(StringUtils.isNotBlank(arealayerno)){
+ Document noStartsWith = new Document("no", new Document("$regex", "^" + arealayerno));
+ // 鏋勫缓鍊掓暟绗笁浣嶄笉鏄�3鐨勬潯浠�
+ Document noThirdLastNot3 = new Document("$expr", new Document("$and", Arrays.asList(
+ new Document("$gte", Arrays.asList(new Document("$strLenCP", "$no"), 3)),
+ new Document("$ne", Arrays.asList(
+ new Document("$substrCP", Arrays.asList(
+ "$no",
+ new Document("$subtract", Arrays.asList(new Document("$strLenCP", "$no"), 3)),
+ 1
+ )),
+ "3"
+ ))
+ )));
+ // 灏嗕袱涓潯浠剁敤$and缁勫悎鍚庢坊鍔犲埌鏉′欢鍒楄〃
+ onlineMatch.add(new Document("$and", Arrays.asList(noStartsWith, noThirdLastNot3)));
+ }
// 鏋勫缓鑱氬悎绠￠亾
List<Document> onlinePipeline = Arrays.asList(
new Document("$match", new Document("$and", onlineMatch)),
@@ -1365,6 +1507,10 @@
))
)
);
+ //鎺掗櫎鍗″彛闆嗗悎
+
+
+
// 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
AggregateIterable<Document> onlineResult = onlineCollection.aggregate(onlinePipeline);
for (Document doc : onlineResult) {
@@ -1401,6 +1547,22 @@
@Override
public void export(HttpServletResponse response, TMonitorVO tMonitor) {
List<TMonitorExp> monitors = tMonitorMapper.exportTMonitorList(tMonitor);
+ //杩囨护鍑鸿澶囧缓璁剧被鍨�
+ if (StringUtils.isNotBlank(tMonitor.getConstructionType())){
+ List<MonitorConstruction> list =
+ monitorConstructionService.getSerialNumberListByConstructionType(tMonitor.getConstructionType());
+ //鑾峰緱璁惧缂栧彿闆嗗悎 閫氳繃寤鸿绫诲瀷鏍囩
+ List<String> serialNumberList = list.stream().map(MonitorConstruction::getSerialNumber).collect(Collectors.toList());
+ monitors = monitors.stream()
+ .filter(result -> {
+ String sn = result.getSerialNumber();
+ // 浠讳竴瀛楁闈炵┖涓斿湪闆嗗悎涓嵆鍙�
+ return (sn != null && serialNumberList.contains(sn));
+ })
+ .collect(Collectors.toList());
+ }
+
+
//鑾峰彇鍔ㄦ�佸垪鏁版嵁
List<Integer> pointIds = monitors.stream().map(TMonitorExp::getPointId).collect(Collectors.toList());
List<DynamicColumnVO> dynamics = dynamicColumnMapper.getDynamicsByIds("t_yw_point", pointIds);
@@ -1496,10 +1658,13 @@
Integer examineTag = monitorQuery.getExamineTag();
// 鏋勫缓鍩烘湰鐨�$match鏉′欢
List<Document> matchConditions = new ArrayList<>();
+ String arealayerno = monitorQuery.getArea();
matchConditions.add(new Document("mongoCreateTime", new Document("$gte", startDate).append("$lte", endDate)));
matchConditions.add(new Document("dataType", new Document("$eq", ApiConstants.HK_DataType_CAR)));
if (examineTag != null && examineTag.equals(1)) {
matchConditions.add(new Document("provinceTag", true));
+ }else if(StringUtils.isNotBlank(arealayerno)){
+ matchConditions.add(new Document("orgCode",new Document("$eq", arealayerno)));
}
// 鏋勫缓鑱氬悎绠￠亾
List<Document> pipeline = Arrays.asList(
@@ -1524,6 +1689,8 @@
onlineMatch.add(new Document("monitorType", new Document("$regex", "2")));
if (examineTag != null && examineTag.equals(1)) {
onlineMatch.add(new Document("provinceTag", true));
+ }else if(StringUtils.isNotBlank(arealayerno)){
+ onlineMatch.add(new Document("no", new Document("$regex", "^" + arealayerno)));
}
// 鏋勫缓鑱氬悎绠￠亾
List<Document> onlinePipeline = Arrays.asList(
@@ -1602,6 +1769,7 @@
calendar.add(Calendar.DAY_OF_MONTH, -1);
// 鑾峰彇鏈堜唤鏈�鍚庝竴澶╃殑Date
Date endDate = calendar.getTime();
+ String arealayerno = monitorQuery.getArea();
//mongo鏌ユ姄鎷嶉噺
MongoDatabase database = mongoTemplate.getDb();
MongoCollection<Document> collection = database.getCollection("hk_snapshot_data_monitor");
@@ -1612,6 +1780,8 @@
matchConditions.add(new Document("dataType", new Document("$eq", ApiConstants.HK_DataType_FACE)));
if (examineTag != null && examineTag.equals(1)) {
matchConditions.add(new Document("provinceTag", true));
+ }else if(StringUtils.isNotBlank(arealayerno)){
+ matchConditions.add(new Document("orgCode",new Document("$eq", arealayerno)));
}
// 鏋勫缓鑱氬悎绠￠亾
List<Document> pipeline = Arrays.asList(
@@ -1638,6 +1808,8 @@
onlineMatch.add(new Document("monitorType", new Document("$regex", "3")));
if (examineTag != null && examineTag.equals(1)) {
onlineMatch.add(new Document("provinceTag", true));
+ }else if(StringUtils.isNotBlank(arealayerno)){
+ onlineMatch.add(new Document("no", new Document("$regex", "^" + arealayerno)));
}
// 鏋勫缓鑱氬悎绠￠亾
List<Document> onlinePipeline = Arrays.asList(
@@ -1733,6 +1905,7 @@
List<TMonitorResult> onlineResult = onlines.stream().filter(online -> online.getNo().equals(result.getNo())).collect(Collectors.toList());
videoDailyExp.setOnlineStateList(onlineResult);
for (TMonitorResult monitorResult : onlineResult) {
+ //涓虹┖鐧界殑鍘熷洜 濡傝繘鍏ョ1鍙锋椂 monitorResult娌℃湁瀵瑰簲涓�鍙风殑鏁版嵁锛屽氨鏄竴鍙穖ongodb閲岄潰娌℃湁瀵瑰簲璇ヨ澶囩殑鏁版嵁
int dayOfMonth = monitorResult.getMongoCreateTime().getDayOfMonth();
String online = "";
if (ApiConstants.UY_OnlineSite_Online.equals(monitorResult.getOnline())) {
@@ -1747,8 +1920,6 @@
field.setAccessible(true);
field.set(videoDailyExp, online);
}
-
-
}
//璁剧疆姣忔棩褰曞儚鏁版嵁
--
Gitblit v1.8.0