From d6f915ecc8ee7efd5fcd3a205b57ef490b918fa5 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期三, 21 八月 2024 14:27:59 +0800
Subject: [PATCH] feat：数据中心数字增加中文字段
---
ycl-server/src/main/java/com/ycl/task/MonitorTask.java | 146 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 110 insertions(+), 36 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 e53b548..904cd0f 100644
--- a/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
@@ -6,15 +6,22 @@
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.MonitorQualifyResult;
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;
import com.ycl.system.service.ISysDictDataService;
import com.ycl.utils.DateUtils;
+import com.ycl.utils.StringUtils;
import constant.RedisConstant;
+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;
@@ -39,78 +46,145 @@
@Autowired
private ITMonitorService monitorService;
@Autowired
+ private TMonitorMapper monitorMapper;
+ @Autowired
private ISysDictDataService dictDataService;
@Autowired
private YwPointService ywPointService;
@Autowired
+ private YwPointMapper ywPointMapper;
+ @Autowired
private RedisTemplate redisTemplate;
+
//鍚屾mongodb涓�鏈轰竴妗ｅ埌鏁版嵁搴�
+ @Transactional(rollbackFor = Exception.class)
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);
+ 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琛ㄦ暟鎹�
- 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, 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()));
- //TODO:鎻掑叆鐐逛綅琛�
- //TODO:瑙ｆ瀽鍖哄煙銆佽ˉ鍏卍eptId
- //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 = getMonitor(result);
- YwPoint point = getPoint(result,pointMap,importantSite);
+
+ //鍑嗗鎻掑叆璁惧琛ㄧ殑鏁版嵁
+ List<TMonitor> monitorList = new ArrayList<>();
+ //鍑嗗鎻掑叆鐐逛綅琛ㄧ殑鏁版嵁
+ List<YwPoint> ywPointList = new ArrayList<>();
+ //鏂扮殑鏁版嵁锛屽師鏁版嵁搴撲腑涓嶅瓨鍦ㄧ殑鏁版嵁
+ Set<TMonitor> newMonitorList = new HashSet<>();
+
+ //鍏ㄥ勾鐣欏瓨
+ for (MonitorQualifyResult result : oneMachineFileResults) {
+ TMonitor monitor = getMonitor(result, monitorVOMap);
+ YwPoint point = getPoint(result, pointMap, importantSite);
monitorList.add(monitor);
+ ywPointList.add(point);
//姣斿绛涢�夊嚭鏂扮殑鏁版嵁
- if(!CollectionUtils.isEmpty(serialNumberInBase) && !serialNumberInBase.contains(result.getSBBM())){
+ if (!CollectionUtils.isEmpty(monitorVOMap) && !monitorVOMap.containsKey(result.getSerialNumber().getValue())) {
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.deleteTMonitorById(null);
+ if (!CollectionUtils.isEmpty(monitorList)) {
+ monitorMapper.deleteAll();
monitorService.saveBatch(monitorList);
+ }
+ if (!CollectionUtils.isEmpty(ywPointList)) {
+ ywPointMapper.deleteAll();
+ ywPointService.saveBatch(ywPointList);
}
//鏂扮殑鏁版嵁鏀惧叆Redis涓瓑寰呰�冩牳鎸囨爣浠诲姟浣跨敤
redisTemplate.opsForValue().set(RedisConstant.New_Monitor_Set, JSONArray.toJSONString(newMonitorList));
-
-
+ log.info("缁撴潫鍚屾mongodb涓�鏈轰竴妗ｅ埌鏁版嵁搴�");
}
- private YwPoint getPoint(OneMachineFileResult result, Map<String, YwPoint> pointMap,List<String> importantSite) {
+ private YwPoint getPoint(MonitorQualifyResult result, Map<String, YwPoint> pointMap, List<String> importantSite) {
YwPoint ywPoint = new YwPoint();
- if(pointMap.containsKey(result.getSBBM())){
- ywPoint = pointMap.get(result.getSBBM());
+ if (pointMap.containsKey(result.getSerialNumber().getValue())) {
+ ywPoint = pointMap.get(result.getSerialNumber().getValue());
+ } else {
+ ywPoint.setPointName(result.getName().getValue());
+ ywPoint.setStatus(PointStatus.WAIT.getDesc());
+ 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.getSBBM())){
-
+ if (importantSite.contains(result.getSxjcjqy().getValue())) {
+ ywPoint.setImportantTag(Boolean.TRUE);
}
-
+ //瑙ｆ瀽deptId
+ //鍖哄煙琛屾斂缂栫爜
+ String serialNumber = result.getSerialNumber().getValue();
+ Integer deptId = -1;
+ if (!StringUtils.isEmpty(serialNumber)) {
+ String areaCode = serialNumber.substring(0, 6);
+ AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromCode(areaCode);
+ //濡傛灉瑙ｆ瀽涓嶅嚭鍖哄煙deptId涓�-1
+ if (areaDeptEnum != null) {
+ deptId = areaDeptEnum.getDeptId();
+ }
+ }
+ ywPoint.setDeptId(Long.valueOf(deptId + ""));
return ywPoint;
}
- private TMonitor getMonitor(OneMachineFileResult result) {
+ private TMonitor getMonitor(MonitorQualifyResult result, Map<String, TMonitorVO> monitorVOMap) {
TMonitor monitor = new TMonitor();
- monitor.setSerialNumber(result.getSBBM());
- monitor.setName(result.getSBMC());
- monitor.setSiteType(Long.valueOf(result.getJKDWLX()));
- monitor.setMacAddr(result.getMACDZ());
- monitor.setIp(result.getIP());
- monitor.setCameraFunType(result.getSXJGNLX());
- monitor.setLongitude(result.getJD() + "");
- monitor.setLatitude(result.getWD() + "");
- monitor.setCameraCaptureArea(result.getSXJCJQY());
- monitor.setOnState(Long.valueOf(result.getSBZT()));
+ if (monitorVOMap.containsKey(result.getSerialNumber().getValue())) {
+ monitor.setId(monitorVOMap.get(result.getSerialNumber().getValue()).getId());
+ }
+ monitor.setSerialNumber(result.getSerialNumber().getValue());
+ monitor.setName(result.getName().getValue());
+ String siteType = result.getJkdwlx().getValue();
+ if (!StringUtils.isEmpty(siteType)) {
+ monitor.setSiteType(Long.valueOf(siteType));
+ }
+ monitor.setMacAddr(result.getMacdz().getValue());
+ monitor.setIp(result.getIp().getValue());
+ monitor.setCameraFunType(result.getSxjgnlx().getValue());
+ monitor.setLongitude(result.getLongitude().getValue());
+ monitor.setLatitude(result.getLatitude().getValue() + "");
+ monitor.setCameraCaptureArea(result.getSxjcjqy().getValue());
+ String onState = result.getSbzt().getValue();
+ if (!StringUtils.isEmpty(onState)) {
+ monitor.setOnState(Long.valueOf(onState));
+ }
//鍥芥爣鐮佸墠鍏綅涓鸿鏀跨紪鐮�
- monitor.setCivilCode(result.getSBBM().substring(0, 8));
+ String serialNumber = result.getSerialNumber().getValue();
+ if (!StringUtils.isEmpty(serialNumber)) {
+ monitor.setCivilCode(serialNumber.substring(0, 8));
+ }
return monitor;
}
}
--
Gitblit v1.8.0