备份

Controllers/ApiInfoController.cs

@@ -0,0 +1,124 @@
+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>
+    /// ApiInfo)Controller
+    /// </summary>
+    // [Route("ApiInfo")]
+    // [ApiExplorerSettings(GroupName = "ApiInfo")]
+    public class ApiInfoController : BaseController
+    {
+        /// <summary>
+        /// api分组接口
+        /// </summary>
+        private readonly IApiInfoService _ApiInfoService;
+
+
+        public ApiInfoController(IApiInfoService ApiInfoService)
+        {
+            _ApiInfoService = ApiInfoService;
+
+        }
+
+        /// <summary>
+        /// api接口列表
+        /// </summary>
+        /// <param name="parm">请求参数</param>
+        /// <returns>api接口列表</returns>
+        [HttpGet]
+        [Route("/v1/api/ApiInfo/list")]
+        public IActionResult List([FromQuery] ApiInfoListDto parm)
+        {
+            var response = _ApiInfoService.List(parm);
+            return SUCCESS(response);
+        }
+
+
+
+
+        /// <summary>
+        /// api接口详情
+        /// </summary>
+        /// <param name="parm">请求参数</param>
+        /// <returns>api接口详情</returns>
+        [HttpGet]
+        [Route("/v1/api/ApiInfo/query")]
+        public IActionResult Query([FromQuery] ApiInfoQueryDto parm)
+        {
+            var response = _ApiInfoService.Queryable()
+                .First(x => x.id == parm.id)
+                .Adapt<ApiInfoQueryVo>() ?? new ApiInfoQueryVo();
+            return SUCCESS(response);
+        }
+
+
+
+
+        /// <summary>
+        /// api接口添加
+        /// </summary>
+        /// <param name="parm">请求参数</param>
+        /// <returns>api接口添加</returns>
+        [HttpPost]
+        [Route("/v1/api/ApiInfo/add")]
+        public IActionResult Add([FromBody] ApiInfoAddDto parm)
+        {
+            var modal = parm.Adapt<ApiInfo>().ToCreate(HttpContext);
+            var response = _ApiInfoService.Add(modal);
+            return SUCCESS(response);
+        }
+
+
+
+
+        /// <summary>
+        /// api接口修改
+        /// </summary>
+        /// <param name="parm">请求参数</param>
+        /// <returns>api接口修改</returns>
+        [HttpPut]
+        [Route("/v1/api/ApiInfo/update")]
+        public IActionResult Update([FromBody] ApiInfoUpdateDto parm)
+        {
+            var modal = parm.Adapt<ApiInfo>().ToUpdate(HttpContext);
+            var response = _ApiInfoService.Update(modal, true);
+            return SUCCESS(response);
+        }
+
+
+
+
+        /// <summary>
+        /// api接口删除
+        /// </summary>
+        /// <param name="Id">ID</param>
+        /// <returns>api接口删除</returns>
+        [HttpDelete]
+        [Route("/v1/api/ApiInfo/delete/{id}")]
+        public IActionResult Delete(int id)
+        {
+            var response = _ApiInfoService.Delete(id);
+            return SUCCESS(response);
+        }
+
+
+
+
+
+
+    }
+}

Model/Base/SysUser.cs

@@ -190,7 +190,6 @@ namespace Model
                 return deptJoin.Adapt<DeptFeignVo>();
             }
         }
-
         [SugarColumn(IsIgnore = true)]
         [Navigate(NavigateType.OneToOne, nameof(deptId))]
         public SysDept deptJoin { get; set; }
@@ -209,5 +208,8 @@ namespace Model
         {
             return 1 == userId;
         }
+
+        [SugarColumn(IsIgnore = true)]
+        public string deptName { get; set; }
     }
 }

Model/Database/ApiGroup.cs

