From 552c700f584700316e8d1919dd1ad7f551c53ec4 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期二, 12 十一月 2024 10:03:22 +0800
Subject: [PATCH] fix : 新增日统计接口

---
 src/main/java/com/boying/controller/car/PlateServlet2.java |  417 +++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 265 insertions(+), 152 deletions(-)

diff --git a/src/main/java/com/boying/controller/car/PlateServlet2.java b/src/main/java/com/boying/controller/car/PlateServlet2.java
index 57c87d7..75b1ebd 100644
--- a/src/main/java/com/boying/controller/car/PlateServlet2.java
+++ b/src/main/java/com/boying/controller/car/PlateServlet2.java
@@ -1,23 +1,23 @@
 package com.boying.controller.car;
 
+import cn.hutool.http.HttpRequest;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.boying.common.R;
 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.google.gson.JsonIOException;
+import com.boying.util.StringUtil;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import com.google.gson.JsonSyntaxException;
-import io.swagger.models.auth.In;
-import ledshow.CodeUtil;
-import ledshow.LedBean;
-import ledshow.ResultData;
+
 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;
@@ -27,9 +27,12 @@
 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.Duration;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.Base64;
@@ -41,11 +44,14 @@
  * Servlet implementation class PlateServlet
  */
 @Controller
-@RequestMapping("/car")
+@RequestMapping("/ffzf/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;
@@ -53,8 +59,9 @@
     private final BarrierService barrierService;
     private final TicketService ticketService;
     private final CostRuleService costRuleService;
-    private final LedShowService ledShowService;
     private final WhiteListService whiteListService;
+    private final OutParkLogService outParkLogService;
+    private final String LEDURL = "http://192.168.31.212:9988/LedShow/IGetResultDataAllLine";
 
     /**
      * 鍥炲寮�闂�
@@ -114,10 +121,26 @@
         out.close();
     }
 
+//    protected void easyOpen(HttpServletRequest request, HttpServletResponse response) throws IOException {
+//        response.setContentType("text/json");
+//        PrintWriter out = response.getWriter();
+//        out.println("{\"Response_AlarmInfoPlate\":{\"info\":\"ok\",\"content\":\"...\",\"is_pay\":\"true\",\"ivs_ioctrl\":{\"delay\":800,\"io\":0,\"value\":2}}}");
+//        out.flush();
+//        out.close();
+//    }
+
     protected void easyOpen(HttpServletRequest request, HttpServletResponse response) throws IOException {
         response.setContentType("text/json");
         PrintWriter out = response.getWriter();
-        out.println("{\"Response_AlarmInfoPlate\":{\"info\":\"ok\",\"content\":\"...\",\"is_pay\":\"true\"}}");
+        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();
+        out.println("{\"Response_AlarmInfoPlate\":{\"info\":\"error\",\"content\":\"...\",\"is_pay\":\"false\"}}");
         out.flush();
         out.close();
     }
@@ -125,9 +148,13 @@
     @PostMapping("/status")
     public void heart(String serialno,HttpServletRequest request,HttpServletResponse response) throws ServletException, IOException {
         Barrier barrier = barrierService.findByCode(serialno);
-        Park park = parkService.getById(barrier.getParkId());
-        String redis = redisTemplate.opsForValue().get("park_up_" + park.getId());
+        Park park = parkService.getOneById(barrier.getParkId());
+        //Park park = parkService.getById(barrier.getParkId());
+        //String redis = redisTemplate.opsForValue().get("park_up_" + park.getId());
         String redisnum = redisTemplate.opsForValue().get("car_park_" + park.getId());
+        if(StringUtils.isBlank(redisnum)){
+            redisnum = "0";
+        }
         if(barrier!=null){
             if(barrier.getType2()==1){
                 //寰呭紑闂�
@@ -139,9 +166,11 @@
                     int i = Integer.parseInt(redisnum);
                     i--;
                     if(i<0){
+                        String s= "2."+barrier.getCarNo()+"闂告満鎵嬪姩鍚姩锛屽満鍐呭仠杞︽暟涓�"+i+"\n";
                         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";
                         redisTemplate.opsForValue().set("car_park_" + park.getId(),Integer.toString(i),30, TimeUnit.DAYS);
                         redisTemplate.opsForValue().set("park_up_" + park.getId(),"true",30, TimeUnit.DAYS);
                     }
@@ -152,31 +181,52 @@
                 barrier.setStatus(0);
                 barrier.setUpdateTime(LocalDateTime.now());
                 barrierService.saveOrUpdate(barrier);
+
+                String jsonValue = JSON.toJSONString(barrier);
+                redisTemplate.opsForValue().set("barrier-"+barrier.getCode(), jsonValue);
                 easyOpen(request,response);
             }else {
                 //涓嶉渶寮�闂�
-                barrier.setStatus(0);
-                barrier.setUpdateTime(LocalDateTime.now());
-                barrierService.saveOrUpdate(barrier);
-                OutPark outPark = outParkService.count4(barrier.getId());
-                if(outPark!=null){
-                    if(barrier.getType() == 0){
-                        int i = Integer.parseInt(redisnum);
-                        i--;
-                        if(i<0){
-                            redisTemplate.opsForValue().set("car_park_" + park.getId(),"0",30, TimeUnit.DAYS);
-                            redisTemplate.opsForValue().set("park_up_" + park.getId(),"true",30, TimeUnit.DAYS);
-                        }else {
-                            redisTemplate.opsForValue().set("car_park_" + park.getId(),Integer.toString(i),30, TimeUnit.DAYS);
-                            redisTemplate.opsForValue().set("park_up_" + park.getId(),"true",30, TimeUnit.DAYS);
+                LocalDateTime now = LocalDateTime.now();
+                LocalDateTime updateTime = barrier.getUpdateTime();
+                Duration duration = Duration.between(updateTime,now);
+                long minutes = duration.toMinutes();
+                if(minutes>=2){
+                    barrier.setStatus(0);
+                    barrier.setUpdateTime(LocalDateTime.now());
+                    barrierService.saveOrUpdate(barrier);
+                }
+
+                String jsonValue = JSON.toJSONString(barrier);
+                redisTemplate.opsForValue().set("barrier-"+barrier.getCode(), jsonValue);
+                if(barrier.getType() == 0){
+                    OutPark outPark = outParkService.count4(barrier.getId());
+                    if(outPark!=null){
+                        if(barrier.getType() == 0){
+                            int i = Integer.parseInt(redisnum);
+                            i--;
+                            if(i<0){
+                                String s= "2."+outPark.getCarNo()+"缂磋垂瀹屾垚锛屽満鍐呭仠杞︽暟涓�"+i+"\n";
+                                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";
+                                redisTemplate.opsForValue().set("car_park_" + park.getId(),Integer.toString(i),30, TimeUnit.DAYS);
+                                redisTemplate.opsForValue().set("park_up_" + park.getId(),"true",30, TimeUnit.DAYS);
+                            }
                         }
+                        outPark.setStatus2(1);
+                        outParkService.saveOrUpdate(outPark);
+                        easyOpen(request,response);
+                        OutParkLog byOutPark = outParkLogService.getByOutPark(outPark.getCarNo(), outPark.getId());
+                        byOutPark.setOpenTime(LocalDateTime.now());
+                        outParkLogService.saveOrUpdate(byOutPark);
+                        enterParkService.deleteByCarNo(outPark.getCarNo(), barrier.getParkId());
+                        redisTemplate.delete("outPark-"+outPark.getBarrierId());
                     }
-                    outPark.setStatus2(1);
-                    outParkService.saveOrUpdate(outPark);
-                    easyOpen(request,response);
                 }
                 if(barrier.getType() == 1){
-                    boolean in = barrierService.getDateDifIn(barrier.getId());
+                    boolean in = barrierService.getDateDifIn(park.getId());
                     if(in){
                         inLedShowDefault(park.getId(),request,response);
                     }
@@ -188,6 +238,8 @@
                 }
             }
 
+        }else {
+            easyNoOpen(request,response);
         }
     }
     /**
@@ -255,29 +307,31 @@
                     s+="鏌ヨ閬撻椄涓虹┖\n";
                 }else{
                     if(barrier.getType()==0){
+                        easyOpen(request,response);
                         //noOpen(request,response);
-                        outPark(license, barrier.getId(), barrier.getParkId(),request,response);
-                        s+=license+"-淇濆瓨鍑哄満璁板綍\n";
+//                        outPark(license, barrier.getId(), barrier.getParkId(),request,response);
+//                        s+=license+"-淇濆瓨鍑哄満璁板綍\n";
                     }else{
-                        String num = redisTemplate.opsForValue().get("car_park_" +  barrier.getParkId());
-                        if(StringUtils.isBlank(num)){
-                            num = "0";
-                            redisTemplate.opsForValue().set("car_park_" + barrier.getParkId(),num,30, TimeUnit.DAYS);
-                            redisTemplate.opsForValue().set("park_up_" + barrier.getParkId(),"true",30, TimeUnit.DAYS);
-                        }
-                        Park byId = parkService.getById(barrier.getParkId());
-                        if(Integer.parseInt(num) >= byId.getNum() ){
-                            //led鏄剧ず
-                            inLedFullShow(code, license,barrier.getParkId(),request,response);
-                        }else {
-                            //led鏄剧ず
-                            inLedShow(code, license,barrier.getParkId(),request,response);
-                            enterPark(license,barrier.getId(),barrier.getParkId());
-                            s+=license+"-淇濆瓨鍏ュ満璁板綍\n";
-                        }
+                        easyOpen(request,response);
+//                        String num = redisTemplate.opsForValue().get("car_park_" +  barrier.getParkId());
+//                        if(StringUtils.isBlank(num)){
+//                            num = "0";
+//                            redisTemplate.opsForValue().set("car_park_" + barrier.getParkId(),num,30, TimeUnit.DAYS);
+//                            redisTemplate.opsForValue().set("park_up_" + barrier.getParkId(),"true",30, TimeUnit.DAYS);
+//                        }
+//                        Park byId = parkService.getById(barrier.getParkId());
+//                        if(Integer.parseInt(num) >= byId.getNum() ){
+//                            //led鏄剧ず
+//                            inLedFullShow(code, license,barrier.getParkId(),request,response);
+//                        }else {
+//                            //led鏄剧ず
+//                            inLedShow(code, license,barrier.getParkId(),request,response);
+//                            enterPark(license,barrier.getId(),barrier.getParkId());
+//                            s+=license+"-淇濆瓨鍏ュ満璁板綍\n";
+//                        }
                     }
                 }
-                writeTxt(s);
+               // writeTxt(s);
             }while(false);
         }
         catch (Exception e) {
@@ -293,7 +347,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();
@@ -340,6 +394,8 @@
             enterPark.setStatus(1);//鍙戠幇鏈夎繚绔�
         }
         enterParkService.saveOrUpdate(enterPark);
+        String jsonValue = JSON.toJSONString(enterPark);
+        redisTemplate.opsForValue().set("enterPark_dif_"+ parkId, jsonValue);
 
         Barrier barrier = barrierService.getById(barrierId);
         barrier.setType2(1);
@@ -397,6 +453,8 @@
                     byCarNoAndBarrierId.setStatus(1);
                     byCarNoAndBarrierId.setStatus2(1);
                     outParkService.saveOrUpdate(byCarNoAndBarrierId);
+                    String jsonValue = JSON.toJSONString(byCarNoAndBarrierId);
+                    redisTemplate.opsForValue().set("outPark_dif_"+ barrierId, jsonValue);
                     return 0.0;
                 }else{
                     if(w.getParkIds()!=null){
@@ -411,6 +469,8 @@
                                     byCarNoAndBarrierId.setStatus(1);
                                     byCarNoAndBarrierId.setStatus2(1);
                                     outParkService.saveOrUpdate(byCarNoAndBarrierId);
+                                    String jsonValue = JSON.toJSONString(byCarNoAndBarrierId);
+                                    redisTemplate.opsForValue().set("outPark_dif_"+ barrierId, jsonValue);
                                     return 0.0;
                                 }
                             }
@@ -421,10 +481,14 @@
         }
         if(outPark.getPrice()==0&&outPark.getStatus3()==0){
             System.out.println(outPark.getCarNo()+"璇ヨ溅涓嶉渶瑕佺即璐�");
+            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);
         }else {
             //闇�瑕佺即璐规垨鑰呮湁杩濈珷
             System.out.println(outPark.getCarNo()+"璇ヨ溅闇�瑕佺即璐�"+outPark.getPrice());
+            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);
         }
         barrierService.saveOrUpdate(barrier);
@@ -481,27 +545,46 @@
         }
 
         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);
-        ResultData resultData = CodeUtil.GetResultDataAnyLine(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);//鍏ュ満寮�闂�
+        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);
+        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 {
@@ -526,22 +609,28 @@
         }
 
         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("杞︿綅宸叉弧,璇烽┒绂�");
-        ResultData resultData = CodeUtil.GetResultDataAnyLine(ledBean);
-        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(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());
         String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
         data1 = data1.replaceAll("\r\n", "");
 
@@ -551,22 +640,28 @@
     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+"鍏�");
-        ResultData resultData = CodeUtil.GetResultDataAnyLine(ledBean);
-        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(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());
         String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
         data1 = data1.replaceAll("\r\n", "");
         if(type == 0){
@@ -590,22 +685,28 @@
     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+"娆㈣繋涓嬫鍏変复");
-        ResultData resultData = CodeUtil.GetResultDataAnyLine(ledBean);
-        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(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());
         String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
         data1 = data1.replaceAll("\r\n", "");
         if(type == 0){
@@ -627,22 +728,28 @@
 
     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("");
-        ResultData resultData = CodeUtil.GetResultDataAnyLine(ledBean);
-        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(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());
         String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
         data1 = data1.replaceAll("\r\n", "");
         noOpen(request,response,data1);
@@ -659,22 +766,28 @@
             i = 0;
         }
         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("");
-        ResultData resultData = CodeUtil.GetResultDataAnyLine(ledBean);
-        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("浣欎綅:"+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());
         String data1 = Base64.getMimeEncoder().encodeToString(dataX) + "=";
         data1 = data1.replaceAll("\r\n", "");
         noOpen(request,response,data1);

--
Gitblit v1.9.1