From 2a12d6d43b6f7abc0ef594ee9b992f34ee00b7a1 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 16 八月 2024 10:28:59 +0800
Subject: [PATCH] python接口
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
index b9a473e..020946c 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -80,6 +80,9 @@
workOrderList.stream().filter(item -> {
return StringUtils.hasText(item.getSerialNumber()) && Objects.nonNull(item.getStatus()) && StringUtils.hasText(item.getErrorType());
});
+ if (CollectionUtils.isEmpty(workOrderList)) {
+ return Boolean.TRUE;
+ }
List<String> serialNumberList = workOrderList.stream().map(WorkOrder::getSerialNumber).collect(Collectors.toList());
// 鏌ュ嚭鏁版嵁搴撲腑鍥芥爣鐮佸搴旂殑鏈畬鎴愮殑宸ュ崟
List<WorkOrder> inDatabaseWorkOrderList = new LambdaQueryChainWrapper<>(baseMapper)
@@ -122,8 +125,14 @@
// 鏌ュ嚭閲嶇偣鐐逛綅銆佹櫘閫氱偣浣嶇殑澶勭悊鏃堕棿
SysConfig important = configMapper.checkConfigKeyUnique("important.wordkorder.time");
SysConfig normal = configMapper.checkConfigKeyUnique("normal.wordkorder.alarm.time");
+ // 濡傛灉鍗冲皢鐢熸垚宸ュ崟锛屼絾鏄澶囧浗鏍囩爜鏌ヤ笉鍒扮偣浣嶏紝鍒欎笉娣诲姞锛�
+ List<WorkOrder> notAddList = new ArrayList<>();
for (WorkOrder workOrder : waitAddList) {
YwPoint point = pointMapping.get(workOrder.getSerialNumber());
+ if (Objects.isNull(point)) {
+ notAddList.add(workOrder);
+ continue;
+ }
workOrder.setWorkOrderNo(IdUtils.timeAddRandomNO(5));
workOrder.setUnitId(Math.toIntExact(point.getUnitId()));
if (point.getImportantTag() || point.getImportantCommandImageTag()) {
@@ -131,6 +140,10 @@
} else {
workOrder.setProcessingPeriod(Integer.valueOf(normal.getConfigValue()));
}
+ }
+ waitAddList.removeAll(notAddList);
+ if (CollectionUtils.isEmpty(waitAddList)) {
+ return Boolean.TRUE;
}
this.saveBatch(waitAddList);
// 濡傛灉鏄洿鎺ヤ笅鍙戯紝娣诲姞涓嬪彂璁板綍
@@ -343,11 +356,6 @@
public Result distributePage(DistributeWorkOrderQuery query) {
IPage<WorkOrderVO> page = PageUtil.getPage(query, WorkOrderVO.class);
baseMapper.distributePage(page, query);
- page.getRecords().stream().forEach(workOrder -> {
- if (StringUtils.hasText(workOrder.getPointTag()) && workOrder.getPointTag().contains(IMPORTANT)) {
- workOrder.setImportant(Boolean.TRUE);
- }
- });
return Result.ok().data(page).total(page.getTotal());
}
--
Gitblit v1.8.0