Merge branch 'sqlsugar-dev' into sqlsugar

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

@@ -91,6 +91,12 @@
             <param name="giveRoleSetMenuDto"></param>
             <returns></returns>
         </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.RoleController.GetInMenuByRoleId(System.Int64)">
+            <summary>
+            通过角色id来获取菜单列表
+            </summary>
+            <returns></returns>
+        </member>
         <member name="T:Yi.Framework.ApiMicroservice.Controllers.TestController">
             <summary>
             测试控制器

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

@@ -28,15 +28,17 @@ namespace Yi.Framework.ApiMicroservice.Controllers
             _iMenuService = iMenuService;
         }
 
+
+
         /// <summary>
         /// 得到树形菜单
         /// </summary>
         /// <returns></returns>
         [HttpGet]
         //暂未制作逻辑删除与多租户的过滤
-        public async Task<List<MenuEntity>> GetMenuTree()
+        public async Task<Result> GetMenuTree()
         { 
-             return await _iMenuService.GetMenuTreeAsync();
+             return Result.Success().SetData(await _iMenuService. GetMenuTreeAsync());
         }
     }
 }

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

@@ -40,6 +40,14 @@ namespace Yi.Framework.ApiMicroservice.Controllers
             return Result.Success().SetStatus(await _iRoleService.GiveRoleSetMenu(giveRoleSetMenuDto.RoleIds, giveRoleSetMenuDto.MenuIds));
         }
 
-
+        /// <summary>
+        /// 通过角色id来获取菜单列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public async Task<Result> GetInMenuByRoleId(long RoleId)
+        {
+            return Result.Success().SetData(await _iRoleService.GetInMenuByRoleId(RoleId));
+        }
     }
 }

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

@@ -63,7 +63,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers
             //不建议操作，直接切换其他仓储
             await _iUserService._repository.ChangeRepository<Repository<RoleEntity>>().GetListAsync();
 
-            //直接操作Db对象？？？恭喜你已经毕业了！此后将有一天，接手到这个的软件的程序员将破口大骂。
+            //最好不要直接操作Db对象
             await _iUserService._repository._Db.Queryable<UserEntity>().ToListAsync();
 
             return Result.Success().SetData(await _iUserService.DbTest());

Yi.Framework.Net6/Yi.Framework.Interface/IRoleService.cs

@@ -13,6 +13,13 @@ namespace Yi.Framework.Interface
         /// <returns></returns>
         Task<List<RoleEntity>> DbTest();
 
+        /// <summary>
+        /// 通过角色id获取角色实体包含菜单
+        /// </summary>
+        /// <param name="roleId"></param>
+        /// <returns></returns>
+        Task<RoleEntity> GetInMenuByRoleId(long roleId);
+
         /// <summary>
         /// 给角色设置菜单，多角色，多菜单
         /// </summary>

Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/MenuEntity.cs

@@ -32,7 +32,7 @@ namespace Yi.Framework.Model.Models
         /// <summary>
         ///  
         ///</summary>
-         [SugarColumn(ColumnName="MenuCode"    )]
+         [SugarColumn(ColumnName= "PermissionCode")]
          public string PermissionCode { get; set; }
         /// <summary>
         ///  

Yi.Framework.Net6/Yi.Framework.Model/RoleEntity.cs

@@ -10,5 +10,7 @@ namespace Yi.Framework.Model.Models
     {
         //[Navigate(typeof(UserRoleEntity), nameof(UserRoleEntity.RoleId), nameof(UserRoleEntity.UserId))]
         //public List<UserEntity> Users { get; set; }
+        [Navigate(typeof(RoleMenuEntity),nameof(RoleMenuEntity.RoleId),nameof(RoleMenuEntity.MenuId))]
+        public List<MenuEntity> Menus { get; set; }
     }
 }

Yi.Framework.Net6/Yi.Framework.Repository/DataContext.cs

@@ -1,16 +1,15 @@
-using SqlSugar;
-using Yi.Framework.Common.Models;
-using Yi.Framework.Model.Models;
+//using SqlSugar;
+//using Yi.Framework.Common.Models;
+//using Yi.Framework.Model.Models;
 
