From 1130ad3b89e73f9b76292f6da391e0e04b8417dd Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 03 十二月 2024 16:15:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 MinistryOfTransport/src/main/java/com/sinata/ministryoftransport/util/MinistryOfTransport.java |  174 ++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 115 insertions(+), 59 deletions(-)

diff --git a/MinistryOfTransport/src/main/java/com/sinata/ministryoftransport/util/MinistryOfTransport.java b/MinistryOfTransport/src/main/java/com/sinata/ministryoftransport/util/MinistryOfTransport.java
index a1a2b8d..a669578 100644
--- a/MinistryOfTransport/src/main/java/com/sinata/ministryoftransport/util/MinistryOfTransport.java
+++ b/MinistryOfTransport/src/main/java/com/sinata/ministryoftransport/util/MinistryOfTransport.java
@@ -72,6 +72,7 @@
         header.put("accept-encoding", "gzip");
         header.put("accept-charset", "utf-8");
         HttpResult httpResult = httpClientUtil.pushHttpRequset("POST", path, data, header, "json");
+
         if(httpResult.getCode() == 200){
             analysisResult(httpResult.getData());
         }
@@ -105,6 +106,7 @@
         header.put("accept-encoding", "gzip");
         header.put("accept-charset", "utf-8");
         HttpResult httpResult = httpClientUtil.pushHttpRequset("POST", path, data, header, "json");
+
         if(httpResult.getCode() == 200){
             analysisResult(httpResult.getData());
         }
@@ -143,6 +145,8 @@
         header.put("accept-encoding", "gzip");
         header.put("accept-charset", "utf-8");
         HttpResult httpResult = httpClientUtil.pushHttpRequset("POST", path, data, header, "json");
+
+
         if(httpResult.getCode() == 200){
             analysisResult(httpResult.getData());
         }
@@ -186,6 +190,8 @@
         header.put("accept-encoding", "gzip");
         header.put("accept-charset", "utf-8");
         HttpResult httpResult = httpClientUtil.pushHttpRequset("POST", path, data, header, "json");
+
+
         if(httpResult.getCode() == 200){
             analysisResult(httpResult.getData());
         }
@@ -226,6 +232,8 @@
         header.put("accept-encoding", "gzip");
         header.put("accept-charset", "utf-8");
         HttpResult httpResult = httpClientUtil.pushHttpRequset("POST", path, data, header, "json");
+
+
         if(httpResult.getCode() == 200){
             analysisResult(httpResult.getData());
         }
@@ -282,6 +290,8 @@
         header.put("accept-encoding", "gzip");
         header.put("accept-charset", "utf-8");
         HttpResult httpResult = httpClientUtil.pushHttpRequset("POST", path, data, header, "json");
+
+
         if(httpResult.getCode() == 200){
             analysisResult(httpResult.getData());
         }
@@ -347,6 +357,8 @@
         header.put("accept-encoding", "gzip");
         header.put("accept-charset", "utf-8");
         HttpResult httpResult = httpClientUtil.pushHttpRequset("POST", path, data, header, "json");
+
+
         if(httpResult.getCode() == 200){
             analysisResult(httpResult.getData());
         }
@@ -386,6 +398,8 @@
         header.put("accept-encoding", "gzip");
         header.put("accept-charset", "utf-8");
         HttpResult httpResult = httpClientUtil.pushHttpRequset("POST", path, data, header, "json");
+
+
         if(httpResult.getCode() == 200){
             analysisResult(httpResult.getData());
         }
@@ -421,6 +435,8 @@
         header.put("accept-encoding", "gzip");
         header.put("accept-charset", "utf-8");
         HttpResult httpResult = httpClientUtil.pushHttpRequset("POST", path, data, header, "json");
+
+
         if(httpResult.getCode() == 200){
             analysisResult(httpResult.getData());
         }
@@ -474,16 +490,13 @@
         jsonObject.put("EmergencyContact", baseInfoDriver.getEmergencyContact());//紧急情况联系人
         jsonObject.put("EmergencyContactPhone", baseInfoDriver.getEmergencyContactPhone());//紧急情况联系人电话
         jsonObject.put("EmergencyContactAddress", baseInfoDriver.getEmergencyContactAddress());//紧急情况联系人通信地址
