fix: asset_field_group name 以及asset_field_meta key增加唯一校验

3 files changed, 19 insertions, 4 deletions

diff --git a/nz-admin/src/main/java/com/nis/modules/asset/service/impl/AssetFieldGroupServiceImpl.java b/nz-admin/src/main/java/com/nis/modules/asset/service/impl/AssetFieldGroupServiceImpl.java
index 85b413fa..81b7eb84 100644
--- a/nz-admin/src/main/java/com/nis/modules/asset/service/impl/AssetFieldGroupServiceImpl.java
+++ b/nz-admin/src/main/java/com/nis/modules/asset/service/impl/AssetFieldGroupServiceImpl.java
@@ -1,5 +1,6 @@
 package com.nis.modules.asset.service.impl;
 
+import java.util.List;
 import java.util.Map;
 
 import org.springframework.stereotype.Service;
@@ -7,8 +8,10 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.nis.common.exception.NZException;
 import com.nis.common.utils.PageUtils;
 import com.nis.common.utils.Query;
+import com.nis.common.utils.RCode;
 import com.nis.modules.asset.dao.AssetFieldGroupDao;
 import com.nis.modules.asset.entity.AssetFieldGroup;
 import com.nis.modules.asset.entity.AssetFieldMeta;
@@ -28,11 +31,17 @@ public class AssetFieldGroupServiceImpl extends ServiceImpl<AssetFieldGroupDao,A
 	}
 
 	@Override
-	public Integer saveOrModifyAssetFieldGroup(AssetFieldGroup assetFieldMeta) {
+	public Integer saveOrModifyAssetFieldGroup(AssetFieldGroup assetFieldGroup) {
+		// 校验name不重复
+		String name = assetFieldGroup.getName();
+		List<AssetFieldGroup> list = this.list(new QueryWrapper<AssetFieldGroup>().lambda().eq(AssetFieldGroup::getName, name));
+		if(ObjectUtil.isNotEmpty(list)) {
+			throw new NZException(RCode.ASSET_FIELD_GROUP_NAME_DUPLICATE);
+		}
 		
-		this.saveOrUpdate(assetFieldMeta);
+		this.saveOrUpdate(assetFieldGroup);
 		
-		return assetFieldMeta.getId();
+		return assetFieldGroup.getId();
 	}
 
 }
diff --git a/nz-admin/src/main/java/com/nis/modules/asset/service/impl/AssetFieldMetaServiceImpl.java b/nz-admin/src/main/java/com/nis/modules/asset/service/impl/AssetFieldMetaServiceImpl.java
index b4307bca..0317deb0 100644
--- a/nz-admin/src/main/java/com/nis/modules/asset/service/impl/AssetFieldMetaServiceImpl.java
+++ b/nz-admin/src/main/java/com/nis/modules/asset/service/impl/AssetFieldMetaServiceImpl.java
@@ -57,6 +57,11 @@ public class AssetFieldMetaServiceImpl extends ServiceImpl<AssetFieldMetaDao,Ass
 			throw new NZException(RCode.ASSET_FIELD_META_KEY_ERROR);
 		}
 		
+		List<AssetFieldMeta> list = this.list(new QueryWrapper<AssetFieldMeta>().lambda().eq(AssetFieldMeta::getMetaKey, key));
+		if(ObjectUtil.isNotEmpty(list)) {
+			throw new NZException(RCode.ASSET_FIELD_META_KEY_DUPLICATE);
+		}
+		
 		if(ObjectUtil.isEmpty(assetFieldMeta.getParam())){
 			assetFieldMeta.setParam(JSON.toJSONString(new HashMap()));
 		}
diff --git a/nz-common/src/main/java/com/nis/common/utils/RCode.java b/nz-common/src/main/java/com/nis/common/utils/RCode.java
index 7bac5e23..595880b4 100644
--- a/nz-common/src/main/java/com/nis/common/utils/RCode.java
+++ b/nz-common/src/main/java/com/nis/common/utils/RCode.java
@@ -339,6 +339,7 @@ public enum RCode {
 
     ASSET_FIELD_GROUP_ID_ISNULL(361001,"Asset field group id can not be empty"),
     ASSET_FIELD_GROUP_NAME_ISNULL(361002,"Asset field group name can not be empty"),
+    ASSET_FIELD_GROUP_NAME_DUPLICATE(362003,"Asset field group name can not duplicate"),
     
     ASSET_FIELD_META_ID_ISNULL(371001,"Asset field meta id can not be empty"),
     ASSET_FIELD_META_NAME_ISNULL(371002,"Asset field meta name can not be empty"),
@@ -349,7 +350,7 @@ public enum RCode {
     ASSET_FIELD_META_TYPE_ISNULL(371007,"Asset field meta type can not be empty"),
     ASSET_FIELD_META_TYPE_ERROR(375008,"Asset field type value out of range"),
     ASSET_FIELD_META_KEY_ERROR(373009,"Asset field key value incorrect format"),
-    
+    ASSET_FIELD_META_KEY_DUPLICATE(372010,"Asset field key value duplicate"),
     /**
      * alerts菜单栏相关
      */