浏览代码

添加角色权限,管理员添加对应的关联字段--role_id

lrf 3 年之前
父节点
当前提交
09ff76d931

+ 35 - 0
app/controller/system/config/.role.js

@@ -0,0 +1,35 @@
+module.exports = {
+  create: {
+    requestBody: ['name', 'brief', 'menu', 'remark'],
+  },
+  destroy: {
+    params: ['!id'],
+    service: 'delete',
+  },
+  update: {
+    params: ['!id'],
+    requestBody: ['name', 'brief', 'menu', 'remark'],
+  },
+  show: {
+    parameters: {
+      params: ['!id'],
+    },
+    service: 'fetch',
+  },
+  index: {
+    parameters: {
+      query: {
+        'meta.createdAt@start': 'meta.createdAt@start',
+        'meta.createdAt@end': 'meta.createdAt@end',
+        name: 'name',
+      },
+    },
+    service: 'query',
+    options: {
+      query: ['skip', 'limit'],
+      sort: ['meta.createdAt'],
+      desc: true,
+      count: true,
+    },
+  },
+};

+ 13 - 0
app/controller/system/role.js

@@ -0,0 +1,13 @@
+'use strict';
+const meta = require('./config/.role.js');
+const Controller = require('egg').Controller;
+const { CrudController } = require('naf-framework-mongoose-free/lib/controller');
+
+// 角色
+class RoleController extends Controller {
+  constructor(ctx) {
+    super(ctx);
+    this.service = this.ctx.service.system.role;
+  }
+}
+module.exports = CrudController(RoleController, meta);

+ 3 - 2
app/controller/user/config/.admin.js

@@ -1,6 +1,6 @@
 module.exports = {
   create: {
-    requestBody: ['!name', '!phone', '!passwd', 'openid', '!role', 'menus', '!pid', 'deptname', 'code', 'isdel', 'remark'],
+    requestBody: ['!name', '!phone', '!passwd', 'openid', '!role', 'menus', '!pid', 'deptname', 'code', 'isdel', 'remark', 'role_id'],
   },
   destroy: {
     params: ['!id'],
@@ -8,7 +8,7 @@ module.exports = {
   },
   update: {
     params: ['!id'],
-    requestBody: ['name', 'phone', 'openid', 'role', 'menus', 'pid', 'deptname', 'code', 'isdel', 'remark'],
+    requestBody: ['name', 'phone', 'openid', 'role', 'menus', 'pid', 'deptname', 'code', 'isdel', 'remark', 'role_id'],
   },
   show: {
     parameters: {
@@ -26,6 +26,7 @@ module.exports = {
         deptname: '%deptname%',
         code: 'code',
         isdel: 'isdel',
+        role_id: 'role_id',
         'create_time@start': 'create_time@start',
         'create_time@end': 'create_time@end',
       },

+ 20 - 0
app/model/system/role.js

@@ -0,0 +1,20 @@
+'use strict';
+const Schema = require('mongoose').Schema;
+const moment = require('moment');
+const metaPlugin = require('naf-framework-mongoose-free/lib/model/meta-plugin');
+const { ObjectId } = require('mongoose').Types;
+// 角色表
+const role = {
+  name: { type: String, zh: '名称' }, // 名称
+  brief: { type: String, zh: '简介' }, // 简介
+  menu: { type: Array, zh: '菜单' }, // 菜单
+  remark: { type: String },
+};
+const schema = new Schema(role, { toJSON: { virtuals: true } });
+schema.index({ id: 1 });
+schema.index({ 'meta.createdAt': 1 });
+schema.plugin(metaPlugin);
+module.exports = app => {
+  const { mongoose } = app;
+  return mongoose.model('Role', schema, 'role');
+};

+ 2 - 0
app/model/user/admin.js

@@ -17,6 +17,7 @@ const admin = {
   code: { type: String }, // 邀请码
   isdel: { type: Boolean, default: false }, // 是否删除
   remark: { type: String, maxLength: 200 },
+  role_id: { type: String }, // 关联角色id
 };
 const schema = new Schema(admin, { toJSON: { virtuals: true } });
 schema.index({ id: 1 });
@@ -25,6 +26,7 @@ schema.index({ phone: 1 });
 schema.index({ role: 1 });
 schema.index({ pid: 1 });
 schema.index({ code: 1 });
+schema.index({ role_id: 1 });
 schema.index({ 'meta.createdAt': 1 });
 schema.plugin(metaPlugin);
 module.exports = app => {

+ 1 - 0
app/router.js

@@ -84,6 +84,7 @@ module.exports = app => {
   require('./z_router/system/category')(app); // 字典分类
   require('./z_router/system/code')(app); // 字典
   require('./z_router/system/menu')(app); // 菜单
+  require('./z_router/system/role')(app); // 角色
 
   // patent
 };

+ 15 - 0
app/service/system/role.js

@@ -0,0 +1,15 @@
+'use strict';
+const { CrudService } = require('naf-framework-mongoose-free/lib/service');
+const { BusinessError, ErrorCode } = require('naf-core').Error;
+const _ = require('lodash');
+const assert = require('assert');
+
+// 角色
+class RoleService extends CrudService {
+  constructor(ctx) {
+    super(ctx, 'role');
+    this.model = this.ctx.model.System.Role;
+  }
+}
+
+module.exports = RoleService;

+ 29 - 0
app/z_router/system/role.js

@@ -0,0 +1,29 @@
+'use strict';
+// 路由配置
+const rkey = 'role';
+const ckey = 'system.role';
+const keyZh = '角色';
+const routes = [
+  { method: 'get', path: `${rkey}`, controller: `${ckey}.index`, name: `${ckey}Query`, zh: `${keyZh}列表查询` },
+  { method: 'get', path: `${rkey}/:id`, controller: `${ckey}.show`, name: `${ckey}Show`, zh: `${keyZh}查询` },
+  { method: 'post', path: `${rkey}`, controller: `${ckey}.create`, name: `${ckey}Create`, zh: `创建${keyZh}` },
+  { method: 'post', path: `${rkey}/:id`, controller: `${ckey}.update`, name: `${ckey}Update`, zh: `修改${keyZh}` },
+  { method: 'delete', path: `${rkey}/:id`, controller: `${ckey}.destroy`, name: `${ckey}Delete`, zh: `删除${keyZh}` },
+];
+
+module.exports = app => {
+  const { router, config } = app;
+  const mwares = app.middleware;
+  console.log(`${keyZh}:  ${rkey}`);
+  for (const route of routes) {
+    const { method, path, controller: ctl, zh } = route;
+    let { middleware = [] } = route;
+    if (!method || !path || !ctl) continue;
+    // 拼全路径
+    const allPath = `${config.routePrefix}/${path}`;
+    // 处理中间件
+    if (middleware.length > 0) middleware = middleware.map(i => mwares[i]({ enable: true }));
+    // 注册路由
+    router[method](zh, allPath, ...middleware, ctl);
+  }
+};