From ea7140711e2f2aec1559049ee139d69dfbe1575d Mon Sep 17 00:00:00 2001
From: kongdeqiang <kongdeqiang960204@163.com>
Date: 星期四, 01 六月 2023 13:47:26 +0800
Subject: [PATCH] 提交更新

---
 src/main/java/com/boying/controller/car/PlateServlet3.java |   30 ++++++++++++++++++++++++------
 1 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/boying/controller/car/PlateServlet3.java b/src/main/java/com/boying/controller/car/PlateServlet3.java
index a318310..a087cd5 100644
--- a/src/main/java/com/boying/controller/car/PlateServlet3.java
+++ b/src/main/java/com/boying/controller/car/PlateServlet3.java
@@ -9,6 +9,7 @@
 import com.boying.entity.*;
 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;
@@ -35,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;
@@ -52,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";
 
     /**
@@ -216,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;
         }
@@ -226,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 {
@@ -261,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+"  ";
 
@@ -272,7 +284,7 @@
                     easyNoOpen(request,response);
                 }else{
                     if(barrier.getType()==0){
-                        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());
@@ -288,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";
                         }
                     }
@@ -342,7 +354,7 @@
 
 
 
-    public void enterPark(String carNo,Integer barrierId,Integer parkId) {
+    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);
@@ -373,6 +385,9 @@
         if(tickets.size()>0){
             enterPark.setStatus(1);//鍙戠幇鏈夎繚绔�
         }
+        if(fileInfo != null){
+            enterPark.setImgId(fileInfo.getId());
+        }
         enterParkService.saveOrUpdate(enterPark);
 
 //        Barrier barrier = barrierService.getById(barrierId);
@@ -380,7 +395,7 @@
 //        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;
@@ -411,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);

--
Gitblit v1.9.1