From 29fbb07e30eab4b8092a7600a0ef0e39db1de1f2 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 25 九月 2024 14:35:00 +0800
Subject: [PATCH] 工单号生成修改
---
ycl-server/src/main/java/com/ycl/task/OsdTask.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/task/OsdTask.java b/ycl-server/src/main/java/com/ycl/task/OsdTask.java
index 4829199..a847840 100644
--- a/ycl-server/src/main/java/com/ycl/task/OsdTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/OsdTask.java
@@ -100,12 +100,14 @@
List<OsdCheckResult> checkResults = new ArrayList<>();
Map<String, TMonitor> monitorMap = monitors.stream().collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity()));
for (OSDResult osdResult : osdResultList) {
- TMonitor monitor = monitorMap.get(osdResult.getSerialNumber());
- //灏佽OsdCheckResult
- OsdCheckResult osdCheckResult = getOsdCheckResult(osdResult, monitor);
- checkCorrect(osdResult, monitor, osdCheckResult);
- log.info("鏍￠獙缁撴灉锛歿}",osdCheckResult);
- checkResults.add(osdCheckResult);
+ if(osdResult!=null) {
+ TMonitor monitor = monitorMap.get(osdResult.getSerialNumber());
+ //灏佽OsdCheckResult
+ OsdCheckResult osdCheckResult = getOsdCheckResult(osdResult, monitor);
+ checkCorrect(osdResult, monitor, osdCheckResult);
+ log.info("鏍￠獙缁撴灉锛歿}", osdCheckResult);
+ checkResults.add(osdCheckResult);
+ }
}
log.info("缁撴灉鏁版嵁澶у皬:{}", checkResults.size());
//缁撴灉瀛樺叆mongo
@@ -128,6 +130,7 @@
private OsdCheckResult getOsdCheckResult(OSDResult osdResult, TMonitor monitor) {
OsdCheckResult osdCheckResult = new OsdCheckResult();
osdCheckResult.setDeviceNo(osdResult.getSerialNumber());
+ osdCheckResult.setNo(osdResult.getSerialNumber());
osdCheckResult.setIp(monitor.getIp());
osdCheckResult.setDeviceType(monitor.getCameraFunType());
osdCheckResult.setCheckTime(osdResult.getCheckTime());
--
Gitblit v1.8.0