From 9578ae952527cdafc64d642f5183aa60ef92b7f2 Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期三, 10 九月 2025 11:26:10 +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 | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 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 f450d72..de6eddf 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,10 +5,13 @@
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;
@@ -40,6 +43,8 @@
protected final Logger logger = LoggerFactory.getLogger(getClass());
@Resource
private KeyCollectionInfoMapper keyCollectionInfoMapper;
+ @Resource
+ private SmartLockerApplicationMapper smartLockerApplicationMapper;
@@ -203,6 +208,7 @@
//璋冨害瓒呮椂
Integer schedulingTimeout = keyCollectionInfo.getSchedulingTimeout();
if(schedulingTimeout>5){
+ logger.info("璋冨害瓒呮椂涓嬪崟锛岃秴鏃�"+schedulingTimeout+"涓皬鏃�");
return AjaxResult.error("璋冨害瓒呮椂涓嬪崟锛岃秴鏃�"+schedulingTimeout+"涓皬鏃�",3);
}
@@ -210,8 +216,27 @@
if (keyTimeout!=null && keyTimeout>24){
Date estimatedDepartureTime = keyCollectionInfo.getEstimatedDepartureTime();
String dateToStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, estimatedDepartureTime);
+ logger.info("瑕佹眰鍑哄彂鏃堕棿"+ dateToStr+"锛岄鍙栭挜鍖欒秴鏃�"+keyTimeout+"涓皬鏃�");
return AjaxResult.error("瑕佹眰鍑哄彂鏃堕棿"+ dateToStr+"锛岄鍙栭挜鍖欒秴鏃�"+keyTimeout+"涓皬鏃�");
}
- return AjaxResult.success("鎴愬姛",2);
+ AjaxResult success = new AjaxResult(0, "鎴愬姛",1);
+ success.put("boxNum",keyCollectionInfo.getBoxNum());
+ logger.info("鎴愬姛杩斿洖{}",success);
+ return success;
+ }
+
+ @Override
+ public AjaxResult selectSmartLockerApplication(TakeReviewDto takeReviewDto) {
+ SmartLockerApplication smartLockerApplication =smartLockerApplicationMapper.selectSmartLockerApplication(takeReviewDto);
+ if (smartLockerApplication == null){
+ return AjaxResult.error("鏌ユ棤绗﹀悎瑕佹眰鐨勮皟搴﹀崟锛岃鑱旂郴璋冨害浜哄憳",3);
+ }
+ smartLockerApplication.setStatus(2);
+ smartLockerApplication.setReceiveTime(new Date());
+ smartLockerApplicationMapper.updateSmartLockerApplication(smartLockerApplication);
+ AjaxResult success = new AjaxResult(0, "鎴愬姛",1);
+ success.put("boxNum",smartLockerApplication.getLockerPort());
+ logger.info("鎴愬姛杩斿洖{}",success);
+ return success;
}
}
--
Gitblit v1.8.0