From 05e0bb9b28295d1e80c6c47783e53d6879285198 Mon Sep 17 00:00:00 2001
From: kongdeqiang <kongdeqiang960204@163.com>
Date: 星期一, 18 十二月 2023 16:17:14 +0800
Subject: [PATCH] 提交更新
---
src/main/java/com/boying/controller/car/PlateServlet3.java | 63 +++++++++++++++++++++++--------
1 files changed, 46 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 82b1f85..d8761fa 100644
--- a/src/main/java/com/boying/controller/car/PlateServlet3.java
+++ b/src/main/java/com/boying/controller/car/PlateServlet3.java
@@ -19,6 +19,7 @@
import ledshow.LedBean;
import ledshow.ResultData;
import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PostMapping;
@@ -195,6 +196,7 @@
outPark.setStatus2(1);
outParkService.saveOrUpdate(outPark);
easyOpen(request,response);
+ enterParkService.deleteByCarNo(outPark.getCarNo(), barrier.getParkId());
}
if(barrier.getType() == 1){
boolean in = barrierService.getDateDifIn(barrier.getId());
@@ -359,6 +361,8 @@
if(tickets.size()>0){
enterPark.setStatus(1);//鍙戠幇鏈夎繚绔�
}
+ enterPark.setIsPay(0);
+ enterPark.setPrice(0);
enterParkService.deleteByCarNo(enterPark.getCarNo(),enterPark.getParkId());
enterParkService.save(enterPark);
barrier.setType2(1);
@@ -409,6 +413,15 @@
outPark.setTime(l/(1000*60));
toDayHrMinSec = DateUtilOther.millisToDayHrMinSec(l/(1000*60));
money = costRuleService.getMoney(one.getParkId(), outPark.getEnterTime(), outPark.getCreateTime(), 1);
+
+ //鍏ュ満璁板綍淇濆瓨涓�涓�
+ if(one.getIsPay()==1){
+ money = money - one.getPrice();
+ }else {
+ one.setPrice(money);
+ one.setIsPay(0);
+ enterParkService.updateById(one);
+ }
} catch (ParseException e) {
e.printStackTrace();
}
@@ -486,6 +499,8 @@
}else {
enterParkService.deleteByCarNo(carNo,parkId);
EnterPark enterPark = new EnterPark();
+ enterPark.setIsPay(0);
+ enterPark.setPrice(0);
enterPark.setCarNo(carNo);
enterPark.setBarrierId(barrierId);
enterPark.setParkId(parkId);
@@ -528,6 +543,15 @@
outPark.setTime(l/(1000*60));
toDayHrMinSec = DateUtilOther.millisToDayHrMinSec(l/(1000*60));
money = costRuleService.getMoney(parkId, outPark.getEnterTime(), outPark.getCreateTime(), 1);
+
+ //鍏ュ満璁板綍淇濆瓨涓�涓�
+ if(enterPark.getIsPay() != null && enterPark.getIsPay()==1){
+ money = money - enterPark.getPrice();
+ }else {
+ enterPark.setPrice(money);
+ enterPark.setIsPay(0);
+ enterParkService.updateById(enterPark);
+ }
} catch (ParseException e) {
e.printStackTrace();
}
@@ -544,7 +568,7 @@
barrier.setCarNo(carNo);
//led灞曠ず
if(toDayHrMinSec == null){
- toDayHrMinSec = "涓嶈冻涓ゅ皬鏃�";
+ toDayHrMinSec = "鍏ュ満璁板綍寮傚父,璇疯仈绯荤鐞嗗憳";
}
//鍒ゆ柇鏄惁鍦ㄧ櫧鍚嶅崟
QueryWrapper<WhiteList> wrapper = new QueryWrapper<>();
@@ -556,7 +580,7 @@
if(w.getType()==0){
outLedShowYueZu(barrier.getCarNo(),"鏈堢杞�",parkId,request,response,0);
OutPark byCarNoAndBarrierId = outParkService.findByCarNoAndBarrierId(carNo, barrierId);
- byCarNoAndBarrierId.setStatus(1);
+ byCarNoAndBarrierId.setStatus(2);
byCarNoAndBarrierId.setStatus2(1);
outParkService.saveOrUpdate(byCarNoAndBarrierId);
return 0.0;
@@ -570,7 +594,7 @@
if(pid == outPark.getParkId() && System.currentTimeMillis()<w.getEndTime().getTime()){
outLedShowYueZu(barrier.getCarNo(),"鏈堢杞�",parkId,request,response,0);
OutPark byCarNoAndBarrierId = outParkService.findByCarNoAndBarrierId(carNo, barrierId);
- byCarNoAndBarrierId.setStatus(1);
+ byCarNoAndBarrierId.setStatus(2);
byCarNoAndBarrierId.setStatus2(1);
outParkService.saveOrUpdate(byCarNoAndBarrierId);
return 0.0;
@@ -771,22 +795,27 @@
if(carNo.equals("鏃犺溅鐗�")){
noOpen(request,response,data1);
}else {
- //寮�闂�
- open(request,response,data1);
- redisTemplate.opsForValue().set("park_change_in_"+parkId,"true",1, TimeUnit.DAYS);
- int i = Integer.parseInt(redisnum);
- i--;
- if(i<0){
- String s= "2."+carNo+"锛屽満鍐呭仠杞︽暟涓�0\n";
- writeTxt2(s);
- redisTemplate.opsForValue().set("car_park_" + parkId,"0",30, TimeUnit.DAYS);
- redisTemplate.opsForValue().set("park_up_" + parkId,"true",30, TimeUnit.DAYS);
+ if(timeStamp.contains("璁板綍寮傚父")){
+ noOpen(request,response,data1);
}else {
- String s= "2."+carNo+"锛屽満鍐呭仠杞︽暟涓�"+i+"\n";
- writeTxt2(s);
- redisTemplate.opsForValue().set("car_park_" + parkId,Integer.toString(i),30, TimeUnit.DAYS);
- redisTemplate.opsForValue().set("park_up_" + parkId,"true",30, TimeUnit.DAYS);
+ //寮�闂�
+ open(request,response,data1);
+ redisTemplate.opsForValue().set("park_change_in_"+parkId,"true",1, TimeUnit.DAYS);
+ int i = Integer.parseInt(redisnum);
+ i--;
+ if(i<0){
+ String s= "2."+carNo+"锛屽満鍐呭仠杞︽暟涓�0\n";
+ writeTxt2(s);
+ redisTemplate.opsForValue().set("car_park_" + parkId,"0",30, TimeUnit.DAYS);
+ redisTemplate.opsForValue().set("park_up_" + parkId,"true",30, TimeUnit.DAYS);
+ }else {
+ String s= "2."+carNo+"锛屽満鍐呭仠杞︽暟涓�"+i+"\n";
+ writeTxt2(s);
+ redisTemplate.opsForValue().set("car_park_" + parkId,Integer.toString(i),30, TimeUnit.DAYS);
+ redisTemplate.opsForValue().set("park_up_" + parkId,"true",30, TimeUnit.DAYS);
+ }
}
+
}
}else {
noOpen(request,response,data1);
--
Gitblit v1.9.1