From fb050c0dafa5363a73540dd9e52b78487e25ba0a Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期二, 09 四月 2024 17:32:46 +0800
Subject: [PATCH] fix：新增手动抬杆记录
---
src/main/java/com/boying/controller/car/PlateServlet2.java | 63 +++++++++++++++++++++----------
1 files changed, 43 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/boying/controller/car/PlateServlet2.java b/src/main/java/com/boying/controller/car/PlateServlet2.java
index fb6ede3..302f3a5 100644
--- a/src/main/java/com/boying/controller/car/PlateServlet2.java
+++ b/src/main/java/com/boying/controller/car/PlateServlet2.java
@@ -11,10 +11,14 @@
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 com.sun.media.jfxmedia.track.Track;
import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PostMapping;
@@ -24,7 +28,9 @@
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.sound.sampled.AudioFormat;
import java.io.*;
+import java.nio.charset.StandardCharsets;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
@@ -38,11 +44,14 @@
* Servlet implementation class PlateServlet
*/
@Controller
-@RequestMapping("/car")
+@RequestMapping("/car2")
@RequiredArgsConstructor
public class PlateServlet2 extends HttpServlet {
private static final long serialVersionUID = 1L;
- private final SystemConfigProperties systemConfigProperties;
+ @Value("${ffpark.logPath}")
+ private String logPath;
+// @Autowired
+// private final SystemConfigProperties systemConfigProperties;
private final StringRedisTemplate redisTemplate;
private final ParkService parkService;
private final OutParkService outParkService;
@@ -51,7 +60,7 @@
private final TicketService ticketService;
private final CostRuleService costRuleService;
private final WhiteListService whiteListService;
- private final String LEDURL = "http://localhost:9988/LedShow/IGetResultDataAllLine";
+ private final String LEDURL = "http://192.168.31.212:9988/LedShow/IGetResultDataAllLine";
/**
* 鍥炲寮�闂�
@@ -290,7 +299,7 @@
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
try
{
- FileWriter f = new FileWriter(systemConfigProperties.getLogPath()+sdf.format(new Date())+".txt",true);
+ FileWriter f = new FileWriter(logPath+sdf.format(new Date())+".txt",true);
BufferedWriter bw=new BufferedWriter(f);
bw.write(txt);
bw.newLine();
@@ -498,12 +507,26 @@
.execute()
.body();
ResultData resultData = JSON.parseObject(s1,ResultData.class);
- byte[] dataX = new byte[resultData.getLength()];
- System.arraycopy(resultData.getDatas(),0,dataX,0,resultData.getLength());
- String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
- data1 = data1.replaceAll("\r\n", "");
-
- open(request,response,data1);//鍏ュ満寮�闂�
+ System.out.println(resultData);
+ 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);
+ byte[] bytes1 = StringUtil.hex2Byte(resultData.getDatas());
+ byte[] bytes = StringUtil.byte2hex(bytes1);
+ for (byte aByte : bytes) {
+ System.out.print(aByte+" ");
+ }
+ System.out.println();
+ System.out.println("bytes.length: "+bytes.length);
+ //String data1 = new String("gb2312");
+ String 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);//鍏ュ満寮�闂�
}
public void inLedFullShow(String ledId, String carNo, Integer parkId,HttpServletRequest request, HttpServletResponse response) throws IOException {
@@ -548,8 +571,8 @@
.execute()
.body();
ResultData resultData = JSON.parseObject(s1,ResultData.class);
- byte[] dataX = new byte[resultData.getLength()];
- System.arraycopy(resultData.getDatas(),0,dataX,0,resultData.getLength());
+ 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", "");
@@ -579,8 +602,8 @@
.execute()
.body();
ResultData resultData = JSON.parseObject(s1,ResultData.class);
- byte[] dataX = new byte[resultData.getLength()];
- System.arraycopy(resultData.getDatas(),0,dataX,0,resultData.getLength());
+ 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){
@@ -624,8 +647,8 @@
.execute()
.body();
ResultData resultData = JSON.parseObject(s1,ResultData.class);
- byte[] dataX = new byte[resultData.getLength()];
- System.arraycopy(resultData.getDatas(),0,dataX,0,resultData.getLength());
+ 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){
@@ -667,8 +690,8 @@
.execute()
.body();
ResultData resultData = JSON.parseObject(s1,ResultData.class);
- byte[] dataX = new byte[resultData.getLength()];
- System.arraycopy(resultData.getDatas(),0,dataX,0,resultData.getLength());
+ 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);
@@ -705,8 +728,8 @@
.execute()
.body();
ResultData resultData = JSON.parseObject(s1,ResultData.class);
- byte[] dataX = new byte[resultData.getLength()];
- System.arraycopy(resultData.getDatas(),0,dataX,0,resultData.getLength());
+ 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);
--
Gitblit v1.9.1