From 5ed58d32e4c9c880d93067fd4af13bb215a4d70b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期六, 31 八月 2024 11:14:59 +0800
Subject: [PATCH] mongo同步一机一档保留品牌
---
ycl-server/src/main/java/com/ycl/task/MonitorTask.java | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/task/MonitorTask.java b/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
index bc08a68..f6267aa 100644
--- a/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
@@ -21,6 +21,7 @@
import enumeration.general.AreaDeptEnum;
import enumeration.general.PointStatus;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria;
@@ -56,28 +57,28 @@
private RedisTemplate redisTemplate;
//鍚屾mongodb涓�鏈轰竴妗ｅ埌鏁版嵁搴�
- @Transactional(rollbackFor = Exception.class)
public void synchronize() {
- Date date = DateUtils.getDay(2024,7,13);
- Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(date)).lt(DateUtils.getDayEnd(date)));
-// Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
+ log.info("寮�濮嬪悓姝ongodb涓�鏈轰竴妗ｅ埌鏁版嵁搴�");
+ Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
List<MonitorQualifyResult> oneMachineFileResults = mongoTemplate.find(query, MonitorQualifyResult.class);
//鏁版嵁搴搈onitor琛ㄦ暟鎹�
Map<String, TMonitorVO> monitorVOMap = monitorMapper.selectMonitorVOList().stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
- //鍑嗗鎻掑叆璁惧琛ㄧ殑鏁版嵁
- List<TMonitor> monitorList = new ArrayList<>();
- //鍑嗗鎻掑叆鐐逛綅琛ㄧ殑鏁版嵁
- List<YwPoint> ywPointList = new ArrayList<>();
- //鏂扮殑鏁版嵁锛屽師鏁版嵁搴撲腑涓嶅瓨鍦ㄧ殑鏁版嵁
- Set<TMonitor> newMonitorList = new HashSet<>();
//鐐逛綅鏁版嵁
Map<String, YwPoint> pointMap = ywPointService.list(new QueryWrapper<YwPoint>()).stream().collect(Collectors.toMap(YwPoint::getSerialNumber, Function.identity()));
+
//閲嶇偣鐐逛綅闆嗗悎瀛楀吀(瑙ｆ瀽SXJCJQY瀛楁)
SysDictData sysDictData = new SysDictData();
sysDictData.setDictType("platform_important_site");
List<SysDictData> DictDataList = dictDataService.selectDictDataList(sysDictData);
//閲囬泦鍖哄煙涓洪噸鐐圭偣浣嶇殑闆嗗悎
List<String> importantSite = DictDataList.stream().map(SysDictData::getDictValue).collect(Collectors.toList());
+
+ //鍑嗗鎻掑叆璁惧琛ㄧ殑鏁版嵁
+ List<TMonitor> monitorList = new ArrayList<>();
+ //鍑嗗鎻掑叆鐐逛綅琛ㄧ殑鏁版嵁
+ List<YwPoint> ywPointList = new ArrayList<>();
+ //鏂扮殑鏁版嵁锛屽師鏁版嵁搴撲腑涓嶅瓨鍦ㄧ殑鏁版嵁
+ Set<TMonitor> newMonitorList = new HashSet<>();
//鍏ㄥ勾鐣欏瓨
for (MonitorQualifyResult result : oneMachineFileResults) {
@@ -90,6 +91,22 @@
newMonitorList.add(monitor);
}
}
+ //娣诲姞鑰佹暟鎹�
+ List<String> numbers = CollectionUtils.isEmpty(monitorList) ? new ArrayList<>() : monitorList.stream().map(TMonitor::getSerialNumber).collect(Collectors.toList());
+ monitorVOMap.forEach((key, value) -> {
+ if (!numbers.contains(key)){
+ TMonitor monitor = new TMonitor();
+ BeanUtils.copyProperties(value,monitor);
+ monitorList.add(monitor);
+ }
+ });
+ List<String> points = CollectionUtils.isEmpty(ywPointList) ? new ArrayList<>() : ywPointList.stream().map(YwPoint::getSerialNumber).collect(Collectors.toList());
+ pointMap.forEach((key, value) -> {
+ if (!points.contains(key)){
+ ywPointList.add(value);
+ }
+ });
+
log.info("result闆嗗悎{},璁惧闆嗗悎{},鐐逛綅闆嗗悎{}", oneMachineFileResults.size(), monitorList.size(), ywPointList.size());
//鎻掑叆鏁版嵁搴�
if (!CollectionUtils.isEmpty(monitorList)) {
@@ -102,6 +119,7 @@
}
//鏂扮殑鏁版嵁鏀惧叆Redis涓瓑寰呰�冩牳鎸囨爣浠诲姟浣跨敤
redisTemplate.opsForValue().set(RedisConstant.New_Monitor_Set, JSONArray.toJSONString(newMonitorList));
+ log.info("缁撴潫鍚屾mongodb涓�鏈轰竴妗ｅ埌鏁版嵁搴�");
}
private YwPoint getPoint(MonitorQualifyResult result, Map<String, YwPoint> pointMap, List<String> importantSite) {
@@ -142,7 +160,9 @@
TMonitor monitor = new TMonitor();
if (monitorVOMap.containsKey(result.getSerialNumber().getValue())) {
monitor.setId(monitorVOMap.get(result.getSerialNumber().getValue()).getId());
+ monitor.setDeviceType(monitorVOMap.get(result.getSerialNumber().getValue()).getDeviceType());
}
+
monitor.setSerialNumber(result.getSerialNumber().getValue());
monitor.setName(result.getName().getValue());
String siteType = result.getJkdwlx().getValue();
--
Gitblit v1.8.0