-namespace Yi.Framework.Repository
-{
-    public class DataContext<T> : SimpleClient<T> where T : class, IBaseModelEntity, new()
-    {
-        public DataContext(ISqlSugarClient context) : base(context)
-        {
-            Db =base.Context;
-        }
+//namespace Yi.Framework.Repository
+//{
+//    public class DataContext<T> : SimpleClient<T> where T : class, IBaseModelEntity, new()
+//    {
+//        public DataContext(ISqlSugarClient context) : base(context)
+//        {
+//        }
         
-        public ISqlSugarClient Db;
-    }
-}
+//    }
+//}
+//简化已被弃用

Yi.Framework.Net6/Yi.Framework.Repository/IRepository.cs

@@ -23,6 +23,6 @@ namespace Yi.Framework.Repository
         public  Task<bool> UpdateIgnoreNullAsync(T entity);
         public  Task<List<S>> UseSqlAsync<S>(string sql);
         public  Task<bool> UseSqlAsync(string sql);
-
+        ISugarQueryable<T> QueryConditionHandler(QueryCondition pars);
     }
 }

Yi.Framework.Net6/Yi.Framework.Repository/Repository.cs

@@ -12,16 +12,15 @@ namespace Yi.Framework.Repository
     /// 仓储模式
     /// </summary>
     /// <typeparam name="T"></typeparam>
