From ea3fb85c6257996d88897e7535af9f46a45e2b4a Mon Sep 17 00:00:00 2001
From: "Mr.Wang" <wang@qq.com>
Date: Mon, 8 Jul 2024 09:06:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A4=E9=80=9A=E6=B5=81?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=AD=98=E5=82=A8=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/ExternalInterfaceMonitoringTask.java | 39 ++++++++++++++-----
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/zc-business/src/main/java/com/zc/business/task/ExternalInterfaceMonitoringTask.java b/zc-business/src/main/java/com/zc/business/task/ExternalInterfaceMonitoringTask.java
index 6251b3a8..e44df653 100644
--- a/zc-business/src/main/java/com/zc/business/task/ExternalInterfaceMonitoringTask.java
+++ b/zc-business/src/main/java/com/zc/business/task/ExternalInterfaceMonitoringTask.java
@@ -84,6 +84,7 @@ public class ExternalInterfaceMonitoringTask extends BaseController {
         if (externalInterfaceMonitoring.getInterfaceName() != null) {
             lambdaQueryWrapper.like(ExternalInterfaceMonitoring::getInterfaceName, externalInterfaceMonitoring.getInterfaceName());
         }
+        lambdaQueryWrapper.orderByDesc(ExternalInterfaceMonitoring::getOperationTime);
         List<ExternalInterfaceMonitoring> list = externalInterfaceMonitoringMapper.selectList(lambdaQueryWrapper);
         return getDataTable(list);
     }
@@ -200,7 +201,7 @@ public class ExternalInterfaceMonitoringTask extends BaseController {
         externalInterfaceMonitoring.setInterfaceOwnership(InterfaceOwnershipEnum.TRAFFIC_FLOW.getCode());
         externalInterfaceMonitoring.setInterfaceName(operationName);
         // 插入
-        insertIntoExternalInterface(externalInterfaceMonitoring, response);
+        trafficFlowResultProcessing(externalInterfaceMonitoring, response);
     }
 
     //车辆
@@ -232,7 +233,7 @@ public class ExternalInterfaceMonitoringTask extends BaseController {
         externalInterfaceMonitoring.setInterfaceOwnership(InterfaceOwnershipEnum.TRAFFIC_FLOW.getCode());
         externalInterfaceMonitoring.setInterfaceName(operationName);
         // 插入
-        insertIntoExternalInterface(externalInterfaceMonitoring, response);
+        trafficFlowResultProcessing(externalInterfaceMonitoring, response);
     }
 
     //获取门架指标数据
@@ -271,7 +272,7 @@ public class ExternalInterfaceMonitoringTask extends BaseController {
         externalInterfaceMonitoring.setInterfaceOwnership(InterfaceOwnershipEnum.TRAFFIC_FLOW.getCode());
         externalInterfaceMonitoring.setInterfaceName(operationName);
         // 插入
-        insertIntoExternalInterface(externalInterfaceMonitoring, response);
+        trafficFlowResultProcessing(externalInterfaceMonitoring, response);
     }
 
     //收费站 TollStation
@@ -304,7 +305,7 @@ public class ExternalInterfaceMonitoringTask extends BaseController {
         externalInterfaceMonitoring.setInterfaceOwnership(InterfaceOwnershipEnum.TRAFFIC_FLOW.getCode());
         externalInterfaceMonitoring.setInterfaceName(operationName);
         // 插入
-        insertIntoExternalInterface(externalInterfaceMonitoring, response);
+        trafficFlowResultProcessing(externalInterfaceMonitoring, response);
     }
 
     /**
@@ -589,6 +590,29 @@ public class ExternalInterfaceMonitoringTask extends BaseController {
 
     }
 
+    /**
+     * 交通流结果处理
+     */
+    public void trafficFlowResultProcessing(ExternalInterfaceMonitoring externalInterfaceMonitoring, Response response) throws Exception {
+        ResponseBody body = response.body();
+
+        externalInterfaceMonitoring.setOperationStatus(UniversalEnum.ZERO.getNumber());
+        if (body != null) {
+            JSONObject jsonResult = JSONObject.parseObject(body.string());
+            if (jsonResult.containsKey("code") && jsonResult.get("code").equals(UniversalEnum.TWO_HUNDRED.getNumber())) {
+                externalInterfaceMonitoring.setOperationStatus(UniversalEnum.ONE.getNumber());
+            }
+            externalInterfaceMonitoring.setOperationResult(body.string());
+        } else {
+            externalInterfaceMonitoring.setOperationResult(response.toString());
+        }
+
+        externalInterfaceMonitoring.setId(IdUtils.fastSimpleUUID());
+        externalInterfaceMonitoring.setOperatorName("系统");
+        externalInterfaceMonitoring.setOperationTime(new Date());
+        externalInterfaceMonitoringMapper.insert(externalInterfaceMonitoring);
+    }
+
     /**
      * 存储外部接口监测数据
      */
@@ -622,17 +646,14 @@ public class ExternalInterfaceMonitoringTask extends BaseController {
      */
     public void videoResultInsertInto(ExternalInterfaceMonitoring externalInterfaceMonitoring, Response response) throws Exception {
         ResponseBody body = response.body();
+        externalInterfaceMonitoring.setOperationStatus(UniversalEnum.ZERO.getNumber());
         if (body != null) {
             JSONObject jsonResult = JSONObject.parseObject(body.string());
-
-            if (jsonResult.get("code").equals(UniversalEnum.TWO_HUNDRED.getNumber())) {
+            if (jsonResult.containsKey("code") && jsonResult.get("code").equals(UniversalEnum.TWO_HUNDRED.getNumber())) {
                 externalInterfaceMonitoring.setOperationStatus(UniversalEnum.ONE.getNumber());
-            } else {
-                externalInterfaceMonitoring.setOperationStatus(UniversalEnum.ZERO.getNumber());
             }
             externalInterfaceMonitoring.setOperationResult(JSON.toJSONString(jsonResult));
         } else {
-            externalInterfaceMonitoring.setOperationStatus(UniversalEnum.ZERO.getNumber());
             externalInterfaceMonitoring.setOperationResult(response.toString());
         }
         externalInterfaceMonitoring.setId(IdUtils.fastSimpleUUID());