修改接口

wujianwei

2025-09-05 abb51ab390fa6cf9bf3747f57576c1507f89ae00

修改接口

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

@@ -2,6 +2,7 @@

import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.RandomUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.cwgl.domain.KeyCollectionInfo;
import com.ruoyi.cwgl.domain.RequestLog;
@@ -15,6 +16,8 @@
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
import java.util.Random;
import java.util.concurrent.ThreadLocalRandom;


/**
@@ -44,6 +47,17 @@
    public AjaxResult takeReview(@Valid @RequestBody TakeReviewDto takeReviewDto){

        logger.info("请求上报参数{}",takeReviewDto);
        if ("test".equals(takeReviewDto.getDriverCode())){
            Random random = new Random();

            // 生成 1-30 的随机整数
            int randomNumber = random.nextInt(30) + 1;
            AjaxResult success = new AjaxResult(0, "成功",1);
            success.put("boxNumber",randomNumber);
            logger.info("成功返回{}",success);
            return success;
        }

        KeyCollectionInfo keyCollectionInfo = keyCollectionInfoService.selectCwData(takeReviewDto);
        //添加请求日志
        RequestLog requestLog = new RequestLog();
@@ -69,6 +83,7 @@

    @PostMapping("/returnReport")
    public AjaxResult returnReport(@Valid @RequestBody ReturnReportDto returnReportDto){
        logger.info("归还参数{}",returnReportDto);

        //添加请求日志
        RequestLog requestLog = new RequestLog();

 quartz/src/main/java/com/ruoyi/quartz/task/SettlementTask.java

@@ -3,12 +3,15 @@
import cn.hutool.core.collection.CollectionUtil;
import com.ruoyi.common.utils.RandomUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.reflect.ReflectUtils;
import com.ruoyi.cwgl.domain.EstimatedReceivable;
import com.ruoyi.cwgl.domain.PendingSettlementBusiness;
import com.ruoyi.cwgl.domain.ReceivableLineTruckPriceRule;
import com.ruoyi.cwgl.service.IEstimatedReceivableService;
import com.ruoyi.cwgl.service.IPendingSettlementBusinessService;
import com.ruoyi.cwgl.service.impl.ExactPricingRuleMatcher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

@@ -26,7 +29,7 @@
@Component("settlementTask")
public class SettlementTask
{

    private static Logger logger = LoggerFactory.getLogger(SettlementTask.class);
    @Autowired
    private IPendingSettlementBusinessService pendingSettlementBusinessService;
    @Autowired
@@ -96,6 +99,14 @@
            estimatedReceivableService.insertEstimatedReceivableBatch(estimatedReceivables);
        }
        pendingSettlementBusinessService.insertPendingSettlement(pendingSettlementBusinesses);

        //更新同步状态用
        Integer[] ids = pendingSettlementBusinesses.stream().map(PendingSettlementBusiness::getServiceId).toArray(Integer[]::new);
        int i = pendingSettlementBusinessService.updeteCwData(ids);
        if (i>0){
            logger.info("同步状态更新成功");
        }

    }



 service/src/main/java/com/ruoyi/cwgl/domain/dto/ReturnReportDto.java

@@ -4,6 +4,7 @@
import lombok.Data;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Date;

/**
@@ -20,7 +21,7 @@
    @NotBlank(message = "司机唯一编号不能为空")
    private  String driverCode ;
    /**司机唯一编号*/
    @NotBlank(message = "存入时间不能为空")
    @NotNull(message = "存入时间不能为空")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date saveTime ;


 service/src/main/java/com/ruoyi/cwgl/service/IPendingSettlementBusinessService.java

@@ -141,4 +141,6 @@
    int createBillList(PendingSettlementBusiness pendingSettlementBusiness);

    List<String> selectCustomName();

    int updeteCwData(Integer[] ids);
}

 service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java

@@ -215,7 +215,7 @@
            logger.info("要求出发时间"+ dateToStr+"，领取钥匙超时"+keyTimeout+"个小时");
            return AjaxResult.error("要求出发时间"+ dateToStr+"，领取钥匙超时"+keyTimeout+"个小时");
        }
        AjaxResult success = new AjaxResult(0, "成功",2);
        AjaxResult success = new AjaxResult(0, "成功",1);
        success.put("boxNum",keyCollectionInfo.getBoxNum());
        logger.info("成功返回{}",success);
        return success;

 service/src/main/java/com/ruoyi/cwgl/service/impl/PendingSettlementBusinessServiceImpl.java

@@ -212,12 +212,6 @@
    @Override
    public List<PendingSettlementBusiness> selectPendingSettlement2Cw() {
        List<PendingSettlementBusiness> pendingSettlementBusinesses = pendingSettlementBusinessMapper.selectPendingSettlement2Cw();
        //更新同步状态用
       /*     Integer[] ids = pendingSettlementBusinesses.stream().map(PendingSettlementBusiness::getServiceId).toArray(Integer[]::new);
            int i = pendingSettlementBusinessMapper.updeteCwData(ids);
            if (i>0){
                logger.info("同步状态更新成功");
            }*/
        return pendingSettlementBusinesses;
    }

@@ -375,4 +369,10 @@
    public List<String> selectCustomName() {
        return pendingSettlementBusinessMapper.selectCustomName();
    }

    @Override
    @DataSource(DataSourceType.CWSJ)
    public int updeteCwData(Integer[] ids) {
        return pendingSettlementBusinessMapper.updeteCwData(ids);
    }
}

 service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml

@@ -532,7 +532,7 @@
        </foreach>
    </update>
    <update id="updeteCwData">
        update pending_settlement_business set IS_SYNC = 1
        update tms_shipment set IS_SYNC = 1
        where ID in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}