From e13b129c300d3eff2ba555d0c41bbccbaab1014a Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 17 九月 2024 18:56:59 +0800
Subject: [PATCH] 新大屏数据对接
---
ycl-server/src/main/java/com/ycl/task/OsdTask.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 1e268ab..a50e42a 100644
--- a/ycl-server/src/main/java/com/ycl/task/OsdTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/OsdTask.java
@@ -12,6 +12,7 @@
import com.ycl.platform.domain.vo.OnlineThreadVO;
import com.ycl.platform.mapper.TMonitorMapper;
import com.ycl.platform.service.UYErrorTypeCheckService;
+import com.ycl.platform.service.YwPointService;
import com.ycl.thread.OSDCheckThread;
import com.ycl.utils.DateUtils;
import com.ycl.utils.StringUtils;
@@ -44,7 +45,8 @@
private TMonitorMapper monitorMapper;
@Autowired
private UYErrorTypeCheckService uyErrorTypeCheckService;
-
+ @Autowired
+ private YwPointService pointService;
/**
* 閫氳繃鏌ongoDB姣忔棩涓�鏈轰竴妗ｆ暟鎹幏鍙栬澶噄p
* 閫氳繃璁惧ip銆佸搧鐗岃皟鐢ㄤ笉鍚宎pi鑾峰彇osd淇℃伅
@@ -101,6 +103,7 @@
Query pyQuery = new Query(Criteria
.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
DeleteResult result = mongoTemplate.remove(pyQuery, OsdCheckResult.class);
+ pointService.setDeviceTagByGB(checkResults);
//瀛樻斁鍦╩ongo涓�
mongoTemplate.insertAll(checkResults);
// 宸ュ崟鐢熸垚
@@ -167,7 +170,7 @@
//妫�鏌ュ尯鍘挎槸鍚︽纭�
if (!StringUtils.isEmpty(osdResult.getOSD3())) {
AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromCode(monitor.getSerialNumber().substring(0, 6));
- if (areaDeptEnum != null && osdResult.getOSD3().equals(areaDeptEnum.getName())) {
+ if (areaDeptEnum != null && osdResult.getOSD3().equals(areaDeptEnum.getOsdName())) {
osdCheckResult.setOsdPartCorrect(ApiConstants.OSD_Correct);
} else {
osdCheckResult.setOsdPartCorrect(ApiConstants.OSD_Error);
--
Gitblit v1.8.0