From 3e9a6da99aae968123ee7bca352fc08becd7f1f2 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 29 八月 2024 17:29:21 +0800
Subject: [PATCH] 工单过程图接口更换
---
ycl-server/src/main/java/com/ycl/task/MonitorTask.java | 56 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 13 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 76725ba..904cd0f 100644
--- a/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
@@ -10,6 +10,7 @@
import com.ycl.platform.domain.result.UY.OneMachineFileResult;
import com.ycl.platform.domain.vo.TMonitorVO;
import com.ycl.platform.mapper.TMonitorMapper;
+import com.ycl.platform.mapper.YwPointMapper;
import com.ycl.platform.service.ITMonitorService;
import com.ycl.platform.service.YwPointService;
import com.ycl.system.entity.SysDictData;
@@ -20,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;
@@ -50,30 +52,38 @@
@Autowired
private YwPointService ywPointService;
@Autowired
+ private YwPointMapper ywPointMapper;
+ @Autowired
private RedisTemplate redisTemplate;
//鍚屾mongodb涓�鏈轰竴妗ｅ埌鏁版嵁搴�
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public void synchronize() {
- Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
+ log.info("寮�濮嬪悓姝ongodb涓�鏈轰竴妗ｅ埌鏁版嵁搴�");
+ 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())));
List<MonitorQualifyResult> oneMachineFileResults = mongoTemplate.find(query, MonitorQualifyResult.class);
//鏁版嵁搴搈onitor琛ㄦ暟鎹�
Map<String, TMonitorVO> monitorVOMap = monitorMapper.selectMonitorVOList().stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
+ //鐐逛綅鏁版嵁
+ 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<>();
- //鐐逛綅鏁版嵁
- 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());
- //TODO:鍏ㄥ勾鐣欏瓨杩樻槸鍗曟鐣欏瓨
+ //鍏ㄥ勾鐣欏瓨
for (MonitorQualifyResult result : oneMachineFileResults) {
TMonitor monitor = getMonitor(result, monitorVOMap);
YwPoint point = getPoint(result, pointMap, importantSite);
@@ -84,16 +94,35 @@
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)) {
- monitorService.saveOrUpdateBatch(monitorList);
+ monitorMapper.deleteAll();
+ monitorService.saveBatch(monitorList);
}
if (!CollectionUtils.isEmpty(ywPointList)) {
- ywPointService.saveOrUpdateBatch(ywPointList);
+ ywPointMapper.deleteAll();
+ ywPointService.saveBatch(ywPointList);
}
//鏂扮殑鏁版嵁鏀惧叆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) {
@@ -106,11 +135,12 @@
ywPoint.setSerialNumber(result.getSerialNumber().getValue());
ywPoint.setImportantTag(Boolean.FALSE);
ywPoint.setProvinceTag(Boolean.FALSE);
+ ywPoint.setImportantCommandImageTag(Boolean.FALSE);
ywPoint.setCreateTime(new Date());
ywPoint.setUpdateTime(new Date());
}
//姣斿鏄惁鏄噸鐐圭偣浣�
- if (importantSite.contains(result.getSerialNumber().getValue())) {
+ if (importantSite.contains(result.getSxjcjqy().getValue())) {
ywPoint.setImportantTag(Boolean.TRUE);
}
//瑙ｆ瀽deptId
--
Gitblit v1.8.0