From 09ccb76894acb9bf8f09ce2b126e7098eeb76d64 Mon Sep 17 00:00:00 2001 From: WangGuangYuan Date: Thu, 14 Aug 2025 16:44:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86=E9=A1=B5?= =?UTF-8?q?=E7=9B=B8=E6=9C=BA=E7=8A=B6=E6=80=81=EF=BC=8C=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspect/job/task/PatrolDeviceStatusSynTask.java | 12 ++++++++++++ .../controller/BasedataEqpBookController.java | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/inspect-job/src/main/java/com/inspect/job/task/PatrolDeviceStatusSynTask.java b/inspect-job/src/main/java/com/inspect/job/task/PatrolDeviceStatusSynTask.java index 98b9b82..58023d2 100644 --- a/inspect-job/src/main/java/com/inspect/job/task/PatrolDeviceStatusSynTask.java +++ b/inspect-job/src/main/java/com/inspect/job/task/PatrolDeviceStatusSynTask.java @@ -147,7 +147,13 @@ public class PatrolDeviceStatusSynTask { for (int i = 0; i < patrolDeviceObjects.size(); ++i) { JSONObject item = patrolDeviceObjects.getJSONObject(i); String patrolDeviceCode = item.getString("patrolDeviceCode"); + if (StringUtils.isEmpty(patrolDeviceCode)) { + patrolDeviceCode = item.getString("patroldeviceCode"); + } Long eqpBookId = item.getLongValue("eqpBookId"); + if (eqpBookId == 0) { + eqpBookId = item.getLongValue("eqpbookId"); + } if (ivsDeviceStatusMap.containsKey(patrolDeviceCode)) { boolean online = ivsDeviceStatusMap.get(patrolDeviceCode); if (online) { @@ -172,7 +178,13 @@ public class PatrolDeviceStatusSynTask { if (webSendFlag == 1) { JSONObject item = patrolDeviceObjects.getJSONObject(0); String patrolDeviceCode = item.getString("patrolDeviceCode"); + if (StringUtils.isEmpty(patrolDeviceCode)) { + patrolDeviceCode = item.getString("patroldeviceCode"); + } Long eqpBookId = item.getLongValue("eqpBookId"); + if (eqpBookId == 0) { + eqpBookId = item.getLongValue("eqpbookId"); + } JSONObject returnJsonObject = patrolDeviceMesHandle(patrolDeviceCode, null, eqpBookId, heart_beat_interval, heartBeatInterval, dateTimeNowFormat); parseMessage(JSON.toJSONString(returnJsonObject)); } diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/controller/BasedataEqpBookController.java b/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/controller/BasedataEqpBookController.java index 13140d9..3de2cd0 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/controller/BasedataEqpBookController.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/controller/BasedataEqpBookController.java @@ -393,7 +393,7 @@ public class BasedataEqpBookController extends BaseController { } @GetMapping({"/downloadPicMap"}) - public AjaxResult downloadPicMap(String patrolDeviceCode) throws IOException { + public AjaxResult downloadPicMap(@RequestParam("patroldeviceCode") String patrolDeviceCode) throws IOException { BasedataEqpBook basedataEqpbook = this.basedataEqpBookService.selectBasedataEqpBookByPatrolDeviceCode(patrolDeviceCode); Map map = new HashMap<>(); map.put("path", basedataEqpbook.getMapFilePath());