@@ -0,0 +1,85 @@
+using Mapster;
+
+
+namespace Model
+{
+    /// <summary>
+    /// api接口分组 api_group
+    /// </summary>
+    [SugarTable("api_group", "api接口分组")]
+    [Tenant("0")]
+    public class ApiGroup
+    {
+        /// <summary>
+        /// 名称
+        /// </summary>
+        [SugarColumn(ColumnDescription = "名称", Length = 50, ColumnName = "group_name")]
+        public string groupName { get; set; }
+
+
+        /// <summary>
+        /// 说明
+        /// </summary>
+        [SugarColumn(ColumnDescription = "说明", Length = 200, ColumnName = "group_remark")]
+        public string groupRemark { get; set; }
+
+
+        /// <summary>
+        /// 版本号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "版本号", Length = 20, ColumnName = "group_version")]
+        public string groupVersion { get; set; }
+
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        [SugarColumn(ColumnDescription = "ID", IsPrimaryKey = true, IsIdentity = true, ColumnName = "id")]
+        public int id { get; set; }
+
+
+        /// <summary>
+        /// 状态
+        /// </summary>
+        [SugarColumn(ColumnDescription = "状态", ColumnName = "status")]
+        public int status { get; set; }
+
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        [SugarColumn(ColumnDescription = "排序", ColumnName = "sort")]
+        public int sort { get; set; }
+
+
+        /// <summary>
+        /// 版本号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "版本号", ColumnName = "version")]
+        public int version { get; set; }
+
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "创建时间", ColumnName = "create_date")]
+        public DateTime? createDate { get; set; }
+
+
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "更新时间", ColumnName = "update_date")]
+        public DateTime? updateDate { get; set; }
+
+
+        /// <summary>
+        /// 类型
+        /// </summary>
+        [SugarColumn(ColumnDescription = "类型", ColumnName = "group_kind")]
+        public int groupKind { get; set; }
+
+
+
+    }
+}

Model/Database/ApiInfo.cs

@@ -0,0 +1,123 @@
+using Mapster;
+using Vo;
+
+
+namespace Model
+{
+    /// <summary>
+    /// api接口 api_info
+    /// </summary>
+    [SugarTable("api_info", "api接口")]
+    [Tenant("0")]
+    public class ApiInfo
+    {
+        /// <summary>
+        /// 分组
+        /// </summary>
+        [SugarColumn(ColumnDescription = "分组", ColumnName = "group_id")]
+        public int groupId { get; set; }
+
+
+        /// <summary>
+        /// 接口名称
+        /// </summary>
+        [SugarColumn(ColumnDescription = "接口名称", Length = 50, ColumnName = "api_name")]
+        public string apiName { get; set; }
+
+
+        /// <summary>
+        /// 接口关键字
+        /// </summary>
+        [SugarColumn(ColumnDescription = "接口关键字", Length = 50, ColumnName = "api_key")]
+        public string apiKey { get; set; }
+
+
+        /// <summary>
+        /// 接口主机头
+        /// </summary>
+        [SugarColumn(ColumnDescription = "接口主机头", Length = 50, ColumnName = "api_host")]
+        public string apiHost { get; set; }
+
+
+        /// <summary>
+        /// 接口端口号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "接口端口号", ColumnName = "api_port")]
+        public int apiPort { get; set; }
+
+
+        /// <summary>
+        /// 接口路由
+        /// </summary>
+        [SugarColumn(ColumnDescription = "接口路由", Length = 200, ColumnName = "api_router")]
+        public string apiRouter { get; set; }
+
+
+        /// <summary>
+        /// 接口请求方式
+        /// </summary>
+        [SugarColumn(ColumnDescription = "接口请求方式", Length = 10, ColumnName = "api_method")]
+        public string apiMethod { get; set; }
+
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        [SugarColumn(ColumnDescription = "ID", IsPrimaryKey = true, IsIdentity = true, ColumnName = "id")]
+        public int id { get; set; }
+
+
+        /// <summary>
+        /// 状态
+        /// </summary>
+        [SugarColumn(ColumnDescription = "状态", ColumnName = "status")]
+        public int status { get; set; }
+
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        [SugarColumn(ColumnDescription = "排序", ColumnName = "sort")]
+        public int sort { get; set; }
+
+
+        /// <summary>
+        /// 版本号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "版本号", ColumnName = "version")]
+        public int version { get; set; }
+
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "创建时间", ColumnName = "create_date")]
+        public DateTime? createDate { get; set; }
+
+
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "更新时间", ColumnName = "update_date")]
+        public DateTime? updateDate { get; set; }
+
+
+        /// <summary>
+        /// api接口分组
+        /// <summary>
+        [SugarColumn(IsIgnore = true)]
+        [Navigate(NavigateType.OneToOne, nameof(groupId))]
+        public ApiGroup apiGroupJoin { get; set; }
+        [SugarColumn(IsIgnore = true)]
+        public ApiGroupVo apiGroupInfo 
+        { 
+            get
+            {
+                return apiGroupJoin.Adapt<ApiGroupVo>();
+            }
+        }
+
+
+
+    }
+}

Model/Dto/ApiInfoAddDto.cs