-
         jsonObject.put("State", baseInfoDriver.getState());//状态(0:有效,1:失效)
         jsonObject.put("Flag", baseInfoDriver.getFlag());//操作标识(1:新增,2:更新,3:删除)
         jsonObject.put("UpdateTime", Long.valueOf(sdf.format(baseInfoDriver.getUpdateTime())));
-
         data.put("CompanyId", CompanyId);
         data.put("Source", Source);
         data.put("IPCType", IPCType);
         data.put(IPCType, jsonObject);
-
         Map<String, String> header = new HashMap<>();
         header.put("connection", "keep-alive");
         header.put("content-type", "application/json; charset=UTF-8");
@@ -530,6 +543,8 @@
         header.put("accept-encoding", "gzip");
         header.put("accept-charset", "utf-8");
         HttpResult httpResult = httpClientUtil.pushHttpRequset("POST", path, data, header, "json");
+
+
         if(httpResult.getCode() == 200){
             analysisResult(httpResult.getData());
         }
@@ -569,6 +584,8 @@
         header.put("accept-encoding", "gzip");
         header.put("accept-charset", "utf-8");
         HttpResult httpResult = httpClientUtil.pushHttpRequset("POST", path, data, header, "json");
+
+
         if(httpResult.getCode() == 200){
             analysisResult(httpResult.getData());
         }
@@ -607,6 +624,8 @@
         header.put("accept-encoding", "gzip");
         header.put("accept-charset", "utf-8");
         HttpResult httpResult = httpClientUtil.pushHttpRequset("POST", path, data, header, "json");
+
+
         if(httpResult.getCode() == 200){
             analysisResult(httpResult.getData());
         }
@@ -644,6 +663,8 @@
         header.put("accept-encoding", "gzip");
         header.put("accept-charset", "utf-8");
         HttpResult httpResult = httpClientUtil.pushHttpRequset("POST", path, data, header, "json");
+
+
         if(httpResult.getCode() == 200){
             analysisResult(httpResult.getData());
         }
@@ -686,6 +707,8 @@
         header.put("accept-encoding", "gzip");
         header.put("accept-charset", "utf-8");
         HttpResult httpResult = httpClientUtil.pushHttpRequset("POST", path, data, header, "json");
+
+
         if(httpResult.getCode() == 200){
             analysisResult(httpResult.getData());
         }
@@ -724,6 +747,8 @@
         header.put("accept-encoding", "gzip");
         header.put("accept-charset", "utf-8");
         HttpResult httpResult = httpClientUtil.pushHttpRequset("POST", path, data, header, "json");
+
+
         if(httpResult.getCode() == 200){
             analysisResult(httpResult.getData());
         }
@@ -760,6 +785,8 @@
         header.put("accept-encoding", "gzip");
         header.put("accept-charset", "utf-8");
         HttpResult httpResult = httpClientUtil.pushHttpRequset("POST", path, data, header, "json");
+
+
         if(httpResult.getCode() == 200){
             analysisResult(httpResult.getData());
         }
@@ -795,6 +822,8 @@
         header.put("accept-encoding", "gzip");
         header.put("accept-charset", "utf-8");
         HttpResult httpResult = httpClientUtil.pushHttpRequset("POST", path, data, header, "json");
+
+
         if(httpResult.getCode() == 200){
             analysisResult(httpResult.getData());
         }
@@ -830,6 +859,8 @@
         header.put("accept-encoding", "gzip");
         header.put("accept-charset", "utf-8");
         HttpResult httpResult = httpClientUtil.pushHttpRequset("POST", path, data, header, "json");
+
+
         if(httpResult.getCode() == 200){
             analysisResult(httpResult.getData());
         }
@@ -869,6 +900,8 @@
         header.put("accept-encoding", "gzip");
         header.put("accept-charset", "utf-8");
         HttpResult httpResult = httpClientUtil.pushHttpRequset("POST", path, data, header, "json");
+
+
         if(httpResult.getCode() == 200){
             analysisResult(httpResult.getData());
         }