-    public class Repository<T> : DataContext<T>, IRepository<T> where T : class, IBaseModelEntity, new()
+    public class Repository<T> : SimpleClient<T>, IRepository<T> where T : class, IBaseModelEntity, new()
     {
-        public ISqlSugarClient _Db { get; set; }
+        public ISqlSugarClient _Db { get { return base.Context; } set { } }
         /// <summary>
         /// 构造函数
         /// </summary>
         /// <param name="context"></param>
         public Repository(ISqlSugarClient context) : base(context)//注意这里要有默认值等于null
         {
-            _Db = context;
         }
 
         /// <summary>
@@ -31,7 +30,8 @@ namespace Yi.Framework.Repository
         /// <returns></returns>
         public async Task<bool> UseTranAsync(Func<Task> func)
         {
-            var res = await Db.AsTenant().UseTranAsync(func);
+            var con = Context;
+            var res = await _Db.AsTenant().UseTranAsync(func);
             return res.IsSuccess;
 
         }
@@ -44,7 +44,7 @@ namespace Yi.Framework.Repository
         /// <returns></returns>
         public async Task<List<S>> UseSqlAsync<S>(string sql)
         {
-            return await Db.Ado.SqlQueryAsync<S>(sql);
+            return await _Db.Ado.SqlQueryAsync<S>(sql);
         }
 
 
@@ -55,7 +55,7 @@ namespace Yi.Framework.Repository
         /// <returns></returns>
         public async Task<bool> UseSqlAsync(string sql)
         {
-            return await Db.Ado.ExecuteCommandAsync(sql)>0;
+            return await _Db.Ado.ExecuteCommandAsync(sql)>0;
         }
 
 
@@ -68,7 +68,7 @@ namespace Yi.Framework.Repository
         public async Task<T> InsertReturnEntityAsync(T entity)
         {
             entity.Id =SnowFlakeSingle.instance.getID();
-            return await Db.Insertable(entity).ExecuteReturnEntityAsync();
+            return await _Db.Insertable(entity).ExecuteReturnEntityAsync();
         }
 
         /// <summary>
@@ -78,7 +78,7 @@ namespace Yi.Framework.Repository
         /// <returns></returns>
         public async Task<bool> UpdateIgnoreNullAsync(T entity)
         {
-            return await Db.Updateable(entity).IgnoreColumns(true).ExecuteCommandAsync()>0;
+            return await _Db.Updateable(entity).IgnoreColumns(true).ExecuteCommandAsync()>0;
         }
 
 
@@ -88,9 +88,9 @@ namespace Yi.Framework.Repository
         /// <returns></returns>
         public async Task<bool> DeleteByLogicAsync(List<long> ids)
         {
-            var entitys = await Db.Queryable<T>().Where(u => ids.Contains(u.Id)).ToListAsync();
+            var entitys = await _Db.Queryable<T>().Where(u => ids.Contains(u.Id)).ToListAsync();
             entitys.ForEach(u=>u.IsDeleted=true);
-            return await Db.Updateable(entitys).ExecuteCommandAsync()>0;
+            return await _Db.Updateable(entitys).ExecuteCommandAsync()>0;
         }
 
 
@@ -103,7 +103,7 @@ namespace Yi.Framework.Repository
         /// <returns></returns>
         public async Task<List<S>> StoreAsync<S>(string storeName, object para)
         {
-            return await Db.Ado.UseStoredProcedure().SqlQueryAsync<S>(storeName, para);
+            return await _Db.Ado.UseStoredProcedure().SqlQueryAsync<S>(storeName, para);
         }
 
 
@@ -134,7 +134,7 @@ namespace Yi.Framework.Repository
 
 
 
-        private ISugarQueryable<T> QueryConditionHandler(QueryCondition pars)
+        public ISugarQueryable<T> QueryConditionHandler(QueryCondition pars)
         {
             var sugarParamters = pars.Parameters.Select(it => (IConditionalModel)new ConditionalModel()
             {
@@ -142,7 +142,7 @@ namespace Yi.Framework.Repository
                 FieldName = it.Key,
                 FieldValue = it.Value
             }).ToList();
-            var query = Db.Queryable<T>();
+            var query = _Db.Queryable<T>();
             if (pars.OrderBys != null)
             {
                 foreach (var item in pars.OrderBys)

Yi.Framework.Net6/Yi.Framework.Service/MenuService.cs

@@ -13,7 +13,7 @@ namespace Yi.Framework.Service
         {
             //ParentId 0,代表为根目录，只能存在一个
             //复杂查询直接使用db代理
-            return await _repository._Db.Queryable<MenuEntity>().ToTreeAsync(it=>it.Children,it=>it.ParentId,0);
+            return await _repository._Db.Queryable<MenuEntity>().Where(u=>u.IsDeleted==false).ToTreeAsync(it=>it.Children,it=>it.ParentId,0);
         }
     }
 }

Yi.Framework.Net6/Yi.Framework.Service/RoleService.cs

@@ -15,8 +15,7 @@ namespace Yi.Framework.Service
         }
         public async Task<bool> GiveRoleSetMenu(List<long> roleIds, List<long> menuIds)
         {
-            var _repositoryRoleMenu = _repository.ChangeRepository<Repository<RoleMenuEntity>>();
-
+          var _repositoryRoleMenu=  _repository.ChangeRepository<Repository<RoleMenuEntity>>();
             //多次操作，需要事务确保原子性
             return await _repositoryRoleMenu.UseTranAsync(async () =>
             {
@@ -35,12 +34,17 @@ namespace Yi.Framework.Service
                     }
 
                     //一次性批量添加
-                    await _repositoryRoleMenu.InsertRangeAsync(roleMenuEntity);
+                    await _repositoryRoleMenu.InsertReturnSnowflakeIdAsync(roleMenuEntity);
                 }
             });
 
 
         }
 
+        public async Task<RoleEntity> GetInMenuByRoleId(long roleId)
+        {
+            return await _repository._Db.Queryable<RoleEntity>().Includes(u => u.Menus).InSingleAsync(roleId);
+        
+        }
     }
 }

Yi.Framework.Net6/Yi.Framework.Service/UserService.cs

@@ -92,7 +92,7 @@ namespace Yi.Framework.Service
                      }
 
                      //一次性批量添加
-                     await _repositoryUserRole.InsertRangeAsync(userRoleEntities);
+                     await _repositoryUserRole.InsertReturnSnowflakeIdAsync(userRoleEntities);
                  }
              });
         }

Yi.Vue2.x/src/api/menuApi.js

