From 09fd436754acfe095035d24ba82a565fe9aa8dec Mon Sep 17 00:00:00 2001 From: htjcAdmin Date: Tue, 4 Mar 2025 17:41:03 +0800 Subject: [PATCH] =?UTF-8?q?/*=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E7=AE=A1=E7=90=86-=E3=80=8B=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=B1=BB=E5=9E=8B=E5=A4=B1=E8=B4=A5bug?= =?UTF-8?q?=E3=80=82*/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspect/metadata/prodevmnt/domain/BasedataDeviceType.java | 3 +++ .../metadata/prodevmnt/mapper/BasedataDeviceTypeMapper.java | 4 ++-- .../prodevmnt/service/impl/BasedataDeviceTypeServiceImpl.java | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/domain/BasedataDeviceType.java b/inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/domain/BasedataDeviceType.java index cb8f3df..e42e348 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/domain/BasedataDeviceType.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/domain/BasedataDeviceType.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.TreeEntity; import lombok.Getter; @@ -19,11 +20,13 @@ public class BasedataDeviceType extends TreeEntity { name = "电力主设备标识" ) private String powerMainEquFlag; + @JsonProperty("devicetypeName") private String deviceTypeName; private String ancestors; @Excel( name = "设备编码" ) + @JsonProperty("devicetypeCode") private String deviceTypeCode; @Excel( name = "相数" diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/mapper/BasedataDeviceTypeMapper.java b/inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/mapper/BasedataDeviceTypeMapper.java index 295ce84..d8d92e2 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/mapper/BasedataDeviceTypeMapper.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/mapper/BasedataDeviceTypeMapper.java @@ -24,9 +24,9 @@ public interface BasedataDeviceTypeMapper { Map getDeviceTypeIdByDeviceTypeName(BasedataDeviceType deviceType); - BasedataDeviceType checkDeviceTypeNameUnique(@Param("devicetypeName") String deviceTypeName, @Param("parentId") Long parentId); + BasedataDeviceType checkDeviceTypeNameUnique(@Param("deviceTypeName") String deviceTypeName, @Param("parentId") Long parentId); - BasedataDeviceType checkDeviceTypeCodeUnique(@Param("devicetypeCode") String deviceTypeCode, @Param("devicetypeId") Long deviceTypeId); + BasedataDeviceType checkDeviceTypeCodeUnique(@Param("deviceTypeCode") String deviceTypeCode, @Param("deviceTypeId") Long deviceTypeId); int getMaxDeviceTypeId(); } diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/service/impl/BasedataDeviceTypeServiceImpl.java b/inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/service/impl/BasedataDeviceTypeServiceImpl.java index 68f3366..3861e7d 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/service/impl/BasedataDeviceTypeServiceImpl.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/service/impl/BasedataDeviceTypeServiceImpl.java @@ -61,7 +61,7 @@ public class BasedataDeviceTypeServiceImpl implements IBasedataDeviceTypeService } public String checkDeviceTypeNameUnique(BasedataDeviceType basedataDevicetype) { - long deviceTypeId = StringUtils.isNull(basedataDevicetype.getDeviceTypeId()) ? -1L : basedataDevicetype.getDeviceTypeId().longValue(); + long deviceTypeId = StringUtils.isNull(basedataDevicetype.getDeviceTypeId()) ? -1L : basedataDevicetype.getDeviceTypeId(); BasedataDeviceType info = this.basedataDevicetypeMapper.checkDeviceTypeNameUnique(basedataDevicetype.getDeviceTypeName(), basedataDevicetype.getParentId()); if (StringUtils.isNotNull(info) && info.getDeviceTypeId() != deviceTypeId) { return "1";