字典、字典类型服务新增和修改接口新增数据校验

src/platform/ZhonTai.Admin/Services/Dictionary/DictionaryService.cs

@@ -71,6 +71,26 @@ public class DictionaryService : BaseService, IDictionaryService, IDynamicApi
     /// <returns></returns>
     public async Task<long> AddAsync(DictionaryAddInput input)
     {
+        if (await _dictionaryRepository.Select.AnyAsync(a => a.DictionaryTypeId == input.DictionaryTypeId && a.Name == input.Name))
+        {
+            throw ResultOutput.Exception($"字典已存在");
+        }
+
+        if (input.Code.NotNull() && await _dictionaryRepository.Select.AnyAsync(a => a.DictionaryTypeId == input.DictionaryTypeId && a.Code == input.Code))
+        {
+            throw ResultOutput.Exception($"字典编码已存在");
+        }
+
+        if (input.Code.NotNull() && await _dictionaryRepository.Select.AnyAsync(a => a.DictionaryTypeId == input.DictionaryTypeId && a.Code == input.Code))
+        {
+            throw ResultOutput.Exception($"字典编码已存在");
+        }
+
+        if (input.Value.NotNull() && await _dictionaryRepository.Select.AnyAsync(a => a.DictionaryTypeId == input.DictionaryTypeId && a.Value == input.Value))
+        {
+            throw ResultOutput.Exception($"字典值已存在");
+        }
+
         var dictionary = Mapper.Map<DictionaryEntity>(input);
         await _dictionaryRepository.InsertAsync(dictionary);
         return dictionary.Id;
@@ -86,7 +106,22 @@ public class DictionaryService : BaseService, IDictionaryService, IDynamicApi
         var entity = await _dictionaryRepository.GetAsync(input.Id);
         if (!(entity?.Id > 0))
         {
-            throw ResultOutput.Exception("数据字典不存在");
+            throw ResultOutput.Exception("字典不存在");
+        }
+
+        if (await _dictionaryRepository.Select.AnyAsync(a => a.Id != input.Id && a.DictionaryTypeId == input.DictionaryTypeId && a.Name == input.Name))
+        {
+            throw ResultOutput.Exception($"字典已存在");
+        }
+
+        if (input.Code.NotNull() && await _dictionaryRepository.Select.AnyAsync(a => a.Id != input.Id && a.DictionaryTypeId == input.DictionaryTypeId && a.Code == input.Code))
+        {
+            throw ResultOutput.Exception($"字典编码已存在");
+        }
+
+        if (input.Value.NotNull() && await _dictionaryRepository.Select.AnyAsync(a => a.Id != input.Id && a.DictionaryTypeId == input.DictionaryTypeId && a.Value == input.Value))
+        {
+            throw ResultOutput.Exception($"字典值已存在");
         }
 
         Mapper.Map(input, entity);

src/platform/ZhonTai.Admin/Services/Dictionary/Dto/DictionaryAddInput.cs

@@ -1,18 +1,23 @@
-namespace ZhonTai.Admin.Services.Dictionary.Dto;
+using System.ComponentModel.DataAnnotations;
+using ZhonTai.Admin.Core.Validators;
+
+namespace ZhonTai.Admin.Services.Dictionary.Dto;
 
 /// <summary>
-/// 添加
+/// 添加字典
 /// </summary>
 public class DictionaryAddInput
 {
     /// <summary>
     /// 字典类型Id
     /// </summary>
+    [ValidateRequired(ErrorMessage = "请选择字典类型")]
     public long DictionaryTypeId { get; set; }
 
     /// <summary>
     /// 字典名称
     /// </summary>
+    [Required(ErrorMessage = "请输入字典名称")]
     public string Name { get; set; }
 
     /// <summary>

src/platform/ZhonTai.Admin/Services/DictionaryType/DictionaryTypeService.cs

@@ -73,6 +73,16 @@ public class DictionaryTypeService : BaseService, IDictionaryTypeService, IDynam
     /// <returns></returns>
     public async Task<long> AddAsync(DictionaryTypeAddInput input)
     {
+        if (await _DictionaryTypeRepository.Select.AnyAsync(a => a.Name == input.Name))
+        {
+            throw ResultOutput.Exception($"字典类型已存在");
+        }
+
+        if (input.Code.NotNull() && await _DictionaryTypeRepository.Select.AnyAsync(a => a.Code == input.Code))
+        {
+            throw ResultOutput.Exception($"字典类型编码已存在");
+        }
+
         var DictionaryType = Mapper.Map<DictionaryTypeEntity>(input);
         await _DictionaryTypeRepository.InsertAsync(DictionaryType);
         return DictionaryType.Id;
@@ -88,7 +98,17 @@ public class DictionaryTypeService : BaseService, IDictionaryTypeService, IDynam
         var entity = await _DictionaryTypeRepository.GetAsync(input.Id);
         if (!(entity?.Id > 0))
         {
-            throw ResultOutput.Exception("数据字典不存在！");
+            throw ResultOutput.Exception("数据字典不存在");
+        }
+
+        if (await _DictionaryTypeRepository.Select.AnyAsync(a => a.Id != input.Id && a.Name == input.Name))
+        {
+            throw ResultOutput.Exception($"字典类型已存在");
+        }
+
+        if (input.Code.NotNull() && await _DictionaryTypeRepository.Select.AnyAsync(a => a.Id != input.Id && a.Code == input.Code))
+        {
+            throw ResultOutput.Exception($"字典类型编码已存在");
         }
 
         Mapper.Map(input, entity);

src/platform/ZhonTai.Admin/Services/DictionaryType/Dto/DictionaryTypeAddInput.cs

@@ -1,17 +1,20 @@
-namespace ZhonTai.Admin.Services.DictionaryType.Dto;
+using System.ComponentModel.DataAnnotations;
+
+namespace ZhonTai.Admin.Services.DictionaryType.Dto;
 
 /// <summary>
-/// 添加
+/// 添加字典类型
 /// </summary>
 public class DictionaryTypeAddInput
 {
     /// <summary>
-    /// 字典名称
+    /// 字典类型名称
     /// </summary>
+    [Required(ErrorMessage = "请输入字典类型名称")]
     public string Name { get; set; }
 
     /// <summary>
-    /// 字典编码
+    /// 字典类型编码
     /// </summary>
     public string Code { get; set; }
 

src/platform/ZhonTai.Admin/ZhonTai.Admin.xml

@@ -692,7 +692,7 @@
         </member>
         <member name="P:ZhonTai.Admin.Core.Configs.DbConfig.IdleTime">
             <summary>
-            空闲时间(分)
+            空闲时间（分），默认10分钟，设置idleTime=0则不自动回收
             </summary>
         </member>
         <member name="P:ZhonTai.Admin.Core.Configs.DbConfig.Dbs">
@@ -4251,17 +4251,17 @@
         </member>
         <member name="T:ZhonTai.Admin.Services.DictionaryType.Dto.DictionaryTypeAddInput">
             <summary>
-            添加
+            添加字典类型
             </summary>
         </member>
         <member name="P:ZhonTai.Admin.Services.DictionaryType.Dto.DictionaryTypeAddInput.Name">
             <summary>
-            字典名称
+            字典类型名称
             </summary>
         </member>
         <member name="P:ZhonTai.Admin.Services.DictionaryType.Dto.DictionaryTypeAddInput.Code">
             <summary>
-            字典编码
+            字典类型编码
             </summary>
         </member>
         <member name="P:ZhonTai.Admin.Services.DictionaryType.Dto.DictionaryTypeAddInput.Description">
@@ -4372,7 +4372,7 @@
         </member>
         <member name="T:ZhonTai.Admin.Services.Dictionary.Dto.DictionaryAddInput">
             <summary>
-            添加
+            添加字典
             </summary>
         </member>
         <member name="P:ZhonTai.Admin.Services.Dictionary.Dto.DictionaryAddInput.DictionaryTypeId">