From ed65319f4703f9d9e566934747ac283759db4cf0 Mon Sep 17 00:00:00 2001
From: lijw <lijw@123.com>
Date: Sat, 15 Mar 2025 16:07:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8E=B0=E5=9C=BA=E8=81=94=E8=B0=83=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/inspect/patrol/domain/PatrolPresetPos.java     | 4 ++--
 .../inspect/metadata/prodevmnt/domain/BasedataDevice.java   | 3 +++
 .../prodevmnt/service/impl/BasedataDeviceServiceImpl.java   | 6 ++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/domain/PatrolPresetPos.java b/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/domain/PatrolPresetPos.java
index 121dfa7..6ac7341 100644
--- a/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/domain/PatrolPresetPos.java
+++ b/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/domain/PatrolPresetPos.java
@@ -28,7 +28,7 @@ public class PatrolPresetPos extends BaseEntity {
             readConverterExp = "部=件ID"
     )
 
-//    @JsonProperty("patrolpointId")
+    @JsonProperty("patrolpointId")
 //    @JsonAlias({"patrolPointId"})
     @JsonProperty("patrolpointId")
     private Long patrolPointId;
@@ -58,7 +58,7 @@ public class PatrolPresetPos extends BaseEntity {
     )
     private String isEnable;
     private String algSubtypeCode;
-//    @JsonProperty("eqpbookId")
+    @JsonProperty("eqpbookId")
 //    @JsonAlias({"eqpBookId"})
     @JsonProperty("eqpbookId")
     private String eqpBookId;
diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/domain/BasedataDevice.java b/inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/domain/BasedataDevice.java
index 7112a52..ee157ca 100644
--- a/inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/domain/BasedataDevice.java
+++ b/inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/domain/BasedataDevice.java
@@ -1,5 +1,6 @@
 package com.inspect.metadata.prodevmnt.domain;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.inspect.base.core.annotation.Excel;
 import com.inspect.base.core.web.domain.BaseEntity;
 import com.inspect.system.base.openDomain.PatrolTaskDomain;
@@ -55,6 +56,8 @@ public class BasedataDevice extends BaseEntity {
     private Long parentId;
     private String ancestors;
     private Long areaId;
+
+    @JsonProperty("devicetypeId")
     private Long deviceTypeId;
     private String powerMainEquFlag;
     private String phyAssetId;
diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/service/impl/BasedataDeviceServiceImpl.java b/inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/service/impl/BasedataDeviceServiceImpl.java
index 3854872..14c7509 100644
--- a/inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/service/impl/BasedataDeviceServiceImpl.java
+++ b/inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/service/impl/BasedataDeviceServiceImpl.java
@@ -33,10 +33,15 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 @Service
 public class BasedataDeviceServiceImpl implements IBasedataDeviceService {
+
+    private final Logger logger = LoggerFactory.getLogger(BasedataDeviceServiceImpl.class);
+
     private final BasedataDeviceMapper basedataDeviceMapper;
     final
     BasedataPatrolPointMapper basedataPatrolPointMapper;
@@ -482,6 +487,7 @@ public class BasedataDeviceServiceImpl implements IBasedataDeviceService {
         this.basedataDeviceMapper.insertBasedataDevice(basedataDevice);
         BasedataDeviceType basedataDeviceTypeQuery = new BasedataDeviceType();
         basedataDeviceTypeQuery.setParentId(basedataDevice.getDeviceTypeId());
+        logger.info("basedataDevice.getDeviceTypeId(): " + basedataDevice.getDeviceTypeId());
         List<BasedataDeviceType> commTypeList = this.basedataDevicetypeMapper.selectBasedataDeviceTypeList(basedataDeviceTypeQuery);
         if (!commTypeList.isEmpty()) {
             int i = 0;