From 76a01586b6308d0524a8ad744779f53c3c7f5792 Mon Sep 17 00:00:00 2001 From: kongdeqiang <123456> Date: 星期五, 22 三月 2024 15:42:09 +0800 Subject: [PATCH] 出场后删除入场车辆 --- src/main/java/com/boying/controller/car/PlateServlet3.java | 62 ++++++++++++++++++++++-------- 1 files changed, 45 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/boying/controller/car/PlateServlet3.java b/src/main/java/com/boying/controller/car/PlateServlet3.java index c9ec120..3aaf2e4 100644 --- a/src/main/java/com/boying/controller/car/PlateServlet3.java +++ b/src/main/java/com/boying/controller/car/PlateServlet3.java @@ -34,6 +34,7 @@ import java.io.*; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.time.Duration; import java.time.LocalDateTime; import java.time.ZoneOffset; import java.util.Base64; @@ -62,7 +63,7 @@ private final FileInfoService fileInfoService; private final TicketBlackService ticketBlackService; private final OutParkLogService outParkLogService; - private final RedisJsonUtil redisJsonUtil; + // private final RedisJsonUtil redisJsonUtil; private final String LEDURL = "http://192.168.31.212:9988/LedShow/IGetResultDataAllLine"; /** @@ -143,8 +144,12 @@ public void heart(String serialno,HttpServletRequest request,HttpServletResponse response) throws ServletException, IOException { Barrier barrier = barrierService.findByCode(serialno); Park park = parkService.getOneById(barrier.getParkId()); - String redis = redisTemplate.opsForValue().get("park_up_" + park.getId()); + // Park park = parkService.getById(barrier.getParkId()); + // String redis = redisTemplate.opsForValue().get("park_up_" + park.getId()); String redisnum = redisTemplate.opsForValue().get("car_park_" + park.getId()); + if(StringUtils.isBlank(redisnum)){ + redisnum = "0"; + } if(barrier!=null){ if(barrier.getType2()==1){ //寰呭紑闂� @@ -173,22 +178,24 @@ barrier.setStatus(0); barrier.setUpdateTime(LocalDateTime.now()); barrierService.saveOrUpdate(barrier); - try { - redisJsonUtil.set("barrier-"+barrier.getCode(),barrier); - } catch (IOException e) { - e.printStackTrace(); - } + + String jsonValue = JSON.toJSONString(barrier); + redisTemplate.opsForValue().set("barrier-"+barrier.getCode(), jsonValue); easyOpen(request,response); }else { //涓嶉渶寮�闂� - barrier.setStatus(0); - barrier.setUpdateTime(LocalDateTime.now()); - barrierService.saveOrUpdate(barrier); - try { - redisJsonUtil.set("barrier-"+barrier.getCode(),barrier); - } catch (IOException e) { - e.printStackTrace(); + LocalDateTime now = LocalDateTime.now(); + LocalDateTime updateTime = barrier.getUpdateTime(); + Duration duration = Duration.between(updateTime,now); + long minutes = duration.toMinutes(); + if(minutes>=2){ + barrier.setStatus(0); + barrier.setUpdateTime(LocalDateTime.now()); + barrierService.saveOrUpdate(barrier); } + + String jsonValue = JSON.toJSONString(barrier); + redisTemplate.opsForValue().set("barrier-"+barrier.getCode(), jsonValue); if(barrier.getType() == 0){ OutPark outPark = outParkService.count4(barrier.getId()); if(outPark!=null){ @@ -214,11 +221,11 @@ byOutPark.setOpenTime(LocalDateTime.now()); outParkLogService.saveOrUpdate(byOutPark); enterParkService.deleteByCarNo(outPark.getCarNo(), barrier.getParkId()); - redisJsonUtil.del("outPark-"+outPark.getBarrierId()); + redisTemplate.delete("outPark-"+outPark.getBarrierId()); } } if(barrier.getType() == 1){ - boolean in = barrierService.getDateDifIn(barrier.getId()); + boolean in = barrierService.getDateDifIn(park.getId()); if(in){ inLedShowDefault(park.getId(),request,response); } @@ -536,6 +543,9 @@ enterPark.setImgId(fileInfo.getId()); } enterParkService.saveOrUpdate(enterPark); + String jsonValue = JSON.toJSONString(enterPark); + redisTemplate.opsForValue().set("enterPark_dif_"+ parkId, jsonValue); + } } @@ -602,6 +612,11 @@ byCarNoAndBarrierId.setStatus(2); byCarNoAndBarrierId.setStatus2(1); outParkService.saveOrUpdate(byCarNoAndBarrierId); + barrierService.saveOrUpdate(barrier); + String jsonValue2 = JSON.toJSONString(barrier); + redisTemplate.opsForValue().set("barrier-"+barrier.getCode(), jsonValue2); + String jsonValue = JSON.toJSONString(byCarNoAndBarrierId); + redisTemplate.opsForValue().set("outPark_dif_"+ barrierId, jsonValue); return 0.0; }else{ if(StringUtils.isNotBlank(w.getParkIds())){ @@ -616,6 +631,11 @@ byCarNoAndBarrierId.setStatus(2); byCarNoAndBarrierId.setStatus2(1); outParkService.saveOrUpdate(byCarNoAndBarrierId); + barrierService.saveOrUpdate(barrier); + String jsonValue2 = JSON.toJSONString(barrier); + redisTemplate.opsForValue().set("barrier-"+barrier.getCode(), jsonValue2); + String jsonValue = JSON.toJSONString(byCarNoAndBarrierId); + redisTemplate.opsForValue().set("outPark_dif_"+ barrierId, jsonValue); return 0.0; } } @@ -624,10 +644,15 @@ } } } + barrierService.saveOrUpdate(barrier); + String jsonValue2 = JSON.toJSONString(barrier); + redisTemplate.opsForValue().set("barrier-"+barrier.getCode(), jsonValue2); if(outPark.getPrice()==0&&outPark.getStatus3()==0){ System.out.println(outPark.getCarNo()+"璇ヨ溅涓嶉渶瑕佺即璐�"); String s= "1."+barrier.getCarNo()+"璇ヨ溅涓嶉渶瑕佺即璐筡n"; writeTxt2(s); + String jsonValue = JSON.toJSONString(outPark); + redisTemplate.opsForValue().set("outPark_dif_"+ barrierId, jsonValue); outLedShow(barrier.getCode(),barrier.getCarNo(),outPark.getPrice(),toDayHrMinSec,barrier.getParkId(),request,response,0); }else { //闇�瑕佺即璐规垨鑰呮湁杩濈珷 @@ -638,9 +663,10 @@ byOutPark.setOutTime(outPark.getCreateTime()); byOutPark.setParkId(outPark.getParkId()); outParkLogService.saveOrUpdate(byOutPark); + String jsonValue = JSON.toJSONString(outPark); + redisTemplate.opsForValue().set("outPark_dif_"+ barrierId, jsonValue); outLedShow(barrier.getCode(),barrier.getCarNo(),outPark.getPrice(),toDayHrMinSec,barrier.getParkId(),request,response,1); } - barrierService.saveOrUpdate(barrier); return money; } @@ -823,6 +849,7 @@ }else { //寮�闂� open(request,response,data1); + enterParkService.deleteByCarNo(carNo, parkId); redisTemplate.opsForValue().set("park_change_in_"+parkId,"true",1, TimeUnit.DAYS); int i = Integer.parseInt(redisnum); i--; @@ -870,6 +897,7 @@ if(type == 0){ //寮�闂� open(request,response,data1); + enterParkService.deleteByCarNo(carNo,parkId); redisTemplate.opsForValue().set("park_change_in_"+parkId,"true",1, TimeUnit.DAYS); int i = Integer.parseInt(redisnum); i--; -- Gitblit v1.9.1