From ee83188936c8ac306144f6c8cd119b6d7574dfc6 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期四, 02 三月 2023 22:44:11 +0800
Subject: [PATCH] 默认变更列表
---
src/main/java/com/boying/util/MD5Util.java | 6
src/main/java/com/boying/service/impl/BarrierServiceImpl.java | 22 ++
src/main/java/com/boying/util/DateUtilOther.java | 2
src/main/java/com/boying/service/impl/CostRuleServiceImpl.java | 2
src/main/java/com/boying/util/ObjectToMapUtil.java | 2
src/main/java/com/boying/controller/car/PlateServlet3.java | 309 ++++++++++++++++++++------------------------
src/main/java/com/boying/controller/ParkController.java | 12 +
src/main/java/com/boying/util/StringUtil.java | 1
src/main/java/com/boying/job/EticketScheduled.java | 4
src/main/java/com/boying/controller/car/PlateServlet2.java | 2
src/main/java/com/boying/job/PayResultScheduled.java | 2
src/main/java/com/boying/controller/car/PlateServlet.java | 2
src/main/java/com/boying/Application.java | 14 ++
src/main/resources/application.yml | 2
14 files changed, 197 insertions(+), 185 deletions(-)
diff --git a/src/main/java/com/boying/Application.java b/src/main/java/com/boying/Application.java
index e493929..5a2e03a 100644
--- a/src/main/java/com/boying/Application.java
+++ b/src/main/java/com/boying/Application.java
@@ -1,10 +1,16 @@
package com.boying;
+import cn.hutool.core.io.resource.ClassPathResource;
+import net.sf.jni4net.Bridge;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
import org.springframework.scheduling.annotation.EnableScheduling;
+
+import java.io.File;
+import java.io.IOException;
/**
* @author kdq
@@ -19,4 +25,12 @@
public static void main(String[] args) {
SpringApplication.run(Application.class, args);
}
+
+ @Bean
+ public static void getBean() throws IOException {
+ Bridge.setVerbose(true);
+ Bridge.init();
+ File loadDll = new File("LedShow.j4n.dll");
+ Bridge.LoadAndRegisterAssemblyFrom(loadDll);
+ }
}
diff --git a/src/main/java/com/boying/controller/ParkController.java b/src/main/java/com/boying/controller/ParkController.java
index bd38d70..1818e65 100644
--- a/src/main/java/com/boying/controller/ParkController.java
+++ b/src/main/java/com/boying/controller/ParkController.java
@@ -109,7 +109,17 @@
return R.ok(list);
}
}
-
+ @PostMapping("/getById")
+ public Object getById(Long parkId) {
+ Park byId = parkService.getById(parkId);
+ if(byId == null){
+ return R.failed("鏈煡璇㈠埌璇ュ仠杞﹀満");
+ }else {
+ String s = redisTemplate.opsForValue().get("car_park_" + parkId);
+ byId.setCarNum(Integer.parseInt(s));
+ return R.ok(byId,"鏌ヨ鎴愬姛");
+ }
+ }
@PostMapping("/editParkCarNum")
public Object editParkCarNum(Park park) {
Park byId = parkService.getById(park.getId());
diff --git a/src/main/java/com/boying/controller/car/PlateServlet.java b/src/main/java/com/boying/controller/car/PlateServlet.java
index 57a8c46..9fa4d11 100644
--- a/src/main/java/com/boying/controller/car/PlateServlet.java
+++ b/src/main/java/com/boying/controller/car/PlateServlet.java
@@ -37,7 +37,7 @@
* Servlet implementation class PlateServlet
*/
@Controller
-@RequestMapping("/car2")
+@RequestMapping("/car1")
@RequiredArgsConstructor
public class PlateServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/boying/controller/car/PlateServlet2.java b/src/main/java/com/boying/controller/car/PlateServlet2.java
index 69d9384..ef3314b 100644
--- a/src/main/java/com/boying/controller/car/PlateServlet2.java
+++ b/src/main/java/com/boying/controller/car/PlateServlet2.java
@@ -42,7 +42,7 @@
* Servlet implementation class PlateServlet
*/
@Controller
-@RequestMapping("/car")
+@RequestMapping("/car2")
@RequiredArgsConstructor
public class PlateServlet2 extends HttpServlet {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/boying/controller/car/PlateServlet3.java b/src/main/java/com/boying/controller/car/PlateServlet3.java
index caec9fa..8e6023b 100644
--- a/src/main/java/com/boying/controller/car/PlateServlet3.java
+++ b/src/main/java/com/boying/controller/car/PlateServlet3.java
@@ -7,13 +7,14 @@
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.boying.common.SystemConfigProperties;
import com.boying.entity.*;
-import com.boying.entity.led.LedBean;
-import com.boying.entity.led.ResultData;
import com.boying.service.*;
import com.boying.util.DateUtilOther;
import com.boying.util.StringUtil;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
+import ledshow.CodeUtil;
+import ledshow.LedBean;
+import ledshow.ResultData;
import lombok.RequiredArgsConstructor;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Controller;
@@ -119,6 +120,14 @@
out.close();
}
+ protected void easyNoOpen(HttpServletRequest request, HttpServletResponse response) throws IOException {
+ response.setContentType("text/json");
+ PrintWriter out = response.getWriter();
+ out.println("{\"Response_AlarmInfoPlate\":{\"info\":\"error\",\"content\":\"...\",\"is_pay\":\"false\"}}");
+ out.flush();
+ out.close();
+ }
+
@PostMapping("/status")
public void heart(String serialno,HttpServletRequest request,HttpServletResponse response) throws ServletException, IOException {
Barrier barrier = barrierService.findByCode(serialno);
@@ -185,6 +194,8 @@
}
}
+ }else {
+ easyNoOpen(request,response);
}
}
/**
@@ -250,9 +261,9 @@
System.out.println("鏌ヨ鍒伴亾闂镐负锛�"+barrier);
if(barrier==null){
s+="鏌ヨ閬撻椄涓虹┖\n";
+ easyNoOpen(request,response);
}else{
if(barrier.getType()==0){
- //noOpen(request,response);
outPark(license, barrier.getId(), barrier.getParkId(),request,response);
s+=license+"-淇濆瓨鍑哄満璁板綍\n";
}else{
@@ -281,6 +292,7 @@
System.out.println("鏃犲叆鍦鸿褰�");
s+=" ,鏌ヨ鍦哄唴璁板綍寮傚父";
writeTxt(s);
+ easyNoOpen(request,response);
}
}
@@ -307,21 +319,21 @@
public void enterPark(String carNo,Integer barrierId,Integer parkId) {
Park park = parkService.getById(parkId);
- int num = 0;
- String s = redisTemplate.opsForValue().get("car_park_" + parkId);
- if(park != null){
- num = park.getNum();
- if(s !=null){
- 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);
- }
- }
+// int num = 0;
+// String s = redisTemplate.opsForValue().get("car_park_" + parkId);
+// if(park != null){
+// num = park.getNum();
+// if(s !=null){
+// 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);
EnterPark enterPark = new EnterPark();
enterPark.setCarNo(carNo);
@@ -338,9 +350,9 @@
}
enterParkService.saveOrUpdate(enterPark);
- Barrier barrier = barrierService.getById(barrierId);
- barrier.setType2(1);
- barrierService.saveOrUpdate(barrier);
+// Barrier barrier = barrierService.getById(barrierId);
+// barrier.setType2(1);
+// barrierService.saveOrUpdate(barrier);
}
public double outPark(String carNo,Integer barrierId,Integer parkId,HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -478,42 +490,26 @@
}
LedBean ledBean = new LedBean();
- ledBean.setColor1(0);
- ledBean.setColor2(0);
- ledBean.setColor3(0);
- ledBean.setColor4(0);
- ledBean.setContent1(carNo);
- ledBean.setContent2(carType);
- ledBean.setContent3(carDay);
- ledBean.setContent4("浣欎綅:"+i);
- ledBean.setDisMode1(1);
- ledBean.setDisMode2(1);
- ledBean.setDisMode3(1);
- ledBean.setDisMode4(1);
- ledBean.setVoiceContent(carType+","+carNo+","+carDay);
- String s = JSON.toJSONString(ledBean);
- String s1= HttpRequest.post(LEDURL)
- .timeout(5000)
- .body(s)
- .execute()
- .body();
- ResultData resultData = JSON.parseObject(s1,ResultData.class);
- String[] split = resultData.getDatas().split("-");
- String[] dataX = new String[resultData.getLenth()];
- System.arraycopy(split,0,dataX,0,resultData.getLenth());
- String s2 = StringUtil.toStr(dataX);
- byte[] bytes = StringUtil.HexString2Bytes(s2);
- for (byte aByte : bytes) {
- System.out.print(aByte+" ");
- }
- System.out.println();
- String data1 = new String("gb2312");
- data1 = Base64.getMimeEncoder().encodeToString(bytes);
- // String data2 = data1.replace("\n", "");
- String data3 = data1.replaceAll("\r\n", "");
- System.out.println();
- System.out.println(data3);
- open(request,response,data3);//鍏ュ満寮�闂�
+ ledBean.setcolor1(0);
+ ledBean.setcolor2(0);
+ ledBean.setcolor3(0);
+ ledBean.setcolor4(0);
+ ledBean.setcontent1(carNo);
+ ledBean.setcontent2(carType);
+ ledBean.setcontent3(carDay);
+ ledBean.setcontent4("浣欎綅:"+i);
+ ledBean.setdisMode1(0);
+ ledBean.setdisMode2(0);
+ ledBean.setdisMode3(0);
+ ledBean.setdisMode4(0);
+ ledBean.setvoiceContent(carType+","+carNo+","+carDay);
+ ResultData resultData = CodeUtil.GetResultDataAllLine(ledBean);
+ byte[] dataX = new byte[resultData.getlenth()];
+ System.arraycopy(resultData.getdatas(),0,dataX,0,resultData.getlenth());
+ String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
+ data1 = data1.replaceAll("\r\n", "");
+
+ open(request,response,data1);//鍏ュ満寮�闂�
}
public void inLedFullShow(String ledId, String carNo, Integer parkId,HttpServletRequest request, HttpServletResponse response) throws IOException {
@@ -538,28 +534,22 @@
}
LedBean ledBean = new LedBean();
- ledBean.setColor1(0);
- ledBean.setColor2(0);
- ledBean.setColor3(0);
- ledBean.setColor4(0);
- ledBean.setContent1(carNo);
- ledBean.setContent2(carType);
- ledBean.setContent3("杞︿綅宸叉弧");
- ledBean.setContent4("璇烽┒绂�");
- ledBean.setDisMode1(1);
- ledBean.setDisMode2(1);
- ledBean.setDisMode3(1);
- ledBean.setDisMode4(1);
- ledBean.setVoiceContent("杞︿綅宸叉弧,璇烽┒绂�");
- String s = JSON.toJSONString(ledBean);
- String s1= HttpRequest.post(LEDURL)
- .timeout(5000)
- .body(s)
- .execute()
- .body();
- ResultData resultData = JSON.parseObject(s1,ResultData.class);
- byte[] dataX = new byte[resultData.getLenth()];
- System.arraycopy(resultData.getDatas(),0,dataX,0,resultData.getLenth());
+ ledBean.setcolor1(0);
+ ledBean.setcolor2(0);
+ ledBean.setcolor3(0);
+ ledBean.setcolor4(0);
+ ledBean.setcontent1(carNo);
+ ledBean.setcontent2(carType);
+ ledBean.setcontent3("杞︿綅宸叉弧");
+ ledBean.setcontent4("璇烽┒绂�");
+ ledBean.setdisMode1(0);
+ ledBean.setdisMode2(0);
+ ledBean.setdisMode3(0);
+ ledBean.setdisMode4(0);
+ ledBean.setvoiceContent("杞︿綅宸叉弧,璇烽┒绂�");
+ ResultData resultData = CodeUtil.GetResultDataAllLine(ledBean);
+ byte[] dataX = new byte[resultData.getlenth()];
+ System.arraycopy(resultData.getdatas(),0,dataX,0,resultData.getlenth());
String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
data1 = data1.replaceAll("\r\n", "");
@@ -569,28 +559,22 @@
public void outLedShow(String ledId,String carNo,Double price,String timeStamp,Integer parkId,HttpServletRequest request, HttpServletResponse response,int type) throws ServletException, IOException {
String redisnum = redisTemplate.opsForValue().get("car_park_" + parkId);
LedBean ledBean = new LedBean();
- ledBean.setColor1(0);
- ledBean.setColor2(0);
- ledBean.setColor3(0);
- ledBean.setColor4(0);
- ledBean.setContent1(carNo);
- ledBean.setContent2("鍋滆溅"+timeStamp);
- ledBean.setContent3("浜よ垂"+price+"鍏�");
- ledBean.setContent4("绂佹闂潌");
- ledBean.setDisMode1(1);
- ledBean.setDisMode2(1);
- ledBean.setDisMode3(1);
- ledBean.setDisMode4(1);
- ledBean.setVoiceContent(carNo+"鍋滆溅"+timeStamp+"浜よ垂"+price+"鍏�");
- String s = JSON.toJSONString(ledBean);
- String s1= HttpRequest.post(LEDURL)
- .timeout(5000)
- .body(s)
- .execute()
- .body();
- ResultData resultData = JSON.parseObject(s1,ResultData.class);
- byte[] dataX = new byte[resultData.getLenth()];
- System.arraycopy(resultData.getDatas(),0,dataX,0,resultData.getLenth());
+ ledBean.setcolor1(0);
+ ledBean.setcolor2(0);
+ ledBean.setcolor3(0);
+ ledBean.setcolor4(0);
+ ledBean.setcontent1(carNo);
+ ledBean.setcontent2("鍋滆溅"+timeStamp);
+ ledBean.setcontent3("浜よ垂"+price+"鍏�");
+ ledBean.setcontent4("绂佹闂潌");
+ ledBean.setdisMode1(0);
+ ledBean.setdisMode2(1);
+ ledBean.setdisMode3(1);
+ ledBean.setdisMode4(0);
+ ledBean.setvoiceContent(carNo+"鍋滆溅"+timeStamp+"浜よ垂"+price+"鍏�");
+ ResultData resultData = CodeUtil.GetResultDataAllLine(ledBean);
+ byte[] dataX = new byte[resultData.getlenth()];
+ System.arraycopy(resultData.getdatas(),0,dataX,0,resultData.getlenth());
String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
data1 = data1.replaceAll("\r\n", "");
if(type == 0){
@@ -614,28 +598,22 @@
public void outLedShowYueZu(String carNo,String text,Integer parkId,HttpServletRequest request, HttpServletResponse response,int type) throws ServletException, IOException{
String redisnum = redisTemplate.opsForValue().get("car_park_" + parkId);
LedBean ledBean = new LedBean();
- ledBean.setColor1(0);
- ledBean.setColor2(0);
- ledBean.setColor3(0);
- ledBean.setColor4(0);
- ledBean.setContent1(carNo);
- ledBean.setContent2(text);
- ledBean.setContent3("鍑忛�熸參琛�");
- ledBean.setContent4("娆㈣繋涓嬫鍏変复");
- ledBean.setDisMode1(1);
- ledBean.setDisMode2(1);
- ledBean.setDisMode3(1);
- ledBean.setDisMode4(1);
- ledBean.setVoiceContent(text+carNo+"娆㈣繋涓嬫鍏変复");
- String s = JSON.toJSONString(ledBean);
- String s1= HttpRequest.post(LEDURL)
- .timeout(5000)
- .body(s)
- .execute()
- .body();
- ResultData resultData = JSON.parseObject(s1,ResultData.class);
- byte[] dataX = new byte[resultData.getLenth()];
- System.arraycopy(resultData.getDatas(),0,dataX,0,resultData.getLenth());
+ ledBean.setcolor1(0);
+ ledBean.setcolor2(0);
+ ledBean.setcolor3(0);
+ ledBean.setcolor4(0);
+ ledBean.setcontent1(carNo);
+ ledBean.setcontent2(text);
+ ledBean.setcontent3("鍑忛�熸參琛�");
+ ledBean.setcontent4("娆㈣繋涓嬫鍏変复");
+ ledBean.setdisMode1(0);
+ ledBean.setdisMode2(0);
+ ledBean.setdisMode3(0);
+ ledBean.setdisMode4(1);
+ ledBean.setvoiceContent(text+carNo+"娆㈣繋涓嬫鍏変复");
+ ResultData resultData = CodeUtil.GetResultDataAllLine(ledBean);
+ byte[] dataX = new byte[resultData.getlenth()];
+ System.arraycopy(resultData.getdatas(),0,dataX,0,resultData.getlenth());
String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
data1 = data1.replaceAll("\r\n", "");
if(type == 0){
@@ -657,28 +635,22 @@
public void outLedShowDefault(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException{
LedBean ledBean = new LedBean();
- ledBean.setColor1(0);
- ledBean.setColor2(0);
- ledBean.setColor3(0);
- ledBean.setColor4(0);
- ledBean.setContent1("涓�杞︿竴鏉�");
- ledBean.setContent2("鍑忛�熸參琛�");
- ledBean.setContent3("鏃犻渶鍙栧崱");
- ledBean.setContent4("鎵爜缂磋垂");
- ledBean.setDisMode1(1);
- ledBean.setDisMode2(1);
- ledBean.setDisMode3(1);
- ledBean.setDisMode4(1);
- ledBean.setVoiceContent("");
- String s = JSON.toJSONString(ledBean);
- String s1= HttpRequest.post(LEDURL)
- .timeout(5000)
- .body(s)
- .execute()
- .body();
- ResultData resultData = JSON.parseObject(s1,ResultData.class);
- byte[] dataX = new byte[resultData.getLenth()];
- System.arraycopy(resultData.getDatas(),0,dataX,0,resultData.getLenth());
+ ledBean.setcolor1(0);
+ ledBean.setcolor2(0);
+ ledBean.setcolor3(0);
+ ledBean.setcolor4(0);
+ ledBean.setcontent1("涓�杞︿竴鏉�");
+ ledBean.setcontent2("鍑忛�熸參琛�");
+ ledBean.setcontent3("鏃犻渶鍙栧崱");
+ ledBean.setcontent4("鎵爜缂磋垂");
+ ledBean.setdisMode1(0);
+ ledBean.setdisMode2(0);
+ ledBean.setdisMode3(0);
+ ledBean.setdisMode4(0);
+ ledBean.setvoiceContent("");
+ ResultData resultData = CodeUtil.GetResultDataAllLine(ledBean);
+ byte[] dataX = new byte[resultData.getlenth()];
+ System.arraycopy(resultData.getdatas(),0,dataX,0,resultData.getlenth());
String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
data1 = data1.replaceAll("\r\n", "");
noOpen(request,response,data1);
@@ -686,37 +658,38 @@
public void inLedShowDefault(Integer parkId,HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException{
String num = redisTemplate.opsForValue().get("car_park_" + parkId);
+ String con3 = "";
+ String con4 = "";
if(num == null){
num = "0";
}
Park byId = parkService.getById(parkId);
int i = byId.getNum() - Integer.parseInt(num);
- if(i<0){
+ if(i<=0){
i = 0;
+ con3 = "杞︿綅宸叉弧";
+ con4 = "璇烽┒绂�";
+ }else {
+ con3 = "鎺掗槦绛夊��";
+ con4 = "浣欎綅:"+i;
}
LedBean ledBean = new LedBean();
- ledBean.setColor1(0);
- ledBean.setColor2(0);
- ledBean.setColor3(0);
- ledBean.setColor4(0);
- ledBean.setContent1("涓�杞︿竴鏉�");
- ledBean.setContent2("鍑忛�熸參琛�");
- ledBean.setContent3("鎺掗槦绛夊��");
- ledBean.setContent4("浣欎綅:"+i);
- ledBean.setDisMode1(1);
- ledBean.setDisMode2(1);
- ledBean.setDisMode3(1);
- ledBean.setDisMode4(1);
- ledBean.setVoiceContent("");
- String s = JSON.toJSONString(ledBean);
- String s1= HttpRequest.post(LEDURL)
- .timeout(5000)
- .body(s)
- .execute()
- .body();
- ResultData resultData = JSON.parseObject(s1,ResultData.class);
- byte[] dataX = new byte[resultData.getLenth()];
- System.arraycopy(resultData.getDatas(),0,dataX,0,resultData.getLenth());
+ ledBean.setcolor1(0);
+ ledBean.setcolor2(0);
+ ledBean.setcolor3(0);
+ ledBean.setcolor4(0);
+ ledBean.setcontent1("涓�杞︿竴鏉�");
+ ledBean.setcontent2("鍑忛�熸參琛�");
+ ledBean.setcontent3(con3);
+ ledBean.setcontent4(con4);
+ ledBean.setdisMode1(0);
+ ledBean.setdisMode2(0);
+ ledBean.setdisMode3(0);
+ ledBean.setdisMode4(0);
+ ledBean.setvoiceContent("");
+ ResultData resultData = CodeUtil.GetResultDataAllLine(ledBean);
+ byte[] dataX = new byte[resultData.getlenth()];
+ System.arraycopy(resultData.getdatas(),0,dataX,0,resultData.getlenth());
String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
data1 = data1.replaceAll("\r\n", "");
noOpen(request,response,data1);
diff --git a/src/main/java/com/boying/job/EticketScheduled.java b/src/main/java/com/boying/job/EticketScheduled.java
index 2fcc296..059aa00 100644
--- a/src/main/java/com/boying/job/EticketScheduled.java
+++ b/src/main/java/com/boying/job/EticketScheduled.java
@@ -115,7 +115,7 @@
txt += map+",\n";
if(entity.getBody().getCode() ==1 ){
//鐢宠鎴愬姛锛屽幓鑾峰彇寮�绁ㄦ枃浠�
- System.out.println(entity.getBody());
+ // System.out.println(entity.getBody());
txt += entity.getBody()+",\n";
Object o = entity.getBody().getData().get(0);
String s = JSON.toJSONString(o);
@@ -130,7 +130,7 @@
writeTxt(txt);
orderRecordService.saveOrUpdate(orderRecord);
}else {
- System.out.println(entity.getBody());
+ // System.out.println(entity.getBody());
txt += entity.getBody()+",\n";
writeTxt(txt);
}
diff --git a/src/main/java/com/boying/job/PayResultScheduled.java b/src/main/java/com/boying/job/PayResultScheduled.java
index 3b774a0..e6ae708 100644
--- a/src/main/java/com/boying/job/PayResultScheduled.java
+++ b/src/main/java/com/boying/job/PayResultScheduled.java
@@ -92,7 +92,7 @@
for (int i = 0; i < 10; i++) {
String s= i+"";
ThreadUtil.execute(() -> {
- System.out.println(s);
+ // System.out.println(s);
});
}
}
diff --git a/src/main/java/com/boying/service/impl/BarrierServiceImpl.java b/src/main/java/com/boying/service/impl/BarrierServiceImpl.java
index 69755c2..26419ed 100644
--- a/src/main/java/com/boying/service/impl/BarrierServiceImpl.java
+++ b/src/main/java/com/boying/service/impl/BarrierServiceImpl.java
@@ -7,12 +7,15 @@
import com.boying.entity.Barrier;
import com.boying.entity.EnterPark;
import com.boying.entity.OutPark;
+import com.boying.entity.Park;
import com.boying.mapper.BarrierMapper;
import com.boying.mapper.EnterParkMapper;
import com.boying.mapper.OutParkMapper;
+import com.boying.mapper.ParkMapper;
import com.boying.service.BarrierService;
import com.boying.service.EnterParkService;
import lombok.AllArgsConstructor;
+import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
import java.time.ZoneId;
@@ -31,6 +34,8 @@
public class BarrierServiceImpl extends ServiceImpl<BarrierMapper, Barrier> implements BarrierService {
private EnterParkMapper enterParkMapper;
private OutParkMapper outParkMapper;
+ private StringRedisTemplate redisTemplate;
+ private ParkMapper parkMapper;
@Override
public Barrier findByCode(String code) {
QueryWrapper<Barrier> wrapper = new QueryWrapper<>();
@@ -53,10 +58,21 @@
.last(" limit 1");
EnterPark enterPark = enterParkMapper.selectOne(wrapper);
long dif = DateUtil.between(Date.from( enterPark.getCreateTime().atZone( ZoneId.systemDefault()).toInstant()), new Date(), DateUnit.SECOND, false);
- if(dif >= 5 && dif <= 10){
+ if(dif >= 5 && dif <= 7){
return true;
}else {
- return false;
+ //鍒ゆ柇鍋滆溅鍦烘槸鍚︽湁浜嗚溅浣�
+ String num = redisTemplate.opsForValue().get("car_park_" + enterPark.getParkId());
+ if(num == null){
+ num = "0";
+ }
+ Park byId = parkMapper.selectById(enterPark.getParkId());
+ int i = byId.getNum() - Integer.parseInt(num);
+ if(i<=0){
+ return false;
+ }else {
+ return true;
+ }
}
}
@@ -70,7 +86,7 @@
.last(" limit 1");
OutPark outPark = outParkMapper.selectOne(wrapper);
long dif = DateUtil.between(Date.from( outPark.getCreateTime().atZone( ZoneId.systemDefault()).toInstant()), new Date(), DateUnit.SECOND, false);
- if(dif >= 20 && dif <= 30){
+ if(dif >= 20 && dif <= 23){
return true;
}else {
return false;
diff --git a/src/main/java/com/boying/service/impl/CostRuleServiceImpl.java b/src/main/java/com/boying/service/impl/CostRuleServiceImpl.java
index af663f6..b8c5353 100644
--- a/src/main/java/com/boying/service/impl/CostRuleServiceImpl.java
+++ b/src/main/java/com/boying/service/impl/CostRuleServiceImpl.java
@@ -513,6 +513,6 @@
public static void main(String[] args) {
- System.out.println(((30*1.0)/30)>(30/30));
+ // System.out.println(((30*1.0)/30)>(30/30));
}
}
diff --git a/src/main/java/com/boying/util/DateUtilOther.java b/src/main/java/com/boying/util/DateUtilOther.java
index a0c48db..2b43d70 100644
--- a/src/main/java/com/boying/util/DateUtilOther.java
+++ b/src/main/java/com/boying/util/DateUtilOther.java
@@ -257,7 +257,7 @@
}
public static void main(String[] args) {
- System.out.println(millisToDayHrMinSec(1450));
+ // System.out.println(millisToDayHrMinSec(1450));
}
}
diff --git a/src/main/java/com/boying/util/MD5Util.java b/src/main/java/com/boying/util/MD5Util.java
index fa81466..3fb141e 100644
--- a/src/main/java/com/boying/util/MD5Util.java
+++ b/src/main/java/com/boying/util/MD5Util.java
@@ -62,7 +62,7 @@
resultString = byteArrayToHexString(md.digest(resultString
.getBytes()));
} catch (Exception ex) {
- System.out.println(ex);
+ //System.out.println(ex);
}
return resultString;
}
@@ -137,8 +137,8 @@
public static void main(String[] args) {
String s ="amt=1.00¬ifyUrl=http://test/payNotify&payKey=3ed6f127559e4f2f80e5e1cb0231b76b&payerName=tom&payerNum=54c51b276a9a47329b295662122968e1&payerTypeCode=130000451000011&paySecret=492f497a17cc41d19a757ae9d5809238";
- System.out.println(encode(s));
+ //System.out.println(encode(s));
String s2="amt=1.00¬ifyUrl=http://test/payNotify&payKey=3ed6f127559e4f2f80e5e1cb0231b76b&paySecret=492f497a17cc41d19a757ae9d5809238&payerName=宄板嘲&payerNum=3aa0f6499acb45f686b6442229d23b31&payerTypeCode=130000451000012";
- System.out.println(DigestUtils.md5DigestAsHex(s.toString().getBytes()));
+ //System.out.println(DigestUtils.md5DigestAsHex(s.toString().getBytes()));
}
}
diff --git a/src/main/java/com/boying/util/ObjectToMapUtil.java b/src/main/java/com/boying/util/ObjectToMapUtil.java
index 9126bc3..3cd5620 100644
--- a/src/main/java/com/boying/util/ObjectToMapUtil.java
+++ b/src/main/java/com/boying/util/ObjectToMapUtil.java
@@ -15,7 +15,7 @@
Class<?> aClass = obj.getClass();
for (Field field : aClass.getDeclaredFields()) {
field.setAccessible(true);
- System.out.println(field);
+ // System.out.println(field);
String name = field.getName();
Object o = field.get(obj);
if (o == null)
diff --git a/src/main/java/com/boying/util/StringUtil.java b/src/main/java/com/boying/util/StringUtil.java
index c99d6cc..2075beb 100644
--- a/src/main/java/com/boying/util/StringUtil.java
+++ b/src/main/java/com/boying/util/StringUtil.java
@@ -51,7 +51,6 @@
}
System.out.print(hex.toUpperCase() + " ");
}
- System.out.println("");
}
/**
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 8d012e2..152db19 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -5,7 +5,7 @@
datasource:
url: jdbc:mysql://localhost:3306/ffparknew?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
username: root
- password: rootroot
+ password: 2009Boying!@#
driverClassName: com.mysql.cj.jdbc.Driver
#杩炴帴姹�
hikari:
--
Gitblit v1.9.1