From 2ca1013333bb1f80d104e54ac2e7171bd8dffc77 Mon Sep 17 00:00:00 2001 From: wujianwei <wjw@11.com> Date: 星期四, 18 九月 2025 18:02:00 +0800 Subject: [PATCH] 新增要求出发时间 --- service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java | 63 +++++++++++++++++++++++++++++++ 1 files changed, 63 insertions(+), 0 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 8d2ea1a..60bcd5a 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 @@ -1,8 +1,19 @@ package com.ruoyi.cwgl.service.impl; +import java.util.Date; import java.util.List; 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; @@ -32,6 +43,9 @@ protected final Logger logger = LoggerFactory.getLogger(getClass()); @Resource private KeyCollectionInfoMapper keyCollectionInfoMapper; + @Resource + private SmartLockerApplicationMapper smartLockerApplicationMapper; + /** @@ -176,4 +190,53 @@ { return keyCollectionInfoMapper.deleteKeyCollectionInfoById(id); } + + @DataSource(DataSourceType.CWSJ) + @Override + public KeyCollectionInfo selectCwData(TakeReviewDto takeReviewDto) { + return keyCollectionInfoMapper.selectCwData(takeReviewDto); + } + + @Override + public AjaxResult takeReview(KeyCollectionInfo keyCollectionInfo) { + if (keyCollectionInfo == null) { + return AjaxResult.error("鏌ユ棤绗﹀悎瑕佹眰鐨勮皟搴﹀崟锛岃鑱旂郴璋冨害浜哄憳",3); + } + keyCollectionInfoMapper.insertKeyCollectionInfo(keyCollectionInfo); + + + //璋冨害瓒呮椂 + Integer schedulingTimeout = keyCollectionInfo.getSchedulingTimeout(); + if(schedulingTimeout>5){ + logger.info("璋冨害瓒呮椂涓嬪崟锛岃秴鏃�"+schedulingTimeout+"涓皬鏃�"); + return AjaxResult.error("璋冨害瓒呮椂涓嬪崟锛岃秴鏃�"+schedulingTimeout+"涓皬鏃�",3); + + } + Integer keyTimeout = keyCollectionInfo.getKeyTimeout(); + if (keyTimeout!=null && keyTimeout>24){ + 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("boxNumber",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("boxNumber",smartLockerApplication.getLockerPort()); + logger.info("鎴愬姛杩斿洖{}",success); + return success; + } } -- Gitblit v1.8.0