修改

kongdeqiang

2023-06-05 bb344d8e73bf3a6825f21584609649cb5d5042f5

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

@@ -3,6 +3,7 @@
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.boying.common.R;
import com.boying.common.SystemConfigProperties;
import com.boying.entity.*;
@@ -52,10 +53,23 @@
    private StringRedisTemplate redisTemplate;

    @PostMapping("/findPage")
    public Object findPage(Page page,OutPark outPark) {
        QueryWrapper<OutPark> wrapper = new QueryWrapper<>();
        wrapper.lambda().orderByDesc(OutPark::getId);
        return R.ok(outParkService.page(page,wrapper));
    public Object findPage(Page page, String  carNo,Long parkId,String  payCode,String date) throws ParseException {
        List<OutPark> list = outParkService.getList(page.getCurrent(), page.getSize(), carNo,parkId,payCode, date);
        long count = outParkService.getCount(carNo,parkId,payCode, date);
        for (OutPark record : list) {
            record.setParkName(parkService.getById(record.getParkId()).getName());
            if(record.getEnterTime() != null){
                record.setTimeStr(DateUtilOther.millisToDayHrMinSec(new Double(record.getTime()).longValue()));
            }else {
                record.setTimeStr("未发现入场记录");
            }
            if(record.getImgId() != null){
                record.setImgPath("/ffzf/fileinfo/showImgById/"+record.getImgId());
            }
        }
        page.setRecords(list);
        page.setTotal(count);
        return R.ok(page);
    }

    //道闸code
@@ -79,7 +93,7 @@
                if(outPark.getTime() > 0){
                    outPark.setTimeStr(DateUtilOther.millisToDayHrMinSec(new Double(outPark.getTime()).longValue()));
                }else {
                    outPark.setTimeStr("0");
                    outPark.setTimeStr("不足一分钟");
                }
                return R.ok(outPark);
            }