@@ -1,50 +1,30 @@
 import myaxios from '@/util/myaxios'
 export default {
-    GetMenuInMould() {
+    getMenuTree() {
         return myaxios({
-            url: '/Menu/GetMenuInMould',
+            url: '/Menu/getMenuTree',
             method: 'get'
         })
     },
-    addChildrenMenu(id, data) {
+    Update(data) {
         return myaxios({
-            url: '/Menu/addChildrenMenu',
-            method: 'post',
-            data: { parentId: id, data }
-        })
-    },
-    UpdateMenu(data) {
-        return myaxios({
-            url: '/Menu/UpdateMenu',
+            url: '/Menu/Update',
             method: 'put',
             data: data
         })
     },
-    DelListMenu(ids) {
+    DeleteList(ids) {
         return myaxios({
-            url: '/Menu/DelListMenu',
+            url: '/Menu/DeleteList',
             method: 'delete',
             data: ids
         })
     },
-    AddTopMenu(data) {
+    Add(data) {
         return myaxios({
-            url: '/Menu/AddTopMenu',
+            url: '/Menu/Add',
             method: 'post',
             data: data
         })
-    },
-    SetMouldByMenu(menuId, mouldId) {
-        return myaxios({
-            url: '/Menu/SetMouldByMenu',
-            method: 'post',
-            data: { id1: menuId, id2: mouldId }
-        })
-    },
-    GetTopMenusByHttpUser() {
-        return myaxios({
-            url: '/Menu/GetTopMenusByHttpUser',
-            method: 'get'
-        })
     }
 }

Yi.Vue2.x/src/api/roleApi.js

@@ -1,23 +1,36 @@
 import myaxios from '@/util/myaxios'
 export default {
-    getRole() {
+    getList() {
         return myaxios({
-            url: '/Role/getRole',
-            method: 'get'
-        })
-    },
-    setMenuByRole(roleList, menuList) {
-        return myaxios({
-            url: '/Role/setMenuByRole',
+            url: '/Role/GetList',
             method: 'post',
-            data: { ids1: roleList, ids2: menuList }
+            data: {
+                parameters: [
+                    {
+                        key: "isDeleted",
+                        value: "0",
+                        type: 0
+
+                    }
+                ],
+                orderBys: [
+                    "id"
+                ]
+            }
         })
     },
-    GetTopMenusByRoleId(roleId) {
+    giveRoleSetMenu(roleList, menuList) {
         return myaxios({
-            url: `/Role/GetTopMenusByRoleId?roleId=${roleId}`,
-            method: 'get'
+            url: '/Role/GiveRoleSetMenu',
+            method: 'put',
+            data: { RoleIds: roleList, menuIds: menuList }
+        })
+    },
 
+    getInMenuByRoleId(roleId) {
+        return myaxios({
+            url: `/Role/GetInMenuByRoleId?roleId=${roleId}`,
+            method: 'get'
         })
     }
 

Yi.Vue2.x/src/components/ccTreeview.vue

@@ -1,14 +1,11 @@
 <template>
   <div>
     <v-divider></v-divider>
-    <app-btn  dark class="ma-4" @click="showAll"> 展开全部</app-btn>
-    <app-btn  dark class="my-4 mr-4" @click="dialog = true"> 添加新项 </app-btn>
-    <app-btn dark class="my-4"  color="secondary" @click="deleteItem(null)">
+    <app-btn dark class="ma-4" @click="showAll"> 展开全部</app-btn>
+    <app-btn dark class="my-4 mr-4" @click="dialog = true"> 添加新项 </app-btn>
+    <app-btn dark class="my-4" color="secondary" @click="deleteItem(null)">
       删除所选
     </app-btn>
-   
-
- 
 
     <v-dialog v-model="dialog" max-width="500px">
       <v-card>
@@ -53,15 +50,16 @@
       return-object
       open-all
       hoverable
-      item-text="menu_name"
+      item-text="menuName"
     >
       <template v-slot:append="{ item }">
         <v-btn class="mr-2">编号:{{ item.id }}</v-btn>
-        <v-btn class="mr-2">图标:{{ item.icon }}</v-btn>
-        <v-btn class="mr-2">路由:{{ item.router }}</v-btn>
-        <v-btn v-if="item.mould" class="mr-2">接口名:{{ item.mould.mould_name }}</v-btn>
-        <v-btn  v-if="item.mould" class="mr-2" color="secondary">接口地址:{{ item.mould.url }}</v-btn>
-        <ccCombobox
+        <v-btn class="mr-2">权限:{{ item.permissionCode }}</v-btn>
+        <!-- <v-btn class="mr-2">图标:{{ item.icon }}</v-btn> -->
+        <!-- <v-btn class="mr-2">路由:{{ item.router }}</v-btn> -->
+        <!-- <v-btn v-if="item.mould" class="mr-2">接口名:{{ item.mould.mould_name }}</v-btn>
+        <v-btn  v-if="item.mould" class="mr-2" color="secondary">接口地址:{{ item.mould.url }}</v-btn> -->
+        <!-- <ccCombobox
           headers="设置接口权限"
           itemText="url"
           :items="mouldList"
@@ -72,24 +70,24 @@
               保存</v-btn
             >
           </template>
-        </ccCombobox>
-         <app-btn
+        </ccCombobox> -->
+        <app-btn
           @click="
-            parentId = item.id;
+            editedItem.parentId = item.id;
             dialog = true;
           "
           >添加子菜单</app-btn
         >
         <app-btn class="mx-2" @click="editItem(item)">编辑</app-btn>
-        
-        <app-btn color="secondary" class="mr-2" @click="deleteItem(item)">删除</app-btn>
-       
+
+        <app-btn color="secondary" class="mr-2" @click="deleteItem(item)"
+          >删除</app-btn
+        >
       </template>
     </v-treeview>
   </div>
 </template>
 <script>
-import mouldApi from "../api/mouldApi";
 import menuApi from "../api/menuApi";
 export default {
   name: "ccTreeview",
@@ -103,12 +101,12 @@ export default {
     dialog: false,
     editedItem: {},
     editedIndex: -1,
-    parentId: 0,
     defaultItem: {
-      icon: "mdi-start",
-      router: "test",
-      menu_name: "测试",
-      is_show:1
+      // icon: "mdi-start",
+      permissionCode: "test",
+      menuName: "管理",
+      parentId: 0,
+      MenuType:0
     },
   }),
   computed: {
@@ -120,25 +118,25 @@ export default {
     this.init();
   },
   methods: {
-showAll(){
-  this.$refs.tree.updateAll(true);
-},
-
-    setMould(item) {
-      menuApi.SetMouldByMenu(item.id, this.mouldSelect[0].id).then((resp) => {
-        this.$dialog.notify.info(resp.msg, {
-          position: "top-right",
-          timeout: 5000,
-        });
-               this.init();
-      });
+    showAll() {
+      this.$refs.tree.updateAll(true);
     },
 
+    // setMould(item) {
+    //   menuApi.SetMouldByMenu(item.id, this.mouldSelect[0].id).then((resp) => {
+    //     this.$dialog.notify.info(resp.msg, {
+    //       position: "top-right",
+    //       timeout: 5000,
+    //     });
+    //     this.init();
+    //   });
+    // },
+
     getSelect(data) {
       this.mouldSelect = data;
     },
     async deleteItem(item) {
-      this.editedIndex = this.desserts.indexOf(item);
+      this.editedIndex = 1;
       this.editedItem = Object.assign({}, item);
       var p = await this.$dialog.warning({
         text: "你确定要删除此条记录吗？?",
@@ -161,7 +159,7 @@ showAll(){
           Ids.push(item.id);
         });
       }
-      menuApi.DelListMenu(Ids).then(() => this.init());
+      menuApi.DeleteList(Ids).then(() => this.init());
     },
 
     close() {
@@ -173,20 +171,14 @@ showAll(){
     },
     init() {
       this.parentId = 0;
-      mouldApi.getMould().then((resp) => {
-        this.mouldList = resp.data;
-      });
 
-      menuApi.GetMenuInMould().then((resp) => {
-        this.desserts =[ resp.data];
+      menuApi.getMenuTree().then((resp) => {
+        this.desserts = resp.data;
       });
       this.$nextTick(() => {
         this.editedItem = Object.assign({}, this.defaultItem);
         this.editedIndex = -1;
       });
-
-
-      
     },
     editItem(item) {
       this.editedIndex = item.id;
@@ -196,17 +188,11 @@ showAll(){
 
     save() {
       if (this.editedIndex > -1) {
-        menuApi.UpdateMenu(this.editedItem).then(() => this.init());
+        menuApi.Update(this.editedItem).then(() => this.init());
       } else {
-        if (this.parentId == 0) {
-          menuApi.AddTopMenu(this.editedItem).then(() => {
+        menuApi.Add(this.editedItem).then(() => {
             this.init();
           });
-        } else {
-          menuApi.addChildrenMenu(this.parentId, this.editedItem).then(() => {
-            this.init();
-          });
-        }
       }
       this.close();
     },

Yi.Vue2.x/src/views/AdmRoleMenu.vue

@@ -6,30 +6,28 @@
           角色菜单分配管理 —
           <small class="text-body-1"
             >你可以在这里多角色分配多菜单/选中一个可查看</small
-          > </template
-        >
-         <v-divider></v-divider>
-            <app-btn  dark class="ma-4" @click="showAll"> 展开全部</app-btn>
-        <app-btn class="my-4 mr-4" @click="setMenu">确定分配</app-btn
-        >
-        
-        <app-btn class="my-4"  color="secondary" @click="clear">清空选择</app-btn></material-card
+          >
+        </template>
+        <v-divider></v-divider>
+        <app-btn dark class="ma-4" @click="showAll"> 展开全部</app-btn>
+        <app-btn class="my-4 mr-4" @click="setMenu">确定分配</app-btn>
+
+        <app-btn class="my-4" color="secondary" @click="clear"
+          >清空选择</app-btn
+        ></material-card
       >
-      
     </v-col>
-   
+
     <v-col cols="12" md="4" lg="4">
       <v-card class="mx-auto" width="100%">
         <v-treeview
-        
-         
           selectable
           :items="RoleItems"
           v-model="selectionRole"
           return-object
           open-all
           hoverable
-          item-text="role_name"
+          item-text="roleName"
         >
         </v-treeview>
       </v-card>
@@ -38,7 +36,7 @@
     <v-col cols="12" md="8" lg="8">
       <v-card class="mx-auto" width="100%">
         <v-treeview
-        ref="tree"
+          ref="tree"
           open-on-click
           selectable
           :items="Menuitems"
@@ -47,7 +45,7 @@
           return-object
           open-all
           hoverable
-          item-text="menu_name"
+          item-text="menuName"
         >
           <template v-slot:append="{ item }">
             <v-btn>id:{{ item.id }}</v-btn>
@@ -68,8 +66,12 @@ export default {
     selectionRole: {
       handler(val, oldVal) {
         if (val.length == 1) {
-          roleApi.GetTopMenusByRoleId(val[0].id).then((resp) => {
-            this.selectionMenu = resp.data;
+          roleApi.getInMenuByRoleId(val[0].id).then((resp) => {
+            if (resp.data.menus == null) {
+              this.selectionMenu = [];
+            } else {
+              this.selectionMenu = resp.data.menus;
+            }
           });
         }
       },
@@ -77,9 +79,9 @@ export default {
     },
   },
   methods: {
-    showAll(){
-  this.$refs.tree.updateAll(true);
-},
+    showAll() {
+      this.$refs.tree.updateAll(true);
+    },
     clear() {
       this.selectionMenu = [];
       this.selectionRole = [];
@@ -93,20 +95,20 @@ export default {
       this.selectionMenu.forEach((ele) => {
         menuIds.push(ele.id);
       });
-      roleApi.setMenuByRole(roleIds, menuIds).then((resp) => {
-        this.$dialog.notify.info(resp.msg, {
+      roleApi.giveRoleSetMenu(roleIds, menuIds).then((resp) => {
+        this.$dialog.notify.info(resp.message, {
           position: "top-right",
           timeout: 5000,
         });
       });
     },
     init() {
-      roleApi.getRole().then((resp) => {
+      roleApi.getList().then((resp) => {
         this.RoleItems = resp.data;
       });
 
-      menuApi.GetMenuInMould().then((resp) => {
-        this.Menuitems = [resp.data];
+      menuApi.getMenuTree().then((resp) => {
+        this.Menuitems = resp.data;
       });
     },
   },