From c16ca04b474d445cde54332045db19458863709e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 26 八月 2024 19:42:11 +0800
Subject: [PATCH] 设备增加厂商类型
---
ycl-server/src/main/java/com/ycl/platform/service/impl/UYErrorTypeCheckServiceImpl.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
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..78fd917 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);
+ }
+
/**
* 宸ュ崟淇℃伅
*
@@ -142,7 +164,7 @@
*/
private void genWorkOrder(WorkOrder workOrder, ErrorType errorType, String serialNumber) {
if (! StringUtils.hasText(workOrder.getWorkOrderNo())) {
- workOrder.setWorkOrderNo(IdUtils.timeAddRandomNO(5));
+ workOrder.setWorkOrderNo(IdUtils.randomNO());
}
if (CollectionUtils.isEmpty(workOrder.getErrorTypeList())) {
workOrder.setErrorTypeList(new ArrayList<>());
--
Gitblit v1.8.0