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 | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 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 e924d06..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
@@ -2,18 +2,24 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.RandomUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.cwgl.domain.KeyCollectionInfo;
import com.ruoyi.cwgl.domain.RequestLog;
import com.ruoyi.cwgl.domain.dto.ReturnReportDto;
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;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.util.Random;
+import java.util.concurrent.ThreadLocalRandom;
/**
@@ -30,6 +36,8 @@
private IKeyCollectionInfoService keyCollectionInfoService;
@Autowired
private IRequestLogService logService;
+ @Autowired
+ private ITmsCarKeyDispatchService tmsCarKeyDispatchService;
/**
* 涓婃姤鍙栧嚭瀹℃牳
@@ -42,16 +50,39 @@
@PostMapping("/takeReview")
public AjaxResult takeReview(@Valid @RequestBody TakeReviewDto takeReviewDto){
- KeyCollectionInfo keyCollectionInfo = keyCollectionInfoService.selectCwData(takeReviewDto);
+ logger.info("璇锋眰涓婃姤鍙傛暟{}",takeReviewDto);
+ if ("test".equals(takeReviewDto.getDriverCode())){
+ Random random = new Random();
+
+ // 鐢熸垚 1-30 鐨勯殢鏈烘暣鏁�
+ int randomNumber = random.nextInt(30) + 1;
+ AjaxResult success = new AjaxResult(0, "鎴愬姛",1);
+ success.put("boxNumber",randomNumber);
+ logger.info("鎴愬姛杩斿洖{}",success);
+ return success;
+ }
+
+ TmsCarKeyDispatch tmsCarKeyDispatch = tmsCarKeyDispatchService.selectTmsCarKeyDispatchdriverMobile(takeReviewDto.getDriverCode());
//娣诲姞璇锋眰鏃ュ織
RequestLog requestLog = new RequestLog();
requestLog.setDriverCode(takeReviewDto.getDriverCode());
requestLog.setDriverName(takeReviewDto.getDriverName());
requestLog.setReqTime(takeReviewDto.getHandleTime());
+ if (tmsCarKeyDispatch!=null){
+ String boxNum = tmsCarKeyDispatch.getVehicleCarKeyNo();
+ requestLog.setBoxNum(boxNum);
+
+
+ }
requestLog.setType(0);
logService.insertRequestLog(requestLog);
- return keyCollectionInfoService.takeReview(keyCollectionInfo);
+ AjaxResult ajaxResult = tmsCarKeyDispatchService.takeReview(tmsCarKeyDispatch);
+ if (!ajaxResult.get("code").equals(0)){
+ ajaxResult = keyCollectionInfoService.selectSmartLockerApplication(takeReviewDto);
+
+ }
+ return ajaxResult;
}
@@ -62,6 +93,7 @@
@PostMapping("/returnReport")
public AjaxResult returnReport(@Valid @RequestBody ReturnReportDto returnReportDto){
+ logger.info("褰掕繕鍙傛暟{}",returnReportDto);
//娣诲姞璇锋眰鏃ュ織
RequestLog requestLog = new RequestLog();
@@ -71,7 +103,7 @@
requestLog.setType(1);
logService.insertRequestLog(requestLog);
- return AjaxResult.success();
+ return new AjaxResult(0, "",0);
}
--
Gitblit v1.8.0