fix:合并代码

kongdeqiang

2024-09-26 da9a4f7ad988c452f3a356989eaf7a6c06ae5032

 src/main/java/com/boying/controller/BarrierOpenLogController.java

@@ -8,10 +8,13 @@
import com.boying.entity.Barrier;
import com.boying.entity.BarrierOpenLog;
import com.boying.entity.OutPark;
import com.boying.entity.Park;
import com.boying.service.BarrierOpenLogService;
import com.boying.service.BarrierService;
import com.boying.service.OutParkService;
import com.boying.service.ParkService;

import io.swagger.annotations.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.web.bind.annotation.PostMapping;
@@ -28,6 +31,7 @@
public class BarrierOpenLogController {

    private final BarrierOpenLogService barrierOpenLogService;
    private final ParkService parkService;


    @PostMapping("findPage")
@@ -35,8 +39,12 @@
        QueryWrapper<BarrierOpenLog> wrapper = new QueryWrapper<>();
        wrapper.lambda()
                .eq(parkId != null,BarrierOpenLog::getParkId,parkId)
                .eq(StringUtils.isNotBlank(carNo),BarrierOpenLog::getCarNo,carNo);
        Page page1 = barrierOpenLogService.page(page, wrapper);
                .eq(StringUtils.isNotBlank(carNo),BarrierOpenLog::getCarNo,carNo)
                .orderByDesc(BarrierOpenLog::getCreateTime);
        Page<BarrierOpenLog> page1 = barrierOpenLogService.page(page, wrapper);
        for (BarrierOpenLog record : page1.getRecords()) {
            record.setParkName(parkService.getById(record.getParkId()).getName());
        }
        return R.ok(page1);
    }