测试表增删查改，DBFirst生成优化

1 year ago · 6c86c22efd
parent 346b597e30
commit 6c86c22efd
14 changed files with 73 additions and 46 deletions
--- a/Tiobon.Core.Api/Controllers/Ghra_GradeController.cs
+++ b/Tiobon.Core.Api/Controllers/Ghra_GradeController.cs
@ -43,8 +43,11 @@
        [HttpGet("{Id}")]
        public async Task<MessageModel<Ghra_GradeDto>> Get(string Id)
        {
-            var response = await _ghra_GradeServices.QueryById(Id);
-            return new MessageModel<Ghra_GradeDto>() { msg = "获取成功", success = true, response = response };
+            var entity = await _ghra_GradeServices.QueryById(Id);
+            if (entity == null)
+                return MessageModel<Ghra_GradeDto>.Fail("获取失败");
+            else
+                return new MessageModel<Ghra_GradeDto>() { msg = "获取成功", success = true, response = entity };
        }
        #endregion

@ -76,9 +79,9 @@
        /// <param name="editModel"></param>
        /// <returns></returns>
        [HttpPut("{Id}")]
-        public async Task<MessageModel<string>> Put(long Id, [FromBody] EditGhra_GradeInput editModel)
+        public async Task<MessageModel> Put(long Id, [FromBody] EditGhra_GradeInput editModel)
        {
-            var data = MessageModel<string>.Success("更新成功", null);
+            var data = MessageModel.Success("更新成功");
            data.success = await _ghra_GradeServices.Update(Id, editModel);
            if (!data.success)
                data.msg = "更新失败";
@ -91,21 +94,20 @@
        /// <summary>
        /// Ghra_Grade -- 删除数据
        /// </summary>
-        /// <param name="id"></param>
+        /// <param name="Id"></param>
        /// <returns></returns>
-        [HttpDelete]
-        public async Task<MessageModel<string>> Delete(int id)
+        [HttpDelete("{Id}")]
+        public async Task<MessageModel> Delete(int Id)
        {
-            var data = new MessageModel<string>();
-            var model = await _ghra_GradeServices.QueryById(id);
-            model.IsEnable = 1;
-            // data.success = await _departmentServices.Update(model);
-            if (data.success)
-            {
-                data.msg = "删除成功";
-                data.response = model?.Id.ObjToString();
-            }
+            var data = MessageModel.Success("删除成功");
+            var entity = await _ghra_GradeServices.QueryById(Id);
+            if (entity == null)
+                return MessageModel.Fail("删除失败");

+            entity.IsEnable = 0;
+            data.success = await _ghra_GradeServices.Update(entity);
+            if (!data.success)
+                data.msg = "删除失败";
            return data;
        }
        #endregion
--- a/Tiobon.Core.Api/Filter/GlobalActionFilter.cs
+++ b/Tiobon.Core.Api/Filter/GlobalActionFilter.cs
@ -32,7 +32,7 @@ namespace Tiobon.Core.Api.Filter
                        }
                    }
                }
-                filterContext.Result = new JsonResult(MessageModel.OprateFailed($"参数验证失败:{msg}"));
+                filterContext.Result = new JsonResult(MessageModel.Fail($"参数验证失败:{msg}"));
                return;
            }

@ -232,18 +232,18 @@ namespace Tiobon.Core.Api.Filter
                        }
                    }
                    error += $"：{sb.ToString()}";
-                    filterContext.Result = new JsonResult(MessageModel.OprateFailed($"请求的数据类型不正确：{error}"));
+                    filterContext.Result = new JsonResult(MessageModel.Fail($"请求的数据类型不正确：{error}"));
                }
                else
                {
-                    filterContext.Result = new JsonResult(MessageModel.OprateFailed(error));
+                    filterContext.Result = new JsonResult(MessageModel.Fail(error));
                }
                //LoggerHelper.SendLog(error);
                return;
            }
            if (filterContext.Result is ObjectResult objectResult && objectResult.Value == null)
            {
-                filterContext.Result = new JsonResult(MessageModel.OprateSuccess("查询成功"));
+                filterContext.Result = new JsonResult(MessageModel.Success("查询成功"));
            }

            base.OnResultExecuting(filterContext);
--- a/Tiobon.Core.Api/Tiobon.Core.Model.xml
+++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml
@ -2045,14 +2045,14 @@
            返回数据集合
            </summary>
        </member>
-        <member name="M:Tiobon.Core.Model.MessageModel.OprateSuccess(System.String)">
+        <member name="M:Tiobon.Core.Model.MessageModel.Success(System.String)">
            <summary>
            操作成功
            </summary>
            <param name="msg"></param>
            <returns></returns>
        </member>
