From 18087f533cd48ddb9f972c0848ffe920ec58ee8e Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期一, 26 九月 2022 16:01:14 +0800
Subject: [PATCH] 修改打包和app

---
 src/main/java/com/boying/controller/car/PlateServlet2.java |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/boying/controller/car/PlateServlet2.java b/src/main/java/com/boying/controller/car/PlateServlet2.java
index aa197ed..8ebd595 100755
--- a/src/main/java/com/boying/controller/car/PlateServlet2.java
+++ b/src/main/java/com/boying/controller/car/PlateServlet2.java
@@ -84,9 +84,12 @@
 
 	@PostMapping("/status")
 	public void heart(String serialno,HttpServletRequest request,HttpServletResponse response) throws ServletException, IOException {
-
 		Barrier barrier = barrierService.findByCode(serialno);
-
+		Park park = (Park)parkService.findById(barrier.getParkId());
+		String redis = redisTemplate.opsForValue().get("park_up_" + park.getId());
+		if(StringUtil.isNullOrEmpty(redis) || redis.equals("false")){
+			return;
+		}
 		if(barrier!=null){
 			if(barrier.getType2()==1){
 				open(request,response);
@@ -115,7 +118,7 @@
 	@PostMapping("/PlateServlet")
 	protected void info(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
 		String s= "";
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd-HH:mm:ss");
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss");
 		BufferedReader reader = new BufferedReader(new InputStreamReader(request.getInputStream(),"UTF-8"));
 		String str = "";
 		String lineStr = "";
@@ -242,12 +245,14 @@
 		if(park != null){
 			num = park.getNum();
 			if(s !=null){
-				if(Integer.parseInt(s) > num){
+				if(Integer.parseInt(s) >= num){
+					redisTemplate.opsForValue().set("park_up_" + parkId,"false",30, TimeUnit.DAYS);
 					return;
 				}
 			}else {
 				s= "0";
 				redisTemplate.opsForValue().set("car_park_" + parkId,s,30, TimeUnit.DAYS);
+				redisTemplate.opsForValue().set("park_up_" + parkId,"true",30, TimeUnit.DAYS);
 			}
 		}
 		enterParkService.deleteByCarNo(carNo,parkId);
@@ -292,7 +297,7 @@
 		EnterPark enterPark = enterParkService.findByCarNo(carNo).get(0);
 
 		if(enterPark==null){
-			String s1 = "鏈彂鐜板叆鍦鸿溅杈嗭細"+carNo;
+			System.out.println(carNo+"鏈彂鐜板満鍐呰溅杈�");
 		}else{
 			outPark.setEnterTime(enterPark.getCreateTime());
 		}
@@ -313,8 +318,10 @@
 		i--;
 		if(i<0){
 			redisTemplate.opsForValue().set("car_park_" + parkId,"0",30, TimeUnit.DAYS);
+			redisTemplate.opsForValue().set("park_up_" + parkId,"true",30, TimeUnit.DAYS);
 		}else {
 			redisTemplate.opsForValue().set("car_park_" + parkId,Integer.toString(i),30, TimeUnit.DAYS);
+			redisTemplate.opsForValue().set("park_up_" + parkId,"true",30, TimeUnit.DAYS);
 		}
 
 		Barrier barrier = (Barrier) barrierService.findById(barrierId);

--
Gitblit v1.9.1