修改

kongdeqiang

2023-07-10 85f5baee0e3d255860395278dcb5cbb5cc766023

 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.*;
@@ -32,7 +33,7 @@
import java.util.concurrent.TimeUnit;

@RestController
@RequestMapping("outPark")
@RequestMapping("ffzf/outpark")
@RequiredArgsConstructor
public class OutParkController  {

@@ -52,14 +53,27 @@
    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
    @PostMapping("findByBarrierCode")
    @PostMapping("/findByBarrierCode")
    public Object findById(String code) {
       QueryWrapper<Barrier> wrapper = new QueryWrapper<>();
       wrapper.lambda()
@@ -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);
            }
@@ -197,45 +211,39 @@
        return R.ok(outPark);
    }

    @GetMapping("/statisticParkOrder")
    public Object statisticParkOrder(Integer userId) {
        User byId = userService.getById(userId);
    @GetMapping("/statisticParkOrder/count")
    public R statisticParkOrder(String parkIds) {
        Map<String,Object> resultMap = new HashMap<>();
        if(byId != null){
            String parkIds = byId.getParkIds();
            if(parkIds != null){
                String[] split = parkIds.split(",");
                int[] array = Arrays.stream(split).mapToInt(Integer::parseInt).toArray();
                List<Integer> parkIdList = new ArrayList<>();
                for (int i : array) {
                    parkIdList.add(i);
                }
                QueryWrapper<OutPark> wrapper = new QueryWrapper<>();
                wrapper.lambda()
                        .between(OutPark::getCreateTime, DateUtil.beginOfDay(new Date()),DateUtil.endOfDay(new Date()))
                        .eq(OutPark::getStatus,1)
                        .in(OutPark::getParkId,parkIdList);
                wrapper.select("IFNULL(ROUND(SUM(price)),0) as num");
                Map<String, Object> map = outParkService.getMap(wrapper);
                String a = map.get("num").toString();
                if(a != null){
                    resultMap.put("money",Double.parseDouble(a));
                }else {
                    resultMap.put("money",0.0);
                }
                wrapper.clear();
                wrapper.lambda()
                        .between(OutPark::getCreateTime, DateUtil.beginOfDay(new Date()),DateUtil.endOfDay(new Date()))
                        .eq(OutPark::getStatus,1)
                        .in(OutPark::getParkId,parkIdList);
                int count = outParkService.count(wrapper);
                resultMap.put("count",count);
                return R.ok(resultMap);
            }else {
                return R.failed(null,"该用户未管理停车场");
        if(StringUtils.isNotBlank(parkIds)){
            String[] split = parkIds.split(",");
            long[] array = Arrays.stream(split).mapToLong(Long::parseLong).toArray();
            List<Long> parkIdList = new ArrayList<>();
            for (long i : array) {
                parkIdList.add(i);
            }
            QueryWrapper<OutPark> wrapper = new QueryWrapper<>();
            wrapper.lambda()
                    .between(OutPark::getCreateTime, DateUtil.beginOfDay(new Date()),DateUtil.endOfDay(new Date()))
                    .eq(OutPark::getStatus,1)
                    .in(OutPark::getParkId,parkIdList);
            wrapper.select("IFNULL(ROUND(SUM(price)),0) as num");
            Map<String, Object> map = outParkService.getMap(wrapper);
            String a = map.get("num").toString();
            if(a != null){
                resultMap.put("money",Double.parseDouble(a));
            }else {
                resultMap.put("money",0.0);
            }
            wrapper.clear();
            wrapper.lambda()
                    .between(OutPark::getCreateTime, DateUtil.beginOfDay(new Date()),DateUtil.endOfDay(new Date()))
                    .eq(OutPark::getStatus,1)
                    .in(OutPark::getParkId,parkIdList);
            long count = outParkService.count(wrapper);
            resultMap.put("count",count);
            return R.ok(resultMap);
        }else {
            return R.failed(null,"未查询到该用户");
            return R.failed(null,"该用户未管理停车场");
        }
    }

@@ -243,9 +251,9 @@
    public Object isJS(String carNo ,Integer parkId) {
        List<EnterPark> byCarNo = enterParkService.findByCarNo(carNo, parkId);
        if(byCarNo.size() > 0){
            return R.ok(byCarNo.get(0));
            return R.ok(byCarNo.get(0),"true");
        }else {
            return R.failed();
            return R.ok(null,"false");
        }
    }