From c8ca3c42906b89c5de910ad3ff9f164e6b846a4c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 09 八月 2024 15:41:21 +0800
Subject: [PATCH] 一机一档合格率
---
ycl-server/src/main/java/com/ycl/task/MonitorTask.java | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 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 bce6e07..25d072f 100644
--- a/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
@@ -54,7 +54,7 @@
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());
+ Map<String, TMonitorVO> monitorVOMap = monitorService.selectTMonitorList(null).stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
//鍑嗗鎻掑叆璁惧琛ㄧ殑鏁版嵁
List<TMonitor> monitorList = new ArrayList<>();
//鍑嗗鎻掑叆鐐逛綅琛ㄧ殑鏁版嵁
@@ -68,24 +68,27 @@
sysDictData.setDictType("platform_important_site");
List<SysDictData> DictDataList = dictDataService.selectDictDataList(sysDictData);
List<String> importantSite = DictDataList.stream().map(SysDictData::getDictValue).collect(Collectors.toList());
+
+ //TODO:鍏ㄥ勾鐣欏瓨杩樻槸鍗曟鐣欏瓨
for (OneMachineFileResult result : oneMachineFileResults) {
- TMonitor monitor = getMonitor(result);
+ 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.getSBBM())) {
newMonitorList.add(monitor);
}
}
//鎻掑叆鏁版嵁搴�
if (!CollectionUtils.isEmpty(monitorList)) {
- monitorService.deleteTMonitorById(null);
- monitorService.saveBatch(monitorList);
+ monitorService.saveOrUpdateBatch(monitorList);
+ }
+ if(!CollectionUtils.isEmpty(ywPointList)){
+ ywPointService.saveOrUpdateBatch(ywPointList);
}
//鏂扮殑鏁版嵁鏀惧叆Redis涓瓑寰呰�冩牳鎸囨爣浠诲姟浣跨敤
redisTemplate.opsForValue().set(RedisConstant.New_Monitor_Set, JSONArray.toJSONString(newMonitorList));
-
-
}
private YwPoint getPoint(OneMachineFileResult result, Map<String, YwPoint> pointMap, List<String> importantSite) {
@@ -108,15 +111,22 @@
//瑙ｆ瀽deptId
//鍖哄煙琛屾斂缂栫爜
String areaCode = result.getSBBM().substring(0, 6);
- Integer deptId = AreaDeptEnum.fromCode(areaCode).getDeptId();
- if (deptId != null) {
- ywPoint.setDeptId(Long.valueOf(deptId + ""));
+ AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromCode(areaCode);
+ //濡傛灉瑙ｆ瀽涓嶅嚭鍖哄煙deptId涓�-1
+ Integer deptId = -1;
+ if(areaDeptEnum!=null){
+ deptId = areaDeptEnum.getDeptId();
}
+ ywPoint.setDeptId(Long.valueOf(deptId + ""));
+
return ywPoint;
}
- private TMonitor getMonitor(OneMachineFileResult result) {
+ private TMonitor getMonitor(OneMachineFileResult result, Map<String, TMonitorVO> monitorVOMap) {
TMonitor monitor = new TMonitor();
+ if (monitorVOMap.containsKey(result.getSBBM())) {
+ monitor.setId(monitorVOMap.get(result.getSBBM()).getId());
+ }
monitor.setSerialNumber(result.getSBBM());
monitor.setName(result.getSBMC());
monitor.setSiteType(Long.valueOf(result.getJKDWLX()));
--
Gitblit v1.8.0