From 84fa53cb66bb4b05f0622c738346ce77f8f13aea Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 08 五月 2025 14:15:14 +0800
Subject: [PATCH] 订单下发接口bug修改
---
ycl-server/src/main/java/com/ycl/task/WorkOrderTask.java | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/task/WorkOrderTask.java b/ycl-server/src/main/java/com/ycl/task/WorkOrderTask.java
index 2f65607..cdec41f 100644
--- a/ycl-server/src/main/java/com/ycl/task/WorkOrderTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/WorkOrderTask.java
@@ -15,6 +15,7 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import java.util.ArrayList;
@@ -82,9 +83,9 @@
}
}
- public static List<String> errType = new ArrayList<>(List.of("OSD","ABNORMALPIC","DEVICEOFFLINE"));
+ public static List<String> errType = new ArrayList<>(List.of("鍥惧儚寮傚父","OSD寮傚父","璁惧绂荤嚎"));
//宸ュ崟涓嬪彂瀹氭椂浠诲姟锛� 宸ュ崟鍥犱负鏇存柊瀵艰嚧 鐘舵�佸彉涓哄緟涓嬪彂锛屾牴鎹敊璇被鍨嬪皢闇�瑕佺洿鎺ヤ笅鍙戝伐鍗�
- //绂荤嚎锛屽浘褰㈠紓甯革紝osd閿欒
+ //绂荤嚎锛屽浘鍍忓紓甯革紝osd閿欒
public void workOrderDistribute(){
//鏌ヨ浠婃棩寰呬笅鍙戝伐鍗�
Date now = new Date();
@@ -92,19 +93,25 @@
Date endDate = DateUtils.getDayEnd(now);
//鑾峰緱浠婃棩宸ュ崟
List<WorkOrderVO> list = workOrderService.distributeList(startDate,endDate);
+ log.error("鑾峰緱宸ュ崟:{}",list);
List<String> workOrderNos = new ArrayList<>();
for (WorkOrderVO workOrderVO : list){
- for (String errType : workOrderVO.getErrorTypeList()){
- if (WorkOrderTask.errType.contains(errType)){
- //鍒ゆ柇宸ュ崟鏄惁鍖呭惈errType涓殑閿欒绫诲瀷
- workOrderNos.add(workOrderVO.getWorkOrderNo());
- break;
- }
- }
+ List<String> errTypeArray = Arrays.stream(workOrderVO.getErrorType().split("銆�")).toList();
+ for (String errType : errTypeArray) {
+ if (WorkOrderTask.errType.contains(errType)) {
+ //鍒ゆ柇宸ュ崟鏄惁鍖呭惈errType涓殑閿欒绫诲瀷
+ workOrderNos.add(workOrderVO.getWorkOrderNo());
+ break;
+ }
+ }
+
}
+ log.error("宸ュ崟鎵撳嵃{}",workOrderNos);
DistributeWorkOrderQuery distributeWorkOrderQuery = new DistributeWorkOrderQuery();
distributeWorkOrderQuery.setWorkOrderNOList(workOrderNos);
//涓嬪彂鎺ュ彛
- workOrderService.selectedIdsDistribute(distributeWorkOrderQuery);
+ if(!CollectionUtils.isEmpty(workOrderNos)){
+ workOrderService.selectedIdsDistribute(distributeWorkOrderQuery);
+ }
}
}
--
Gitblit v1.8.0