From 68c95c45b4b339c272e4e1082f40b79207ffb132 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期五, 26 五月 2023 13:30:30 +0800
Subject: [PATCH] 默认变更列表

---
 src/main/java/com/boying/controller/phone/EticketController.java |   47 +++++++++++++++--------
 src/main/java/com/boying/controller/car/PlateServlet3.java       |   10 ++--
 src/main/java/com/boying/controller/ParkController.java          |    7 +++
 3 files changed, 41 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/boying/controller/ParkController.java b/src/main/java/com/boying/controller/ParkController.java
index 1818e65..d662341 100644
--- a/src/main/java/com/boying/controller/ParkController.java
+++ b/src/main/java/com/boying/controller/ParkController.java
@@ -39,7 +39,12 @@
         List<Park> records = page1.getRecords();
         for (Park record : records) {
             String num = redisTemplate.opsForValue().get("car_park_" +  record.getId());
-            record.setCarNum(Integer.parseInt(num));
+            if(num != null){
+                record.setCarNum(Integer.parseInt(num));
+            }else {
+                record.setCarNum(0);
+            }
+
         }
         page1.setRecords(records);
         return R.ok(page1);
diff --git a/src/main/java/com/boying/controller/car/PlateServlet3.java b/src/main/java/com/boying/controller/car/PlateServlet3.java
index e00d4ee..a4c9c3b 100644
--- a/src/main/java/com/boying/controller/car/PlateServlet3.java
+++ b/src/main/java/com/boying/controller/car/PlateServlet3.java
@@ -230,7 +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 image = plateResult.get("imageFile").toString();
         String code = alarmInfoPlate.get("serialno").toString();
 
         try {
@@ -267,10 +267,10 @@
                 }
 
 
-                if(StringUtils.isNotBlank(image)){
-                    fileInfo = FileUtil.generateBase64StringToFile(image, 1,1);
-                    fileInfoService.save(fileInfo);
-                }
+//                if(StringUtils.isNotBlank(image)){
+//                    fileInfo = FileUtil.generateBase64StringToFile(image, 1,1);
+//                    fileInfoService.save(fileInfo);
+//                }
 
 
                 System.out.println("缂栧彿锛�"+serialno+"  璁惧璇嗗埆鍒颁簡锛�"+license);
diff --git a/src/main/java/com/boying/controller/phone/EticketController.java b/src/main/java/com/boying/controller/phone/EticketController.java
index 4b0f1f9..4b68085 100644
--- a/src/main/java/com/boying/controller/phone/EticketController.java
+++ b/src/main/java/com/boying/controller/phone/EticketController.java
@@ -35,7 +35,7 @@
         SimpleDateFormat sdf2 = new SimpleDateFormat("hh:mm:ss");
         String format = sdf.format(new Date());
         String format2 = sdf2.format(new Date());
-        String idStr = 17107+"";
+        String idStr = 146920+"";
         String dateStr = DateUtil.currentSeconds()+"";
         String l = idStr + dateStr;
 
@@ -43,7 +43,7 @@
         //寮�绁ㄧ敵璇�
         DirectTicket.info info = new DirectTicket.info();
         info.setOrdernum(1);
-        info.setAmt(7.5);
+        info.setAmt(3);
         info.setAmount(1);
         info.setIncitemcode("072101");
         info.setIncitemname("鍋滆溅娉婁綅鍙婂叕鍏卞仠杞﹀満绛夋湁鍋夸娇鐢ㄦ敹鍏�");
@@ -58,11 +58,12 @@
         directTicket.setIssuetime(format2);
         directTicket.setPayerpartytype("1");
         directTicket.setPayer("鍐�A0CM05");
-        directTicket.setAmt(7.5);
+        directTicket.setAmt(3);
         directTicket.setUsername("寮犲▏");
         directTicket.setChecker("涔斿畞");
         directTicket.setPayinfo(json);
         directTicket.setState(1);
+        directTicket.setBilltypeid("1252");
 
         String jsonStr = JSON.toJSONString(directTicket, SerializerFeature.WriteDateUseDateFormat);
         Map<String, Object> map = JSON.parseObject(jsonStr, new TypeReference<Map<String, Object>>() {});
@@ -84,16 +85,37 @@
             System.out.println("einvoiceid:"+(String) mapTypes.get("einvoiceid"));
             System.out.println("einvoicefilename:"+(String) mapTypes.get("einvoicefilename"));
         }else {
-
+            System.out.println(entity.getBody());
         }
+
+        /**
+         * ReturnData(code=1, msg=鑾峰彇鎴愬姛, total=0, data=[{randomnumber=407348, einvoicefilename=, einvoiceid=3649845000-32211031, einvoicenumber=0005489463, eticketnum=171041683249011, state=0, einvoicecode=13011223}], singleData=null)
+         * bizcode:171041683249011
+         * einvoicecode:13011223
+         * einvoicenumber:0005489463
+         * randomnumber:407348
+         * einvoiceid:3649845000-32211031
+         * einvoicefilename:
+         */
     }