@@ -905,6 +938,8 @@
         header.put("accept-encoding", "gzip");
         header.put("accept-charset", "utf-8");
         HttpResult httpResult = httpClientUtil.pushHttpRequset("POST", path, data, header, "json");
+
+
         if(httpResult.getCode() == 200){
             analysisResult(httpResult.getData());
         }
@@ -973,6 +1008,8 @@
         header.put("accept-encoding", "gzip");
         header.put("accept-charset", "utf-8");
         HttpResult httpResult = httpClientUtil.pushHttpRequset("POST", path, data, header, "json");
+
+
         if(httpResult.getCode() == 200){
             analysisResult(httpResult.getData());
         }
@@ -1014,6 +1051,8 @@
         header.put("accept-encoding", "gzip");
         header.put("accept-charset", "utf-8");
         HttpResult httpResult = httpClientUtil.pushHttpRequset("POST", path, data, header, "json");
+
+
         if(httpResult.getCode() == 200){
             analysisResult(httpResult.getData());
         }
@@ -1057,6 +1096,8 @@
         header.put("accept-encoding", "gzip");
         header.put("accept-charset", "utf-8");
         HttpResult httpResult = httpClientUtil.pushHttpRequset("POST", path, data, header, "json");
+
+
         if(httpResult.getCode() == 200){
             analysisResult(httpResult.getData());
         }
@@ -1092,6 +1133,8 @@
         header.put("accept-encoding", "gzip");
         header.put("accept-charset", "utf-8");
         HttpResult httpResult = httpClientUtil.pushHttpRequset("POST", path, data, header, "json");
+
+
         if(httpResult.getCode() == 200){
             analysisResult(httpResult.getData());
         }
@@ -1125,6 +1168,8 @@
         header.put("accept-encoding", "gzip");
         header.put("accept-charset", "utf-8");
         HttpResult httpResult = httpClientUtil.pushHttpRequset("POST", path, data, header, "json");
+
+
         if(httpResult.getCode() == 200){
             analysisResult(httpResult.getData());
         }
@@ -1157,6 +1202,8 @@
         header.put("accept-encoding", "gzip");
         header.put("accept-charset", "utf-8");
         HttpResult httpResult = httpClientUtil.pushHttpRequset("POST", path, data, header, "json");
+
+
         if(httpResult.getCode() == 200){
             analysisResult(httpResult.getData());
         }
@@ -1190,6 +1237,8 @@
         header.put("accept-encoding", "gzip");
         header.put("accept-charset", "utf-8");
         HttpResult httpResult = httpClientUtil.pushHttpRequset("POST", path, data, header, "json");
+
+
         if(httpResult.getCode() == 200){
             analysisResult(httpResult.getData());
         }
@@ -1229,6 +1278,8 @@
         header.put("accept-encoding", "gzip");
         header.put("accept-charset", "utf-8");
         HttpResult httpResult = httpClientUtil.pushHttpRequset("POST", path, data, header, "json");
+
+
         if(httpResult.getCode() == 200){
             analysisResult(httpResult.getData());
         }
@@ -1273,6 +1324,8 @@
         header.put("accept-encoding", "gzip");
         header.put("accept-charset", "utf-8");
         HttpResult httpResult = httpClientUtil.pushHttpRequset("POST", path, data, header, "json");
+
+
         if(httpResult.getCode() == 200){
             analysisResult(httpResult.getData());
         }
@@ -1316,6 +1369,8 @@
         header.put("accept-encoding", "gzip");
         header.put("accept-charset", "utf-8");
         HttpResult httpResult = httpClientUtil.pushHttpRequset("POST", path, data, header, "json");
+
+
         if(httpResult.getCode() == 200){
             analysisResult(httpResult.getData());
         }
@@ -1384,68 +1439,69 @@
         return JSON.toJSONString(httpResult);
     }
 
