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 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());