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/controller/car/PlateServlet3.java |  309 +++++++++++++++++++++++----------------------------
 1 files changed, 141 insertions(+), 168 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..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);

--
Gitblit v1.9.1