From 64b11e539b05798b7b460305d2ee36e81489d8ae Mon Sep 17 00:00:00 2001 From: kongdeqiang <123456> Date: 星期二, 03 十二月 2024 17:31:22 +0800 Subject: [PATCH] fix : 新增修改出场接口 --- src/main/java/com/boying/controller/OutParkController.java | 81 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 79 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/boying/controller/OutParkController.java b/src/main/java/com/boying/controller/OutParkController.java index 99aef6e..be0c09f 100644 --- a/src/main/java/com/boying/controller/OutParkController.java +++ b/src/main/java/com/boying/controller/OutParkController.java @@ -1,8 +1,10 @@ package com.boying.controller; import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.boying.common.R; import com.boying.common.SystemConfigProperties; @@ -319,6 +321,57 @@ return R.failed(null,"鏈壘鍒版暟鎹�"); } } + + //鎵爜淇敼鍑哄満锛堟ā绯婅溅鐗岋級 + @GetMapping("/getLikeCar") + public Object getLikeCar(Integer outParkId) { + OutPark byId = outParkService.getById(outParkId); + List<Map<String, Object>> likeCar = outParkService.getLikeCar(byId.getCarNo(), byId.getParkId(), byId.getCreateTime()); + if (CollectionUtils.isNotEmpty(likeCar)) { + Collections.sort(likeCar, (m1, m2)-> String.valueOf(m2.get("createTime")).compareTo(String.valueOf(m1.get("createTime")))); + } + return R.ok(likeCar); + } + + //鎵爜淇敼鍑哄満锛堟ā绯婅溅鐗岋級 + @GetMapping("/editOutPark") + public Object editOutPark(Integer outParkId,Integer enterParkId,Integer type) { + double money = 0.0; + OutPark outPark = outParkService.getById(outParkId); + EnterPark enterPark = enterParkService.getById(enterParkId); + Barrier barrier =barrierService.getById(outPark.getBarrierId()); + if(type == 0){ //鍏ュ満姝g‘锛屾浛鎹㈠嚭鍦猴紝鏇存柊鍑哄満璁板綍 + outPark.setCarNo(enterPark.getCarNo()); + barrier.setCarNo(enterPark.getCarNo()); + barrierService.saveOrUpdate(barrier); + String jsonValue = JSON.toJSONString(barrier); + redisTemplate.opsForValue().set("barrier-"+barrier.getCode(), jsonValue); + }else { //鍑哄満姝g‘锛屾浛鎹㈠叆鍦猴紝鏇存柊鍑哄満璁板綍 + enterPark.setCarNo(outPark.getCarNo()); + } + outPark.setEnterTime(enterPark.getCreateTime()); + try { + long l = outPark.getCreateTime().toInstant(ZoneOffset.of("+8")).toEpochMilli() - enterPark.getCreateTime().toInstant(ZoneOffset.of("+8")).toEpochMilli(); + outPark.setTime(l/(1000*60)); + if(outPark.getTime() > 0){ + outPark.setTimeStr(DateUtilOther.millisToDayHrMinSec(new Double(outPark.getTime()).longValue())); + }else { + outPark.setTimeStr("涓嶈冻涓�鍒嗛挓"); + } + money = costRuleService.getMoney(outPark.getParkId(), outPark.getEnterTime(), outPark.getCreateTime(), 1); + //鍏ュ満璁板綍淇濆瓨涓�涓� + enterPark.setPrice(money); + enterPark.setIsPay(0); + enterParkService.updateById(enterPark); + } catch (ParseException e) { + e.printStackTrace(); + } + outPark.setPrice(money); + outParkService.saveOrUpdate(outPark); + outPark.setParkName(barrier.getName()); + return R.ok(outPark,"鏇存柊鎴愬姛"); + } + @GetMapping("/editEnterPark") public Object editEnterPark(String carNo ,Integer parkId,String time) { QueryWrapper<Barrier> wrapper = new QueryWrapper<>(); @@ -332,10 +385,34 @@ enterPark.setParkId(parkId); enterPark.setBarrierId(list.get(0).getId()); enterPark.setStatus(0); + enterPark.setIsAdd(1); enterPark.setIsPay(0); - enterPark.setImgId(null); enterParkService.saveOrUpdate(enterPark); - return R.ok("淇敼鎴愬姛"); + + OutPark outPark = null; + QueryWrapper<OutPark> wrapper1 = new QueryWrapper<>(); + wrapper1.lambda() + .eq(OutPark::getParkId,parkId) + .eq(OutPark::getCarNo,carNo) + .ge(OutPark::getCreateTime,enterPark.getCreateTime()) + .ne(OutPark::getStatus,1); + List<OutPark> list1 = outParkService.list(wrapper1); + if(list1 !=null&&list1.size()>0){ + outPark = list1.get(0); + outPark.setEnterTime(enterPark.getCreateTime()); + long l = outPark.getCreateTime().toInstant(ZoneOffset.of("+8")).toEpochMilli() - enterPark.getCreateTime().toInstant(ZoneOffset.of("+8")).toEpochMilli(); + outPark.setTime(l/(1000*60)); + try { + outPark.setPrice(costRuleService.getMoney(parkId, outPark.getEnterTime(), outPark.getCreateTime(), 1)); + }catch (Exception e){ + e.printStackTrace(); + } + outParkService.saveOrUpdate(outPark); + return R.ok(null,"淇敼鍑哄満璁板綍鎴愬姛"); + }else { + return R.ok(null,"鏂板鍏ュ満璁板綍鎴愬姛"); + } + } -- Gitblit v1.9.1