From e05049e8cc736ab6db1ea2791641120e024665a3 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 25 三月 2025 15:48:43 +0800
Subject: [PATCH] echarts 新增无录像列
---
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/home/HomeVideoVO.java | 6 ++++++
ycl-pojo/src/main/java/com/ycl/platform/domain/result/OSDResult.java | 3 +++
ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java | 10 +++++++++-
3 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/OSDResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/OSDResult.java
index 0360f02..b04b1e0 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/OSDResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/OSDResult.java
@@ -42,5 +42,8 @@
*/
private String OSD4;
+ /**
+ * 璁惧鍝佺墝
+ */
private Integer deviceBrand;
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/home/HomeVideoVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/home/HomeVideoVO.java
index 23ca3c6..e398213 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/home/HomeVideoVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/home/HomeVideoVO.java
@@ -12,6 +12,12 @@
* 褰曞儚缂哄け鏁�
*/
private Integer loseNum;
+
+ /**
+ * 鏃犲綍鍍忔暟
+ */
+ private Integer errNum;
+
/**
* 鐐逛綅鍦ㄧ嚎鏁�
*/
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 f527aad..3865624 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
@@ -971,7 +971,14 @@
))
.append("loseCount", new Document("$sum",
new Document("$cond", Arrays.asList(
- new Document("$in", Arrays.asList("$recordStatus", Arrays.asList(-1, 0))),
+ new Document("$eq", Arrays.asList("$recordStatus", 0)),
+ 1,
+ 0
+ ))
+ ))
+ .append("errCount", new Document("$sum",
+ new Document("$cond", Arrays.asList(
+ new Document("$eq", Arrays.asList("$recordStatus", -1)),
1,
0
))
@@ -985,6 +992,7 @@
homeVideoVO.setCreateDate(doc.getDate("_id"));
homeVideoVO.setIntegrityNum(doc.getInteger("normalCount"));
homeVideoVO.setLoseNum(doc.getInteger("loseCount"));
+ homeVideoVO.setErrNum(doc.getInteger("errCount"));
results.add(homeVideoVO);
}
--
Gitblit v1.8.0