From ca412ade3b178fbc8ba0a4b6215a040acdede954 Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期二, 09 十二月 2025 10:29:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java | 6 +++
service/src/main/java/com/ruoyi/cwgl/service/IKeyCollectionInfoService.java | 2 +
tms/src/main/java/com/ruoyi/tms/service/impl/TmsCarKeyDispatchServiceImpl.java | 30 +++++++++++++++
api/src/main/java/com/ruoyi/api/third/controller/LockerApiController.java | 21 ++++------
tms/src/main/java/com/ruoyi/tms/service/ITmsCarKeyDispatchService.java | 6 +++
tms/src/main/java/com/ruoyi/tms/mapper/TmsCarKeyDispatchMapper.java | 2 +
tms/src/main/resources/mapper/tms/TmsCarKeyDispatchMapper.xml | 9 ++++
7 files changed, 63 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;
diff --git a/service/src/main/java/com/ruoyi/cwgl/service/IKeyCollectionInfoService.java b/service/src/main/java/com/ruoyi/cwgl/service/IKeyCollectionInfoService.java
index 62c0cbb..19dfe17 100644
--- a/service/src/main/java/com/ruoyi/cwgl/service/IKeyCollectionInfoService.java
+++ b/service/src/main/java/com/ruoyi/cwgl/service/IKeyCollectionInfoService.java
@@ -121,4 +121,6 @@
AjaxResult selectSmartLockerApplication(TakeReviewDto takeReviewDto);
String selectCwBoxNum(String licensePlateNumber);
+
+ String selectBoxNum(String licensePlateNumber);
}
diff --git a/service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java b/service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java
index d3e829b..a474157 100644
--- a/service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java
+++ b/service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java
@@ -44,6 +44,7 @@
+
/**
* 鏌ヨ閽ュ寵棰嗗彇淇℃伅
*
@@ -241,4 +242,9 @@
public String selectCwBoxNum(String licensePlateNumber) {
return keyCollectionInfoMapper.selectCwBoxNum(licensePlateNumber);
}
+
+ @Override
+ public String selectBoxNum(String licensePlateNumber) {
+ return null;
+ }
}
diff --git a/tms/src/main/java/com/ruoyi/tms/mapper/TmsCarKeyDispatchMapper.java b/tms/src/main/java/com/ruoyi/tms/mapper/TmsCarKeyDispatchMapper.java
index e18cff4..fec7492 100644
--- a/tms/src/main/java/com/ruoyi/tms/mapper/TmsCarKeyDispatchMapper.java
+++ b/tms/src/main/java/com/ruoyi/tms/mapper/TmsCarKeyDispatchMapper.java
@@ -84,4 +84,6 @@
* @return 缁撴灉
*/
public int deleteTmsCarKeyDispatchByIds(Integer[] ids);
+
+ TmsCarKeyDispatch selectTmsCarKeyDispatchdriverMobile(String driverCode);
}
diff --git a/tms/src/main/java/com/ruoyi/tms/service/ITmsCarKeyDispatchService.java b/tms/src/main/java/com/ruoyi/tms/service/ITmsCarKeyDispatchService.java
index 09be893..cae7690 100644
--- a/tms/src/main/java/com/ruoyi/tms/service/ITmsCarKeyDispatchService.java
+++ b/tms/src/main/java/com/ruoyi/tms/service/ITmsCarKeyDispatchService.java
@@ -1,6 +1,8 @@
package com.ruoyi.tms.service;
import java.util.List;
+
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.tms.domain.TmsCarKeyDispatch;
import com.baomidou.mybatisplus.extension.service.IService;
/**
@@ -99,4 +101,8 @@
* @return 缁撴灉
*/
public int deleteTmsCarKeyDispatchById(Integer id);
+
+ TmsCarKeyDispatch selectTmsCarKeyDispatchdriverMobile(String driverCode);
+
+ AjaxResult takeReview(TmsCarKeyDispatch tmsCarKeyDispatch);
}
diff --git a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsCarKeyDispatchServiceImpl.java b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsCarKeyDispatchServiceImpl.java
index 480386e..45738c7 100644
--- a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsCarKeyDispatchServiceImpl.java
+++ b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsCarKeyDispatchServiceImpl.java
@@ -1,9 +1,13 @@
package com.ruoyi.tms.service.impl;
+import java.util.Date;
import java.util.List;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.DateUtils;
import javax.annotation.Resource;
+
+import com.ruoyi.common.utils.StringUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.stereotype.Service;
import org.springframework.scheduling.annotation.Async;
@@ -179,4 +183,30 @@
{
return tmsCarKeyDispatchMapper.deleteTmsCarKeyDispatchById(id);
}
+
+ @Override
+ public TmsCarKeyDispatch selectTmsCarKeyDispatchdriverMobile(String driverCode) {
+ return tmsCarKeyDispatchMapper.selectTmsCarKeyDispatchdriverMobile(driverCode);
+ }
+ @Override
+ public AjaxResult takeReview(TmsCarKeyDispatch tmsCarKeyDispatch) {
+ if (tmsCarKeyDispatch == null) {
+ return AjaxResult.error("鏌ユ棤绗﹀悎瑕佹眰鐨勮皟搴﹀崟锛岃鑱旂郴璋冨害浜哄憳",3);
+ }
+ if (StringUtils.isEmpty(tmsCarKeyDispatch.getVehicleCarKeyNo())){
+ return AjaxResult.error("杞﹂挜鍖欐煖鍙蜂负绌猴紝璇疯仈绯昏皟搴︿汉鍛�",3);
+
+ }
+ tmsCarKeyDispatch.setStatus(1);
+ tmsCarKeyDispatch.setCarKeyCollectionTime(new Date());
+ tmsCarKeyDispatchMapper.updateTmsCarKeyDispatch(tmsCarKeyDispatch);
+
+
+
+
+ AjaxResult success = new AjaxResult(0, "鎴愬姛",1);
+ success.put("boxNumber",tmsCarKeyDispatch.getVehicleCarKeyNo());
+ logger.info("鎴愬姛杩斿洖{}",success);
+ return success;
+ }
}
diff --git a/tms/src/main/resources/mapper/tms/TmsCarKeyDispatchMapper.xml b/tms/src/main/resources/mapper/tms/TmsCarKeyDispatchMapper.xml
index 2d3ae1d..d0a7c6d 100644
--- a/tms/src/main/resources/mapper/tms/TmsCarKeyDispatchMapper.xml
+++ b/tms/src/main/resources/mapper/tms/TmsCarKeyDispatchMapper.xml
@@ -62,6 +62,15 @@
</where>
order by thisTab.id desc
</select>
+ <select id="selectTmsCarKeyDispatchdriverMobile" resultMap="TmsCarKeyDispatchResult">
+ <include refid="selectTmsCarKeyDispatchVo"/>
+ WHERE
+ thisTab.driver_mobile = #{driverCode}
+ AND thisTab.status = 0
+ AND thisTab.car_key_expiration_time <= NOW()
+ limit 1
+
+ </select>
<!-- 鏂板 -->
<insert id="insertTmsCarKeyDispatch" parameterType="com.ruoyi.tms.domain.TmsCarKeyDispatch" useGeneratedKeys="true" keyProperty="id">
--
Gitblit v1.8.0