From 73548e5d89a79ef1850c03dea162dcf727e2c0b1 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 20 九月 2024 09:32:57 +0800
Subject: [PATCH] 去重
---
ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 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 d803fa2..ce7c654 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
@@ -26,6 +26,7 @@
import com.ycl.system.service.ISysConfigService;
import com.ycl.utils.DateUtils;
import com.ycl.utils.StringUtils;
+import enumeration.general.AreaDeptEnum;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;
@@ -54,6 +55,7 @@
private MongoTemplate mongoTemplate;
@Autowired
private WorkOrderMapper workOrderMapper;
+
/**
* 鏌ヨ璁惧璧勪骇
*
@@ -85,17 +87,17 @@
}
List<TMonitorVO> monitors = tMonitorMapper.selectTMonitorList(tMonitor);
// 寮傚父鎭㈠鐩戞帶
- if(Objects.equals(tMonitor.getRecovery(), 1L)){
+ if (Objects.equals(tMonitor.getRecovery(), 1L)) {
//宸ュ崟鍙�
List<String> orders = monitors.stream().map(TMonitorVO::getWorkOrderNo).collect(Collectors.toList());
- if(CollectionUtils.isEmpty(orders)){
+ if (CollectionUtils.isEmpty(orders)) {
return monitors;
}
List<WorkOrderVO> voList = workOrderMapper.getRecoveryInfo(orders);
for (TMonitorVO monitor : monitors) {
- if(!CollectionUtils.isEmpty(voList)){
+ if (!CollectionUtils.isEmpty(voList)) {
for (WorkOrderVO workOrderVO : voList) {
- if(monitor.getWorkOrderNo().equals(workOrderVO.getWorkOrderNo())){
+ if (monitor.getWorkOrderNo().equals(workOrderVO.getWorkOrderNo())) {
monitor.setUnitContact(workOrderVO.getUnitContact());
monitor.setUnitContactPhone(workOrderVO.getUnitContactPhone());
monitor.setYwPeopleName(workOrderVO.getYwPeopleName());
@@ -109,9 +111,7 @@
//璁惧缂栧彿
List<String> numbers = monitors.stream().map(TMonitorVO::getSerialNumber).collect(Collectors.toList());
Query query = new Query();
- //TODO:鏈湴娴嬭瘯
- // Date now = new Date()
- Date now = DateUtils.getDay(2024, 7, 13);
+ Date now = new Date();
query.addCriteria(Criteria.where("no").in(numbers)
.and("mongoCreateTime").gte(DateUtils.getDayStart(now)).lt(DateUtils.getDayEnd(now))
);
@@ -324,8 +324,32 @@
}
@Override
- public List<MonitorTotalVO> monitorTotal(DashboardQuery dashboardQuery) {
- return baseMapper.monitorTotal(dashboardQuery);
+ public Map<String, List<Map<String, Object>>> monitorTotal(DashboardQuery dashboardQuery) {
+ List<MonitorTotalVO> monitorTotalVOS = baseMapper.monitorTotal(dashboardQuery);
+ /** facilityData: {
+ * video:[
+ * {value: 4589,title: '璁惧鎬绘暟'},
+ * {value: 4294,title: '璁惧姝ｅ父鏁�'},
+ * {value: 295,title: '璁惧寮傚父鏁�'}
+ * ]} */
+ Map<String, List<Map<String, Object>>> resultMap = new HashMap<>();
+ for (MonitorTotalVO vo : monitorTotalVOS) {
+ List<Map<String, Object>> list = new ArrayList();
+ Map<String, Object> total = new HashMap<>();
+ total.put("value", vo.getTotalNum());
+ total.put("title", "璁惧鎬绘暟");
+ Map<String, Object> normal = new HashMap<>();
+ normal.put("value", vo.getNormalNum());
+ normal.put("title", "姝ｅ父鏁�");
+ Map<String, Object> error = new HashMap<>();
+ error.put("value", vo.getErrorNum());
+ error.put("title", "寮傚父鏁�");
+ list.add(total);
+ list.add(normal);
+ list.add(error);
+ resultMap.put(vo.getType(), list);
+ }
+ return resultMap;
}
@Override
--
Gitblit v1.8.0