From f990f7e352782c74a5af3b54651cf1a21fc0d099 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期日, 23 四月 2023 11:51:54 +0800
Subject: [PATCH] 修改开票
---
src/main/java/com/boying/controller/car/PlateServlet3.java | 50 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 45 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/boying/controller/car/PlateServlet3.java b/src/main/java/com/boying/controller/car/PlateServlet3.java
index 5115a1e..a318310 100644
--- a/src/main/java/com/boying/controller/car/PlateServlet3.java
+++ b/src/main/java/com/boying/controller/car/PlateServlet3.java
@@ -145,9 +145,13 @@
int i = Integer.parseInt(redisnum);
i--;
if(i<0){
+ String s= "2."+barrier.getCarNo()+"闂告満鎵嬪姩鍚姩锛屽満鍐呭仠杞︽暟涓�"+i+"\n";
+ writeTxt2(s);
redisTemplate.opsForValue().set("car_park_" + park.getId(),"0",30, TimeUnit.DAYS);
redisTemplate.opsForValue().set("park_up_" + park.getId(),"true",30, TimeUnit.DAYS);
}else {
+ String s= "2."+barrier.getCarNo()+"闂告満鎵嬪姩鍚姩锛屽満鍐呭仠杞︽暟涓�"+i+"\n";
+ writeTxt2(s);
redisTemplate.opsForValue().set("car_park_" + park.getId(),Integer.toString(i),30, TimeUnit.DAYS);
redisTemplate.opsForValue().set("park_up_" + park.getId(),"true",30, TimeUnit.DAYS);
}
@@ -170,9 +174,13 @@
int i = Integer.parseInt(redisnum);
i--;
if(i<0){
+ String s= "2."+outPark.getCarNo()+"缂磋垂瀹屾垚锛屽満鍐呭仠杞︽暟涓�"+i+"\n";
+ writeTxt2(s);
redisTemplate.opsForValue().set("car_park_" + park.getId(),"0",30, TimeUnit.DAYS);
redisTemplate.opsForValue().set("park_up_" + park.getId(),"true",30, TimeUnit.DAYS);
}else {
+ String s= "2."+outPark.getCarNo()+"缂磋垂瀹屾垚锛屽満鍐呭仠杞︽暟涓�"+i+"\n";
+ writeTxt2(s);
redisTemplate.opsForValue().set("car_park_" + park.getId(),Integer.toString(i),30, TimeUnit.DAYS);
redisTemplate.opsForValue().set("park_up_" + park.getId(),"true",30, TimeUnit.DAYS);
}
@@ -314,6 +322,23 @@
}
}
+ private void writeTxt2( String txt)
+ {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+ try
+ {
+ FileWriter f = new FileWriter(systemConfigProperties.getLogPath()+sdf.format(new Date())+"LED.txt",true);
+ BufferedWriter bw=new BufferedWriter(f);
+ bw.write(txt);
+ bw.newLine();
+ bw.close();
+ }
+ catch(Exception e)
+ {
+ System.out.println("鎵撳嵃閿欒");
+ }
+ }
+
@@ -408,7 +433,7 @@
outParkService.saveOrUpdate(byCarNoAndBarrierId);
return 0.0;
}else{
- if(w.getParkIds()!=null){
+ if(StringUtils.isNotBlank(w.getParkIds())){
if(w.getEndTime()!=null){
String parkIds = w.getParkIds();
String[] split = parkIds.split(",");
@@ -430,10 +455,14 @@
}
if(outPark.getPrice()==0&&outPark.getStatus3()==0){
System.out.println(outPark.getCarNo()+"璇ヨ溅涓嶉渶瑕佺即璐�");
+ String s= "1."+barrier.getCarNo()+"璇ヨ溅涓嶉渶瑕佺即璐筡n";
+ writeTxt2(s);
outLedShow(barrier.getCode(),barrier.getCarNo(),outPark.getPrice(),toDayHrMinSec,barrier.getParkId(),request,response,0);
}else {
//闇�瑕佺即璐规垨鑰呮湁杩濈珷
System.out.println(outPark.getCarNo()+"璇ヨ溅闇�瑕佺即璐�"+outPark.getPrice());
+ String s= "1."+barrier.getCarNo()+"璇ヨ溅闇�瑕佺即璐筡n";
+ writeTxt2(s);
outLedShow(barrier.getCode(),barrier.getCarNo(),outPark.getPrice(),toDayHrMinSec,barrier.getParkId(),request,response,1);
}
barrierService.saveOrUpdate(barrier);
@@ -478,10 +507,12 @@
carType = "鏈堢杞�";
}else {
//鐧藉悕鍗曞浐瀹氬仠杞﹀満杞﹁締
- if(byCarNo.getParkId().equals(barrier.getParkId())){
+ if(StringUtils.isNotBlank(byCarNo.getParkIds()) && byCarNo.getParkIds().contains(barrier.getParkId()+"")){
carType = "鏈堢杞�";
long l = (byCarNo.getEndTime().getTime() - byCarNo.getStartTime().getTime()) / (24 * 3600 * 1000);
carDay = "鏈夋晥鏈熻繕鏈�"+l+"澶�";
+ }else {
+ carType = "涓存椂杞�";
}
}
}
@@ -525,10 +556,10 @@
carType = "鏈堢杞�";
}else {
//鐧藉悕鍗曞浐瀹氬仠杞﹀満杞﹁締
- if(byCarNo.getParkId().equals(barrier.getParkId())){
+ if(StringUtils.isNotBlank(byCarNo.getParkIds()) && byCarNo.getParkIds().contains(barrier.getParkId()+"")){
carType = "鏈堢杞�";
- long l = (byCarNo.getEndTime().getTime() - byCarNo.getStartTime().getTime()) / (24 * 3600 * 1000);
- carDay = "鏈夋晥鏈熻繕鏈�"+l+"澶�";
+ }else {
+ carType = "涓存椂杞�";
}
}
}
@@ -585,9 +616,13 @@
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);
}
@@ -625,9 +660,13 @@
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);
}
@@ -698,4 +737,5 @@
noOpen(request,response,data1);
}
+
}
--
Gitblit v1.9.1