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 | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
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 de6eddf..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
@@ -5,15 +5,11 @@
import javax.annotation.Resource;
-import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.cwgl.domain.RequestLog;
import com.ruoyi.cwgl.domain.SmartLockerApplication;
import com.ruoyi.cwgl.domain.dto.TakeReviewDto;
import com.ruoyi.cwgl.mapper.SmartLockerApplicationMapper;
-import com.ruoyi.cwgl.service.IRequestLogService;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.stereotype.Service;
import org.springframework.scheduling.annotation.Async;
@@ -45,6 +41,7 @@
private KeyCollectionInfoMapper keyCollectionInfoMapper;
@Resource
private SmartLockerApplicationMapper smartLockerApplicationMapper;
+
@@ -214,13 +211,13 @@
}
Integer keyTimeout = keyCollectionInfo.getKeyTimeout();
if (keyTimeout!=null && keyTimeout>24){
- Date estimatedDepartureTime = keyCollectionInfo.getEstimatedDepartureTime();
+ Date estimatedDepartureTime = keyCollectionInfo.getRequiredDepartureTime();
String dateToStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, estimatedDepartureTime);
logger.info("瑕佹眰鍑哄彂鏃堕棿"+ dateToStr+"锛岄鍙栭挜鍖欒秴鏃�"+keyTimeout+"涓皬鏃�");
return AjaxResult.error("瑕佹眰鍑哄彂鏃堕棿"+ dateToStr+"锛岄鍙栭挜鍖欒秴鏃�"+keyTimeout+"涓皬鏃�");
}
AjaxResult success = new AjaxResult(0, "鎴愬姛",1);
- success.put("boxNum",keyCollectionInfo.getBoxNum());
+ success.put("boxNumber",keyCollectionInfo.getBoxNum());
logger.info("鎴愬姛杩斿洖{}",success);
return success;
}
@@ -235,8 +232,19 @@
smartLockerApplication.setReceiveTime(new Date());
smartLockerApplicationMapper.updateSmartLockerApplication(smartLockerApplication);
AjaxResult success = new AjaxResult(0, "鎴愬姛",1);
- success.put("boxNum",smartLockerApplication.getLockerPort());
+ success.put("boxNumber",smartLockerApplication.getLockerPort());
logger.info("鎴愬姛杩斿洖{}",success);
return success;
}
+
+ @DataSource(DataSourceType.CWSJ)
+ @Override
+ public String selectCwBoxNum(String licensePlateNumber) {
+ return keyCollectionInfoMapper.selectCwBoxNum(licensePlateNumber);
+ }
+
+ @Override
+ public String selectBoxNum(String licensePlateNumber) {
+ return null;
+ }
}
--
Gitblit v1.8.0