From da9a4f7ad988c452f3a356989eaf7a6c06ae5032 Mon Sep 17 00:00:00 2001
From: kongdeqiang <kongdeqiang960204@163.com>
Date: 星期四, 26 九月 2024 23:03:05 +0800
Subject: [PATCH] fix:合并代码
---
src/main/java/com/boying/controller/car/PlateServlet3.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/boying/controller/car/PlateServlet3.java b/src/main/java/com/boying/controller/car/PlateServlet3.java
index 198c90e..da86413 100644
--- a/src/main/java/com/boying/controller/car/PlateServlet3.java
+++ b/src/main/java/com/boying/controller/car/PlateServlet3.java
@@ -132,6 +132,14 @@
out.close();
}
+ protected void easyOpen2(HttpServletRequest request, HttpServletResponse response) throws IOException {
+ response.setContentType("text/json");
+ PrintWriter out = response.getWriter();
+ out.println("{\"Response_AlarmInfoPlate\":{\"ivs_ioctrl\":{\"delay\":1000,\"io\":0,\"value\":2}}}");
+ out.flush();
+ out.close();
+ }
+
protected void easyNoOpen(HttpServletRequest request, HttpServletResponse response) throws IOException {
response.setContentType("text/json");
PrintWriter out = response.getWriter();
@@ -331,8 +339,8 @@
inLedFullShow(code, license,barrier.getParkId(),request,response);
}else {
//led鏄剧ず
- inLedShow(code, license,barrier.getParkId(),request,response);
enterPark(license,barrier.getId(),barrier.getParkId(),fileInfo);
+ inLedShow(code, license,barrier.getParkId(),request,response);
s+=license+"-淇濆瓨鍏ュ満璁板綍\n";
}
}
@@ -377,7 +385,7 @@
if(one == null){
return R.failed("鏈煡璇㈠埌杞﹁締瀛樺湪");
}else {
- if(one.getCarNo().equals("鏃犵墝杞�")){
+ if(one.getCarNo().equals("_鏃燺")){
enterPark.setCreateTime(LocalDateTime.now());
QueryWrapper<Ticket> wrapper = new QueryWrapper<>();
wrapper.lambda()
@@ -653,7 +661,7 @@
writeTxt2(s);
String jsonValue = JSON.toJSONString(outPark);
redisTemplate.opsForValue().set("outPark_dif_"+ barrierId, jsonValue);
- outLedShow(barrier.getCode(),barrier.getCarNo(),outPark.getPrice(),toDayHrMinSec,barrier.getParkId(),request,response,0);
+ outLedShow(outPark,barrier.getCode(),barrier.getCarNo(),outPark.getPrice(),toDayHrMinSec,barrier.getParkId(),request,response,0);
}else {
//闇�瑕佺即璐规垨鑰呮湁杩濈珷
System.out.println(outPark.getCarNo()+"璇ヨ溅闇�瑕佺即璐�"+outPark.getPrice());
@@ -665,7 +673,7 @@
outParkLogService.saveOrUpdate(byOutPark);
String jsonValue = JSON.toJSONString(outPark);
redisTemplate.opsForValue().set("outPark_dif_"+ barrierId, jsonValue);
- outLedShow(barrier.getCode(),barrier.getCarNo(),outPark.getPrice(),toDayHrMinSec,barrier.getParkId(),request,response,1);
+ outLedShow(outPark,barrier.getCode(),barrier.getCarNo(),outPark.getPrice(),toDayHrMinSec,barrier.getParkId(),request,response,1);
}
return money;
}
@@ -740,9 +748,9 @@
}
}
}
- if(StringUtils.isBlank(carDay) && !carNo.equals("鏃犵墝杞�")){
+ if(StringUtils.isBlank(carDay) && !carNo.equals("_鏃燺")){
carDay = "娆㈣繋鍏変复";
- }else if(StringUtils.isBlank(carDay) && carNo.equals("鏃犵墝杞�")){
+ }else if(StringUtils.isBlank(carDay) && carNo.equals("_鏃燺")){
carDay = "鎷掔粷椹跺叆";
}
@@ -766,7 +774,7 @@
String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
data1 = data1.replaceAll("\r\n", "");
- if(!carNo.equals("鏃犵墝杞�")){
+ if(!carNo.equals("_鏃燺")){
open(request,response,data1);//鍏ュ満寮�闂�
}else {
noOpen(request,response,data1);
@@ -818,7 +826,7 @@
noOpen(request,response,data1);//鍏ュ満寮�闂�
}
- public void outLedShow(String ledId,String carNo,Double price,String timeStamp,Integer parkId,HttpServletRequest request, HttpServletResponse response,int type) throws ServletException, IOException {
+ public void outLedShow(OutPark outPark,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);
Park park = parkService.getById(parkId);
LedBean ledBean = new LedBean();
@@ -841,7 +849,7 @@
String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
data1 = data1.replaceAll("\r\n", "");
if(type == 0){
- if(carNo.equals("鏃犵墝杞�")){
+ if(carNo.equals("_鏃燺")){
noOpen(request,response,data1);
}else {
if(timeStamp.contains("璁板綍寮傚父")){
@@ -870,6 +878,11 @@
}else {
//寮�闂�
open(request,response,data1);
+
+ //缂撳瓨鍦╮edis閲�,蹇冭烦鎺ュ彛鍘绘姮鏉�
+ String jsonValue = JSON.toJSONString(outPark);
+ redisTemplate.opsForValue().set("outPark-"+outPark.getBarrierId(), jsonValue);
+
enterParkService.deleteByCarNo(carNo, parkId);
redisTemplate.opsForValue().set("park_change_in_"+parkId,"true",1, TimeUnit.DAYS);
int i = Integer.parseInt(redisnum);
--
Gitblit v1.9.1