-        <member name="M:Tiobon.Core.Model.MessageModel.OprateFailed(System.String,System.Int32)">
+        <member name="M:Tiobon.Core.Model.MessageModel.Fail(System.String,System.Int32)">
            <summary>
            操作失败
            </summary>
--- a/Tiobon.Core.Api/Tiobon.Core.xml
+++ b/Tiobon.Core.Api/Tiobon.Core.xml
@ -1259,7 +1259,7 @@
            <summary>
            Ghra_Grade -- 删除数据
            </summary>
-            <param name="id"></param>
+            <param name="Id"></param>
            <returns></returns>
        </member>
        <member name="T:Tiobon.Core.Api.Controllers.NacosController">
--- a/Tiobon.Core.Common/Seed/FrameSeed.cs
+++ b/Tiobon.Core.Common/Seed/FrameSeed.cs
@ -177,8 +177,11 @@ namespace Tiobon.Core.Common.Seed
        [HttpGet(""{Id}"")]
        public async Task<MessageModel<{ClassName}Dto>> Get(string Id)
        {
-            var response = await _{ClassName}Services.QueryById(Id);
-            return new MessageModel<{ClassName}Dto>() { msg = ""获取成功"", success = true, response = response };
+            var entity = await _{ClassName}Services.QueryById(Id);
+            if (entity == null)
+                return MessageModel<{ClassName}Dto>.Fail(""获取失败"");
+            else
+                return new MessageModel<{ClassName}Dto>() { msg = ""获取成功"", success = true, response = entity };            
        }
        #endregion

@ -212,10 +215,10 @@ namespace Tiobon.Core.Common.Seed
        [HttpPut(""{Id}"")]
        public async Task<MessageModel<string>> Put(long Id, [FromBody] Edit{ClassName}Input editModel)
        {
-            var data = MessageModel<string>.Success(""更新成功"", null);
+            var data = MessageModel.Success(""更新成功"");
            data.success = await _{ClassName}Services.Update(Id, editModel);
            if (!data.success)
-                data.msg = ""更新失败"";;
+                data.msg = ""更新失败"";

            return data;
        }
@ -225,21 +228,20 @@ namespace Tiobon.Core.Common.Seed
        /// <summary>
        /// {ClassName} -- 删除数据
        /// </summary>
-        /// <param name=""id""></param>
+        /// <param name=""Id""></param>
        /// <returns></returns>
-        [HttpDelete]
-        public async Task<MessageModel<string>> Delete(int id)
+        [HttpDelete(""{Id}"")]
+        public async Task<MessageModel<string>> Delete(int Id)
        {
-            var data = new MessageModel<string>();
-            var model = await _{ClassName}Services.QueryById(id);
-            model.IsEnable = 1;
-            // data.success = await _departmentServices.Update(model);
-            if (data.success)
-            {
-                data.msg = ""删除成功"";
-                data.response = model?.Id.ObjToString();
-            }
+            var data = MessageModel.Success(""删除成功"")
+            var entity = await _{ClassName}Services.QueryById(Id);
+            if (entity == null)
+                return MessageModel<string>.Fail(""删除失败"");

+            entity.IsEnable = 0;
+            data.success = await _{ClassName}Services.Update(entity);
+            if (!data.success)
+                data.msg = ""删除失败"";
            return data;
        }
        #endregion
