fix ： 新增bug

kongdeqiang

2024-10-22 13294325b4cf59b893a7667676f086befa4df339

fix ： 新增bug

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

@@ -39,7 +39,7 @@
        QueryWrapper<BarrierOpenLog> wrapper = new QueryWrapper<>();
        wrapper.lambda()
                .eq(parkId != null,BarrierOpenLog::getParkId,parkId)
                .eq(StringUtils.isNotBlank(carNo),BarrierOpenLog::getCarNo,carNo)
                .like(StringUtils.isNotBlank(carNo),BarrierOpenLog::getCarNo,carNo)
                .orderByDesc(BarrierOpenLog::getCreateTime);
        Page<BarrierOpenLog> page1 = barrierOpenLogService.page(page, wrapper);
        for (BarrierOpenLog record : page1.getRecords()) {

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

@@ -47,8 +47,8 @@
    private final EditParkNumLogService editParkNumLogService;

    @PostMapping("/findPage")
    public Object findPage(Page page) {
        Page page1 = parkService.page(page, new QueryWrapper<Park>().lambda().orderByDesc(Park::getId));
    public Object findPage(Page page,Park park) {
        Page page1 = parkService.page(page, new QueryWrapper<Park>().lambda().eq(park.getId()!=null,Park::getId,park.getId()).orderByDesc(Park::getId));
        List<Park> records = page1.getRecords();
        for (Park record : records) {
            String num = redisTemplate.opsForValue().get("car_park_" +  record.getId());

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

@@ -13,6 +13,10 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;


@RestController
@RequestMapping("ffzf/whiteList")
@@ -27,8 +31,8 @@
    public Object findPage(Page page, String carNo) {
        QueryWrapper<WhiteList> wrapper = new QueryWrapper<>();
        wrapper.lambda()
                .orderByDesc(WhiteList::getId)
                .like(StringUtils.isNotBlank(carNo),WhiteList::getCarNo,carNo);
                .like(StringUtils.isNotBlank(carNo),WhiteList::getCarNo,carNo)
                .orderByDesc(WhiteList::getId);
        Page<WhiteList> page1 = whiteListService.page(page, wrapper);
        for (WhiteList record : page1.getRecords()) {
            if(record.getParkId() != null){
@@ -39,11 +43,19 @@
    }

    @PostMapping("/findPageNew")
    public Object findPageNew(Page page, String carNo) {
    public Object findPageNew(Page page, String carNo,Integer type,String date) throws ParseException {
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
        if(StringUtils.isNotBlank(date)){
            System.out.println(date);
            Date parse = sdf.parse(date);
            date = sdf.format(parse);
        }
        QueryWrapper<WhiteList> wrapper = new QueryWrapper<>();
        wrapper.lambda()
                .orderByDesc(WhiteList::getId)
                .eq(StringUtils.isNotBlank(carNo),WhiteList::getCarNo,carNo);
                .like(StringUtils.isNotBlank(carNo),WhiteList::getCarNo,carNo)
                .eq(type!=null,WhiteList::getType,type)
                .le(StringUtils.isNotBlank(date),WhiteList::getEndTime,date);
        Page<WhiteList> page1 = whiteListService.page(page, wrapper);
        for (WhiteList record : page1.getRecords()) {
            if(StringUtils.isNotBlank(record.getParkIds())){