From a842dcb7c61ed4e61e299399bff0720b9a521b2037fa52d212426b28b6670348 Mon Sep 17 00:00:00 2001
From: yanglei <yanglei@stargraph.cn>
Date: Thu, 4 Dec 2025 16:21:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=9B=B8=E5=85=B3=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/EbikeDispatchConfigurationService.java  |  2 +-
 .../service/impl/EbikeBikeInfoServiceImpl.java      | 13 +++++++++----
 .../impl/EbikeDispatchConfigurationServiceImpl.java |  6 ++++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/ebike-operations/src/main/java/com/cdzy/operations/service/EbikeDispatchConfigurationService.java b/ebike-operations/src/main/java/com/cdzy/operations/service/EbikeDispatchConfigurationService.java
index df6268b..98510b6 100644
--- a/ebike-operations/src/main/java/com/cdzy/operations/service/EbikeDispatchConfigurationService.java
+++ b/ebike-operations/src/main/java/com/cdzy/operations/service/EbikeDispatchConfigurationService.java
@@ -18,7 +18,7 @@ public interface EbikeDispatchConfigurationService extends IService<EbikeDispatc
      *
      * @return 配置项
      */
-    EbikeDispatchConfiguration getConfigurationByOperationId();
+    EbikeDispatchConfiguration getConfigurationByOperationId(Long operationId);
 
     /**
      * 配置项保存
diff --git a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java
index 1337909..19ceeec 100644
--- a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java
+++ b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java
@@ -12,10 +12,7 @@ import com.cdzy.operations.model.dto.EbikeUserBikeInfo;
 import com.cdzy.operations.model.dto.EbikeUserLockDto;
 import com.cdzy.operations.model.entity.*;
 import com.cdzy.operations.model.vo.*;
-import com.cdzy.operations.service.EbikeBikeInfoService;
-import com.cdzy.operations.service.EbikeEcuInfoService;
-import com.cdzy.operations.service.EbikeInventoryRecordService;
-import com.cdzy.operations.service.EbikeInventoryService;
+import com.cdzy.operations.service.*;
 import com.cdzy.operations.utils.RedisUtil;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
@@ -35,6 +32,7 @@ import java.time.LocalTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.concurrent.TimeUnit;
 
 import static com.cdzy.operations.model.entity.table.EbikeBatteryInfoTableDef.EBIKE_BATTERY_INFO;
 import static com.cdzy.operations.model.entity.table.EbikeBikeInfoTableDef.EBIKE_BIKE_INFO;
@@ -96,6 +94,9 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
     @Resource
     private EbikeBikeOrderMapper orderMapper;
 
+    @Resource
+    private EbikeDispatchConfigurationService dispatchConfigurationService;
+
     @Override
     @Transactional
     public void bind(EbikeBikeBindVo bindVo) {
@@ -466,6 +467,10 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
 
         ebikeEcuInfoService.lock(ebikeEcuInfo);
 
+        EbikeDispatchConfiguration configuration = dispatchConfigurationService.getConfigurationByOperationId(info.getOperatorId());
+
+        redisUtil.expire(bikeCode, configuration.getDispatchDuration(), TimeUnit.HOURS);
+
         this.mapper.update(info);
 
         return EbikeUserLockDto.builder()
diff --git a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeDispatchConfigurationServiceImpl.java b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeDispatchConfigurationServiceImpl.java
index 2339260..5366ea4 100644
--- a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeDispatchConfigurationServiceImpl.java
+++ b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeDispatchConfigurationServiceImpl.java
@@ -10,6 +10,7 @@ import com.mybatisflex.spring.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Objects;
 
 import static com.cdzy.operations.model.entity.table.EbikeDispatchConfigurationTableDef.EBIKE_DISPATCH_CONFIGURATION;
 
@@ -24,9 +25,10 @@ import static com.cdzy.operations.model.entity.table.EbikeDispatchConfigurationT
 public class EbikeDispatchConfigurationServiceImpl extends ServiceImpl<EbikeDispatchConfigurationMapper, EbikeDispatchConfiguration> implements EbikeDispatchConfigurationService {
 
     @Override
-    public EbikeDispatchConfiguration getConfigurationByOperationId() {
+    public EbikeDispatchConfiguration getConfigurationByOperationId(Long operationId) {
         QueryWrapper queryWrapper = QueryWrapper.create()
-                .select(EBIKE_DISPATCH_CONFIGURATION.ALL_COLUMNS);
+                .select(EBIKE_DISPATCH_CONFIGURATION.ALL_COLUMNS)
+                .and(EBIKE_DISPATCH_CONFIGURATION.OPERATOR_ID.eq(operationId, Objects.nonNull(operationId)));
         return this.mapper.selectOneByQuery(queryWrapper);
     }