From 2a23b958988a347ee4831dbe9c274988187e79df Mon Sep 17 00:00:00 2001 From: lijiuwei Date: Tue, 29 Apr 2025 13:48:05 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/task/PatrolEqpbookChannelTask.java | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/inspect-job/src/main/java/com/inspect/job/task/PatrolEqpbookChannelTask.java b/inspect-job/src/main/java/com/inspect/job/task/PatrolEqpbookChannelTask.java index 8e0a38d..84c6196 100644 --- a/inspect-job/src/main/java/com/inspect/job/task/PatrolEqpbookChannelTask.java +++ b/inspect-job/src/main/java/com/inspect/job/task/PatrolEqpbookChannelTask.java @@ -53,19 +53,21 @@ public class PatrolEqpbookChannelTask { JSONObject jsonObject = JSONObject.parseObject(result); if (null != jsonObject) { JSONObject cameraBriefInfos = jsonObject.getJSONObject("cameraBriefInfos"); - JSONArray jsonObjectItems = cameraBriefInfos.getJSONArray("cameraBriefInfoList"); - if (null != jsonObjectItems) { - for (EqpBookChannel eqpBookChannel : eqpBookChannels) { - for (int i = 0; i < jsonObjectItems.size(); i++) { - JSONObject cameraInfo = jsonObjectItems.getJSONObject(i); - //cameracode相等 - if (eqpBookChannel.getChannelCode().equals(cameraInfo.getString("code") + "#" + cameraInfo.getString("domainCode"))) { - //状态发生改变 修改 - if (!eqpBookChannel.getOnlineState().equals(cameraInfo.getString("status")) || - !eqpBookChannel.getChannelName().equals(cameraInfo.getString("name"))) { - eqpBookChannel.setOnlineState(cameraInfo.getString("status")); - eqpBookChannel.setChannelName(cameraInfo.getString("name")); - patrolDeviceStateMapper.updateEqpBookChannel(eqpBookChannel); + if (null != cameraBriefInfos) { + JSONArray jsonObjectItems = cameraBriefInfos.getJSONArray("cameraBriefInfoList"); + if (null != jsonObjectItems) { + for (EqpBookChannel eqpBookChannel : eqpBookChannels) { + for (int i = 0; i < jsonObjectItems.size(); i++) { + JSONObject cameraInfo = jsonObjectItems.getJSONObject(i); + //cameracode相等 + if (eqpBookChannel.getChannelCode().equals(cameraInfo.getString("code") + "#" + cameraInfo.getString("domainCode"))) { + //状态发生改变 修改 + if (!eqpBookChannel.getOnlineState().equals(cameraInfo.getString("status")) || + !eqpBookChannel.getChannelName().equals(cameraInfo.getString("name"))) { + eqpBookChannel.setOnlineState(cameraInfo.getString("status")); + eqpBookChannel.setChannelName(cameraInfo.getString("name")); + patrolDeviceStateMapper.updateEqpBookChannel(eqpBookChannel); + } } } } @@ -73,7 +75,7 @@ public class PatrolEqpbookChannelTask { } } } catch (Exception e) { - e.printStackTrace(); + logger.error("error", e); } } }