From 01a30369e55a754c28dec4939a99e59aefecdc60 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 08 八月 2024 20:48:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java |   50 ++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 36 insertions(+), 14 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 60d3cb8..0491c4f 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
@@ -8,18 +8,14 @@
 import com.ycl.exception.ServiceException;
 import com.ycl.platform.domain.entity.*;
 import com.ycl.platform.domain.form.*;
-import com.ycl.platform.domain.query.DistributeWorkOrderQuery;
-import com.ycl.platform.domain.query.HomeQuery;
-import com.ycl.platform.domain.query.ScreenQuery;
-import com.ycl.platform.domain.query.WorkOrderQuery;
+import com.ycl.platform.domain.query.*;
 import com.ycl.platform.domain.vo.DistributeWorkOrderVO;
 import com.ycl.platform.domain.vo.WorkOrderVO;
 import com.ycl.platform.domain.vo.WorkOrderYwConditionRecordVO;
 import com.ycl.platform.domain.vo.screen.ScreenWorkOrderVO;
-import com.ycl.platform.mapper.WorkOrderAuditingRecordMapper;
-import com.ycl.platform.mapper.WorkOrderDistributeRecordMapper;
-import com.ycl.platform.mapper.WorkOrderMapper;
-import com.ycl.platform.mapper.WorkOrderYwConditionRecordMapper;
+import com.ycl.platform.domain.vo.screen.WorkOrderRegionVO;
+import com.ycl.platform.domain.vo.screen.WorkOrderTotalVO;
+import com.ycl.platform.mapper.*;
 import com.ycl.platform.service.NotifyService;
 import com.ycl.platform.service.WorkOrderAuditingRecordService;
 import com.ycl.platform.service.WorkOrderService;
@@ -36,6 +32,7 @@
 import enumeration.general.WorkOrderDistributeWayEnum;
 import enumeration.general.WorkOrderStatusEnum;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,6 +52,7 @@
  * @author xp
  * @since 2024-03-05
  */
+@Slf4j
 @Service
 @RequiredArgsConstructor
 public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder> implements WorkOrderService {
@@ -66,12 +64,26 @@
     private final WorkOrderYwConditionRecordMapper workOrderYwConditionRecordMapper;
     private final NotifyService notifyService;
     private final WorkOrderDistributeRecordMapper workOrderDistributeRecordMapper;
+    private final TMonitorMapper monitorMapper;
 
     private final String DISTRIBUTE_LOCK_KEY = "distributeLock";
     private final static String IMPORTANT = "important";
 
     @Autowired
     private RedisCache redisCache;
+
+    @Override
+    public Boolean innerAdd(List<WorkOrder> workOrderList) {
+        int total = workOrderList.size();
+        workOrderList.stream().filter(item -> {
+            return StringUtils.hasText(item.getSerialNumber()) && Objects.nonNull(item.getStatus()) && StringUtils.hasText(item.getErrorType());
+        });
+        // TODO 鑷姩涓嬪彂宸ュ崟
+        int real = workOrderList.size();
+        boolean result = this.saveBatch(workOrderList);
+        log.info("浼犲叆宸ュ崟鎬绘暟: {}锛屽疄闄呮坊鍔犲伐鍗曟暟锛歿}", total, real);
+        return result;
+    }
 
     /**
      * 娣诲姞
@@ -132,7 +144,7 @@
         notifyService.save(notify);
         // 鍚屾鐐逛綅鐘舵��
         if (form.getAuditingResult() == WorkOrderStatusEnum.AUDITING_SUCCESS) {
-            ywPointService.updateRecovery(Collections.singletonList(workOrder.getPointId()), 0);
+            ywPointService.updateRecovery(Arrays.asList(workOrder.getSerialNumber()), 0);
         }
         return Result.ok("鎿嶄綔鎴愬姛");
     }
@@ -299,7 +311,7 @@
 
         // 鏌ヨ绗﹀悎鏉′欢鐨勫伐鍗�
         List<WorkOrder> list = new LambdaQueryChainWrapper<>(baseMapper)
-                .select(WorkOrder::getId, WorkOrder::getPointId)
+                .select(WorkOrder::getSerialNumber, WorkOrder::getSerialNumber)
                 .eq(WorkOrder::getStatus, WorkOrderStatusEnum.WAIT_DISTRIBUTE)
                 .eq(Objects.nonNull(data.getUnitId()), WorkOrder::getUnitId, data.getUnitId())
                 .eq(WorkOrder::getErrorType, data.getErrorType())
@@ -308,7 +320,7 @@
                 .last("limit " + data.getFastNumLimit())
                 .list();
         List<Integer> ids = list.stream().map(WorkOrder::getId).toList();
-        List<Integer> pointIds = list.stream().map(WorkOrder::getPointId).toList();
+        List<String> serialNumberList = list.stream().map(WorkOrder::getSerialNumber).toList();
 
         if (ids.isEmpty()) { return Result.error("娌℃湁绗﹀悎鏉′欢鐨勫伐鍗�"); }
         if (!getDistributeLock()) { return Result.error("姝ゅ埢鏈変汉涓嬪彂涓紝涓洪伩鍏嶅啿绐侊紝璇风◢鍚庨噸璇�"); }
@@ -319,7 +331,7 @@
                     .update();
             addDistributeRecord(ids, WorkOrderDistributeWayEnum.FAST_DISTRIBUTE);
             // 鍚屾鐐逛綅鐘舵��
-            ywPointService.updateRecovery(pointIds, 1);
+            ywPointService.updateRecovery(serialNumberList, 1);
             return Result.ok("鎴愬姛涓嬪彂" + ids.size() + "鏉″伐鍗�");
         } catch (Exception e) {
             return Result.error("鎿嶄綔澶辫触");
@@ -352,8 +364,8 @@
                     .update();
             addDistributeRecord(query.getIds(), distributeWayEnum);
             // 鍚屾鐐逛綅鐘舵��
-            List<Integer> pointIds = new LambdaQueryChainWrapper<>(baseMapper).select(WorkOrder::getPointId).in(WorkOrder::getId, query.getIds()).list().stream().map(WorkOrder::getPointId).toList();
-            ywPointService.updateRecovery(pointIds, 1);
+            List<String> serialNumberList = new LambdaQueryChainWrapper<>(baseMapper).select(WorkOrder::getSerialNumber).in(WorkOrder::getId, query.getIds()).list().stream().map(WorkOrder::getSerialNumber).toList();
+            ywPointService.updateRecovery(serialNumberList, 1);
             return Result.ok("鎴愬姛涓嬪彂" + query.getIds().size() + "鏉″伐鍗�");
         } catch (Exception e) {
             return Result.error("鎿嶄綔澶辫触");
@@ -452,4 +464,14 @@
         dataMap.put("pending", data3);
         return dataMap;
     }
+
+    @Override
+    public WorkOrderTotalVO workOrderTotal(DashboardQuery dashboardQuery) {
+        return baseMapper.workOrderTotal(dashboardQuery);
+    }
+
+    @Override
+    public List<WorkOrderRegionVO> workOrderRegion(DashboardQuery dashboardQuery) {
+        return baseMapper.workOrderRegion(dashboardQuery);
+    }
 }

--
Gitblit v1.8.0