@@ -0,0 +1,61 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Model.Base;
+
+namespace Dto
+{
+    /// <summary>
+    /// 添加
+    /// </summary>
+    public class ApiInfoAddDto
+    {
+        /// <summary>
+        /// 分组
+        /// </summary>
+        public int groupId { get; set; }
+
+
+        /// <summary>
+        /// 接口名称
+        /// </summary>
+        [Required(ErrorMessage = "接口名称不能为空")]
+        public string? apiName { get; set; }
+
+
+        /// <summary>
+        /// 接口关键字
+        /// </summary>
+        [Required(ErrorMessage = "接口关键字不能为空")]
+        public string? apiKey { get; set; }
+
+
+        /// <summary>
+        /// 接口主机头
+        /// </summary>
+        [Required(ErrorMessage = "接口主机头不能为空")]
+        public string? apiHost { get; set; }
+
+
+        /// <summary>
+        /// 接口端口号
+        /// </summary>
+        [Required(ErrorMessage = "接口端口号不能为空")]
+        public int apiPort { get; set; }
+
+
+        /// <summary>
+        /// 接口路由
+        /// </summary>
+        [Required(ErrorMessage = "接口路由不能为空")]
+        public string? apiRouter { get; set; }
+
+
+        /// <summary>
+        /// 接口请求方式
+        /// </summary>
+        public string? apiMethod { get; set; }
+
+
+
+    }
+}

Model/Dto/ApiInfoListDto.cs

@@ -0,0 +1,26 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Model.Base;
+
+namespace Dto
+{
+    /// <summary>
+    /// 列表
+    /// </summary>
+    public class ApiInfoListDto
+    {
+        /// <summary>
+        /// 分组
+        /// </summary>
+        public int groupId { get; set; }
+
+
+        /// <summary>
+        /// 接口名称
+        /// </summary>
+        public string? apiName { get; set; }
+
+
+
+    }
+}

Model/Dto/ApiInfoQueryDto.cs

@@ -0,0 +1,20 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Model.Base;
+
+namespace Dto
+{
+    /// <summary>
+    /// 详情
+    /// </summary>
+    public class ApiInfoQueryDto
+    {
+        /// <summary>
+        /// ID
+        /// </summary>
+        public int id { get; set; }
+
+
+
+    }
+}

Model/Dto/ApiInfoUpdateDto.cs

@@ -0,0 +1,67 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Model.Base;
+
+namespace Dto
+{
+    /// <summary>
+    /// 修改
+    /// </summary>
+    public class ApiInfoUpdateDto
+    {
+        /// <summary>
+        /// 分组
+        /// </summary>
+        public int groupId { get; set; }
+
+
+        /// <summary>
+        /// 接口名称
+        /// </summary>
+        [Required(ErrorMessage = "接口名称不能为空")]
+        public string? apiName { get; set; }
+
+
+        /// <summary>
+        /// 接口关键字
+        /// </summary>
+        [Required(ErrorMessage = "接口关键字不能为空")]
+        public string? apiKey { get; set; }
+
+
+        /// <summary>
+        /// 接口主机头
+        /// </summary>
+        [Required(ErrorMessage = "接口主机头不能为空")]
+        public string? apiHost { get; set; }
+
+
+        /// <summary>
+        /// 接口端口号
+        /// </summary>
+        [Required(ErrorMessage = "接口端口号不能为空")]
+        public int apiPort { get; set; }
+
+
+        /// <summary>
+        /// 接口路由
+        /// </summary>
+        [Required(ErrorMessage = "接口路由不能为空")]
+        public string? apiRouter { get; set; }
+
+
+        /// <summary>
+        /// 接口请求方式
+        /// </summary>
+        public string? apiMethod { get; set; }
+
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        public int id { get; set; }
+
+
+
+    }
+}

Model/Vo/ApiInfoAddVo.cs

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

Model/Vo/ApiInfoListVo.cs

@@ -0,0 +1,60 @@
+using Newtonsoft.Json;
+
+namespace Vo
+{
+    /// <summary>
+    /// 列表
+    /// </summary>
+    public class ApiInfoListVo
+    {
+        /// <summary>
+        /// 分组
+        /// </summary>
+        public int groupId { get; set; }
+
+
+        /// <summary>
+        /// 接口名称
+        /// </summary>
+        public string apiName { get; set; }
+
+
+        /// <summary>
+        /// 接口关键字
+        /// </summary>
+        public string apiKey { get; set; }
+
+
+        /// <summary>
+        /// 接口主机头
+        /// </summary>
+        public string apiHost { get; set; }
+
+
+        /// <summary>
+        /// 接口端口号
+        /// </summary>
+        public int apiPort { get; set; }
+
+
+        /// <summary>
+        /// 接口路由
+        /// </summary>
+        public string apiRouter { get; set; }
+
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        public int id { get; set; }
+
+
+        /// <summary>
+        /// api接口分组
+        /// </summary>
+        public ApiGroupVo apiGroupInfo;
+
+
+
+    }
+}

