From bccd25039a08f8833b72ff906d156da63018db98 Mon Sep 17 00:00:00 2001 From: kongdeqiang <123456> Date: 星期二, 19 三月 2024 15:10:13 +0800 Subject: [PATCH] 新增心跳缓存 --- src/main/java/com/boying/controller/OutParkController.java | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/boying/controller/OutParkController.java b/src/main/java/com/boying/controller/OutParkController.java index 47d3411..3d3556d 100644 --- a/src/main/java/com/boying/controller/OutParkController.java +++ b/src/main/java/com/boying/controller/OutParkController.java @@ -29,6 +29,7 @@ import java.text.SimpleDateFormat; import java.time.LocalDateTime; import java.time.ZoneOffset; +import java.time.format.DateTimeFormatter; import java.util.*; import java.util.concurrent.TimeUnit; @@ -55,6 +56,7 @@ @PostMapping("/findPage") 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); + System.out.println(list); long count = outParkService.getCount(carNo,parkId,payCode, date); for (OutPark record : list) { record.setParkName(parkService.getById(record.getParkId()).getName()); @@ -82,6 +84,7 @@ QueryWrapper<Barrier> wrapper = new QueryWrapper<>(); wrapper.lambda() .eq(Barrier::getCode2,code); + System.out.println("code :" +code); List<Barrier> all = barrierService.list(wrapper); if(all.size()==0){ return R.failed("鏈壘鍒拌璁惧"); @@ -107,6 +110,7 @@ //閬撻椄code @PostMapping("/findByBarrierCode2") public Object findById2(String code2) { + System.out.println("code2 :"+code2); QueryWrapper<Barrier> wrapper = new QueryWrapper<>(); wrapper.lambda() .eq(Barrier::getCode2,code2); @@ -289,6 +293,45 @@ } } + @GetMapping("/getByCarAndPark") + public Object getByCarAndPark(String carNo ,Integer parkId) { + QueryWrapper<OutPark> wrapper = new QueryWrapper<>(); + wrapper.lambda() + .eq(OutPark::getCarNo,carNo) + .eq(OutPark::getParkId,parkId) + .orderByDesc(OutPark::getCreateTime); + List<OutPark> list = outParkService.list(wrapper); + if(list.size() > 0){ + OutPark outPark = list.get(0); + if(outPark.getTime() > 0){ + outPark.setTimeStr(DateUtilOther.millisToDayHrMinSec(new Double(outPark.getTime()).longValue())); + }else { + outPark.setTimeStr("涓嶈冻涓�鍒嗛挓"); + } + return R.ok(outPark,"鎵惧埌鏁版嵁"); + }else { + return R.failed(null,"鏈壘鍒版暟鎹�"); + } + } + @GetMapping("/editEnterPark") + public Object editEnterPark(String carNo ,Integer parkId,String time) { + QueryWrapper<Barrier> wrapper = new QueryWrapper<>(); + wrapper.lambda() + .eq(Barrier::getParkId,parkId) + .eq(Barrier::getType,1); + List<Barrier> list = barrierService.list(wrapper); + EnterPark enterPark = new EnterPark(); + enterPark.setCreateTime(LocalDateTime.parse(time, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); + enterPark.setCarNo(carNo); + enterPark.setParkId(parkId); + enterPark.setBarrierId(list.get(0).getId()); + enterPark.setStatus(0); + enterPark.setIsPay(0); + enterPark.setImgId(null); + enterParkService.saveOrUpdate(enterPark); + return R.ok("淇敼鎴愬姛"); + } + public Barrier findBarrier(String code2) { QueryWrapper<Barrier> wrapper = new QueryWrapper<>(); -- Gitblit v1.9.1