From 182b4da079c0a8011fec33cb5908a1d43adcbcd7 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期五, 31 三月 2023 09:19:42 +0800
Subject: [PATCH] 默认变更列表
---
src/main/java/com/boying/controller/car/PlateServlet3.java | 38 ++++++++++++++++++++++++++++++++++++++
src/main/java/com/boying/controller/OutParkController.java | 6 ++++++
2 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/boying/controller/OutParkController.java b/src/main/java/com/boying/controller/OutParkController.java
index a25ddf8..f1e5b4b 100644
--- a/src/main/java/com/boying/controller/OutParkController.java
+++ b/src/main/java/com/boying/controller/OutParkController.java
@@ -7,6 +7,7 @@
import com.boying.common.SystemConfigProperties;
import com.boying.entity.*;
import com.boying.service.*;
+import com.boying.util.DateUtilOther;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -75,6 +76,11 @@
return R.failed("鏈瘑鍒埌杞︾墝鍙�");
}else{
outPark.setParkName(barrier.getName());
+ if(outPark.getTime() > 0){
+ outPark.setTimeStr(DateUtilOther.millisToDayHrMinSec(new Double(outPark.getTime()).longValue()));
+ }else {
+ outPark.setTimeStr("0");
+ }
return R.ok(outPark);
}
}
diff --git a/src/main/java/com/boying/controller/car/PlateServlet3.java b/src/main/java/com/boying/controller/car/PlateServlet3.java
index 5115a1e..fc18ed5 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("鎵撳嵃閿欒");
+ }
+ }
+
@@ -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);
@@ -585,9 +614,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 +658,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 +735,5 @@
noOpen(request,response,data1);
}
+
}
--
Gitblit v1.9.1