From a0e0eca428f47c4d796f1d0917041b072b8e7aac Mon Sep 17 00:00:00 2001
From: lohir <3399054449@qq.com>
Date: 星期二, 22 十月 2024 17:33:38 +0800
Subject: [PATCH] 完成运维考核-工单白名单-列表展示
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 63 ++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 23 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 0438581..213bdf1 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
@@ -3,6 +3,7 @@
import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
@@ -94,6 +95,7 @@
private final SysConfigMapper configMapper;
private final ReportMapper reportMapper;
private final WorkOrderCheckImgMapper workOrderCheckImgMapper;
+ private final WorkOrderWhiteMapper workOrderWhiteMapper;
@Value("${rtsp.server:http://127.0.0.1:7788}")
private String rtspServer;
@@ -211,6 +213,25 @@
List<WorkOrder> notAddList = new ArrayList<>();
//鏌edis浠婃棩宸ュ崟鏁伴噺
int workOrderNum = 0;
+ for (WorkOrder workOrder : waitAddList) {
+ YwPoint point = pointMapping.get(workOrder.getSerialNumber());
+ if (Objects.isNull(point)) {
+ notAddList.add(workOrder);
+ continue;
+ }
+ if (Objects.nonNull(point.getUnitId())) {
+ workOrder.setUnitId(Math.toIntExact(point.getUnitId()));
+ }
+ if (point.getImportantTag() || point.getImportantCommandImageTag()) {
+ workOrder.setProcessingPeriod(Integer.valueOf(important.getConfigValue()));
+ } else {
+ workOrder.setProcessingPeriod(Integer.valueOf(normal.getConfigValue()));
+ }
+ }
+ waitAddList.removeAll(notAddList);
+ if (CollectionUtils.isEmpty(waitAddList)) {
+ return Boolean.TRUE;
+ }
//UUID浣滀负value锛屼繚璇佷笂閿佺殑绾跨▼鑷繁瑙ｉ攣
String requestId = IdUtils.fastSimpleUUID();
try {
@@ -234,20 +255,11 @@
log.error("鑾峰彇閿佸紓甯�");
return Boolean.FALSE;
}
+ //璁板綍宸ュ崟鏁�,琛ュ厖宸ュ崟鍙�
for (WorkOrder workOrder : waitAddList) {
- YwPoint point = pointMapping.get(workOrder.getSerialNumber());
- if (Objects.isNull(point)) {
- notAddList.add(workOrder);
- continue;
- }
- if (Objects.nonNull(point.getUnitId())) {
- workOrder.setUnitId(Math.toIntExact(point.getUnitId()));
- }
- if (point.getImportantTag() || point.getImportantCommandImageTag()) {
- workOrder.setProcessingPeriod(Integer.valueOf(important.getConfigValue()));
- } else {
- workOrder.setProcessingPeriod(Integer.valueOf(normal.getConfigValue()));
- }
+ //鏁板瓧鍓嶉潰琛�0
+ workOrderNum++;
+ workOrder.setWorkOrderNo(IdUtils.workOrderNO(now, String.format("%05d", workOrderNum)));
// 淇濆瓨閿欒绫诲瀷
for (String errorType : workOrder.getErrorTypeList()) {
WorkOrderErrorType workOrderErrorType = new WorkOrderErrorType();
@@ -257,16 +269,7 @@
workOrderErrorType.setErrorName(errorType);
waitAddErrorTypeList.add(workOrderErrorType);
}
- }
- waitAddList.removeAll(notAddList);
- if (CollectionUtils.isEmpty(waitAddList)) {
- return Boolean.TRUE;
- }
- //璁板綍宸ュ崟鏁�,琛ュ厖宸ュ崟鍙�
- for (WorkOrder workOrder : waitAddList) {
- //鏁板瓧鍓嶉潰琛�0
- workOrderNum++;
- workOrder.setWorkOrderNo(IdUtils.workOrderNO(now, String.format("%05d", workOrderNum)));
+ log.info("鍗冲皢鐢熸垚鐨勫伐鍗�:{}",workOrder);
}
redisCache.setCacheObject(RedisConstant.WORKORDER_NUM, workOrderNum);
redisCache.releaseLock(RedisConstant.WORKORDER_NUM_LOCK, requestId);
@@ -984,4 +987,18 @@
System.out.println(export);
return export;
}
+
+ /**
+ * 宸ュ崟鐧藉悕鍗曞垪琛�
+ *
+ * @param query 鏌ヨ
+ * @return {@link List }<{@link WorkOrderWhite }>
+ * @author
+ */
+ @Override
+ public Result selectWorkOrderWhiteList(WorkOrderWhiteQuery query) {
+ IPage<WorkOrderWhite> page = PageUtil.getPage(query, WorkOrderWhite.class);
+ workOrderWhiteMapper.page(page, query);
+ return Result.ok().data(page.getRecords()).total(page.getTotal());
+ }
}
--
Gitblit v1.8.0