From b054362aaf616bfe0be0b50ae5dc2137091dbd7d Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期二, 09 十二月 2025 14:48:07 +0800
Subject: [PATCH] 提交
---
api/src/main/java/com/ruoyi/api/third/controller/LockerApiController.java | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/api/src/main/java/com/ruoyi/api/third/controller/LockerApiController.java b/api/src/main/java/com/ruoyi/api/third/controller/LockerApiController.java
index 88c6763..74d3732 100644
--- a/api/src/main/java/com/ruoyi/api/third/controller/LockerApiController.java
+++ b/api/src/main/java/com/ruoyi/api/third/controller/LockerApiController.java
@@ -10,6 +10,8 @@
import com.ruoyi.cwgl.domain.dto.TakeReviewDto;
import com.ruoyi.cwgl.service.IKeyCollectionInfoService;
import com.ruoyi.cwgl.service.IRequestLogService;
+import com.ruoyi.tms.domain.TmsCarKeyDispatch;
+import com.ruoyi.tms.service.ITmsCarKeyDispatchService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +36,8 @@
private IKeyCollectionInfoService keyCollectionInfoService;
@Autowired
private IRequestLogService logService;
+ @Autowired
+ private ITmsCarKeyDispatchService tmsCarKeyDispatchService;
/**
* 涓婃姤鍙栧嚭瀹℃牳
@@ -58,14 +62,14 @@
return success;
}
- KeyCollectionInfo keyCollectionInfo = keyCollectionInfoService.selectCwData(takeReviewDto);
+ TmsCarKeyDispatch tmsCarKeyDispatch = tmsCarKeyDispatchService.selectTmsCarKeyDispatchdriverMobile(takeReviewDto.getDriverCode());
//娣诲姞璇锋眰鏃ュ織
RequestLog requestLog = new RequestLog();
requestLog.setDriverCode(takeReviewDto.getDriverCode());
requestLog.setDriverName(takeReviewDto.getDriverName());
requestLog.setReqTime(takeReviewDto.getHandleTime());
- if (keyCollectionInfo!=null){
- String boxNum = keyCollectionInfo.getBoxNum();
+ if (tmsCarKeyDispatch!=null){
+ String boxNum = tmsCarKeyDispatch.getVehicleCarKeyNo();
requestLog.setBoxNum(boxNum);
@@ -73,19 +77,10 @@
requestLog.setType(0);
logService.insertRequestLog(requestLog);
- AjaxResult ajaxResult = keyCollectionInfoService.takeReview(keyCollectionInfo);
+ AjaxResult ajaxResult = tmsCarKeyDispatchService.takeReview(tmsCarKeyDispatch);
if (!ajaxResult.get("code").equals(0)){
ajaxResult = keyCollectionInfoService.selectSmartLockerApplication(takeReviewDto);
- }else {
- if (keyCollectionInfo != null) {
- String boxNum = (String) ajaxResult.get("boxNumber");
- if (StringUtils.isEmpty(boxNum) || (Integer.parseInt(boxNum) < 1 && Integer.parseInt(boxNum) > 60)) {
- boxNum = keyCollectionInfoService.selectCwBoxNum(keyCollectionInfo.getLicensePlateNumber());
- ajaxResult.put("boxNumber",boxNum);
- }
-
- }
}
return ajaxResult;
--
Gitblit v1.8.0