lcl 10 months ago
parent
commit
c571d81856

+ 10 - 3
Controllers/Base/SysDeptController.cs

@@ -17,8 +17,6 @@ namespace Controllers
     /// 部门
     /// </summary>
     [Verify]
-    [Route("system/dept")]
-    [ApiExplorerSettings(GroupName = "sys")]
     public class SysDeptController : BaseController
     {
         public ISysDeptService DeptService;
@@ -34,13 +32,22 @@ namespace Controllers
         /// 获取部门列表
         /// </summary>
         /// <returns></returns>
-        [ActionPermissionFilter(Permission = "system:dept:list")]
         [HttpGet("list")]
         public IActionResult List([FromQuery] SysDeptQueryDto dept)
         {
             return SUCCESS(DeptService.GetSysDepts(dept), TIME_FORMAT_FULL);
         }
 
+        /// <summary>
+        /// 获取所有部门列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("/v1/skb/sysServer/dept/list")]
+        public IActionResult AllList()
+        {
+            return SUCCESS(DeptService.GetList(), TIME_FORMAT_FULL);
+        }
+
         /// <summary>
         /// 查询部门列表(排除节点)
         /// </summary>

+ 10 - 0
Controllers/Base/SysPostController.cs

@@ -40,6 +40,16 @@ namespace Controllers
             return SUCCESS(list);
         }
 
+        /// <summary>
+        /// 获取所有岗位列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("/v1/skb/sysServer/post/list")]
+        public IActionResult AllList()
+        {
+            return SUCCESS(PostService.GetList(), TIME_FORMAT_FULL);
+        }
+
         /// <summary>
         /// 岗位查询
         /// </summary>

+ 10 - 0
Controllers/Base/SysRoleController.cs

@@ -47,6 +47,16 @@ namespace Controllers
             return SUCCESS(list, TIME_FORMAT_FULL);
         }
 
+        /// <summary>
+        /// 获取所有角色列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("/v1/skb/sysServer/role/list")]
+        public IActionResult AllList()
+        {
+            return SUCCESS(sysRoleService.GetList(), TIME_FORMAT_FULL);
+        }
+
         /// <summary>
         /// 根据角色编号获取详细信息
         /// </summary>

+ 8 - 14
Controllers/Base/SysUserController.cs

@@ -44,7 +44,7 @@ namespace Controllers
         /// /system/user/list
         /// </summary>
         /// <returns></returns>
-        [HttpGet("/v1/api/SysUser/list")]
+        [HttpGet("/v1/skb/sysServer/user/page")]
         public IActionResult List([FromQuery] SysUserQueryDto user, PagerInfo pager)
         {
             var list = UserService.SelectUserList(user, pager);
@@ -85,9 +85,7 @@ namespace Controllers
         /// </summary>
         /// <param name="parm"></param>
         /// <returns></returns>
-        [HttpPost("add")]
-        [Log(Title = "用户管理", BusinessType = BusinessType.INSERT)]
-        [ActionPermissionFilter(Permission = "system:user:add")]
+        [HttpPost("/v1/skb/sysServer/user/add")]
         public IActionResult AddUser([FromBody] SysUserDto parm)
         {
             var user = parm.Adapt<SysUser>().ToCreate(HttpContext);
@@ -107,9 +105,7 @@ namespace Controllers
         /// </summary>
         /// <param name="parm"></param>
         /// <returns></returns>
-        [HttpPut("edit")]
-        [Log(Title = "用户管理", BusinessType = BusinessType.UPDATE)]
-        [ActionPermissionFilter(Permission = "system:user:edit")]
+        [HttpPut("/v1/skb/sysServer/user/update")]
         public IActionResult UpdateUser([FromBody] SysUserDto parm)
         {
             var user = parm.Adapt<SysUser>().ToUpdate(HttpContext);
@@ -141,14 +137,12 @@ namespace Controllers
         /// </summary>
         /// <param name="userid"></param>
         /// <returns></returns>
-        [HttpDelete("{userId}")]
-        [Log(Title = "用户管理", BusinessType = BusinessType.DELETE)]
-        [ActionPermissionFilter(Permission = "system:user:remove")]
-        public IActionResult Remove(int userid = 0)
+        [HttpDelete("/v1/skb/sysServer/user/removeById/{id}")]
+        public IActionResult Remove(int id = 0)
         {
-            if (userid <= 0) { return ToResponse(ApiResult.Error(101, "请求参数错误")); }
-            if (userid == 1) return ToResponse(ResultCode.FAIL, "不能删除管理员账号");
-            int result = UserService.DeleteUser(userid);
+            if (id <= 0) { return ToResponse(ApiResult.Error(101, "请求参数错误")); }
+            if (id == 1) return ToResponse(ResultCode.FAIL, "不能删除管理员账号");
+            int result = UserService.DeleteUser(id);
 
             return ToResponse(result);
         }

+ 1 - 1
Filters/AuthorizationFilter.cs

@@ -55,7 +55,7 @@ namespace Filters
                 value = Decrypt(value);
                 path += value;
                 request.Path = new PathString(path);
-                request.RouteValues["Id"] = value;
+                request.RouteValues["id"] = value;
             }
             else
             {

+ 8 - 8
Model/Base/PagerInfo.cs

@@ -5,33 +5,33 @@
         /// <summary>
         /// 当前页码
         /// </summary>
-        public int PageNum { get; set; }
+        public int pageNum { get; set; }
         /// <summary>
         /// 每页显示多少条
         /// </summary>
-        public int PageSize { get; set; }
+        public int pageSize { get; set; }
         /// <summary>
         /// 总记录数
         /// </summary>
-        public int TotalNum { get; set; }
+        public int totalNum { get; set; }
         /// <summary>
         /// 排序字段
         /// </summary>
-        public string Sort { get; set; } = string.Empty;
+        public string sort { get; set; } = string.Empty;
         /// <summary>
         /// 排序类型,前端传入的是"ascending","descending"
         /// </summary>
         public string SortType { get; set; } = string.Empty;
         public PagerInfo()
         {
-            PageNum = 1;
-            PageSize = 20;
+            pageNum = 1;
+            pageSize = 20;
         }
 
         public PagerInfo(int page = 1, int pageSize = 20)
         {
-            PageNum = page;
-            PageSize = pageSize;
+            pageNum = page;
+            pageSize = pageSize;
         }
     }
 }