/*修改设备类型管理-》增加设备类型失败bug。*/

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 = "相数"

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();
 }

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";