From 28e3abbc3008a6975363649cbca3effd6e2c115e Mon Sep 17 00:00:00 2001 From: WangGuangYuan Date: Mon, 17 Mar 2025 18:26:11 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=AD=A6=E6=B1=89=E7=8E=B0=E5=9C=BA?= =?UTF-8?q?=E6=89=8B=E5=8A=A8=E9=85=8D=E7=BD=AE=E7=82=B9=E4=BD=8D=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/inspect/job/domain/task/PatrolPresetPos.java | 2 ++ .../inspect/patrol/controller/PatrolPresetPosController.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/inspect-job/src/main/java/com/inspect/job/domain/task/PatrolPresetPos.java b/inspect-job/src/main/java/com/inspect/job/domain/task/PatrolPresetPos.java index 403339e..22ae18b 100644 --- a/inspect-job/src/main/java/com/inspect/job/domain/task/PatrolPresetPos.java +++ b/inspect-job/src/main/java/com/inspect/job/domain/task/PatrolPresetPos.java @@ -1,5 +1,6 @@ package com.inspect.job.domain.task; +import com.fasterxml.jackson.annotation.JsonProperty; import com.inspect.base.core.annotation.Excel; import com.inspect.base.core.web.domain.BaseEntity; @@ -29,6 +30,7 @@ public class PatrolPresetPos extends BaseEntity { name = "设备点位", readConverterExp = "部=件ID" ) + @JsonProperty("patrolpointId") private Long patrolPointId; @Excel( name = "通道ID" diff --git a/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/controller/PatrolPresetPosController.java b/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/controller/PatrolPresetPosController.java index fd58dd7..de65bdb 100644 --- a/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/controller/PatrolPresetPosController.java +++ b/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/controller/PatrolPresetPosController.java @@ -439,7 +439,8 @@ public class PatrolPresetPosController extends BaseController { logger.info("[PRESET] patrolPresetPos eqpBookId: {}, body: {}", patrolPresetPos.getEqpBookId(), patrolPresetPos); AjaxResult ajaxResult = this.basedataEqpbookService.queryById(patrolPresetPos.getEqpBookId()); JSONObject eqpBook = JSONObject.parseObject(JSONObject.toJSONString(ajaxResult)).getJSONObject("data"); - patrolPresetPos.setPatrolDeviceCode(eqpBook.getString("patrolDeviceCode")); + logger.info("[PRESET] eqpBook: {}", eqpBook); + patrolPresetPos.setPatrolDeviceCode(StringUtils.isEmpty(eqpBook.getString("patrolDeviceCode")) ? eqpBook.getString("patroldeviceCode") : eqpBook.getString("patrolDeviceCode")); ajaxResult = this.basedataChannelService.queryById(patrolPresetPos.getChannelId()); JSONObject channel = JSONObject.parseObject(JSONObject.toJSONString(ajaxResult)).getJSONObject("data"); patrolPresetPos.setChannelCode(channel.getString("channelCode"));