+
+    public static void main91(String[] args) {
+        Map<String,Object> map1 = new HashMap<>();
+        map1.put("bizcode","1469201684477973");
+        RestTemplate restTemplate = new RestTemplate();
+        ResponseEntity<ReturnData> entity = restTemplate.postForEntity("http://10.255.200.204:7991/search/meinvoicestatus", HTTPEntityUtil.setEntity(map1), ReturnData.class);
+        System.out.println(entity.getBody());
+        //ReturnData(code=1, msg=鏌ヨ鎴愬姛, total=0, data=[{filldate=2022-12-22, payeeaccount=13001645408050002448, bankaffirm=13061890816FPJZDGVS, eticketnum=13040622000000640564, amt=1.0, bankstation=130618908, payway=2, admdivcode=130406, payinfo=[{"incitemname":"鍋滆溅娉婁綅鍙婂叕鍏卞仠杞﹀満绛夋湁鍋夸娇鐢ㄦ敹鍏�","amount":1,"incitemcode":"072101","amt":1,"ordernum":1}], payer=宄板嘲鏅烘収鍋滆溅, paybankdt=2022-12-22 15:14:59, payeebank=寤鸿閭兏甯傚嘲宄版敮琛�, payee=宄板嘲鐭垮尯闈炵◣鏀跺叆鏈嶅姟涓績, payerbank=, payeraccount=, invoicingpartyname=閭兏甯傚嘲宄扮熆鍖虹患鍚堣鏀挎墽娉曞眬, invoicingpartycode=506002}], singleData=null)
+        // payinfo=[{"incitemname":"鍋滆溅娉婁綅鍙婂叕鍏卞仠杞﹀満绛夋湁鍋夸娇鐢ㄦ敹鍏�","amount":1,"incitemcode":"072101","amt":1,"ordernum":1}]
+    }
+
 
     public static void main(String[] args) {
         Map<String,Object> map1 = new HashMap<>();
-        map1.put("einvoicecode", "13011223");
-        map1.put("einvoicenumber","0005489442");
-        map1.put("bizcode", "171071682490940");
-        map1.put("randomnumber","366660");
+        map1.put("einvoicecode", "13011323");
+        map1.put("einvoicenumber","0001479604");
+        map1.put("bizcode", "1469201684477973");
+        map1.put("randomnumber","279929");
         map1.put("billfiletype",1);
         SimpleDateFormat sdf3 = new SimpleDateFormat("yyyy-MM-dd_HH_mm_ss");
         RestTemplate restTemplate = new RestTemplate();
@@ -253,15 +275,6 @@
         //ReturnData(code=1, msg=鏌ヨ鎴愬姛, total=0, data=[{randomnumber=264640, einvoicefilename=130112220011112124, einvoiceid=4212111100-22211031, einvoicenumber=0011112124, eticketnum=13040622000000640564, state=1, einvoicecode=13011222, info=寮�绁ㄦ垚鍔焳], singleData=null)
     }
 
-    public static void main5(String[] args) {
-        Map<String,Object> map1 = new HashMap<>();
-        map1.put("eticketnum","13040622000000640564");
-        RestTemplate restTemplate = new RestTemplate();
-        ResponseEntity<ReturnData> entity = restTemplate.postForEntity("http://10.255.200.204:7991/search/eticket", HTTPEntityUtil.setEntity(map1), ReturnData.class);
-        System.out.println(entity.getBody());
-        //ReturnData(code=1, msg=鏌ヨ鎴愬姛, total=0, data=[{filldate=2022-12-22, payeeaccount=13001645408050002448, bankaffirm=13061890816FPJZDGVS, eticketnum=13040622000000640564, amt=1.0, bankstation=130618908, payway=2, admdivcode=130406, payinfo=[{"incitemname":"鍋滆溅娉婁綅鍙婂叕鍏卞仠杞﹀満绛夋湁鍋夸娇鐢ㄦ敹鍏�","amount":1,"incitemcode":"072101","amt":1,"ordernum":1}], payer=宄板嘲鏅烘収鍋滆溅, paybankdt=2022-12-22 15:14:59, payeebank=寤鸿閭兏甯傚嘲宄版敮琛�, payee=宄板嘲鐭垮尯闈炵◣鏀跺叆鏈嶅姟涓績, payerbank=, payeraccount=, invoicingpartyname=閭兏甯傚嘲宄扮熆鍖虹患鍚堣鏀挎墽娉曞眬, invoicingpartycode=506002}], singleData=null)
-        // payinfo=[{"incitemname":"鍋滆溅娉婁綅鍙婂叕鍏卞仠杞﹀満绛夋湁鍋夸娇鐢ㄦ敹鍏�","amount":1,"incitemcode":"072101","amt":1,"ordernum":1}]
-    }
 
     //鑾峰彇缂存涔�
     public  void getAPPLYETCKETNUM(ApplyTicket applyTicket) throws IllegalAccessException {

--
Gitblit v1.9.1