From f0b9fe73049ff873a6da7127c60fd3e4f5b6f212 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 07 八月 2024 09:34:39 +0800
Subject: [PATCH] 点位标签
---
ycl-server/src/main/java/com/ycl/task/MonitorTask.java | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 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 0e1d9cb..e53b548 100644
--- a/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
@@ -3,10 +3,13 @@
import com.alibaba.druid.support.json.JSONUtils;
import com.alibaba.fastjson2.JSONArray;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ycl.platform.domain.entity.TMonitor;
+import com.ycl.platform.domain.entity.YwPoint;
import com.ycl.platform.domain.result.UY.OneMachineFileResult;
import com.ycl.platform.domain.vo.TMonitorVO;
import com.ycl.platform.service.ITMonitorService;
+import com.ycl.platform.service.YwPointService;
import com.ycl.system.entity.SysDictData;
import com.ycl.system.service.ISysDictDataService;
import com.ycl.utils.DateUtils;
@@ -18,6 +21,7 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.*;
@@ -37,40 +41,63 @@
@Autowired
private ISysDictDataService dictDataService;
@Autowired
+ private YwPointService ywPointService;
+ @Autowired
private RedisTemplate redisTemplate;
//鍚屾mongodb涓�鏈轰竴妗ｅ埌鏁版嵁搴�
public void synchronize() {
Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
List<OneMachineFileResult> oneMachineFileResults = mongoTemplate.find(query, OneMachineFileResult.class);
+ //鏁版嵁搴搈onitor琛ㄦ暟鎹�
List<String> serialNumberInBase = monitorService.selectTMonitorList(null).stream().map(TMonitorVO::getSerialNumber).collect(Collectors.toList());
//鍑嗗鎻掑叆鏁版嵁搴撶殑鏁版嵁
List<TMonitor> monitorList = new ArrayList<>();
//鏂扮殑鏁版嵁锛屽師鏁版嵁搴撲腑涓嶅瓨鍦ㄧ殑鏁版嵁
Set<TMonitor> newMonitorList = new HashSet<>();
-
+ //鐐逛綅鏁版嵁
+ Map<String, YwPoint> pointMap = ywPointService.list(new QueryWrapper<YwPoint>()).stream().collect(Collectors.toMap(YwPoint::getSerialNumber, Function.identity()));
+ //TODO:鎻掑叆鐐逛綅琛�
//TODO:瑙ｆ瀽鍖哄煙銆佽ˉ鍏卍eptId
- List<SysDictData> areaCodeList = new ArrayList<>();
//TODO:瑙ｆ瀽閲嶇偣鐐逛綅
//閲嶇偣鐐逛綅闆嗗悎瀛楀吀(瑙ｆ瀽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());
-
for (OneMachineFileResult result : oneMachineFileResults) {
- TMonitor monitor = setMonitor(result);
+ TMonitor monitor = getMonitor(result);
+ YwPoint point = getPoint(result,pointMap,importantSite);
monitorList.add(monitor);
//姣斿绛涢�夊嚭鏂扮殑鏁版嵁
if(!CollectionUtils.isEmpty(serialNumberInBase) && !serialNumberInBase.contains(result.getSBBM())){
newMonitorList.add(monitor);
}
}
+ //鎻掑叆鏁版嵁搴�
+ if(!CollectionUtils.isEmpty(monitorList)){
+ monitorService.deleteTMonitorById(null);
+ monitorService.saveBatch(monitorList);
+ }
//鏂扮殑鏁版嵁鏀惧叆Redis涓瓑寰呰�冩牳鎸囨爣浠诲姟浣跨敤
redisTemplate.opsForValue().set(RedisConstant.New_Monitor_Set, JSONArray.toJSONString(newMonitorList));
+
}
- private TMonitor setMonitor(OneMachineFileResult result) {
+ private YwPoint getPoint(OneMachineFileResult result, Map<String, YwPoint> pointMap,List<String> importantSite) {
+ YwPoint ywPoint = new YwPoint();
+ if(pointMap.containsKey(result.getSBBM())){
+ ywPoint = pointMap.get(result.getSBBM());
+ }
+ //姣斿鏄惁鏄噸鐐圭偣浣�
+ if(importantSite.contains(result.getSBBM())){
+
+ }
+
+ return ywPoint;
+ }
+
+ private TMonitor getMonitor(OneMachineFileResult result) {
TMonitor monitor = new TMonitor();
monitor.setSerialNumber(result.getSBBM());
monitor.setName(result.getSBMC());
--
Gitblit v1.8.0