Merge remote-tracking branch 'origin/master'

kongdeqiang

2024-04-24 83a1aa3133ce9c35fb428d0cdf4a84adda4ba3ac

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

@@ -5,10 +5,13 @@
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.boying.common.R;
import com.boying.entity.EnterPark;
import com.boying.entity.Park;
import com.boying.entity.User;
import com.boying.service.EnterParkService;
import com.boying.service.ParkService;
import com.boying.service.UserService;
import com.boying.util.RedisJsonUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
@@ -17,6 +20,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -32,6 +36,8 @@
    private StringRedisTemplate redisTemplate;
    private final ParkService parkService;
    private final UserService userService;
    private final RedisJsonUtil redisJsonUtil;
    private final EnterParkService enterParkService;

    @PostMapping("/findPage")
    public Object findPage(Page page) {
@@ -58,12 +64,18 @@
            redisTemplate.opsForValue().set("car_park_" + park.getId(),"0",30, TimeUnit.DAYS);
            redisTemplate.opsForValue().set("park_up_" + park.getId(),"true",30, TimeUnit.DAYS);
        }
        try {
            redisJsonUtil.set("park-"+park.getId(), park);
        } catch (IOException e) {
            e.printStackTrace();
        }
        return R.ok("保存成功");
    }

    @PostMapping("/delete")
    public Object delete(Long id) {
        parkService.removeById(id);
        redisJsonUtil.del("park-"+id);
        return R.ok("删除成功");
    }

@@ -103,10 +115,15 @@
        for (Long id : ids) {
            Park byId1 = parkService.getById(id);
            String num = redisTemplate.opsForValue().get("car_park_" +  byId1.getId());
            if(StringUtils.isNotBlank(num)){
                num = "0";
            try {
                if(StringUtils.isBlank(num)){
                    num = "0";
                }
                byId1.setCarNum(Integer.parseInt(num));
            }catch (Exception e){
                byId1.setCarNum(0);
                e.printStackTrace();
            }
            byId1.setCarNum(Integer.parseInt(num));
            list.add(byId1);
        }
        return R.ok(list);
@@ -141,4 +158,22 @@
        }
    }


    @PostMapping("/getParkCar")
    public Object getParkCar(Page page, Integer parkId,String carNo) {
        QueryWrapper<EnterPark> enterParkQueryWrapper = new QueryWrapper<>();
        enterParkQueryWrapper.lambda()
                .eq(parkId != null,EnterPark::getParkId,parkId)
                .like(StringUtils.isNotBlank(carNo),EnterPark::getCarNo,carNo)
                .orderByDesc(EnterPark::getCreateTime);
        Page<EnterPark> page1 = enterParkService.page(page, enterParkQueryWrapper);
        for (EnterPark record : page1.getRecords()) {
            record.setParkName(parkService.getById(record.getParkId()).getName());
            if(record.getImgId() != null){
                record.setImgPath("/ffzf/fileinfo/showImgById/"+record.getImgId());
            }
        }
        return R.ok(page1);
    }

}