From eb8c2e062f554aa250d660ac798cdb1de7eeeb99 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 12 十二月 2024 00:14:15 +0800
Subject: [PATCH] 首页抓拍量按钮
---
ycl-pojo/src/main/java/com/ycl/platform/domain/query/HomeQuery.java | 5 ++
ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java | 90 ++++++++++++++++++++++++---------------------
2 files changed, 53 insertions(+), 42 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/HomeQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/HomeQuery.java
index 41f829b..6edf28e 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/HomeQuery.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/HomeQuery.java
@@ -35,4 +35,9 @@
* 鑰冩牳鏍囩1/2 鐪佸巺/鍏畨閮�
*/
private Integer examineTag;
+
+ /**
+ * 鏁版嵁绫诲瀷1/2 绱鏁版嵁/姣忔棩鏁版嵁
+ */
+ private Integer category;
}
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 755d7c4..3f09bc6 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
@@ -1006,30 +1006,33 @@
Map<String, Object> resultMap = new HashMap<>();
//鎸夋椂闂存帓搴�
results = results.stream().sorted(Comparator.comparing(BaseHomeVO::getCreateDate)).collect(Collectors.toList());
- int snapCount = 0;
- for (HomeCarVO vo : results) {
- if (vo.getSnapCount() != null) {
- snapCount += vo.getSnapCount();
+ //濡傛灉鏄粯璁ゆ垨绱拰鍒欒繘琛岀疮鍜屼互鍙婅幏鍙栧熀鍑嗙嚎
+ if(monitorQuery.getCategory() == null || monitorQuery.getCategory().equals(1)) {
+ int snapCount = 0;
+ for (HomeCarVO vo : results) {
+ if (vo.getSnapCount() != null) {
+ snapCount += vo.getSnapCount();
+ }
+ vo.setSnapCount(snapCount);
}
- vo.setSnapCount(snapCount);
+ //浠庡瓧鍏歌幏鍙栧熀鍑嗙嚎
+ List<SysDictData> baseLines = dictDataMapper.selectDictDataByType("home_baseLine");
+ String condition;
+ if (examineTag != null && examineTag == 1) {
+ condition = "car_province_baseLine";
+ } else if (examineTag != null && examineTag == 2) {
+ condition = "car_dept_baseLine";
+ } else {
+ condition = "car_all_baseLine";
+ }
+
+ Optional<SysDictData> first = baseLines.stream().filter(sysDictData -> condition.equals(sysDictData.getDictLabel())).findFirst();
+ if (first.isPresent()) {
+ SysDictData sysDictData = first.get();
+ resultMap.put("baseLine", Integer.valueOf(sysDictData.getDictValue()));
+ }
}
resultMap.put("list", results);
- //浠庡瓧鍏歌幏鍙栧熀鍑嗙嚎
- List<SysDictData> baseLines = dictDataMapper.selectDictDataByType("home_baseLine");
- String condition;
- if (examineTag != null && examineTag == 1) {
- condition = "car_province_baseLine";
- } else if (examineTag != null && examineTag == 2) {
- condition = "car_dept_baseLine";
- } else {
- condition = "car_all_baseLine";
- }
-
- Optional<SysDictData> first = baseLines.stream().filter(sysDictData -> condition.equals(sysDictData.getDictLabel())).findFirst();
- if (first.isPresent()) {
- SysDictData sysDictData = first.get();
- resultMap.put("baseLine", Integer.valueOf(sysDictData.getDictValue()));
- }
return resultMap;
}
@@ -1114,32 +1117,35 @@
HomeFaceVO vo = findOrCreateVO(doc, results, HomeFaceVO.class);
vo.setOnline(doc.getInteger("onlineCount"));
}
+ Map<String, Object> resultMap = new HashMap<>();
//鎸夋椂闂存帓搴�
results = results.stream().sorted(Comparator.comparing(BaseHomeVO::getCreateDate)).collect(Collectors.toList());
- int snapCount = 0;
- for (HomeFaceVO vo : results) {
- if (vo.getSnapCount() != null) {
- snapCount += vo.getSnapCount();
+ //濡傛灉鏄粯璁ゆ垨绱拰鍒欒繘琛岀疮鍜屼互鍙婅幏鍙栧熀鍑嗙嚎
+ if(monitorQuery.getCategory() == null || monitorQuery.getCategory().equals(1)) {
+ int snapCount = 0;
+ for (HomeFaceVO vo : results) {
+ if (vo.getSnapCount() != null) {
+ snapCount += vo.getSnapCount();
+ }
+ vo.setSnapCount(snapCount);
}
- vo.setSnapCount(snapCount);
+ //浠庡瓧鍏歌幏鍙栧熀鍑嗙嚎
+ List<SysDictData> baseLines = dictDataMapper.selectDictDataByType("home_baseLine");
+ String condition;
+ if (examineTag != null && examineTag == 1) {
+ condition = "face_province_baseLine";
+ } else if (examineTag != null && examineTag == 2) {
+ condition = "face_dept_baseLine";
+ } else {
+ condition = "face_all_baseLine";
+ }
+ Optional<SysDictData> first = baseLines.stream().filter(sysDictData -> condition.equals(sysDictData.getDictLabel())).findFirst();
+ if (first.isPresent()) {
+ SysDictData sysDictData = first.get();
+ resultMap.put("baseLine", Integer.valueOf(sysDictData.getDictValue()));
+ }
}
- Map<String, Object> resultMap = new HashMap<>();
resultMap.put("list", results);
- //浠庡瓧鍏歌幏鍙栧熀鍑嗙嚎
- List<SysDictData> baseLines = dictDataMapper.selectDictDataByType("home_baseLine");
- String condition;
- if (examineTag != null && examineTag == 1) {
- condition = "face_province_baseLine";
- } else if (examineTag != null && examineTag == 2) {
- condition = "face_dept_baseLine";
- } else {
- condition = "face_all_baseLine";
- }
- Optional<SysDictData> first = baseLines.stream().filter(sysDictData -> condition.equals(sysDictData.getDictLabel())).findFirst();
- if (first.isPresent()) {
- SysDictData sysDictData = first.get();
- resultMap.put("baseLine", Integer.valueOf(sysDictData.getDictValue()));
- }
return resultMap;
}
--
Gitblit v1.8.0