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 commTypeList = this.basedataDevicetypeMapper.selectBasedataDeviceTypeList(basedataDeviceTypeQuery); if (!commTypeList.isEmpty()) { int i = 0;