From 748a94912543e37633d527bf1343fb78213dab0b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 07 八月 2024 14:14:32 +0800
Subject: [PATCH] 点位去掉类型
---
ycl-server/src/main/java/com/ycl/task/MonitorTask.java | 63 +++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 9 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..bce6e07 100644
--- a/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
@@ -3,14 +3,21 @@
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;
import constant.RedisConstant;
+import enumeration.general.AreaDeptEnum;
+import enumeration.general.ImportantTagEnum;
+import enumeration.general.PointStatus;
+import enumeration.general.ProvinceTagEnum;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;
@@ -18,6 +25,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 +45,77 @@
@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<>();
+ //鍑嗗鎻掑叆鐐逛綅琛ㄧ殑鏁版嵁
+ List<YwPoint> ywPointList = new ArrayList<>();
//鏂扮殑鏁版嵁锛屽師鏁版嵁搴撲腑涓嶅瓨鍦ㄧ殑鏁版嵁
Set<TMonitor> newMonitorList = new HashSet<>();
-
- //TODO:瑙ｆ瀽鍖哄煙銆佽ˉ鍏卍eptId
- List<SysDictData> areaCodeList = new ArrayList<>();
- //TODO:瑙ｆ瀽閲嶇偣鐐逛綅
+ //鐐逛綅鏁版嵁
+ 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());
-
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())){
+ 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());
+ }else {
+ ywPoint.setPointName(result.getSBMC());
+ ywPoint.setStatus(PointStatus.WAIT.getDesc());
+ ywPoint.setSerialNumber(result.getSBBM());
+ ywPoint.setImportantTag(ImportantTagEnum.Normal);
+ ywPoint.setProvinceTag(ProvinceTagEnum.Normal);
+ ywPoint.setCreateTime(new Date());
+ ywPoint.setUpdateTime(new Date());
+ }
+ //姣斿鏄惁鏄噸鐐圭偣浣�
+ if (importantSite.contains(result.getSBBM())) {
+ ywPoint.setImportantTag(ImportantTagEnum.Important);
+ }
+ //瑙ｆ瀽deptId
+ //鍖哄煙琛屾斂缂栫爜
+ String areaCode = result.getSBBM().substring(0, 6);
+ Integer deptId = AreaDeptEnum.fromCode(areaCode).getDeptId();
+ if (deptId != null) {
+ ywPoint.setDeptId(Long.valueOf(deptId + ""));
+ }
+ return ywPoint;
+ }
+
+ private TMonitor getMonitor(OneMachineFileResult result) {
TMonitor monitor = new TMonitor();
monitor.setSerialNumber(result.getSBBM());
monitor.setName(result.getSBMC());
--
Gitblit v1.8.0