From 34e076739e206cb8721acc4879c380437515a6f5 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 24 八月 2024 14:37:55 +0800
Subject: [PATCH] osd工单检测
---
ycl-server/src/main/java/com/ycl/platform/service/UYErrorTypeCheckService.java | 11 +++++++++++
ycl-server/src/main/java/com/ycl/platform/service/impl/UYErrorTypeCheckServiceImpl.java | 22 ++++++++++++++++++++++
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/PyOsdResult.java | 6 +++---
ycl-server/src/main/java/com/ycl/task/PythonTask.java | 5 +++++
4 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/PyOsdResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/PyOsdResult.java
index 7be45e7..defd2ee 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/PyOsdResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/PyOsdResult.java
@@ -81,17 +81,17 @@
/**
* osd1鐪�
*/
- private Integer osd1Province;
+ private String osd1Province;
/**
* osd1甯�
*/
- private Integer osd1City;
+ private String osd1City;
/**
* osd1鍖�
*/
- private Integer osd1Part;
+ private String osd1Part;
/**
* osd1 宸︿笅瑙�
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/UYErrorTypeCheckService.java b/ycl-server/src/main/java/com/ycl/platform/service/UYErrorTypeCheckService.java
index 273fd41..f06ec06 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/UYErrorTypeCheckService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/UYErrorTypeCheckService.java
@@ -32,8 +32,19 @@
*/
void recordMetaDSumCheck(List<RecordMetaDSumResult> dataList);
+ /**
+ * osd鏃堕棿鍋忓樊
+ *
+ * @param dataList
+ */
+ void osdCheck(List<PyOsdResult> dataList);
+
// /**
// * 瑙嗛鏍囨敞
// */
// void osdMonitorCheck(List<OsdMonitorResult> dataList);
+
+ /**
+ * 娴峰悍
+ */
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/UYErrorTypeCheckServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/UYErrorTypeCheckServiceImpl.java
index d68398a..da0bd99 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/UYErrorTypeCheckServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/UYErrorTypeCheckServiceImpl.java
@@ -133,6 +133,28 @@
}
+ @Override
+ public void osdCheck(List<PyOsdResult> dataList) {
+ List<WorkOrder> workOrderList = dataList.stream().map(item -> {
+ WorkOrder workOrder = new WorkOrder();
+ // osd鏃堕棿
+ if (!item.getCheckTime().equals(item.getSetTime())) {
+ this.genWorkOrder(workOrder, ErrorType.CLOCK_SKEW, item.getDeviceNo());
+ }
+ // osd淇℃伅
+ if (!"璁剧疆姝ｇ‘".equals(item.getOsd1Province())
+ || (!"璁剧疆姝ｇ‘".equals(item.getOsd1City()))
+ || (!"璁剧疆姝ｇ‘".equals(item.getOsd1Part()))
+ || (!"璁剧疆姝ｇ‘".equals(item.getOsd1TimeFormat()))
+ || (!"璁剧疆姝ｇ‘".equals(item.getOsd1OSD()))
+ ) {
+ this.genWorkOrder(workOrder, ErrorType.OSD_ERROR, item.getDeviceNo());
+ }
+ return workOrder;
+ }).collect(Collectors.toList());
+ workOrderService.innerAddWorkOrder(workOrderList);
+ }
+
/**
* 宸ュ崟淇℃伅
*
diff --git a/ycl-server/src/main/java/com/ycl/task/PythonTask.java b/ycl-server/src/main/java/com/ycl/task/PythonTask.java
index 430e6a6..46d2a08 100644
--- a/ycl-server/src/main/java/com/ycl/task/PythonTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/PythonTask.java
@@ -8,6 +8,7 @@
import com.ycl.platform.domain.result.UY.*;
import com.ycl.platform.service.ITMonitorService;
import com.ycl.platform.service.IYwThresholdService;
+import com.ycl.platform.service.UYErrorTypeCheckService;
import com.ycl.utils.DateUtils;
import constant.ApiConstants;
import lombok.extern.slf4j.Slf4j;
@@ -36,6 +37,8 @@
private MongoTemplate mongoTemplate;
@Autowired
private PythonClient pythonClient;
+ @Autowired
+ private UYErrorTypeCheckService uyErrorTypeCheckService;
public void pythonOsdTask(){
log.info("寮�濮嬫墽琛宲ythonOsd鏁版嵁鍚屾");
@@ -58,6 +61,8 @@
DeleteResult result = mongoTemplate.remove(pyQuery, PyOsdResult.class);
//瀛樻斁鍦╩ongo涓�
mongoTemplate.insertAll(records);
+ // 宸ュ崟鐢熸垚
+ uyErrorTypeCheckService.osdCheck(records);
}
} else {
log.error("pythonOsd鏁版嵁涓虹┖{}", jsonObject);
--
Gitblit v1.8.0