新增前后端

wujianwei

2025-08-28 446f423ccea20bfbcd03b7f2f4a680567277b5c3

 api/src/main/java/com/ruoyi/api/third/controller/LockerApiController.java

File was renamed from api/src/main/java/com/ruoyi/api/controller/LockerApiController.java
@@ -1,4 +1,4 @@
package com.ruoyi.api.controller;
package com.ruoyi.api.third.controller;

import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.DateUtils;
@@ -8,11 +8,12 @@
import com.ruoyi.cwgl.domain.dto.TakeReviewDto;
import com.ruoyi.cwgl.service.IKeyCollectionInfoService;
import com.ruoyi.cwgl.service.IRequestLogService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;


/**
@@ -20,8 +21,10 @@
 * @author wjw
 */
@RestController
@RequestMapping("/api/third/locker/")
@RequestMapping("/api/third/locker")
public class LockerApiController {

    private static Logger logger = LoggerFactory.getLogger(LockerApiController.class);

    @Autowired
    private IKeyCollectionInfoService keyCollectionInfoService;
@@ -31,16 +34,20 @@
    /**
     * 上报取出审核
     */
    @GetMapping("test")
    public AjaxResult test(){
        return AjaxResult.success();
    }

    @PostMapping("takeReview")
    public AjaxResult takeReview(@RequestBody TakeReviewDto takeReviewDto){
    @PostMapping("/takeReview")
    public AjaxResult takeReview(@Valid @RequestBody TakeReviewDto takeReviewDto){

        KeyCollectionInfo keyCollectionInfo = keyCollectionInfoService.selectCwData(takeReviewDto);
        //添加请求日志
        RequestLog requestLog = new RequestLog();
        requestLog.setDriverCode(takeReviewDto.getDriverCode());
        requestLog.setDriverName(takeReviewDto.getDriverName());
        requestLog.setReqTime(DateUtils.parseDate(takeReviewDto.getHandleTime()));
        requestLog.setReqTime(takeReviewDto.getHandleTime());
        requestLog.setType(0);
        logService.insertRequestLog(requestLog);

@@ -53,14 +60,14 @@
     * 归还上报
     */

    @PostMapping("returnReport")
    public AjaxResult returnReport(@RequestBody ReturnReportDto returnReportDto){
    @PostMapping("/returnReport")
    public AjaxResult returnReport(@Valid @RequestBody ReturnReportDto returnReportDto){

        //添加请求日志
        RequestLog requestLog = new RequestLog();
        requestLog.setDriverCode(returnReportDto.getDriverCode());
        requestLog.setBoxNum(returnReportDto.getBoxNum());
        requestLog.setReqTime(DateUtils.parseDate(returnReportDto.getSaveTime()));
        requestLog.setReqTime(returnReportDto.getSaveTime());
        requestLog.setType(1);
        logService.insertRequestLog(requestLog);