--- a/Tiobon.Core.IServices/BASE/IBaseServices1.cs
+++ b/Tiobon.Core.IServices/BASE/IBaseServices1.cs
@ -17,6 +17,13 @@ namespace Tiobon.Core.IServices.BASE
    {
        ISqlSugarClient Db { get; }

+        Task<bool> AnyAsync(object objId);
+
+        /// <summary>
+        /// 根据ID查询实体数据是否存在
+        /// </summary>
+        /// <param name="objId"></param>
+        /// <returns></returns>
        Task<TEntityDto> QueryById(object objId);
        Task<TEntityDto> QueryById(object objId, bool blnUseCache = false);
        Task<List<TEntityDto>> QueryByIDs(object[] lstIds);
--- a/Tiobon.Core.Model/Base/Ghra/Ghra_Grade.Dto.Base.cs
+++ b/Tiobon.Core.Model/Base/Ghra/Ghra_Grade.Dto.Base.cs
@ -6,7 +6,7 @@
 *
 * Ver    变更日期 负责人  变更内容
 * ───────────────────────────────────
-*V0.01  2024/4/15 14:57:43  SimonHsiao   初版
+*V0.01  2024/4/15 15:25:43  SimonHsiao   初版
 *
 * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved.
 *┌──────────────────────────────────┐
--- a/Tiobon.Core.Model/Edit/Ghra/Ghra_Grade.Dto.EditInput.cs
+++ b/Tiobon.Core.Model/Edit/Ghra/Ghra_Grade.Dto.EditInput.cs
@ -6,7 +6,7 @@
 *
 * Ver    变更日期 负责人  变更内容
 * ───────────────────────────────────
-*V0.01  2024/4/15 14:57:43  SimonHsiao   初版
+*V0.01  2024/4/15 15:25:43  SimonHsiao   初版
 *
 * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved.
 *┌──────────────────────────────────┐
--- a/Tiobon.Core.Model/Insert/Ghra/Ghra_Grade.Dto.InsertInput.cs
+++ b/Tiobon.Core.Model/Insert/Ghra/Ghra_Grade.Dto.InsertInput.cs
@ -6,7 +6,7 @@
 *
 * Ver    变更日期 负责人  变更内容
 * ───────────────────────────────────
-*V0.01  2024/4/15 14:57:43  SimonHsiao   初版
+*V0.01  2024/4/15 15:25:43  SimonHsiao   初版
 *
 * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved.
 *┌──────────────────────────────────┐
--- a/Tiobon.Core.Model/MessageModel.cs
+++ b/Tiobon.Core.Model/MessageModel.cs
@ -101,7 +101,7 @@
        /// </summary>
        /// <param name="msg"></param>
        /// <returns></returns>
-        public static MessageModel OprateSuccess(string msg = "操作成功")
+        public static MessageModel Success(string msg = "操作成功")
        {
            return new MessageModel
            {
@ -117,7 +117,7 @@
        /// <param name="msg"></param>
        /// <param name="status"></param>
        /// <returns></returns>
-        public static MessageModel OprateFailed(string msg = "操作失败", int status = 500)
+        public static MessageModel Fail(string msg = "操作失败", int status = 500)
        {
            return new MessageModel
            {
--- a/Tiobon.Core.Model/Models/Ghra/Ghra_Grade.cs
+++ b/Tiobon.Core.Model/Models/Ghra/Ghra_Grade.cs
@ -6,7 +6,7 @@
 *
 * Ver    变更日期 负责人  变更内容
 * ───────────────────────────────────
-*V0.01  2024/4/15 14:57:43  SimonHsiao   初版
+*V0.01  2024/4/15 15:25:43  SimonHsiao   初版
 *
 * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved.
 *┌──────────────────────────────────┐
--- a/Tiobon.Core.Model/View/Ghra/Ghra_Grade.Dto.View.cs
+++ b/Tiobon.Core.Model/View/Ghra/Ghra_Grade.Dto.View.cs
@ -6,7 +6,7 @@
 *
 * Ver    变更日期 负责人  变更内容
 * ───────────────────────────────────
-*V0.01  2024/4/15 14:57:43  SimonHsiao   初版
+*V0.01  2024/4/15 15:25:43  SimonHsiao   初版
 *
 * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved.
 *┌──────────────────────────────────┐
--- a/Tiobon.Core.Repository/BASE/BaseRepository.cs
+++ b/Tiobon.Core.Repository/BASE/BaseRepository.cs
@ -74,6 +74,11 @@ namespace Tiobon.Core.Repository.Base
            //return await Task.Run(() => _db.Queryable<TEntity>().InSingle(objId));
            return await _db.Queryable<TEntity>().In(objId).SingleAsync();
        }
+        /// <summary>
+        /// 查询实体数据是否存在
+        /// </summary>
+        /// <param name="objId"></param>
+        /// <returns></returns>
        public async Task<bool> AnyAsync(object objId)
        {
            return await _db.Queryable<TEntity>().In(objId).AnyAsync();
--- a/Tiobon.Core.Services/BASE/BaseServices1.cs
+++ b/Tiobon.Core.Services/BASE/BaseServices1.cs
@ -41,6 +41,17 @@ namespace Tiobon.Core.Services.BASE

        public ISqlSugarClient Db => BaseDal.Db;

+        /// <summary>
+        /// 根据ID查询实体数据是否存在
+        /// </summary>
+        /// <param name="objId"></param>
+        /// <returns></returns>
+        public async Task<bool> AnyAsync(object objId)
+        {
+            var data = await BaseDal.AnyAsync(objId);
+            return data;
+        }
+
        public async Task<TEntityDto> QueryById(object objId)
        {
            var data = await BaseDal.QueryById(objId);