对接ruoyi接口

用户、角色、菜单查询部分

Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml

@@ -229,6 +229,14 @@
             用户管理
             </summary>
         </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.UserController.UpdateStatus(System.Int64,System.Boolean)">
+            <summary>
+            更改用户状态
+            </summary>
+            <param name="userId"></param>
+            <param name="isDel"></param>
+            <returns></returns>
+        </member>
         <member name="M:Yi.Framework.ApiMicroservice.Controllers.UserController.Add(Yi.Framework.Model.Models.UserEntity)">
             <summary>
             添加用户，去重，密码加密

Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/DictionaryController.cs

@@ -0,0 +1,35 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Yi.Framework.Common.Models;
+using Yi.Framework.Interface;
+using Yi.Framework.Model.Models;
+using Yi.Framework.Repository;
+using Yi.Framework.WebCore;
+using Yi.Framework.WebCore.AttributeExtend;
+using Yi.Framework.WebCore.AuthorizationPolicy;
+
+namespace Yi.Framework.ApiMicroservice.Controllers
+{
+    [ApiController]
+    [Route("api/[controller]/[action]")]
+    public class DictionaryController 
+    {
+        private IDictionaryService _iDictionaryService;
+        public DictionaryController(ILogger<DictionaryEntity> logger, IDictionaryService iDictionaryService)
+        {
+            _iDictionaryService = iDictionaryService;
+        }
+
+        [HttpGet]
+        [Route("{type}")]
+        public async Task<Result> GetListByType([FromRoute] string type)
+        {
+            return Result.Success().SetData(await _iDictionaryService._repository.GetListAsync(u=>u.DictType==type&&u.IsDeleted==false));
+        }
+    }
+}

Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs

@@ -20,14 +20,20 @@ namespace Yi.Framework.ApiMicroservice.Controllers
     /// </summary>
     [ApiController]
     [Route("api/[controller]/[action]")]
-    public class MenuController : BaseCrudController<MenuEntity>
+    public class MenuController 
     {
         private IMenuService _iMenuService;
-        public MenuController(ILogger<MenuEntity> logger, IMenuService iMenuService) : base(logger, iMenuService)
+        public MenuController(ILogger<MenuEntity> logger, IMenuService iMenuService)
         {
             _iMenuService = iMenuService;
         }
 
+        [HttpGet]
+        public async Task<Result> GetList()
+        {
+            return Result.Success().SetData(await _iMenuService._repository.GetListAsync());
+        }
+
 
 
         /// <summary>
@@ -35,7 +41,6 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        //暂未制作逻辑删除与多租户的过滤
         public async Task<Result> GetMenuTree()
         { 
              return Result.Success().SetData(await _iMenuService. GetMenuTreeAsync());

Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/RoleController.cs

@@ -29,6 +29,12 @@ namespace Yi.Framework.ApiMicroservice.Controllers
             _iRoleService = iRoleService;
         }
 
+        [HttpGet]
+        public async Task<Result> PageList()
+        {
+            return Result.Success().SetData(await _iRoleService._repository.GetListAsync());
+        }
+
         /// <summary>
         /// 给多用户设置多角色
         /// </summary>

Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/UserController.cs

@@ -29,6 +29,26 @@ namespace Yi.Framework.ApiMicroservice.Controllers
             _iUserService = iUserService;
         }
 
+        [HttpGet]
+        public async Task<Result> PageList()
+        {
+            return Result.Success().SetData(await _iUserService._repository.GetListAsync());
+        }
+
+        /// <summary>
+        /// 更改用户状态
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <param name="isDel"></param>
+        /// <returns></returns>
+        [HttpPut]
+        public async Task<Result> UpdateStatus(long userId,bool isDel)
+        {
+            return Result.Success().SetData(await _iUserService._repository.UpdateIgnoreNullAsync(new UserEntity() { Id = userId, IsDeleted = isDel }));
+        
+        }
+
+
         /// <summary>
         /// 添加用户，去重，密码加密
         /// </summary>