From a41b28d983f46f90a41ff7d2aa47179541c1be99 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期一, 05 六月 2023 17:59:13 +0800
Subject: [PATCH] 修改
---
src/main/java/com/boying/controller/car/PlateServlet3.java | 398 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 216 insertions(+), 182 deletions(-)
diff --git a/src/main/java/com/boying/controller/car/PlateServlet3.java b/src/main/java/com/boying/controller/car/PlateServlet3.java
index caec9fa..a087cd5 100644
--- a/src/main/java/com/boying/controller/car/PlateServlet3.java
+++ b/src/main/java/com/boying/controller/car/PlateServlet3.java
@@ -7,13 +7,15 @@
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.FileUtil;
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;
@@ -34,11 +36,12 @@
import java.util.List;
import java.util.concurrent.TimeUnit;
+
/**
* Servlet implementation class PlateServlet
*/
@Controller
-@RequestMapping("/car")
+@RequestMapping("/ffzf/car")
@RequiredArgsConstructor
public class PlateServlet3 extends HttpServlet {
private static final long serialVersionUID = 1L;
@@ -51,6 +54,7 @@
private final TicketService ticketService;
private final CostRuleService costRuleService;
private final WhiteListService whiteListService;
+ private final FileInfoService fileInfoService;
private final String LEDURL = "http://192.168.31.212:9988/LedShow/IGetResultDataAllLine";
/**
@@ -119,6 +123,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);
@@ -136,9 +148,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);
}
@@ -161,9 +177,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);
}
@@ -185,6 +205,8 @@
}
}
+ }else {
+ easyNoOpen(request,response);
}
}
/**
@@ -197,6 +219,7 @@
BufferedReader reader = new BufferedReader(new InputStreamReader(request.getInputStream(),"UTF-8"));
String str = "";
String lineStr = "";
+ FileInfo fileInfo = null;
while((str = reader.readLine()) != null){
lineStr += str;
}
@@ -207,6 +230,7 @@
JSONObject result = alarmInfoPlate.getJSONObject("result");
JSONObject plateResult = result.getJSONObject("PlateResult");
String carNo = plateResult.get("license").toString();
+ // String image = plateResult.get("imageFile").toString();
String code = alarmInfoPlate.get("serialno").toString();
try {
@@ -242,7 +266,14 @@
break;
}
- System.out.println("缂栧彿锛�"+serialno+"璁惧璇嗗埆鍒颁簡锛�"+license);
+
+// if(StringUtils.isNotBlank(image)){
+// fileInfo = FileUtil.generateBase64StringToFile(image, 1,1);
+// fileInfoService.save(fileInfo);
+// }
+
+
+ System.out.println("缂栧彿锛�"+serialno+" 璁惧璇嗗埆鍒颁簡锛�"+license);
String format = sdf.format(new Date());
s+= format+",杞︾墝鍙蜂负锛�"+license+",serialno涓猴細"+code+" ";
@@ -250,10 +281,10 @@
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);
+ outPark(license, barrier.getId(), barrier.getParkId(),request,response,fileInfo);
s+=license+"-淇濆瓨鍑哄満璁板綍\n";
}else{
String num = redisTemplate.opsForValue().get("car_park_" + barrier.getParkId());
@@ -269,7 +300,7 @@
}else {
//led鏄剧ず
inLedShow(code, license,barrier.getParkId(),request,response);
- enterPark(license,barrier.getId(),barrier.getParkId());
+ enterPark(license,barrier.getId(),barrier.getParkId(),fileInfo);
s+=license+"-淇濆瓨鍏ュ満璁板綍\n";
}
}
@@ -281,6 +312,7 @@
System.out.println("鏃犲叆鍦鸿褰�");
s+=" ,鏌ヨ鍦哄唴璁板綍寮傚父";
writeTxt(s);
+ easyNoOpen(request,response);
}
}
@@ -302,26 +334,43 @@
}
}
-
-
-
- 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);
- }
+ 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("鎵撳嵃閿欒");
+ }
+ }
+
+
+
+
+ public void enterPark(String carNo,Integer barrierId,Integer parkId,FileInfo fileInfo) {
+ 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);
+// }
+// }
enterParkService.deleteByCarNo(carNo,parkId);
EnterPark enterPark = new EnterPark();
enterPark.setCarNo(carNo);
@@ -336,14 +385,17 @@
if(tickets.size()>0){
enterPark.setStatus(1);//鍙戠幇鏈夎繚绔�
}
+ if(fileInfo != null){
+ enterPark.setImgId(fileInfo.getId());
+ }
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 {
+ public double outPark(String carNo,Integer barrierId,Integer parkId,HttpServletRequest request, HttpServletResponse response,FileInfo fileInfo) throws ServletException, IOException {
double money = 0.0;
EnterPark enterPark = null;
String toDayHrMinSec = null;
@@ -374,6 +426,9 @@
//outPark.setPrice(Double.valueOf(String.format("%.1f", money)));
outPark.setPrice(money);
outPark.setStatus3(findTicket(carNo));
+ if(fileInfo != null){
+ outPark.setImgId(fileInfo.getId());
+ }
outParkService.saveOrUpdate(outPark);
Barrier barrier =barrierService.getById(barrierId);
barrier.setCarNo(carNo);
@@ -396,7 +451,7 @@
outParkService.saveOrUpdate(byCarNoAndBarrierId);
return 0.0;
}else{
- if(w.getParkIds()!=null){
+ if(StringUtils.isNotBlank(w.getParkIds())){
if(w.getEndTime()!=null){
String parkIds = w.getParkIds();
String[] split = parkIds.split(",");
@@ -418,10 +473,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);
@@ -466,10 +525,12 @@
carType = "鏈堢杞�";
}else {
//鐧藉悕鍗曞浐瀹氬仠杞﹀満杞﹁締
- if(byCarNo.getParkId().equals(barrier.getParkId())){
+ if(StringUtils.isNotBlank(byCarNo.getParkIds()) && byCarNo.getParkIds().contains(barrier.getParkId()+"")){
carType = "鏈堢杞�";
long l = (byCarNo.getEndTime().getTime() - byCarNo.getStartTime().getTime()) / (24 * 3600 * 1000);
carDay = "鏈夋晥鏈熻繕鏈�"+l+"澶�";
+ }else {
+ carType = "涓存椂杞�";
}
}
}
@@ -478,42 +539,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 {
@@ -529,37 +574,31 @@
carType = "鏈堢杞�";
}else {
//鐧藉悕鍗曞浐瀹氬仠杞﹀満杞﹁締
- if(byCarNo.getParkId().equals(barrier.getParkId())){
+ if(StringUtils.isNotBlank(byCarNo.getParkIds()) && byCarNo.getParkIds().contains(barrier.getParkId()+"")){
carType = "鏈堢杞�";
- long l = (byCarNo.getEndTime().getTime() - byCarNo.getStartTime().getTime()) / (24 * 3600 * 1000);
- carDay = "鏈夋晥鏈熻繕鏈�"+l+"澶�";
+ }else {
+ carType = "涓存椂杞�";
}
}
}
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", "");
@@ -568,40 +607,40 @@
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);
+ Park park = parkService.getById(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){
//寮�闂�
open(request,response,data1);
+ redisTemplate.opsForValue().set("park_change_in_"+parkId,"true",1, TimeUnit.DAYS);
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);
}
@@ -614,39 +653,38 @@
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){
//寮�闂�
open(request,response,data1);
+ redisTemplate.opsForValue().set("park_change_in_"+parkId,"true",1, TimeUnit.DAYS);
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);
}
@@ -657,28 +695,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,40 +718,42 @@
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);
}
+
}
--
Gitblit v1.9.1