字典管理

Controllers/Admin/SysDictController.cs

@@ -0,0 +1,108 @@
+using Vo;
+using Microsoft.AspNetCore.Mvc;
+using Model;
+using Services;
+using Model.Base;
+using Vo.Admin;
+using Mapster;
+using Infrastructure;
+
+
+namespace Controllers.Admin
+{
+    /// <summary>
+    /// SysDict)Controller
+    /// </summary>
+    // [Route("${Router}$")]
+    // [ApiExplorerSettings(GroupName = "SysDict")]
+    public class SysDictController : BaseController
+    {
+        /// <summary>
+        /// api分组接口
+        /// </summary>
+        private readonly ISysDictService _SysDictService;
+
+
+        public SysDictController(ISysDictService SysDictService)
+        {
+            _SysDictService = SysDictService;
+
+        }
+
+          /// <param name="page">分页参数</param>
+        /// <summary>
+        /// 列表
+        /// </summary>
+        /// <param name="page">分页对象</param>
+        /// <returns>列表</returns>
+        [HttpGet]
+        [Route("/v1/omega_admin/SysDict/getSysDictList")]
+        public IActionResult getSysDictList([FromQuery] PagerInfo page)
+        {
+            var response = _SysDictService.getSysDictList(page);
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 详情
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <returns>详情</returns>
+        [HttpGet]
+        [Route("/v1/omega_admin/SysDict/getSysDictQuery")]
+        public IActionResult getSysDictQuery([FromQuery] SysDict param)
+        {
+            var response = _SysDictService.GetFirst(m => m.id == param.id).Adapt<GetSysDictQueryVo>();
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 添加
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <returns>添加</returns>
+        [HttpPost]
+        [Route("/v1/omega_admin/SysDict/addSysDict")]
+        public IActionResult addSysDict([FromBody] SysDict param)
+        {
+            var modal = param.Adapt<SysDict>().ToCreate(HttpContext);
+            var response = _SysDictService.InsertReturnIdentity(modal);
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 修改
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <returns>修改</returns>
+        [HttpPut]
+        [Route("/v1/omega_admin/SysDict/updateSysDict")]
+        public IActionResult updateSysDict([FromBody] SysDict param)
+        {
+            var modal = param.Adapt<SysDict>().ToCreate(HttpContext);
+            var response = _SysDictService.Update(modal, true);
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 删除
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns>删除</returns>
+        [HttpDelete]
+        [Route("/v1/omega_admin/SysDict/deleteSysDict/{}")]
+        public IActionResult deleteSysDict(long id)
+        {
+            var response = _SysDictService.Delete(id);
+            return SUCCESS(response);
+        }
+
+
+
+
+    }
+}

Controllers/Admin/SysDictItemController.cs

@@ -0,0 +1,109 @@
+using Vo;
+using Microsoft.AspNetCore.Mvc;
+using Model;
+using Services;
+using Model.Base;
+using Vo.Admin;
+using Mapster;
+using Infrastructure;
+
+
+namespace Controllers.Admin
+{
+    /// <summary>
+    /// SysDictItem)Controller
+    /// </summary>
+    // [Route("${Router}$")]
+    // [ApiExplorerSettings(GroupName = "SysDictItem")]
+    public class SysDictItemController : BaseController
+    {
+        /// <summary>
+        /// api分组接口
+        /// </summary>
+        private readonly ISysDictItemService _SysDictItemService;
+
+
+        public SysDictItemController(ISysDictItemService SysDictItemService)
+        {
+            _SysDictItemService = SysDictItemService;
+
+        }
+
+          /// <param name="page">分页参数</param>
+        /// <summary>
+        /// 列表
+        /// </summary>
+        /// <param name="page">分页对象</param>
+        /// <param name="param">参数请求体</param>
+        /// <returns>列表</returns>
+        [HttpGet]
+        [Route("/v1/omega_admin/SysDictItem/getSysDictItemList")]
+        public IActionResult getSysDictItemList([FromQuery] PagerInfo page, [FromQuery] SysDictItem param)
+        {
+            var response = _SysDictItemService.getSysDictItemList(page, param);
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 详情
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <returns>详情</returns>
+        [HttpGet]
+        [Route("/v1/omega_admin/SysDictItem/getSysDictItemQuery")]
+        public IActionResult getSysDictItemQuery([FromQuery] SysDictItem param)
+        {
+            var response = _SysDictItemService.GetFirst(m => m.id == param.id).Adapt<GetSysDictItemQueryVo>();
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 添加
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <returns>添加</returns>
+        [HttpPost]
+        [Route("/v1/omega_admin/SysDictItem/addSysDictItem")]
+        public IActionResult addSysDictItem([FromBody] SysDictItem param)
+        {
+            var modal = param.Adapt<SysDictItem>().ToCreate(HttpContext);
+            var response = _SysDictItemService.InsertReturnIdentity(modal);
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 修改
+        /// </summary>
+        /// <param name="param">参数请求体</param>
+        /// <returns>修改</returns>
+        [HttpPut]
+        [Route("/v1/omega_admin/SysDictItem/updateSysDictItem")]
+        public IActionResult updateSysDictItem([FromBody] SysDictItem param)
+        {
+            var modal = param.Adapt<SysDictItem>().ToCreate(HttpContext);
+            var response = _SysDictItemService.Update(modal, true);
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 删除
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns>删除</returns>
+        [HttpDelete]
+        [Route("/v1/omega_admin/SysDictItem/deleteSysDictItem/{}")]
+        public IActionResult deleteSysDictItem(long id)
+        {
+            var response = _SysDictItemService.Delete(id);
+            return SUCCESS(response);
+        }
+
+
+
+
+    }
+}

Controllers/SysDictController.cs

@@ -1,124 +0,0 @@
-using Attribute;
-using Common;
-using Dto;
-using Vo;
-using Enums;
-using Filters;
-using Infrastructure;
-using Infrastructure.Model;
-using Mapster;
-using Microsoft.AspNetCore.Mvc;
-using Middleware;
-using Model;
-using Services;
-using Model.Base;
-
-namespace Controllers
-{
-    /// <summary>
-    /// SysDict)Controller
-    /// </summary>
-    // [Route("SysDict")]
-    // [ApiExplorerSettings(GroupName = "SysDict")]
-    public class SysDictController : BaseController
-    {
-        /// <summary>
-        /// api分组接口
-        /// </summary>
-        private readonly ISysDictService _SysDictService;
-
-
-        public SysDictController(ISysDictService SysDictService)
-        {
-            _SysDictService = SysDictService;
-
-        }
-
-        /// <summary>
-        /// 字典表列表
-        /// </summary>
-        /// <param name="parm">请求参数</param>
-        /// <returns>字典表列表</returns>
-        [HttpGet]
-        [Route("/v1/api/SysDict/list")]
-        public IActionResult List([FromQuery] SysDictListDto parm)
-        {
-            var response = _SysDictService.List(parm);
-            return SUCCESS(response);
-        }
-
-
-
-
-        /// <summary>
-        /// 字典表详情
-        /// </summary>
-        /// <param name="parm">请求参数</param>
-        /// <returns>字典表详情</returns>
-        [HttpGet]
-        [Route("/v1/api/SysDict/query")]
-        public IActionResult Query([FromQuery] SysDictQueryDto parm)
-        {
-            var response = _SysDictService.Queryable()
-                .First(x => x.id == parm.id)
-                .Adapt<SysDictQueryVo>() ?? new SysDictQueryVo();
-            return SUCCESS(response);
-        }
-
-
-
-
-        /// <summary>
-        /// 字典表添加
-        /// </summary>
-        /// <param name="parm">请求参数</param>
-        /// <returns>字典表添加</returns>
-        [HttpPost]
-        [Route("/v1/api/SysDict/add")]
-        public IActionResult Add([FromBody] SysDictAddDto parm)
-        {
-            var modal = parm.Adapt<SysDict>().ToCreate(HttpContext);
-            var response = _SysDictService.Add(modal);
-            return SUCCESS(response);
-        }
-
-
-
-
-        /// <summary>
-        /// 字典表修改
-        /// </summary>
-        /// <param name="parm">请求参数</param>
-        /// <returns>字典表修改</returns>
-        [HttpPut]
-        [Route("/v1/api/SysDict/update")]
-        public IActionResult Update([FromBody] SysDictUpdateDto parm)
-        {
-            var modal = parm.Adapt<SysDict>().ToUpdate(HttpContext);
-            var response = _SysDictService.Update(modal, true);
-            return SUCCESS(response);
-        }
-
-
-
-
-        /// <summary>
-        /// 字典表删除
-        /// </summary>
-        /// <param name="Id">编号</param>
-        /// <returns>字典表删除</returns>
-        [HttpDelete]
-        [Route("/v1/api/SysDict/delete/{id}")]
-        public IActionResult Delete(long id)
-        {
-            var response = _SysDictService.Delete(id);
-            return SUCCESS(response);
-        }
-
-
-
-
-
-
-    }
-}

Controllers/SysDictItemController.cs

@@ -1,124 +0,0 @@
-using Attribute;
-using Common;
-using Dto;
-using Vo;
-using Enums;
-using Filters;
-using Infrastructure;
-using Infrastructure.Model;
-using Mapster;
-using Microsoft.AspNetCore.Mvc;
-using Middleware;
-using Model;
-using Services;
-using Model.Base;
-
-namespace Controllers
-{
-    /// <summary>
-    /// SysDictItem)Controller
-    /// </summary>
-    // [Route("SysDictItem")]
-    // [ApiExplorerSettings(GroupName = "SysDictItem")]
-    public class SysDictItemController : BaseController
-    {
-        /// <summary>
-        /// api分组接口
-        /// </summary>
-        private readonly ISysDictItemService _SysDictItemService;
-
-
-        public SysDictItemController(ISysDictItemService SysDictItemService)
-        {
-            _SysDictItemService = SysDictItemService;
-
-        }
-
-        /// <summary>
-        /// 字典项列表
-        /// </summary>
-        /// <param name="parm">请求参数</param>
-        /// <returns>字典项列表</returns>
-        [HttpGet]
-        [Route("/v1/api/SysDictItem/list")]
-        public IActionResult List([FromQuery] SysDictItemListDto parm)
-        {
-            var response = _SysDictItemService.List(parm);
-            return SUCCESS(response);
-        }
-
-
-
-
-        /// <summary>
-        /// 字典项详情
-        /// </summary>
-        /// <param name="parm">请求参数</param>
-        /// <returns>字典项详情</returns>
-        [HttpGet]
-        [Route("/v1/api/SysDictItem/query")]
-        public IActionResult Query([FromQuery] SysDictItemQueryDto parm)
-        {
-            var response = _SysDictItemService.Queryable()
-                .First(x => x.id == parm.id)
-                .Adapt<SysDictItemQueryVo>() ?? new SysDictItemQueryVo();
-            return SUCCESS(response);
-        }
-
-
-
-
-        /// <summary>
-        /// 字典项添加
-        /// </summary>
-        /// <param name="parm">请求参数</param>
-        /// <returns>字典项添加</returns>
-        [HttpPost]
-        [Route("/v1/api/SysDictItem/add")]
-        public IActionResult Add([FromBody] SysDictItemAddDto parm)
-        {
-            var modal = parm.Adapt<SysDictItem>().ToCreate(HttpContext);
-            var response = _SysDictItemService.Add(modal);
-            return SUCCESS(response);
-        }
-
-
-
-
-        /// <summary>
-        /// 字典项修改
-        /// </summary>
-        /// <param name="parm">请求参数</param>
-        /// <returns>字典项修改</returns>
-        [HttpPut]
-        [Route("/v1/api/SysDictItem/update")]
-        public IActionResult Update([FromBody] SysDictItemUpdateDto parm)
-        {
-            var modal = parm.Adapt<SysDictItem>().ToUpdate(HttpContext);
-            var response = _SysDictItemService.Update(modal, true);
-            return SUCCESS(response);
-        }
-
-
-
-
-        /// <summary>
-        /// 字典项删除
-        /// </summary>
-        /// <param name="Id">编号</param>
-        /// <returns>字典项删除</returns>
-        [HttpDelete]
-        [Route("/v1/api/SysDictItem/delete/{id}")]
-        public IActionResult Delete(long id)
-        {
-            var response = _SysDictItemService.Delete(id);
-            return SUCCESS(response);
-        }
-
-
-
-
-
-
-    }
-}

Model/Vo/Admin/AddSysDictItemVo.cs

@@ -0,0 +1,18 @@
+using Newtonsoft.Json;
+
+namespace Vo.Admin
+{
+    /// <summary>
+    /// 添加
+    /// </summary>
+    public class AddSysDictItemVo
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public long id { get; set; }
+
+
+
+    }
+}

Model/Vo/Admin/GetSysDictItemListVo.cs

@@ -0,0 +1,78 @@
+using Newtonsoft.Json;
+
+namespace Vo.Admin
+{
+    /// <summary>
+    /// 列表
+    /// </summary>
+    public class GetSysDictItemListVo
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public long id { get; set; }
+
+
+        /// <summary>
+        /// 字典id
+        /// </summary>
+        public long dictId { get; set; }
+
+
+        /// <summary>
+        /// 字典项值
+        /// </summary>
+        public string itemValue { get; set; }
+
+
+        /// <summary>
+        /// 字典项名称
+        /// </summary>
+        public string label { get; set; }
+
+
+        /// <summary>
+        /// 字典描述
+        /// </summary>
+        public string description { get; set; }
+
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        public int sortOrder { get; set; }
+
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string createBy { get; set; }
+
+
+        /// <summary>
+        /// 修改人
+        /// </summary>
+        public string updateBy { get; set; }
+
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? createTime { get; set; }
+
+
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        public DateTime? updateTime { get; set; }
+
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string remarks { get; set; }
+
+
+
+    }
+}

Model/Vo/Admin/GetSysDictItemQueryVo.cs

@@ -0,0 +1,78 @@
+using Newtonsoft.Json;
+
+namespace Vo.Admin
+{
+    /// <summary>
+    /// 详情
+    /// </summary>
+    public class GetSysDictItemQueryVo
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public long id { get; set; }
+
+
+        /// <summary>
+        /// 字典id
+        /// </summary>
+        public long dictId { get; set; }
+
+
+        /// <summary>
+        /// 字典项值
+        /// </summary>
+        public string itemValue { get; set; }
+
+
+        /// <summary>
+        /// 字典项名称
+        /// </summary>
+        public string label { get; set; }
+
+
+        /// <summary>
+        /// 字典描述
+        /// </summary>
+        public string description { get; set; }
+
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        public int sortOrder { get; set; }
+
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string createBy { get; set; }
+
+
+        /// <summary>
+        /// 修改人
+        /// </summary>
+        public string updateBy { get; set; }
+
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? createTime { get; set; }
+
+
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        public DateTime? updateTime { get; set; }
+
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string remarks { get; set; }
+
+
+
+    }
+}

Model/Vo/Admin/GetSysDictListVo.cs

@@ -0,0 +1,60 @@
+using Newtonsoft.Json;
+
+namespace Vo.Admin
+{
+    /// <summary>
+    /// 列表
+    /// </summary>
+    public class GetSysDictListVo
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public long id { get; set; }
+
+
+        /// <summary>
+        /// 类型
+        /// </summary>
+        public string dictType { get; set; }
+
+
+        /// <summary>
+        /// 描述
+        /// </summary>
+        public string description { get; set; }
+
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? createTime { get; set; }
+
+
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        public DateTime? updateTime { get; set; }
+
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string remarks { get; set; }
+
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string createBy { get; set; }
+
+
+        /// <summary>
+        /// 修改人
+        /// </summary>
+        public string updateBy { get; set; }
+
+
+
+    }
+}

Model/Vo/Admin/GetSysDictQueryVo.cs

@@ -0,0 +1,60 @@
+using Newtonsoft.Json;
+
+namespace Vo.Admin
+{
+    /// <summary>
+    /// 详情
+    /// </summary>
+    public class GetSysDictQueryVo
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public long id { get; set; }
+
+
+        /// <summary>
+        /// 类型
+        /// </summary>
+        public string dictType { get; set; }
+
+
+        /// <summary>
+        /// 描述
+        /// </summary>
+        public string description { get; set; }
+
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? createTime { get; set; }
+
+
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        public DateTime? updateTime { get; set; }
+
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string remarks { get; set; }
+
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string createBy { get; set; }
+
+
+        /// <summary>
+        /// 修改人
+        /// </summary>
+        public string updateBy { get; set; }
+
+
+
+    }
+}

Services/IService/ISysDictItemService.cs

@@ -1,8 +1,8 @@
-using Dto;
-using Vo;
 using Model;
 using Model.Base;
 using Microsoft.AspNetCore.Mvc;
+using Vo.Admin;
+
 
 namespace Services
 {
@@ -11,17 +11,10 @@ namespace Services
         /// <summary>
         /// 字典项-列表
         /// </summary>
-        /// <param name="parm">请求参数</param>
-        /// <returns>字典项列表</returns>
-        PagedInfo<SysDictItemListVo> List([FromQuery] SysDictItemListDto parm);
-
-
-
-
-
-
-
-
+        /// <param name="param">参数请求体</param>
+        /// <param name="page">分页参数</param>
+        /// <returns>列表</returns>
+        PagedInfo<GetSysDictItemListVo> getSysDictItemList([FromQuery] PagerInfo page, [FromQuery] SysDictItem param);
 
 
 

Services/IService/ISysDictService.cs

@@ -1,27 +1,19 @@
-using Dto;
-using Vo;
 using Model;
 using Model.Base;
 using Microsoft.AspNetCore.Mvc;
+using Vo.Admin;
+
 
 namespace Services
 {
     public interface ISysDictService : IBaseService<SysDict>
     {
         /// <summary>
-        /// 字典表-列表
+        /// 字典类型-列表
         /// </summary>
-        /// <param name="parm">请求参数</param>
-        /// <returns>字典表列表</returns>
-        PagedInfo<SysDictListVo> List([FromQuery] SysDictListDto parm);
-
-
-
-
-
-
-
-
+        /// <param name="page">分页参数</param>
+        /// <returns>列表</returns>
+        PagedInfo<GetSysDictListVo> getSysDictList([FromQuery] PagerInfo page);
 
 
 

Services/SysDictItemService.cs

@@ -1,12 +1,11 @@
 using Attribute;
-using Dto;
-using Vo;
 using Model;
 using Model.Base;
-
 using Repository;
 using Service;
 using Microsoft.AspNetCore.Mvc;
+using Vo.Admin;
+
 
 namespace Services
 {
@@ -19,33 +18,22 @@ namespace Services
         /// <summary>
         /// 字典项-列表
         /// </summary>
-        /// <param name="parm">请求参数</param>
-        /// <returns>字典项列表</returns>
-        public PagedInfo<SysDictItemListVo> List([FromQuery] SysDictItemListDto parm)
+        /// <param name="param">参数请求体</param>
+        /// <param name="page">分页参数</param>
+        /// <returns>列表</returns>
+        public PagedInfo<GetSysDictItemListVo> getSysDictItemList([FromQuery] PagerInfo page, [FromQuery] SysDictItem param)
         {
-            //开始拼装查询条件
+            //拼装查询条件
             var predicate = Expressionable.Create<SysDictItem>();
-            predicate = predicate.AndIF(parm.dictId != null, m => m.dictId == parm.dictId);
-            predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.label), m => m.label.Contains(parm.label));
-            predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.description), m => m.description.Contains(parm.description));
+            predicate = predicate.AndIF(param.dictId > 0, m => m.dictId == param.dictId);
             var response = Queryable()
                 .Where(predicate.ToExpression())
                 .OrderByDescending(m => m.id)
-                .ToPage<SysDictItem, SysDictItemListVo>(new PagerInfo());
+                .ToPage<SysDictItem, GetSysDictItemListVo>(page);
             return response;
         }
 
 
 
-
-
-
-
-
-
-
-
-
-
     }
 }

Services/SysDictService.cs

@@ -1,50 +1,37 @@
 using Attribute;
-using Dto;
-using Vo;
 using Model;
 using Model.Base;
-
 using Repository;
 using Service;
 using Microsoft.AspNetCore.Mvc;
+using Vo.Admin;
+
 
 namespace Services
 {
     /// <summary>
-    /// 字典表Service业务层处理
+    /// 字典类型Service业务层处理
     /// </summary>
     [AppService(ServiceType = typeof(ISysDictService), ServiceLifetime = LifeTime.Transient)]
     public class SysDictService : BaseService<SysDict>, ISysDictService
     {
         /// <summary>
-        /// 字典表-列表
+        /// 字典类型-列表
         /// </summary>
-        /// <param name="parm">请求参数</param>
-        /// <returns>字典表列表</returns>
-        public PagedInfo<SysDictListVo> List([FromQuery] SysDictListDto parm)
+        /// <param name="page">分页参数</param>
+        /// <returns>列表</returns>
+        public PagedInfo<GetSysDictListVo> getSysDictList([FromQuery] PagerInfo page)
         {
-            //开始拼装查询条件
+            //拼装查询条件
             var predicate = Expressionable.Create<SysDict>();
-            predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.dictType), m => m.dictType.Contains(parm.dictType));
-            predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.description), m => m.description.Contains(parm.description));
             var response = Queryable()
                 .Where(predicate.ToExpression())
                 .OrderByDescending(m => m.id)
-                .ToPage<SysDict, SysDictListVo>(new PagerInfo());
+                .ToPage<SysDict, GetSysDictListVo>(page);
             return response;
         }
 
 
 
-
-
-
-
-
-
-
-
-
-
     }
 }