-
     /**
      * 处理返回结果
      * @param result
      */
     private void analysisResult(String result){
         JSONObject jsonObject = JSON.parseObject(result);
-        if(null == jsonObject){
-            System.err.println("请求接口出错!");
-            return;
-        }
-        int code = (Integer)jsonObject.get("status");
-        if(code == 200){
-            System.err.println("(成功)服务器已成功处理了请求");
-        }
-        if(code == 201){
-            System.err.println("请求已经完成并一个新的返回资源被创建");
-        }
-        if(code == 400){
-            System.err.println("(错误请求)服务器不理解请求的语法");
-            System.err.println(jsonObject.getString("error"));
-        }
-        if(code == 401){
-            System.err.println("(未授权)请求要求身份验证");
-            System.err.println(jsonObject.getString("error"));
-        }
-        if(code == 403){
-            System.err.println("(禁止)服务器拒绝请求");
-            System.err.println(jsonObject.getString("error"));
-        }
-        if(code == 404){
-            System.err.println("(未找到)服务器找不到请求的网页");
-            System.err.println(jsonObject.getString("error"));
-        }
-        if(code == 500){
-            System.err.println("服务器遭遇异常阻止了当前请求的执行");
-            System.err.println(jsonObject.getString("error"));
-        }
-        if(code == 502){
-            System.err.println("(错误网关)服务器作为网关或代理,从上游服务器收到无效响应");
-            System.err.println(jsonObject.getString("error"));
-        }
-        if(code == 702){
-            System.err.println("请求文件不存在");
-            System.err.println(jsonObject.getString("error"));
-        }
-        if(code == 948){
-            System.err.println("请求文件名格式不正确");
-            System.err.println(jsonObject.getString("error"));
-        }
-        if(code == 949){
-            System.err.println("文件解压失败");
-            System.err.println(jsonObject.getString("error"));
-        }
-        if(code == 952){
-            System.err.println("格式校验失败");
-            System.err.println(jsonObject.getString("error"));
-        }
-        if(code == 1000){
-            System.err.println("请求异常");
-            System.err.println(jsonObject.getString("error"));
-        }
+//        if(null == jsonObject){
+//            System.err.println("请求接口出错!");
+//            return;
+//        }
+        System.err.println("(成功)服务器已成功处理了请求");
+
+//        int code = (Integer)jsonObject.get("status");
+//        if(code == 200){
+//            System.err.println("(成功)服务器已成功处理了请求");
+//        }
+//        if(code == 201){
+//            System.err.println("请求已经完成并一个新的返回资源被创建");
+//        }
+//        if(code == 400){
+//            System.err.println("(错误请求)服务器不理解请求的语法");
+//            System.err.println(jsonObject.getString("error"));
+//        }
+//        if(code == 401){
+//            System.err.println("(未授权)请求要求身份验证");
+//            System.err.println(jsonObject.getString("error"));
+//        }
+//        if(code == 403){
+//            System.err.println("(禁止)服务器拒绝请求");
+//            System.err.println(jsonObject.getString("error"));
+//        }
+//        if(code == 404){
+//            System.err.println("(未找到)服务器找不到请求的网页");
+//            System.err.println(jsonObject.getString("error"));
+//        }
+//        if(code == 500){
+//            System.err.println("服务器遭遇异常阻止了当前请求的执行");
+//            System.err.println(jsonObject.getString("error"));
+//        }
+//        if(code == 502){
+//            System.err.println("(错误网关)服务器作为网关或代理,从上游服务器收到无效响应");
+//            System.err.println(jsonObject.getString("error"));
+//        }
+//        if(code == 702){
+//            System.err.println("请求文件不存在");
+//            System.err.println(jsonObject.getString("error"));
+//        }
+//        if(code == 948){
+//            System.err.println("请求文件名格式不正确");
+//            System.err.println(jsonObject.getString("error"));
+//        }
+//        if(code == 949){
+//            System.err.println("文件解压失败");
+//            System.err.println(jsonObject.getString("error"));
+//        }
+//        if(code == 952){
+//            System.err.println("格式校验失败");
+//            System.err.println(jsonObject.getString("error"));
+//        }
+//        if(code == 1000){
+//            System.err.println("请求异常");
+//            System.err.println(jsonObject.getString("error"));
+//        }
 
     }
 

--
Gitblit v1.7.1