From 5c1bcfec16b501281cd2de5dc6ec8132f359840d Mon Sep 17 00:00:00 2001
From: attiya <2413103649@qq.com>
Date: Sat, 23 Aug 2025 11:57:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E8=B0=83=E5=BA=A6=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E8=BD=A6=E8=BE=86=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/EbikeBikeInfoServiceImpl.java        | 20 ++++++++++++++++++-
 .../user/config/MyBatisFlexConfiguration.java |  3 ---
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java
index 62ced0ce..c956d6b7 100644
--- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java
+++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java
@@ -1208,6 +1208,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
 
             StaffFeign staffFeign = getStaffFeignInfo();
             String userId = staffFeign.getStaffId().toString();
+            checkBikeCodes(eqWorkOrderDispatchDto);
             // 生成工单编号
             SnowFlakeIDKeyGenerator snowFlakeIDKeyGenerator = new SnowFlakeIDKeyGenerator();
             long orderCode = snowFlakeIDKeyGenerator.nextId();
@@ -1258,6 +1259,23 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
         }
     }
 
+    private void checkBikeCodes(ReqWorkOrderDispatchDto eqWorkOrderDispatchDto) {
+        List<String> bikeCodes = eqWorkOrderDispatchDto.getBikeCodes();
+        QueryWrapper queryWrapper = QueryWrapper.create()
+                .select(EBIKE_DISPATCH_RECORDS.BIKE_CODE)
+                .leftJoin(EBIKE_BIKE_ORDER).on(EBIKE_BIKE_ORDER.ORDER_ID.eq(EBIKE_DISPATCH_RECORDS.ORDER_ID))
+                .where(EBIKE_BIKE_ORDER.HANDLE_STATE.ne(0))
+                .where(EBIKE_DISPATCH_RECORDS.BIKE_CODE.in(bikeCodes));
+        List<String> list = ebikeDispatchRecordsMapper.selectListByQueryAs(queryWrapper, String.class);
+        if (!list.isEmpty()) {
+            bikeCodes.removeAll(list);
+            if (bikeCodes.isEmpty()) {
+                throw new RuntimeException("当前所有车辆已创建调度订单");
+            }
+            eqWorkOrderDispatchDto.setBikeCodes(bikeCodes);
+        }
+    }
+
     /**
      * 根据订单ID 获取车辆调度信息
      *
@@ -1356,7 +1374,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
                 .leftJoin(EBIKE_BIKE_CHECKIN).on(EBIKE_BIKE_INFO.BIKE_ID.eq(EBIKE_BIKE_CHECKIN.BIKE_ID))
                 .leftJoin(EBIKE_CAR_STATUS_INFO).on(EBIKE_BIKE_INFO.STATE.eq(EBIKE_CAR_STATUS_INFO.CODE))
                 .leftJoin(EBIKE_DISPATCH_RECORDS).on(EBIKE_BIKE_INFO.BIKE_CODE.eq(EBIKE_DISPATCH_RECORDS.BIKE_CODE)
-                .and(EBIKE_DISPATCH_RECORDS.DISPATCH_STATE.eq(0)))
+                        .and(EBIKE_DISPATCH_RECORDS.DISPATCH_STATE.eq(0)))
                 .where(EBIKE_BIKE_INFO.BIKE_CODE.like(queryParam.getBikeCode(), StringUtil.hasText(queryParam.getBikeCode())))
                 .where(EBIKE_BIKE_CHECKIN.OPERATE_TIME.ge(queryParam.getEnterTime(), queryParam.getEnterTime() != null))
                 .groupBy(EBIKE_BIKE_INFO.BIKE_ID);
diff --git a/ebike-user/src/main/java/com/cdzy/user/config/MyBatisFlexConfiguration.java b/ebike-user/src/main/java/com/cdzy/user/config/MyBatisFlexConfiguration.java
index be476d40..2ff0cec3 100644
--- a/ebike-user/src/main/java/com/cdzy/user/config/MyBatisFlexConfiguration.java
+++ b/ebike-user/src/main/java/com/cdzy/user/config/MyBatisFlexConfiguration.java
@@ -1,15 +1,12 @@
 package com.cdzy.user.config;
 
-import com.cdzy.user.component.MyTenantFactory;
 import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.core.FlexGlobalConfig;
 import com.mybatisflex.core.audit.AuditManager;
 import com.mybatisflex.core.dialect.DbType;
 import com.mybatisflex.core.dialect.DialectFactory;
-import com.mybatisflex.core.tenant.TenantFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 /**