修改归还上报查询司机名字

wujianwei

5 天以前 98d00448989d01cef0e714cfc528ff31011a86b3

 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,25 @@
        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;
    }

    @DataSource(DataSourceType.CWSJ)
    @Override
    public String selectNameByMobile(String driverCode) {
        return keyCollectionInfoMapper.selectNameByMobile(driverCode);
    }
}