Model/Vo/ApiInfoQueryVo.cs

@@ -0,0 +1,54 @@
+using Newtonsoft.Json;
+
+namespace Vo
+{
+    /// <summary>
+    /// 详情
+    /// </summary>
+    public class ApiInfoQueryVo
+    {
+        /// <summary>
+        /// 分组
+        /// </summary>
+        public int groupId { get; set; }
+
+
+        /// <summary>
+        /// 接口名称
+        /// </summary>
+        public string apiName { get; set; }
+
+
+        /// <summary>
+        /// 接口关键字
+        /// </summary>
+        public string apiKey { get; set; }
+
+
+        /// <summary>
+        /// 接口主机头
+        /// </summary>
+        public string apiHost { get; set; }
+
+
+        /// <summary>
+        /// 接口端口号
+        /// </summary>
+        public int apiPort { get; set; }
+
+
+        /// <summary>
+        /// 接口路由
+        /// </summary>
+        public string apiRouter { get; set; }
+
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        public int id { get; set; }
+
+
+
+    }
+}

Model/Vo/Base/SysUserVo.cs

@@ -9,5 +9,6 @@ namespace Vo
         public string username { get; set; }
         public DeptFeignVo deptInfo { get; set; }
         public Users user { get; set; }
+        public string deptName { get; set; }
     }
 }

Model/Vo/Sub/ApiGroupVo.cs

@@ -0,0 +1,30 @@
+using Newtonsoft.Json;
+
+namespace Vo
+{
+    /// <summary>
+    /// api接口分组
+    /// </summary>
+    public class ApiGroupVo
+    {
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string groupName;
+
+
+        /// <summary>
+        /// 说明
+        /// </summary>
+        public string groupRemark;
+
+
+        /// <summary>
+        /// 版本号
+        /// </summary>
+        public string groupVersion;
+
+
+
+    }
+}

Services/ApiInfoService.cs

@@ -0,0 +1,51 @@
+using Attribute;
+using Dto;
+using Vo;
+using Model;
+using Model.Base;
+
+using Repository;
+using Service;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Services
+{
+    /// <summary>
+    /// api接口Service业务层处理
+    /// </summary>
+    [AppService(ServiceType = typeof(IApiInfoService), ServiceLifetime = LifeTime.Transient)]
+    public class ApiInfoService : BaseService<ApiInfo>, IApiInfoService
+    {
+        /// <summary>
+        /// api接口-列表
+        /// </summary>
+        /// <param name="parm">请求参数</param>
+        /// <returns>api接口列表</returns>
+        public PagedInfo<ApiInfoListVo> List([FromQuery] ApiInfoListDto parm)
+        {
+            //开始拼装查询条件
+            var predicate = Expressionable.Create<ApiInfo>();
+            predicate = predicate.AndIF(parm.groupId != null, m => m.groupId == parm.groupId);
+            predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.apiName), m => m.apiName.Contains(parm.apiName));
+            var response = Queryable()
+                .Where(predicate.ToExpression())
+                .OrderByDescending(m => m.id)
+                .Includes(m => m.apiGroupJoin)
+                .ToPage<ApiInfo, ApiInfoListVo>(new PagerInfo());
+            return response;
+        }
+
+
+
+
+
+
+
+
+
+
+
+
+
+    }
+}

Services/Base/SysUserService.cs

@@ -337,7 +337,6 @@ namespace Services
             var predicate = Expressionable.Create<SysUser>();
             var response = Queryable()
                 .Where(predicate.ToExpression())
-                .Select(m => m)
                 .OrderByDescending(m => m.userId)
                 .Includes(m => m.deptJoin)
                 .CrossQuery(typeof(Users), "kxs")

Services/IService/IApiInfoService.cs

@@ -0,0 +1,29 @@
+using Dto;
+using Vo;
+using Model;
+using Model.Base;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Services
+{
+    public interface IApiInfoService : IBaseService<ApiInfo>
+    {
+        /// <summary>
+        /// api接口-列表
+        /// </summary>
+        /// <param name="parm">请求参数</param>
+        /// <returns>api接口列表</returns>
+        PagedInfo<ApiInfoListVo> List([FromQuery] ApiInfoListDto parm);
+
+
+
+
+
+
+
+
+
+
+
+    }
+}