From 928a66524efbdb2371b7fa6b7ee8b55b910182fa Mon Sep 17 00:00:00 2001 From: kongdeqiang <123456> Date: 星期五, 19 四月 2024 08:01:45 +0800 Subject: [PATCH] fix:创建新分支 --- src/main/java/com/boying/controller/BarrierOpenLogController.java | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/boying/controller/BarrierOpenLogController.java b/src/main/java/com/boying/controller/BarrierOpenLogController.java index c6a7346..526ad99 100644 --- a/src/main/java/com/boying/controller/BarrierOpenLogController.java +++ b/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.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; @@ -25,18 +28,25 @@ @RestController @RequestMapping("ffzf/barrierOpenLog") @RequiredArgsConstructor +@Tag(description = "ffzf/barrierOpenLog" , name = "鎵嬪姩寮�闂告棩蹇�" ) public class BarrierOpenLogController { private final BarrierOpenLogService barrierOpenLogService; + private final ParkService parkService; @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); - 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); } -- Gitblit v1.9.1