Merge branch 'master2'

kongdeqiang

2024-04-22 7bc78d8f70a4d11e46f8bd640228804a3dd0dc68

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

@@ -13,6 +13,8 @@
import com.boying.service.BarrierService;
import com.boying.service.OutParkService;
import com.boying.service.ParkService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.web.bind.annotation.PostMapping;
@@ -26,6 +28,7 @@
@RestController
@RequestMapping("ffzf/barrierOpenLog")
@RequiredArgsConstructor
@Tag(description = "ffzf/barrierOpenLog" , name = "手动开闸日志" )
public class BarrierOpenLogController {

    private final BarrierOpenLogService barrierOpenLogService;
@@ -33,11 +36,13 @@


    @PostMapping("findPage")
    @Operation(summary = "分页查询" , description = "分页查询" )
    public Object findPage(Page page, Integer parkId,String carNo) {
        QueryWrapper<BarrierOpenLog> wrapper = new QueryWrapper<>();
        wrapper.lambda()
                .eq(parkId != null,BarrierOpenLog::getParkId,parkId)
                .eq(StringUtils.isNotBlank(carNo),BarrierOpenLog::getCarNo,carNo);
                .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());