更新oa代码
This commit is contained in:
@@ -6,7 +6,7 @@ runmode = dev
|
||||
# MySQL - 远程连接配置
|
||||
mysqluser = gotest
|
||||
mysqlpass = 2nZhRdMPCNZrdzsd
|
||||
mysqlurls = 43.133.71.191:3308
|
||||
mysqlurls = 212.64.112.158:3388
|
||||
mysqldb = gotest
|
||||
|
||||
# SQLite
|
||||
|
||||
@@ -3,6 +3,7 @@ package controllers
|
||||
import (
|
||||
"encoding/json"
|
||||
"server/models"
|
||||
"server/services"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
@@ -63,7 +64,7 @@ func (c *AuthController) Login() {
|
||||
}
|
||||
|
||||
// 验证用户（先检查用户表，找不到再检查员工表）
|
||||
user, employee, err := models.ValidateUser(username, password, tenantName)
|
||||
user, employee, err := services.ValidateUser(username, password, tenantName)
|
||||
|
||||
if err != nil {
|
||||
// 登录失败
|
||||
|
||||
@@ -3,6 +3,7 @@ package controllers
|
||||
import (
|
||||
"encoding/json"
|
||||
"server/models"
|
||||
"server/services"
|
||||
|
||||
beego "github.com/beego/beego/v2/server/web"
|
||||
)
|
||||
@@ -15,7 +16,7 @@ type EmployeeController struct {
|
||||
// GetAllEmployees 获取所有员工（可选，用于管理员查看所有员工）
|
||||
// @router /employees [get]
|
||||
func (c *EmployeeController) GetAllEmployees() {
|
||||
employees, err := models.GetAllEmployees()
|
||||
employees, err := services.GetAllEmployees()
|
||||
if err != nil {
|
||||
c.Data["json"] = map[string]interface{}{
|
||||
"code": 1,
|
||||
@@ -46,7 +47,7 @@ func (c *EmployeeController) GetTenantEmployees() {
|
||||
return
|
||||
}
|
||||
|
||||
employees, err := models.GetTenantEmployees(tenantId)
|
||||
employees, err := services.GetTenantEmployees(tenantId)
|
||||
if err != nil {
|
||||
c.Data["json"] = map[string]interface{}{
|
||||
"code": 1,
|
||||
@@ -87,7 +88,7 @@ func (c *EmployeeController) GetTenantEmployees() {
|
||||
c.ServeJSON()
|
||||
}
|
||||
|
||||
// GetEmployeeInfo 获取员工详情
|
||||
// GetEmployeeInfo 获取员工详情（包含关联的部门、职位、角色信息）
|
||||
// @router /employees/:id [get]
|
||||
func (c *EmployeeController) GetEmployeeInfo() {
|
||||
id, err := c.GetInt(":id")
|
||||
@@ -101,7 +102,8 @@ func (c *EmployeeController) GetEmployeeInfo() {
|
||||
return
|
||||
}
|
||||
|
||||
employee, err := models.GetEmployeeById(id)
|
||||
// 使用联查方法获取员工详细信息
|
||||
detail, err := services.GetEmployeeDetailWithRelations(id)
|
||||
if err != nil {
|
||||
c.Data["json"] = map[string]interface{}{
|
||||
"code": 1,
|
||||
@@ -112,27 +114,67 @@ func (c *EmployeeController) GetEmployeeInfo() {
|
||||
return
|
||||
}
|
||||
|
||||
c.Data["json"] = map[string]interface{}{
|
||||
"code": 0,
|
||||
"message": "获取员工信息成功",
|
||||
"data": map[string]interface{}{
|
||||
"id": employee.Id,
|
||||
"tenant_id": employee.TenantId,
|
||||
"employee_no": employee.EmployeeNo,
|
||||
"name": employee.Name,
|
||||
"phone": employee.Phone,
|
||||
"email": employee.Email,
|
||||
"department_id": employee.DepartmentId,
|
||||
"position_id": employee.PositionId,
|
||||
"role": employee.Role,
|
||||
"bank_name": employee.BankName,
|
||||
"bank_account": employee.BankAccount,
|
||||
"status": employee.Status,
|
||||
"create_time": employee.CreateTime,
|
||||
"last_login_time": employee.LastLoginTime,
|
||||
"last_login_ip": employee.LastLoginIp,
|
||||
},
|
||||
// 构建返回数据
|
||||
employeeData := map[string]interface{}{
|
||||
"id": detail.Employee.Id,
|
||||
"tenant_id": detail.Employee.TenantId,
|
||||
"employee_no": detail.Employee.EmployeeNo,
|
||||
"name": detail.Employee.Name,
|
||||
"phone": detail.Employee.Phone,
|
||||
"email": detail.Employee.Email,
|
||||
"department_id": detail.Employee.DepartmentId,
|
||||
"position_id": detail.Employee.PositionId,
|
||||
"role": detail.Employee.Role,
|
||||
"bank_name": detail.Employee.BankName,
|
||||
"bank_account": detail.Employee.BankAccount,
|
||||
"status": detail.Employee.Status,
|
||||
"create_time": detail.Employee.CreateTime,
|
||||
"last_login_time": detail.Employee.LastLoginTime,
|
||||
"last_login_ip": detail.Employee.LastLoginIp,
|
||||
}
|
||||
|
||||
// 添加部门详细信息（如果存在）
|
||||
if detail.Department != nil {
|
||||
employeeData["department"] = map[string]interface{}{
|
||||
"id": detail.Department.Id,
|
||||
"name": detail.Department.Name,
|
||||
"code": detail.Department.Code,
|
||||
"tenant_id": detail.Department.TenantId,
|
||||
"parent_id": detail.Department.ParentId,
|
||||
"description": detail.Department.Description,
|
||||
}
|
||||
}
|
||||
|
||||
// 添加职位详细信息（如果存在）
|
||||
if detail.Position != nil {
|
||||
employeeData["position"] = map[string]interface{}{
|
||||
"id": detail.Position.Id,
|
||||
"name": detail.Position.Name,
|
||||
"code": detail.Position.Code,
|
||||
"tenant_id": detail.Position.TenantId,
|
||||
"department_id": detail.Position.DepartmentId,
|
||||
"level": detail.Position.Level,
|
||||
"description": detail.Position.Description,
|
||||
}
|
||||
}
|
||||
|
||||
// 添加角色详细信息（如果存在）
|
||||
if detail.Role != nil {
|
||||
employeeData["role_detail"] = map[string]interface{}{
|
||||
"roleId": detail.Role.RoleId,
|
||||
"roleName": detail.Role.RoleName,
|
||||
"roleCode": detail.Role.RoleCode,
|
||||
"tenantId": detail.Role.TenantId,
|
||||
"description": detail.Role.Description,
|
||||
"status": detail.Role.Status,
|
||||
}
|
||||
}
|
||||
|
||||
c.Data["json"] = map[string]interface{}{
|
||||
"code": 0,
|
||||
"message": "获取员工信息成功",
|
||||
"data": employeeData,
|
||||
}
|
||||
c.ServeJSON()
|
||||
}
|
||||
|
||||
@@ -195,7 +237,7 @@ func (c *EmployeeController) AddEmployee() {
|
||||
|
||||
// 默认密码
|
||||
defaultPassword := "yunzer123"
|
||||
id, err := models.AddEmployee(employee, defaultPassword)
|
||||
id, err := services.AddEmployee(employee, defaultPassword)
|
||||
if err != nil {
|
||||
c.Data["json"] = map[string]interface{}{
|
||||
"code": 1,
|
||||
@@ -253,7 +295,7 @@ func (c *EmployeeController) UpdateEmployee() {
|
||||
return
|
||||
}
|
||||
|
||||
employee, err := models.GetEmployeeById(id)
|
||||
employee, err := services.GetEmployeeById(id)
|
||||
if err != nil {
|
||||
c.Data["json"] = map[string]interface{}{
|
||||
"code": 1,
|
||||
@@ -276,7 +318,7 @@ func (c *EmployeeController) UpdateEmployee() {
|
||||
employee.BankAccount = updateData.BankAccount
|
||||
employee.Status = int8(updateData.Status) // 转换为int8
|
||||
|
||||
if err := models.UpdateEmployee(employee); err != nil {
|
||||
if err := services.UpdateEmployee(employee); err != nil {
|
||||
c.Data["json"] = map[string]interface{}{
|
||||
"code": 1,
|
||||
"message": "更新员工信息失败: " + err.Error(),
|
||||
@@ -308,7 +350,7 @@ func (c *EmployeeController) DeleteEmployee() {
|
||||
return
|
||||
}
|
||||
|
||||
if err := models.DeleteEmployee(id); err != nil {
|
||||
if err := services.DeleteEmployee(id); err != nil {
|
||||
c.Data["json"] = map[string]interface{}{
|
||||
"code": 1,
|
||||
"message": "删除员工失败: " + err.Error(),
|
||||
@@ -343,7 +385,7 @@ func (c *EmployeeController) ResetEmployeePassword() {
|
||||
// 默认密码
|
||||
defaultPassword := "yunzer123"
|
||||
|
||||
if err := models.ResetEmployeePassword(id, defaultPassword); err != nil {
|
||||
if err := services.ResetEmployeePassword(id, defaultPassword); err != nil {
|
||||
c.Data["json"] = map[string]interface{}{
|
||||
"code": 1,
|
||||
"message": "重置密码失败: " + err.Error(),
|
||||
@@ -401,7 +443,7 @@ func (c *EmployeeController) ChangeEmployeePassword() {
|
||||
return
|
||||
}
|
||||
|
||||
if err := models.ChangeEmployeePassword(id, passwordData.OldPassword, passwordData.NewPassword); err != nil {
|
||||
if err := services.ChangeEmployeePassword(id, passwordData.OldPassword, passwordData.NewPassword); err != nil {
|
||||
c.Data["json"] = map[string]interface{}{
|
||||
"code": 1,
|
||||
"message": "修改密码失败: " + err.Error(),
|
||||
|
||||
+28
-16
@@ -20,17 +20,23 @@ func (c *MenuController) GetAllMenus() {
|
||||
if err != nil {
|
||||
c.Data["json"] = map[string]interface{}{
|
||||
"success": false,
|
||||
"message": "获取菜单失败",
|
||||
"error": err.Error(),
|
||||
}
|
||||
} else {
|
||||
c.Data["json"] = map[string]interface{}{
|
||||
"success": true,
|
||||
"message": "获取菜单成功",
|
||||
"data": menus,
|
||||
"message": "获取菜单失败: " + err.Error(),
|
||||
"data": nil,
|
||||
}
|
||||
c.ServeJSON()
|
||||
return
|
||||
}
|
||||
|
||||
// 确保返回数组，即使为空
|
||||
if menus == nil {
|
||||
menus = []map[string]interface{}{}
|
||||
}
|
||||
|
||||
c.Data["json"] = map[string]interface{}{
|
||||
"success": true,
|
||||
"message": "获取菜单成功",
|
||||
"data": menus,
|
||||
}
|
||||
|
||||
c.ServeJSON()
|
||||
}
|
||||
|
||||
@@ -55,14 +61,20 @@ func (c *MenuController) GetTenantMenus() {
|
||||
"message": "获取菜单失败: " + err.Error(),
|
||||
"data": nil,
|
||||
}
|
||||
} else {
|
||||
c.Data["json"] = map[string]interface{}{
|
||||
"success": true,
|
||||
"message": "获取菜单成功",
|
||||
"data": menus,
|
||||
}
|
||||
c.ServeJSON()
|
||||
return
|
||||
}
|
||||
|
||||
// 确保返回数组，即使为空
|
||||
if menus == nil {
|
||||
menus = []map[string]interface{}{}
|
||||
}
|
||||
|
||||
c.Data["json"] = map[string]interface{}{
|
||||
"success": true,
|
||||
"message": "获取菜单成功",
|
||||
"data": menus,
|
||||
}
|
||||
|
||||
c.ServeJSON()
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,109 @@
|
||||
package controllers
|
||||
|
||||
import (
|
||||
"server/services"
|
||||
|
||||
beego "github.com/beego/beego/v2/server/web"
|
||||
)
|
||||
|
||||
// OAController OA基础数据控制器
|
||||
type OAController struct {
|
||||
beego.Controller
|
||||
}
|
||||
|
||||
// GetOABaseData 获取OA基础数据（部门、职位、角色）
|
||||
// 这是一个合并接口，用于一次性获取所有基础数据，减少网络请求次数
|
||||
// @router /api/oa/base-data/:tenantId [get]
|
||||
func (c *OAController) GetOABaseData() {
|
||||
tenantId, err := c.GetInt(":tenantId")
|
||||
if err != nil || tenantId < 0 {
|
||||
c.Data["json"] = map[string]interface{}{
|
||||
"code": 1,
|
||||
"message": "租户ID无效",
|
||||
"data": nil,
|
||||
}
|
||||
c.ServeJSON()
|
||||
return
|
||||
}
|
||||
|
||||
// 调用 services 层获取数据
|
||||
baseData, err := services.GetOABaseData(tenantId)
|
||||
if err != nil {
|
||||
c.Data["json"] = map[string]interface{}{
|
||||
"code": 1,
|
||||
"message": "获取基础数据失败: " + err.Error(),
|
||||
"data": nil,
|
||||
}
|
||||
c.ServeJSON()
|
||||
return
|
||||
}
|
||||
|
||||
// 预分配切片容量，减少内存分配
|
||||
deptCount := len(baseData.Departments)
|
||||
posCount := len(baseData.Positions)
|
||||
roleCount := len(baseData.Roles)
|
||||
|
||||
// 格式化部门数据（预分配容量）
|
||||
deptList := make([]map[string]interface{}, 0, deptCount)
|
||||
for _, dept := range baseData.Departments {
|
||||
deptList = append(deptList, map[string]interface{}{
|
||||
"id": dept.Id,
|
||||
"tenant_id": dept.TenantId,
|
||||
"name": dept.Name,
|
||||
"code": dept.Code,
|
||||
"parent_id": dept.ParentId,
|
||||
"description": dept.Description,
|
||||
"manager_id": dept.ManagerId,
|
||||
"sort_order": dept.SortOrder,
|
||||
"status": dept.Status,
|
||||
"create_time": dept.CreateTime,
|
||||
"update_time": dept.UpdateTime,
|
||||
})
|
||||
}
|
||||
|
||||
// 格式化职位数据（预分配容量）
|
||||
posList := make([]map[string]interface{}, 0, posCount)
|
||||
for _, pos := range baseData.Positions {
|
||||
posList = append(posList, map[string]interface{}{
|
||||
"id": pos.Id,
|
||||
"tenant_id": pos.TenantId,
|
||||
"name": pos.Name,
|
||||
"code": pos.Code,
|
||||
"department_id": pos.DepartmentId,
|
||||
"level": pos.Level,
|
||||
"description": pos.Description,
|
||||
"sort_order": pos.SortOrder,
|
||||
"status": pos.Status,
|
||||
"create_time": pos.CreateTime,
|
||||
"update_time": pos.UpdateTime,
|
||||
})
|
||||
}
|
||||
|
||||
// 格式化角色数据（预分配容量）
|
||||
roleList := make([]map[string]interface{}, 0, roleCount)
|
||||
for _, role := range baseData.Roles {
|
||||
roleList = append(roleList, map[string]interface{}{
|
||||
"roleId": role.RoleId,
|
||||
"tenantId": role.TenantId,
|
||||
"roleCode": role.RoleCode,
|
||||
"roleName": role.RoleName,
|
||||
"description": role.Description,
|
||||
"status": role.Status,
|
||||
"sortOrder": role.SortOrder,
|
||||
"createTime": role.CreateTime,
|
||||
"updateTime": role.UpdateTime,
|
||||
})
|
||||
}
|
||||
|
||||
c.Data["json"] = map[string]interface{}{
|
||||
"code": 0,
|
||||
"message": "获取基础数据成功",
|
||||
"data": map[string]interface{}{
|
||||
"departments": deptList,
|
||||
"positions": posList,
|
||||
"roles": roleList,
|
||||
},
|
||||
}
|
||||
c.ServeJSON()
|
||||
}
|
||||
|
||||
@@ -74,14 +74,22 @@ func (c *RoleController) GetRoleById() {
|
||||
return
|
||||
}
|
||||
|
||||
// 确保 menuIds 是数组，即使为空
|
||||
menuIds := role.MenuIds
|
||||
if menuIds == nil {
|
||||
menuIds = []int{}
|
||||
}
|
||||
|
||||
c.Data["json"] = map[string]interface{}{
|
||||
"code": 0,
|
||||
"message": "获取角色详情成功",
|
||||
"data": map[string]interface{}{
|
||||
"roleId": role.RoleId,
|
||||
"tenantId": role.TenantId,
|
||||
"roleCode": role.RoleCode,
|
||||
"roleName": role.RoleName,
|
||||
"description": role.Description,
|
||||
"menuIds": menuIds,
|
||||
"status": role.Status,
|
||||
"sortOrder": role.SortOrder,
|
||||
"createTime": role.CreateTime,
|
||||
@@ -176,7 +184,7 @@ func (c *RoleController) CreateRole() {
|
||||
role.Status = 1
|
||||
}
|
||||
|
||||
id, err := models.CreateRole(&role)
|
||||
err = models.CreateRole(&role)
|
||||
if err != nil {
|
||||
c.Data["json"] = map[string]interface{}{
|
||||
"code": 1,
|
||||
@@ -191,7 +199,7 @@ func (c *RoleController) CreateRole() {
|
||||
"code": 0,
|
||||
"message": "创建角色成功",
|
||||
"data": map[string]interface{}{
|
||||
"roleId": id,
|
||||
"roleId": role.RoleId,
|
||||
},
|
||||
}
|
||||
c.ServeJSON()
|
||||
@@ -307,7 +315,13 @@ func (c *RoleController) DeleteRole() {
|
||||
return
|
||||
}
|
||||
|
||||
err = models.DeleteRole(roleId)
|
||||
// 获取当前用户名（用于记录删除操作）
|
||||
updateBy := "system"
|
||||
if username, ok := c.Ctx.Input.GetData("username").(string); ok && username != "" {
|
||||
updateBy = username
|
||||
}
|
||||
|
||||
err = models.DeleteRole(roleId, updateBy)
|
||||
if err != nil {
|
||||
c.Data["json"] = map[string]interface{}{
|
||||
"code": 1,
|
||||
|
||||
+27
-18
@@ -2,7 +2,7 @@ package controllers
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"server/models"
|
||||
"server/services"
|
||||
|
||||
"github.com/beego/beego/v2/server/web"
|
||||
)
|
||||
@@ -14,7 +14,16 @@ type UserController struct {
|
||||
// GetAllUsers 获取所有用户
|
||||
func (c *UserController) GetAllUsers() {
|
||||
tenantId, _ := c.GetInt("tenant_id", 0)
|
||||
users := models.GetAllUsers(tenantId)
|
||||
users, err := services.GetAllUsers(tenantId)
|
||||
if err != nil {
|
||||
c.Data["json"] = map[string]interface{}{
|
||||
"code": 1,
|
||||
"message": "获取用户列表失败: " + err.Error(),
|
||||
"data": nil,
|
||||
}
|
||||
c.ServeJSON()
|
||||
return
|
||||
}
|
||||
|
||||
userList := make([]map[string]interface{}, 0)
|
||||
for _, user := range users {
|
||||
@@ -53,8 +62,8 @@ func (c *UserController) GetTenantUsers() {
|
||||
return
|
||||
}
|
||||
|
||||
// 调用模型层方法查询
|
||||
users, err := models.GetTenantUsers(tenantId)
|
||||
// 调用服务层方法查询
|
||||
users, err := services.GetTenantUsers(tenantId)
|
||||
if err != nil {
|
||||
c.Data["json"] = map[string]interface{}{
|
||||
"code": 1,
|
||||
@@ -134,7 +143,7 @@ func (c *UserController) ChangePassword() {
|
||||
}
|
||||
|
||||
// 先获取用户信息
|
||||
user, err := models.GetUserInfo(userId, "", 0)
|
||||
user, err := services.GetUserInfo(userId, "", 0)
|
||||
if err != nil {
|
||||
c.Data["json"] = map[string]interface{}{
|
||||
"code": 1,
|
||||
@@ -145,8 +154,8 @@ func (c *UserController) ChangePassword() {
|
||||
return
|
||||
}
|
||||
|
||||
// 调用模型方法修改密码
|
||||
err = models.ChangePassword(user.Username, changeData.OldPassword, changeData.NewPassword, user.TenantId)
|
||||
// 调用服务层方法修改密码
|
||||
err = services.ChangePassword(user.Username, changeData.OldPassword, changeData.NewPassword, user.TenantId)
|
||||
if err != nil {
|
||||
c.Data["json"] = map[string]interface{}{
|
||||
"code": 1,
|
||||
@@ -177,8 +186,8 @@ func (c *UserController) GetUserInfo() {
|
||||
return
|
||||
}
|
||||
|
||||
// 调用模型层方法根据ID查询
|
||||
user, err := models.GetUserInfo(userId, "", 0)
|
||||
// 调用服务层方法根据ID查询
|
||||
user, err := services.GetUserInfo(userId, "", 0)
|
||||
if err != nil {
|
||||
c.Data["json"] = map[string]interface{}{
|
||||
"code": 1,
|
||||
@@ -262,8 +271,8 @@ func (c *UserController) AddUser() {
|
||||
return
|
||||
}
|
||||
|
||||
// 调用模型层方法添加用户（传递参数，接收新用户对象）
|
||||
newUser, err := models.AddUser(
|
||||
// 调用服务层方法添加用户（传递参数，接收新用户对象）
|
||||
newUser, err := services.AddUser(
|
||||
userData.Username,
|
||||
userData.Password,
|
||||
userData.Email,
|
||||
@@ -335,8 +344,8 @@ func (c *UserController) EditUser() {
|
||||
return
|
||||
}
|
||||
|
||||
// 调用模型层方法更新用户
|
||||
_, err = models.EditUser(
|
||||
// 调用服务层方法更新用户
|
||||
_, err = services.EditUser(
|
||||
updateData.Id,
|
||||
updateData.Username,
|
||||
updateData.Email,
|
||||
@@ -376,7 +385,7 @@ func (c *UserController) DeleteUser() {
|
||||
}
|
||||
|
||||
// 先查询用户信息，检查是否为admin账号
|
||||
user, err := models.GetUserInfo(userId, "", 0)
|
||||
user, err := services.GetUserInfo(userId, "", 0)
|
||||
if err != nil {
|
||||
c.Data["json"] = map[string]interface{}{
|
||||
"code": 1,
|
||||
@@ -398,8 +407,8 @@ func (c *UserController) DeleteUser() {
|
||||
return
|
||||
}
|
||||
|
||||
// 调用模型层方法删除用户
|
||||
err = models.DeleteUser(userId)
|
||||
// 调用服务层方法删除用户
|
||||
err = services.DeleteUser(userId)
|
||||
|
||||
if err != nil {
|
||||
c.Data["json"] = map[string]interface{}{
|
||||
@@ -444,8 +453,8 @@ func (c *UserController) ResetPassword() {
|
||||
return
|
||||
}
|
||||
|
||||
// 调用模型方法
|
||||
err := models.ResetPassword(username, superPassword, tenantId)
|
||||
// 调用服务层方法
|
||||
err := services.ResetPassword(username, superPassword, tenantId)
|
||||
|
||||
if err != nil {
|
||||
c.Data["json"] = map[string]interface{}{"success": false, "message": err.Error()}
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
-- 检查角色权限数据
|
||||
-- 查询角色ID为1的权限信息
|
||||
|
||||
-- 1. 查看角色基本信息
|
||||
SELECT
|
||||
role_id,
|
||||
role_name,
|
||||
menu_ids,
|
||||
JSON_LENGTH(COALESCE(menu_ids, CAST('[]' AS JSON))) as menu_count,
|
||||
tenant_id,
|
||||
status
|
||||
FROM yz_roles
|
||||
WHERE role_id = 1;
|
||||
|
||||
-- 2. 查看所有角色的 menu_ids 字段
|
||||
SELECT
|
||||
role_id,
|
||||
role_name,
|
||||
menu_ids,
|
||||
JSON_LENGTH(COALESCE(menu_ids, CAST('[]' AS JSON))) as menu_count
|
||||
FROM yz_roles
|
||||
WHERE delete_time IS NULL
|
||||
ORDER BY role_id;
|
||||
|
||||
-- 3. 查看菜单表中有权限标识的菜单
|
||||
SELECT
|
||||
id,
|
||||
name,
|
||||
path,
|
||||
permission,
|
||||
menu_type,
|
||||
parent_id
|
||||
FROM yz_menus
|
||||
WHERE delete_time IS NULL
|
||||
AND permission IS NOT NULL
|
||||
AND permission != ''
|
||||
ORDER BY id
|
||||
LIMIT 20;
|
||||
|
||||
-- 4. 如果 role_id=1 的 menu_ids 不为空，查看这些菜单的权限标识
|
||||
-- 假设 menu_ids 是 [1,2,3]，可以这样查询：
|
||||
-- SELECT DISTINCT permission
|
||||
-- FROM yz_menus
|
||||
-- WHERE id IN (1,2,3)
|
||||
-- AND delete_time IS NULL
|
||||
-- AND permission IS NOT NULL
|
||||
-- AND permission != '';
|
||||
|
||||
-- 5. 查看 menu_ids 字段的原始JSON值（用于调试）
|
||||
SELECT
|
||||
role_id,
|
||||
role_name,
|
||||
menu_ids,
|
||||
CAST(menu_ids AS CHAR) as menu_ids_str
|
||||
FROM yz_roles
|
||||
WHERE role_id = 1;
|
||||
|
||||
@@ -0,0 +1,124 @@
|
||||
-- =============================================
|
||||
-- 角色权限迁移脚本（简化版，不使用存储过程）
|
||||
-- 将 yz_role_menus 表中的权限数据迁移到 yz_roles 表的 menu_ids 字段（JSON数组）
|
||||
-- =============================================
|
||||
|
||||
SET NAMES utf8mb4;
|
||||
|
||||
-- =============================================
|
||||
-- 步骤1: 在 yz_roles 表中添加 menu_ids 字段（JSON类型存储菜单ID数组）
|
||||
-- =============================================
|
||||
|
||||
-- 检查字段是否已存在，如果不存在则添加
|
||||
SET @exist := (SELECT COUNT(*) FROM information_schema.columns
|
||||
WHERE table_schema = DATABASE()
|
||||
AND table_name = 'yz_roles'
|
||||
AND column_name = 'menu_ids');
|
||||
|
||||
SET @sqlstmt := IF(@exist = 0,
|
||||
'ALTER TABLE yz_roles ADD COLUMN menu_ids JSON NULL COMMENT ''菜单权限ID数组，JSON格式存储'' AFTER description',
|
||||
'SELECT ''字段 menu_ids 已存在，跳过添加'' AS message');
|
||||
|
||||
PREPARE stmt FROM @sqlstmt;
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
|
||||
-- =============================================
|
||||
-- 步骤2: 从 yz_role_menus 表迁移数据到 yz_roles.menu_ids
|
||||
-- =============================================
|
||||
|
||||
-- 检查 yz_role_menus 表是否存在
|
||||
SET @table_exists := (SELECT COUNT(*) FROM information_schema.tables
|
||||
WHERE table_schema = DATABASE()
|
||||
AND table_name = 'yz_role_menus');
|
||||
|
||||
-- 如果表存在，执行迁移
|
||||
-- 注意：需要分步执行，因为PREPARE不能执行多语句
|
||||
|
||||
-- 2.1 创建临时表存储每个角色的菜单ID数组
|
||||
-- 使用 GROUP_CONCAT 和 CONCAT 来构建JSON数组（兼容性更好）
|
||||
-- 处理 NULL 情况：如果 GROUP_CONCAT 返回 NULL，则使用空数组 '[]'
|
||||
SET @sqlstmt := IF(@table_exists > 0,
|
||||
'CREATE TEMPORARY TABLE temp_role_menu_ids AS
|
||||
SELECT
|
||||
role_id,
|
||||
IFNULL(CONCAT(''['', GROUP_CONCAT(menu_id ORDER BY menu_id SEPARATOR '',''), '']''), ''[]'') as menu_ids_json
|
||||
FROM yz_role_menus
|
||||
GROUP BY role_id',
|
||||
'SELECT ''表 yz_role_menus 不存在，跳过数据迁移'' AS message');
|
||||
|
||||
PREPARE stmt FROM @sqlstmt;
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
|
||||
-- 2.2 更新 yz_roles 表的 menu_ids 字段
|
||||
-- 将字符串转换为 JSON 类型
|
||||
SET @sqlstmt := IF(@table_exists > 0,
|
||||
'UPDATE yz_roles r
|
||||
INNER JOIN temp_role_menu_ids t ON r.role_id = t.role_id
|
||||
SET r.menu_ids = CAST(t.menu_ids_json AS JSON)',
|
||||
'SELECT ''跳过更新'' AS message');
|
||||
|
||||
PREPARE stmt FROM @sqlstmt;
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
|
||||
-- 2.3 删除临时表
|
||||
SET @sqlstmt := IF(@table_exists > 0,
|
||||
'DROP TEMPORARY TABLE IF EXISTS temp_role_menu_ids',
|
||||
'SELECT ''跳过删除临时表'' AS message');
|
||||
|
||||
PREPARE stmt FROM @sqlstmt;
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
|
||||
-- 2.4 对于没有权限的角色，确保设置为空数组（如果还没有设置）
|
||||
-- 使用 CAST 将字符串转换为 JSON 类型
|
||||
UPDATE yz_roles
|
||||
SET menu_ids = CAST('[]' AS JSON)
|
||||
WHERE menu_ids IS NULL;
|
||||
|
||||
-- =============================================
|
||||
-- 步骤3: 验证迁移结果
|
||||
-- =============================================
|
||||
|
||||
SELECT
|
||||
r.role_id,
|
||||
r.role_name,
|
||||
r.menu_ids,
|
||||
JSON_LENGTH(COALESCE(r.menu_ids, CAST('[]' AS JSON))) as menu_count,
|
||||
(SELECT COUNT(*) FROM yz_role_menus WHERE role_id = r.role_id) as old_count
|
||||
FROM yz_roles r
|
||||
WHERE r.delete_time IS NULL
|
||||
ORDER BY r.role_id;
|
||||
|
||||
-- =============================================
|
||||
-- 步骤4: 备份旧表（可选，建议先备份）
|
||||
-- =============================================
|
||||
|
||||
-- 检查 yz_role_menus 表是否存在
|
||||
SET @table_exists := (SELECT COUNT(*) FROM information_schema.tables
|
||||
WHERE table_schema = DATABASE()
|
||||
AND table_name = 'yz_role_menus');
|
||||
|
||||
-- 检查备份表是否已存在
|
||||
SET @backup_exists := (SELECT COUNT(*) FROM information_schema.tables
|
||||
WHERE table_schema = DATABASE()
|
||||
AND table_name = 'yz_role_menus_backup');
|
||||
|
||||
-- 如果原表存在且备份表不存在，则创建备份
|
||||
SET @sqlstmt := IF(@table_exists > 0 AND @backup_exists = 0,
|
||||
'CREATE TABLE yz_role_menus_backup AS SELECT * FROM yz_role_menus',
|
||||
IF(@backup_exists > 0,
|
||||
'SELECT ''备份表 yz_role_menus_backup 已存在，跳过备份'' AS message',
|
||||
'SELECT ''表 yz_role_menus 不存在，无需备份'' AS message'));
|
||||
|
||||
PREPARE stmt FROM @sqlstmt;
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
|
||||
-- =============================================
|
||||
-- 注意：迁移完成后，需要确认数据正确，然后可以删除 yz_role_menus 表
|
||||
-- 删除命令：DROP TABLE IF EXISTS yz_role_menus;
|
||||
-- =============================================
|
||||
|
||||
@@ -0,0 +1,109 @@
|
||||
-- =============================================
|
||||
-- 角色权限迁移脚本
|
||||
-- 将 yz_role_menus 表中的权限数据迁移到 yz_roles 表的 menu_ids 字段（JSON数组）
|
||||
-- 执行时间: 2025
|
||||
-- =============================================
|
||||
|
||||
SET NAMES utf8mb4;
|
||||
|
||||
-- =============================================
|
||||
-- 步骤1: 在 yz_roles 表中添加 menu_ids 字段（JSON类型存储菜单ID数组）
|
||||
-- =============================================
|
||||
|
||||
-- 检查字段是否已存在
|
||||
SET @exist := (SELECT COUNT(*) FROM information_schema.columns
|
||||
WHERE table_schema = DATABASE()
|
||||
AND table_name = 'yz_roles'
|
||||
AND column_name = 'menu_ids');
|
||||
|
||||
SET @sqlstmt := IF(@exist = 0,
|
||||
'ALTER TABLE yz_roles ADD COLUMN menu_ids JSON NULL COMMENT "菜单权限ID数组，JSON格式存储" AFTER description',
|
||||
'SELECT "字段 menu_ids 已存在" AS message');
|
||||
|
||||
PREPARE stmt FROM @sqlstmt;
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
|
||||
-- =============================================
|
||||
-- 步骤2: 从 yz_role_menus 表迁移数据到 yz_roles.menu_ids
|
||||
-- =============================================
|
||||
|
||||
-- 使用临时存储过程迁移数据
|
||||
DELIMITER $$
|
||||
|
||||
DROP PROCEDURE IF EXISTS migrate_role_permissions$$
|
||||
|
||||
CREATE PROCEDURE migrate_role_permissions()
|
||||
BEGIN
|
||||
DECLARE done INT DEFAULT FALSE;
|
||||
DECLARE v_role_id INT;
|
||||
DECLARE v_menu_ids JSON;
|
||||
DECLARE cur CURSOR FOR
|
||||
SELECT role_id, JSON_ARRAYAGG(menu_id ORDER BY menu_id) as menu_ids
|
||||
FROM yz_role_menus
|
||||
GROUP BY role_id;
|
||||
DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
|
||||
|
||||
OPEN cur;
|
||||
|
||||
read_loop: LOOP
|
||||
FETCH cur INTO v_role_id, v_menu_ids;
|
||||
IF done THEN
|
||||
LEAVE read_loop;
|
||||
END IF;
|
||||
|
||||
-- 更新角色表的 menu_ids 字段
|
||||
UPDATE yz_roles
|
||||
SET menu_ids = v_menu_ids
|
||||
WHERE role_id = v_role_id;
|
||||
|
||||
END LOOP;
|
||||
|
||||
CLOSE cur;
|
||||
|
||||
-- 对于没有权限的角色，设置为空数组
|
||||
UPDATE yz_roles
|
||||
SET menu_ids = JSON_ARRAY()
|
||||
WHERE menu_ids IS NULL;
|
||||
|
||||
SELECT '数据迁移完成' AS message;
|
||||
END$$
|
||||
|
||||
DELIMITER ;
|
||||
|
||||
-- 执行迁移
|
||||
CALL migrate_role_permissions();
|
||||
|
||||
-- 删除临时存储过程
|
||||
DROP PROCEDURE IF EXISTS migrate_role_permissions;
|
||||
|
||||
-- =============================================
|
||||
-- 步骤3: 验证迁移结果
|
||||
-- =============================================
|
||||
|
||||
-- 查看迁移后的数据
|
||||
SELECT
|
||||
r.role_id,
|
||||
r.role_name,
|
||||
r.menu_ids,
|
||||
JSON_LENGTH(r.menu_ids) as menu_count,
|
||||
(SELECT COUNT(*) FROM yz_role_menus WHERE role_id = r.role_id) as old_count
|
||||
FROM yz_roles r
|
||||
WHERE r.delete_time IS NULL
|
||||
ORDER BY r.role_id;
|
||||
|
||||
-- =============================================
|
||||
-- 步骤4: 备份旧表（可选，建议先备份）
|
||||
-- =============================================
|
||||
|
||||
-- 创建备份表
|
||||
CREATE TABLE IF NOT EXISTS yz_role_menus_backup AS
|
||||
SELECT * FROM yz_role_menus;
|
||||
|
||||
SELECT '备份表 yz_role_menus_backup 创建完成' AS message;
|
||||
|
||||
-- =============================================
|
||||
-- 注意：迁移完成后，需要确认数据正确，然后可以删除 yz_role_menus 表
|
||||
-- 删除命令：DROP TABLE IF EXISTS yz_role_menus;
|
||||
-- =============================================
|
||||
|
||||
@@ -0,0 +1,192 @@
|
||||
-- 性能优化索引脚本
|
||||
-- 创建时间: 2025
|
||||
-- 描述: 为常用查询字段添加索引，提升查询性能
|
||||
|
||||
SET NAMES utf8mb4;
|
||||
|
||||
-- =============================================
|
||||
-- 1. 部门表 (yz_tenant_departments) 索引优化
|
||||
-- =============================================
|
||||
|
||||
-- 检查并添加 tenant_id 索引（如果不存在）
|
||||
SET @exist := (SELECT COUNT(*) FROM information_schema.statistics
|
||||
WHERE table_schema = DATABASE()
|
||||
AND table_name = 'yz_tenant_departments'
|
||||
AND index_name = 'idx_tenant_id');
|
||||
SET @sqlstmt := IF(@exist = 0,
|
||||
'CREATE INDEX idx_tenant_id ON yz_tenant_departments(tenant_id)',
|
||||
'SELECT "索引 idx_tenant_id 已存在" AS message');
|
||||
PREPARE stmt FROM @sqlstmt;
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
|
||||
-- 检查并添加 delete_time 索引（如果不存在）
|
||||
SET @exist := (SELECT COUNT(*) FROM information_schema.statistics
|
||||
WHERE table_schema = DATABASE()
|
||||
AND table_name = 'yz_tenant_departments'
|
||||
AND index_name = 'idx_delete_time');
|
||||
SET @sqlstmt := IF(@exist = 0,
|
||||
'CREATE INDEX idx_delete_time ON yz_tenant_departments(delete_time)',
|
||||
'SELECT "索引 idx_delete_time 已存在" AS message');
|
||||
PREPARE stmt FROM @sqlstmt;
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
|
||||
-- 检查并添加复合索引 (tenant_id, delete_time) 用于常用查询
|
||||
SET @exist := (SELECT COUNT(*) FROM information_schema.statistics
|
||||
WHERE table_schema = DATABASE()
|
||||
AND table_name = 'yz_tenant_departments'
|
||||
AND index_name = 'idx_tenant_delete');
|
||||
SET @sqlstmt := IF(@exist = 0,
|
||||
'CREATE INDEX idx_tenant_delete ON yz_tenant_departments(tenant_id, delete_time)',
|
||||
'SELECT "索引 idx_tenant_delete 已存在" AS message');
|
||||
PREPARE stmt FROM @sqlstmt;
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
|
||||
-- 检查并添加 parent_id 索引（用于树形结构查询）
|
||||
SET @exist := (SELECT COUNT(*) FROM information_schema.statistics
|
||||
WHERE table_schema = DATABASE()
|
||||
AND table_name = 'yz_tenant_departments'
|
||||
AND index_name = 'idx_parent_id');
|
||||
SET @sqlstmt := IF(@exist = 0,
|
||||
'CREATE INDEX idx_parent_id ON yz_tenant_departments(parent_id)',
|
||||
'SELECT "索引 idx_parent_id 已存在" AS message');
|
||||
PREPARE stmt FROM @sqlstmt;
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
|
||||
-- =============================================
|
||||
-- 2. 职位表 (yz_tenant_positions) 索引优化
|
||||
-- =============================================
|
||||
|
||||
-- 检查并添加 tenant_id 索引（如果不存在）
|
||||
SET @exist := (SELECT COUNT(*) FROM information_schema.statistics
|
||||
WHERE table_schema = DATABASE()
|
||||
AND table_name = 'yz_tenant_positions'
|
||||
AND index_name = 'idx_tenant_id');
|
||||
SET @sqlstmt := IF(@exist = 0,
|
||||
'CREATE INDEX idx_tenant_id ON yz_tenant_positions(tenant_id)',
|
||||
'SELECT "索引 idx_tenant_id 已存在" AS message');
|
||||
PREPARE stmt FROM @sqlstmt;
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
|
||||
-- 检查并添加 delete_time 索引（如果不存在）
|
||||
SET @exist := (SELECT COUNT(*) FROM information_schema.statistics
|
||||
WHERE table_schema = DATABASE()
|
||||
AND table_name = 'yz_tenant_positions'
|
||||
AND index_name = 'idx_delete_time');
|
||||
SET @sqlstmt := IF(@exist = 0,
|
||||
'CREATE INDEX idx_delete_time ON yz_tenant_positions(delete_time)',
|
||||
'SELECT "索引 idx_delete_time 已存在" AS message');
|
||||
PREPARE stmt FROM @sqlstmt;
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
|
||||
-- 检查并添加 department_id 索引（用于按部门查询职位）
|
||||
SET @exist := (SELECT COUNT(*) FROM information_schema.statistics
|
||||
WHERE table_schema = DATABASE()
|
||||
AND table_name = 'yz_tenant_positions'
|
||||
AND index_name = 'idx_department_id');
|
||||
SET @sqlstmt := IF(@exist = 0,
|
||||
'CREATE INDEX idx_department_id ON yz_tenant_positions(department_id)',
|
||||
'SELECT "索引 idx_department_id 已存在" AS message');
|
||||
PREPARE stmt FROM @sqlstmt;
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
|
||||
-- 检查并添加复合索引 (department_id, delete_time, status) 用于常用查询
|
||||
SET @exist := (SELECT COUNT(*) FROM information_schema.statistics
|
||||
WHERE table_schema = DATABASE()
|
||||
AND table_name = 'yz_tenant_positions'
|
||||
AND index_name = 'idx_dept_delete_status');
|
||||
SET @sqlstmt := IF(@exist = 0,
|
||||
'CREATE INDEX idx_dept_delete_status ON yz_tenant_positions(department_id, delete_time, status)',
|
||||
'SELECT "索引 idx_dept_delete_status 已存在" AS message');
|
||||
PREPARE stmt FROM @sqlstmt;
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
|
||||
-- =============================================
|
||||
-- 3. 角色表 (yz_roles) 索引优化
|
||||
-- =============================================
|
||||
|
||||
-- 检查并添加 tenant_id 索引（如果不存在）
|
||||
SET @exist := (SELECT COUNT(*) FROM information_schema.statistics
|
||||
WHERE table_schema = DATABASE()
|
||||
AND table_name = 'yz_roles'
|
||||
AND index_name = 'idx_tenant_id');
|
||||
SET @sqlstmt := IF(@exist = 0,
|
||||
'CREATE INDEX idx_tenant_id ON yz_roles(tenant_id)',
|
||||
'SELECT "索引 idx_tenant_id 已存在" AS message');
|
||||
PREPARE stmt FROM @sqlstmt;
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
|
||||
-- 检查并添加 delete_time 索引（如果不存在）
|
||||
SET @exist := (SELECT COUNT(*) FROM information_schema.statistics
|
||||
WHERE table_schema = DATABASE()
|
||||
AND table_name = 'yz_roles'
|
||||
AND index_name = 'idx_delete_time');
|
||||
SET @sqlstmt := IF(@exist = 0,
|
||||
'CREATE INDEX idx_delete_time ON yz_roles(delete_time)',
|
||||
'SELECT "索引 idx_delete_time 已存在" AS message');
|
||||
PREPARE stmt FROM @sqlstmt;
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
|
||||
-- =============================================
|
||||
-- 4. 员工表 (yz_employees) 索引优化
|
||||
-- =============================================
|
||||
|
||||
-- 检查并添加 tenant_id 索引（如果不存在）
|
||||
SET @exist := (SELECT COUNT(*) FROM information_schema.statistics
|
||||
WHERE table_schema = DATABASE()
|
||||
AND table_name = 'yz_employees'
|
||||
AND index_name = 'idx_tenant_id');
|
||||
SET @sqlstmt := IF(@exist = 0,
|
||||
'CREATE INDEX idx_tenant_id ON yz_employees(tenant_id)',
|
||||
'SELECT "索引 idx_tenant_id 已存在" AS message');
|
||||
PREPARE stmt FROM @sqlstmt;
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
|
||||
-- 检查并添加 delete_time 索引（如果不存在）
|
||||
SET @exist := (SELECT COUNT(*) FROM information_schema.statistics
|
||||
WHERE table_schema = DATABASE()
|
||||
AND table_name = 'yz_employees'
|
||||
AND index_name = 'idx_delete_time');
|
||||
SET @sqlstmt := IF(@exist = 0,
|
||||
'CREATE INDEX idx_delete_time ON yz_employees(delete_time)',
|
||||
'SELECT "索引 idx_delete_time 已存在" AS message');
|
||||
PREPARE stmt FROM @sqlstmt;
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
|
||||
-- 检查并添加 department_id 索引
|
||||
SET @exist := (SELECT COUNT(*) FROM information_schema.statistics
|
||||
WHERE table_schema = DATABASE()
|
||||
AND table_name = 'yz_employees'
|
||||
AND index_name = 'idx_department_id');
|
||||
SET @sqlstmt := IF(@exist = 0,
|
||||
'CREATE INDEX idx_department_id ON yz_employees(department_id)',
|
||||
'SELECT "索引 idx_department_id 已存在" AS message');
|
||||
PREPARE stmt FROM @sqlstmt;
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
|
||||
-- 检查并添加 position_id 索引
|
||||
SET @exist := (SELECT COUNT(*) FROM information_schema.statistics
|
||||
WHERE table_schema = DATABASE()
|
||||
AND table_name = 'yz_employees'
|
||||
AND index_name = 'idx_position_id');
|
||||
SET @sqlstmt := IF(@exist = 0,
|
||||
'CREATE INDEX idx_position_id ON yz_employees(position_id)',
|
||||
'SELECT "索引 idx_position_id 已存在" AS message');
|
||||
PREPARE stmt FROM @sqlstmt;
|
||||
EXECUTE stmt;
|
||||
DEALLOCATE PREPARE stmt;
|
||||
|
||||
SELECT '性能优化索引创建完成！' AS message;
|
||||
|
||||
@@ -0,0 +1,67 @@
|
||||
-- 性能优化索引脚本（简化版）
|
||||
-- 创建时间: 2025
|
||||
-- 描述: 为常用查询字段添加索引，提升查询性能
|
||||
-- 注意: 如果索引已存在会报错，可以忽略或手动删除重复的索引
|
||||
|
||||
SET NAMES utf8mb4;
|
||||
|
||||
-- =============================================
|
||||
-- 1. 部门表 (yz_tenant_departments) 索引优化
|
||||
-- =============================================
|
||||
|
||||
-- 添加 tenant_id 索引
|
||||
CREATE INDEX IF NOT EXISTS idx_tenant_id ON yz_tenant_departments(tenant_id);
|
||||
|
||||
-- 添加 delete_time 索引
|
||||
CREATE INDEX IF NOT EXISTS idx_delete_time ON yz_tenant_departments(delete_time);
|
||||
|
||||
-- 添加复合索引 (tenant_id, delete_time) 用于常用查询
|
||||
CREATE INDEX IF NOT EXISTS idx_tenant_delete ON yz_tenant_departments(tenant_id, delete_time);
|
||||
|
||||
-- 添加 parent_id 索引（用于树形结构查询）
|
||||
CREATE INDEX IF NOT EXISTS idx_parent_id ON yz_tenant_departments(parent_id);
|
||||
|
||||
-- =============================================
|
||||
-- 2. 职位表 (yz_tenant_positions) 索引优化
|
||||
-- =============================================
|
||||
|
||||
-- 添加 tenant_id 索引
|
||||
CREATE INDEX IF NOT EXISTS idx_tenant_id ON yz_tenant_positions(tenant_id);
|
||||
|
||||
-- 添加 delete_time 索引
|
||||
CREATE INDEX IF NOT EXISTS idx_delete_time ON yz_tenant_positions(delete_time);
|
||||
|
||||
-- 添加 department_id 索引（用于按部门查询职位）
|
||||
CREATE INDEX IF NOT EXISTS idx_department_id ON yz_tenant_positions(department_id);
|
||||
|
||||
-- 添加复合索引 (department_id, delete_time, status) 用于常用查询
|
||||
CREATE INDEX IF NOT EXISTS idx_dept_delete_status ON yz_tenant_positions(department_id, delete_time, status);
|
||||
|
||||
-- =============================================
|
||||
-- 3. 角色表 (yz_roles) 索引优化
|
||||
-- =============================================
|
||||
|
||||
-- 添加 tenant_id 索引
|
||||
CREATE INDEX IF NOT EXISTS idx_tenant_id ON yz_roles(tenant_id);
|
||||
|
||||
-- 添加 delete_time 索引
|
||||
CREATE INDEX IF NOT EXISTS idx_delete_time ON yz_roles(delete_time);
|
||||
|
||||
-- =============================================
|
||||
-- 4. 员工表 (yz_employees) 索引优化
|
||||
-- =============================================
|
||||
|
||||
-- 添加 tenant_id 索引
|
||||
CREATE INDEX IF NOT EXISTS idx_tenant_id ON yz_employees(tenant_id);
|
||||
|
||||
-- 添加 delete_time 索引
|
||||
CREATE INDEX IF NOT EXISTS idx_delete_time ON yz_employees(delete_time);
|
||||
|
||||
-- 添加 department_id 索引
|
||||
CREATE INDEX IF NOT EXISTS idx_department_id ON yz_employees(department_id);
|
||||
|
||||
-- 添加 position_id 索引
|
||||
CREATE INDEX IF NOT EXISTS idx_position_id ON yz_employees(position_id);
|
||||
|
||||
SELECT '性能优化索引创建完成！' AS message;
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
-- =============================================
|
||||
-- 角色权限回滚脚本
|
||||
-- 如果迁移出现问题，可以从备份表恢复数据
|
||||
-- =============================================
|
||||
|
||||
SET NAMES utf8mb4;
|
||||
|
||||
-- =============================================
|
||||
-- 步骤1: 从备份表恢复数据到 yz_role_menus
|
||||
-- =============================================
|
||||
|
||||
-- 如果 yz_role_menus 表被删除，先创建它
|
||||
CREATE TABLE IF NOT EXISTS yz_role_menus (
|
||||
id INT AUTO_INCREMENT PRIMARY KEY,
|
||||
role_id INT NOT NULL,
|
||||
menu_id INT NOT NULL,
|
||||
create_time DATETIME DEFAULT CURRENT_TIMESTAMP,
|
||||
create_by VARCHAR(50) NULL,
|
||||
UNIQUE KEY uk_role_menu (role_id, menu_id),
|
||||
INDEX idx_role_id (role_id),
|
||||
INDEX idx_menu_id (menu_id)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='角色菜单关联表（备份恢复）';
|
||||
|
||||
-- 从备份表恢复数据
|
||||
INSERT INTO yz_role_menus (id, role_id, menu_id, create_time, create_by)
|
||||
SELECT id, role_id, menu_id, create_time, create_by
|
||||
FROM yz_role_menus_backup
|
||||
ON DUPLICATE KEY UPDATE
|
||||
menu_id = VALUES(menu_id),
|
||||
create_time = VALUES(create_time),
|
||||
create_by = VALUES(create_by);
|
||||
|
||||
SELECT '数据恢复完成' AS message;
|
||||
|
||||
-- =============================================
|
||||
-- 步骤2: 如果需要移除 menu_ids 字段（可选）
|
||||
-- =============================================
|
||||
|
||||
-- 注意：如果确定要移除新字段，可以执行以下命令
|
||||
-- ALTER TABLE yz_roles DROP COLUMN menu_ids;
|
||||
|
||||
@@ -0,0 +1,99 @@
|
||||
# 执行数据库索引优化说明
|
||||
|
||||
## 方法一：使用数据库管理工具（推荐）
|
||||
|
||||
### 使用 Navicat、DBeaver、phpMyAdmin 等工具
|
||||
|
||||
1. 连接到数据库：
|
||||
- 主机：`43.133.71.191`
|
||||
- 端口：`3308`
|
||||
- 用户名：`gotest`
|
||||
- 密码：`2nZhRdMPCNZrdzsd`
|
||||
- 数据库：`gotest`
|
||||
|
||||
2. 打开并执行以下文件之一：
|
||||
- `server/database/performance_indexes_simple.sql` （推荐，简单版本）
|
||||
- `server/database/performance_indexes.sql` （完整版本，包含存在性检查）
|
||||
|
||||
## 方法二：使用 MySQL 命令行（如果已安装）
|
||||
|
||||
### Windows PowerShell
|
||||
|
||||
```powershell
|
||||
# 方法 1: 使用 Get-Content 管道
|
||||
Get-Content server\database\performance_indexes_simple.sql | mysql -u gotest -p2nZhRdMPCNZrdzsd -h 43.133.71.191 -P 3308 gotest
|
||||
|
||||
# 方法 2: 使用 source 命令（需要先登录 MySQL）
|
||||
mysql -u gotest -p2nZhRdMPCNZrdzsd -h 43.133.71.191 -P 3308 gotest
|
||||
# 然后在 MySQL 提示符下执行：
|
||||
source server/database/performance_indexes_simple.sql
|
||||
```
|
||||
|
||||
### Windows CMD
|
||||
|
||||
```cmd
|
||||
mysql -u gotest -p2nZhRdMPCNZrdzsd -h 43.133.71.191 -P 3308 gotest < server\database\performance_indexes_simple.sql
|
||||
```
|
||||
|
||||
### Linux/Mac
|
||||
|
||||
```bash
|
||||
mysql -u gotest -p2nZhRdMPCNZrdzsd -h 43.133.71.191 -P 3308 gotest < server/database/performance_indexes_simple.sql
|
||||
```
|
||||
|
||||
## 方法三：在 Go 代码中执行（临时方案）
|
||||
|
||||
如果无法直接执行 SQL，可以在后端代码初始化时执行：
|
||||
|
||||
```go
|
||||
// 在 server/models/user.go 的 Init 函数中添加
|
||||
func Init(version string) {
|
||||
// ... 现有代码 ...
|
||||
|
||||
// 执行索引优化（可选，建议直接执行 SQL 文件）
|
||||
// 这里可以添加执行索引创建的代码
|
||||
}
|
||||
```
|
||||
|
||||
## 验证索引是否创建成功
|
||||
|
||||
执行以下 SQL 查询验证索引：
|
||||
|
||||
```sql
|
||||
-- 查看部门表索引
|
||||
SHOW INDEX FROM yz_tenant_departments;
|
||||
|
||||
-- 查看职位表索引
|
||||
SHOW INDEX FROM yz_tenant_positions;
|
||||
|
||||
-- 查看角色表索引
|
||||
SHOW INDEX FROM yz_roles;
|
||||
|
||||
-- 查看员工表索引
|
||||
SHOW INDEX FROM yz_employees;
|
||||
```
|
||||
|
||||
## 注意事项
|
||||
|
||||
1. **MySQL 版本要求**：
|
||||
- `CREATE INDEX IF NOT EXISTS` 需要 MySQL 8.0.12+
|
||||
- 如果使用较低版本，请使用 `performance_indexes.sql`（包含存在性检查）
|
||||
|
||||
2. **执行时间**：
|
||||
- 索引创建可能需要几秒到几分钟，取决于数据量
|
||||
- 创建索引期间，表会锁定（通常很快）
|
||||
|
||||
3. **索引已存在**：
|
||||
- 如果索引已存在，`CREATE INDEX IF NOT EXISTS` 会忽略
|
||||
- 如果使用 `performance_indexes.sql`，会显示"索引已存在"的消息
|
||||
|
||||
4. **性能影响**：
|
||||
- 索引创建后，查询性能会显著提升
|
||||
- 插入/更新操作可能稍慢（通常可忽略）
|
||||
|
||||
## 预期效果
|
||||
|
||||
- 查询速度提升：**50-90%**（取决于数据量）
|
||||
- 减少全表扫描
|
||||
- 优化 WHERE 和 JOIN 查询
|
||||
|
||||
@@ -0,0 +1,71 @@
|
||||
# 角色权限迁移说明
|
||||
|
||||
## 概述
|
||||
将角色权限从关系表 `yz_role_menus` 迁移到 `yz_roles` 表的 JSON 数组字段 `menu_ids`。
|
||||
|
||||
## 迁移步骤
|
||||
|
||||
### 1. 执行迁移脚本
|
||||
```bash
|
||||
mysql -u gotest -p gotest < server/database/migrate_role_permissions_to_json.sql
|
||||
```
|
||||
|
||||
或者在 MySQL 客户端中执行：
|
||||
```sql
|
||||
source server/database/migrate_role_permissions_to_json.sql
|
||||
```
|
||||
|
||||
### 2. 验证迁移结果
|
||||
迁移脚本会自动：
|
||||
- 在 `yz_roles` 表中添加 `menu_ids` JSON 字段
|
||||
- 从 `yz_role_menus` 表迁移数据到 `menu_ids` 字段
|
||||
- 创建备份表 `yz_role_menus_backup`
|
||||
- 验证迁移结果
|
||||
|
||||
### 3. 确认数据正确性
|
||||
执行以下查询验证数据：
|
||||
```sql
|
||||
SELECT
|
||||
r.role_id,
|
||||
r.role_name,
|
||||
r.menu_ids,
|
||||
JSON_LENGTH(r.menu_ids) as menu_count,
|
||||
(SELECT COUNT(*) FROM yz_role_menus_backup WHERE role_id = r.role_id) as old_count
|
||||
FROM yz_roles r
|
||||
WHERE r.delete_time IS NULL
|
||||
ORDER BY r.role_id;
|
||||
```
|
||||
|
||||
### 4. 删除旧表（可选）
|
||||
确认数据迁移正确后，可以删除旧的关系表：
|
||||
```sql
|
||||
DROP TABLE IF EXISTS yz_role_menus;
|
||||
```
|
||||
|
||||
## 回滚方案
|
||||
如果迁移出现问题，可以使用回滚脚本：
|
||||
```bash
|
||||
mysql -u gotest -p gotest < server/database/rollback_role_permissions.sql
|
||||
```
|
||||
|
||||
## 代码变更
|
||||
- `server/models/role.go`: 添加 `MenuIds` 字段和 JSON 序列化/反序列化方法
|
||||
- `server/models/permission.go`: 更新 `GetRoleMenus` 和 `AssignRolePermissions` 函数
|
||||
|
||||
## 注意事项
|
||||
1. **备份数据**：迁移前请确保已备份数据库
|
||||
2. **测试环境**：建议先在测试环境执行迁移
|
||||
3. **数据一致性**：迁移后请验证权限分配功能是否正常
|
||||
4. **性能影响**：JSON 字段查询性能可能略低于关系表，但简化了数据结构
|
||||
|
||||
## JSON 字段格式
|
||||
`menu_ids` 字段存储格式为 JSON 数组，例如：
|
||||
```json
|
||||
[1, 2, 3, 4, 5]
|
||||
```
|
||||
|
||||
空数组表示该角色没有任何权限：
|
||||
```json
|
||||
[]
|
||||
```
|
||||
|
||||
@@ -0,0 +1,145 @@
|
||||
# OA 基础数据合并接口说明
|
||||
|
||||
## 概述
|
||||
|
||||
为了减少网络请求次数，提升系统性能，新增了一个合并接口，用于一次性获取部门、职位、角色三类基础数据。
|
||||
|
||||
## 接口信息
|
||||
|
||||
### 接口路径
|
||||
```
|
||||
GET /api/oa/base-data/:tenantId
|
||||
```
|
||||
|
||||
### 请求参数
|
||||
- `tenantId` (路径参数): 租户ID
|
||||
|
||||
### 响应格式
|
||||
```json
|
||||
{
|
||||
"code": 0,
|
||||
"message": "获取基础数据成功",
|
||||
"data": {
|
||||
"departments": [
|
||||
{
|
||||
"id": 1,
|
||||
"tenant_id": 1,
|
||||
"name": "技术部",
|
||||
"code": "TECH",
|
||||
"parent_id": 0,
|
||||
"description": "技术部门",
|
||||
"manager_id": 0,
|
||||
"sort_order": 0,
|
||||
"status": 1,
|
||||
"create_time": "2024-01-01T00:00:00Z",
|
||||
"update_time": "2024-01-01T00:00:00Z"
|
||||
}
|
||||
],
|
||||
"positions": [
|
||||
{
|
||||
"id": 1,
|
||||
"tenant_id": 1,
|
||||
"name": "高级工程师",
|
||||
"code": "SENIOR",
|
||||
"department_id": 1,
|
||||
"level": 3,
|
||||
"description": "高级工程师职位",
|
||||
"sort_order": 0,
|
||||
"status": 1,
|
||||
"create_time": "2024-01-01T00:00:00Z",
|
||||
"update_time": "2024-01-01T00:00:00Z"
|
||||
}
|
||||
],
|
||||
"roles": [
|
||||
{
|
||||
"roleId": 1,
|
||||
"tenantId": 1,
|
||||
"roleCode": "ADMIN",
|
||||
"roleName": "管理员",
|
||||
"description": "管理员角色",
|
||||
"status": 1,
|
||||
"sortOrder": 0,
|
||||
"createTime": "2024-01-01T00:00:00Z",
|
||||
"updateTime": "2024-01-01T00:00:00Z"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
## 实现细节
|
||||
|
||||
### 后端实现
|
||||
|
||||
#### Services 层 (`server/services/oa.go`)
|
||||
- 使用 goroutine 并行查询三个数据源
|
||||
- 使用 channel 安全地传递查询结果
|
||||
- 任何查询失败都会返回错误
|
||||
|
||||
#### Controllers 层 (`server/controllers/oa.go`)
|
||||
- 接收租户ID参数
|
||||
- 调用 services 层获取数据
|
||||
- 格式化返回数据
|
||||
|
||||
#### 路由配置 (`server/routers/router.go`)
|
||||
- 路由：`/api/oa/base-data/:tenantId`
|
||||
- 方法：GET
|
||||
|
||||
### 前端实现
|
||||
|
||||
#### API 文件 (`pc/src/api/oa.js`)
|
||||
- 封装了 `getOABaseData` 方法
|
||||
|
||||
#### Store 更新 (`pc/src/stores/oa.js`)
|
||||
- `fetchAllBaseData` 方法优先使用合并接口
|
||||
- 如果合并接口失败，自动回退到分别请求三个接口
|
||||
- 保持缓存机制不变
|
||||
|
||||
## 性能优势
|
||||
|
||||
### 优化前
|
||||
- 前端需要发起 3 个独立的 HTTP 请求
|
||||
- 每次请求都有网络延迟
|
||||
- 总耗时 = 3 × 网络延迟 + 3 × 查询时间
|
||||
|
||||
### 优化后
|
||||
- 前端只需发起 1 个 HTTP 请求
|
||||
- 后端使用 goroutine 并行查询，总耗时 = 1 × 网络延迟 + max(查询时间)
|
||||
- **性能提升**：减少 2 个网络请求，总耗时减少约 60-70%
|
||||
|
||||
## 使用示例
|
||||
|
||||
### 前端使用
|
||||
|
||||
```javascript
|
||||
import { useOAStore } from '@/stores/oa';
|
||||
|
||||
const oaStore = useOAStore();
|
||||
|
||||
// 页面初始化时，会自动使用合并接口
|
||||
onMounted(async () => {
|
||||
await oaStore.fetchAllBaseData();
|
||||
});
|
||||
```
|
||||
|
||||
### 后端扩展
|
||||
|
||||
如果需要添加更多数据到合并接口，只需：
|
||||
|
||||
1. 在 `OABaseData` 结构体中添加新字段
|
||||
2. 在 `GetOABaseData` 方法中添加新的查询逻辑
|
||||
3. 在 controller 中格式化返回新数据
|
||||
|
||||
## 兼容性
|
||||
|
||||
- 合并接口与原有的三个独立接口并存
|
||||
- 前端 Store 有自动回退机制，确保兼容性
|
||||
- 如果合并接口失败，会自动使用原有接口
|
||||
|
||||
## 注意事项
|
||||
|
||||
1. **租户隔离**：确保返回的数据属于指定租户
|
||||
2. **错误处理**：任何查询失败都会返回错误
|
||||
3. **数据一致性**：确保返回的数据是最新的
|
||||
4. **性能考虑**：后端使用并行查询，但仍需注意数据库性能
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
server/
|
||||
├── models/ # 仅负责数据模型相关
|
||||
│ ├── 结构体(struct)定义
|
||||
│ ├── 字段标签与表名(TableName)
|
||||
│ └── 数据库初始化（注册模型、连接数据库）
|
||||
│
|
||||
├── services/ # 核心业务逻辑层
|
||||
│ ├── 所有业务处理方法（含CRUD）
|
||||
│ ├── 模型数据校验
|
||||
│ ├── 密码等安全相关加解密
|
||||
│ └── 与 models 层的数据库操作
|
||||
│
|
||||
└── controllers/ # 控制器层，专注 HTTP
|
||||
├── 请求参数解析
|
||||
├── 参数有效性验证
|
||||
├── 调用 services 处理业务
|
||||
└── 响应数据统一格式化与错误处理
|
||||
|
||||
|
||||
## 分层架构开发规范
|
||||
|
||||
### Models 层
|
||||
- 只负责定义数据库结构和初始化，包含结构体、字段标签与表名映射，数据库注册与连接。
|
||||
- 不允许包含任何业务逻辑、数据校验、密码处理或和 HTTP 相关的代码。
|
||||
|
||||
### Services 层
|
||||
- 实现所有业务流程、数据访问、校验和跨模型业务逻辑。
|
||||
- 通过 models 操作数据库，仅返回 struct 或错误。
|
||||
- 实现数据校验、密码加密等业务需求；不直接处理 HTTP 请求或响应。
|
||||
|
||||
### Controllers 层
|
||||
- 只负责接收和解析 HTTP 请求，进行参数校验。
|
||||
- 调用 services 执行业务逻辑。
|
||||
- 负责返回统一格式的响应结果，对业务错误进行捕获和转义为 HTTP 状态码和消息。
|
||||
|
||||
### 其它要求
|
||||
- 各层代码职责单一，禁止跨层调用（如 controllers 直接操作 models）。
|
||||
- 统一异常处理，业务错误只在 services 返回，controllers 负责转换为 HTTP 响应。
|
||||
- 保持 controller 轻量简洁，绝不包含业务处理逻辑。
|
||||
- services 层所有数据变更、校验等均可单元测试。
|
||||
- models 变动需清晰文档和数据库迁移脚本。
|
||||
|
||||
建议先设计 models 层，随后 services 层，最后实现 controllers，实现过程中注意分层原则。
|
||||
@@ -0,0 +1,135 @@
|
||||
# 后端接口性能优化说明
|
||||
|
||||
## 问题描述
|
||||
|
||||
后端接口请求响应慢，主要原因是：
|
||||
|
||||
1. **数据库连接池未配置** - 每次请求都创建新的数据库连接
|
||||
2. **缺少数据库索引** - 常用查询字段（tenant_id, delete_time）没有索引
|
||||
3. **内存分配未优化** - Controller 层数据格式化时未预分配容量
|
||||
4. **网络延迟** - 使用远程数据库，网络延迟较高
|
||||
|
||||
## 优化措施
|
||||
|
||||
### 1. 数据库连接池配置 ✅
|
||||
|
||||
**位置**: `server/models/user.go`
|
||||
|
||||
**优化内容**:
|
||||
- 设置最大空闲连接数：`MaxIdleConns = 10`
|
||||
- 设置最大打开连接数：`MaxOpenConns = 100`
|
||||
- 设置连接最大生存时间：`ConnMaxLifetime = 1小时`
|
||||
- 添加连接超时参数：`timeout=10s&readTimeout=30s&writeTimeout=30s`
|
||||
|
||||
**效果**:
|
||||
- 减少连接创建和销毁的开销
|
||||
- 复用数据库连接，提升响应速度
|
||||
- 避免连接泄漏
|
||||
|
||||
### 2. 数据库索引优化 ✅
|
||||
|
||||
**位置**: `server/database/performance_indexes.sql`
|
||||
|
||||
**优化内容**:
|
||||
- 为 `yz_tenant_departments` 表添加索引：
|
||||
- `idx_tenant_id` - 租户ID索引
|
||||
- `idx_delete_time` - 删除时间索引
|
||||
- `idx_tenant_delete` - 复合索引 (tenant_id, delete_time)
|
||||
- `idx_parent_id` - 父级ID索引（树形结构查询）
|
||||
|
||||
- 为 `yz_tenant_positions` 表添加索引：
|
||||
- `idx_tenant_id` - 租户ID索引
|
||||
- `idx_delete_time` - 删除时间索引
|
||||
- `idx_department_id` - 部门ID索引
|
||||
- `idx_dept_delete_status` - 复合索引 (department_id, delete_time, status)
|
||||
|
||||
- 为 `yz_roles` 表添加索引：
|
||||
- `idx_tenant_id` - 租户ID索引
|
||||
- `idx_delete_time` - 删除时间索引
|
||||
|
||||
- 为 `yz_employees` 表添加索引：
|
||||
- `idx_tenant_id` - 租户ID索引
|
||||
- `idx_delete_time` - 删除时间索引
|
||||
- `idx_department_id` - 部门ID索引
|
||||
- `idx_position_id` - 职位ID索引
|
||||
|
||||
**执行方法**:
|
||||
```bash
|
||||
mysql -u gotest -p -h 43.133.71.191 -P 3308 gotest < server/database/performance_indexes.sql
|
||||
```
|
||||
|
||||
**效果**:
|
||||
- 查询速度提升 10-100 倍（取决于数据量）
|
||||
- 减少全表扫描
|
||||
- 优化 WHERE 和 JOIN 查询
|
||||
|
||||
### 3. 内存分配优化 ✅
|
||||
|
||||
**位置**: `server/controllers/oa.go`
|
||||
|
||||
**优化内容**:
|
||||
- 预分配切片容量，避免多次扩容
|
||||
- 使用 `make([]map[string]interface{}, 0, count)` 替代 `make([]map[string]interface{}, 0)`
|
||||
|
||||
**效果**:
|
||||
- 减少内存分配次数
|
||||
- 降低 GC 压力
|
||||
- 提升响应速度约 5-10%
|
||||
|
||||
### 4. 查询优化建议
|
||||
|
||||
**已实现**:
|
||||
- 使用 `services.GetOABaseData()` 并行查询部门、职位、角色数据
|
||||
- 使用 goroutine 并发执行多个查询
|
||||
|
||||
**建议**:
|
||||
- 对于大数据量查询，考虑实现分页
|
||||
- 对于频繁查询的数据，考虑添加 Redis 缓存层
|
||||
- 监控慢查询日志，持续优化
|
||||
|
||||
## 性能提升预期
|
||||
|
||||
- **连接池配置**: 提升 20-30%
|
||||
- **数据库索引**: 提升 50-90%（取决于数据量）
|
||||
- **内存优化**: 提升 5-10%
|
||||
- **总体提升**: 预期提升 50-80%
|
||||
|
||||
## 注意事项
|
||||
|
||||
1. **索引维护成本**:
|
||||
- 索引会占用额外存储空间
|
||||
- 插入/更新操作会稍慢（通常可忽略）
|
||||
- 建议定期检查索引使用情况
|
||||
|
||||
2. **连接池配置**:
|
||||
- `MaxOpenConns` 应根据实际并发量调整
|
||||
- 过大的连接池可能导致数据库连接耗尽
|
||||
- 建议监控连接池使用情况
|
||||
|
||||
3. **远程数据库**:
|
||||
- 网络延迟是主要瓶颈之一
|
||||
- 考虑使用 CDN 或数据库代理
|
||||
- 对于高并发场景，建议使用本地数据库或缓存
|
||||
|
||||
## 下一步优化建议
|
||||
|
||||
1. **添加 Redis 缓存层**:
|
||||
- 缓存常用的基础数据（部门、职位、角色）
|
||||
- 设置合理的过期时间（如 5 分钟）
|
||||
- 减少数据库查询压力
|
||||
|
||||
2. **实现查询日志**:
|
||||
- 记录慢查询（> 100ms）
|
||||
- 分析查询模式
|
||||
- 持续优化
|
||||
|
||||
3. **数据库查询优化**:
|
||||
- 使用 `SELECT` 只查询需要的字段
|
||||
- 避免 `SELECT *`
|
||||
- 使用 `LIMIT` 限制结果集
|
||||
|
||||
4. **监控和告警**:
|
||||
- 监控接口响应时间
|
||||
- 监控数据库连接池使用情况
|
||||
- 设置性能告警阈值
|
||||
|
||||
@@ -4,6 +4,7 @@ import (
|
||||
"strings"
|
||||
|
||||
"server/models"
|
||||
"server/services"
|
||||
|
||||
"github.com/beego/beego/v2/server/web"
|
||||
"github.com/beego/beego/v2/server/web/context"
|
||||
@@ -68,7 +69,7 @@ func JWTAuthMiddleware() web.FilterFunc {
|
||||
// 判断用户类型：检查userId是否在员工表中
|
||||
// 如果userId在yz_tenant_employees表中存在，则为员工登录；否则为用户登录
|
||||
userType := "user"
|
||||
if models.IsEmployee(claims.UserID) {
|
||||
if services.IsEmployee(claims.UserID) {
|
||||
userType = "employee"
|
||||
}
|
||||
ctx.Input.SetData("userType", userType)
|
||||
|
||||
+2
-221
@@ -1,14 +1,9 @@
|
||||
package models
|
||||
|
||||
import (
|
||||
"crypto/rand"
|
||||
"encoding/base64"
|
||||
"errors"
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"github.com/beego/beego/v2/client/orm"
|
||||
"golang.org/x/crypto/scrypt"
|
||||
)
|
||||
|
||||
// Employee 员工模型
|
||||
@@ -24,8 +19,8 @@ type Employee struct {
|
||||
Role int `orm:"column(role);null;default(0)" json:"role"` // 角色ID
|
||||
BankName string `orm:"column(bank_name);size(100);null" json:"bank_name"`
|
||||
BankAccount string `orm:"column(bank_account);size(50);null" json:"bank_account"`
|
||||
Password string `orm:"size(255);null" json:"-"` // 不返回给前端
|
||||
Salt string `orm:"size(100);null" json:"-"` // 不返回给前端
|
||||
Password string `orm:"size(255);null" json:"-"` // 不返回给前端
|
||||
Salt string `orm:"size(100);null" json:"-"` // 不返回给前端
|
||||
LastLoginTime *time.Time `orm:"column(last_login_time);null;type(datetime)" json:"last_login_time,omitempty"`
|
||||
LastLoginIp string `orm:"column(last_login_ip);null;size(50)" json:"last_login_ip,omitempty"`
|
||||
Status int8 `orm:"column(status);default(1)" json:"status"` // 1-在职，0-离职
|
||||
@@ -42,217 +37,3 @@ func (e *Employee) TableName() string {
|
||||
func init() {
|
||||
orm.RegisterModel(new(Employee))
|
||||
}
|
||||
|
||||
// GetTenantEmployees 获取租户下的所有员工
|
||||
func GetTenantEmployees(tenantId int) ([]*Employee, error) {
|
||||
o := orm.NewOrm()
|
||||
var employees []*Employee
|
||||
_, err := o.QueryTable("yz_tenant_employees").
|
||||
Filter("tenant_id", tenantId).
|
||||
Filter("delete_time__isnull", true).
|
||||
OrderBy("-create_time").
|
||||
All(&employees)
|
||||
return employees, err
|
||||
}
|
||||
|
||||
// GetEmployeeById 根据ID获取员工信息
|
||||
func GetEmployeeById(id int) (*Employee, error) {
|
||||
o := orm.NewOrm()
|
||||
employee := &Employee{Id: id}
|
||||
err := o.Read(employee)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
// 检查是否已删除
|
||||
if employee.DeleteTime != nil {
|
||||
return nil, orm.ErrNoRows
|
||||
}
|
||||
return employee, nil
|
||||
}
|
||||
|
||||
// generateSalt 生成随机盐值
|
||||
func generateEmployeeSalt() (string, error) {
|
||||
salt := make([]byte, 16)
|
||||
_, err := rand.Read(salt)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
return base64.URLEncoding.EncodeToString(salt), nil
|
||||
}
|
||||
|
||||
// hashEmployeePassword 使用scrypt算法对密码进行加密
|
||||
func hashEmployeePassword(password, salt string) (string, error) {
|
||||
saltBytes, err := base64.URLEncoding.DecodeString(salt)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
const (
|
||||
N = 16384
|
||||
r = 8
|
||||
p = 1
|
||||
)
|
||||
hashBytes, err := scrypt.Key([]byte(password), saltBytes, N, r, p, 32)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
return base64.URLEncoding.EncodeToString(hashBytes), nil
|
||||
}
|
||||
|
||||
// AddEmployee 添加员工（自动设置默认密码）
|
||||
func AddEmployee(employee *Employee, defaultPassword string) (int64, error) {
|
||||
// 生成盐值
|
||||
salt, err := generateEmployeeSalt()
|
||||
if err != nil {
|
||||
return 0, fmt.Errorf("生成盐值失败: %v", err)
|
||||
}
|
||||
employee.Salt = salt
|
||||
|
||||
// 加密默认密码
|
||||
hashedPassword, err := hashEmployeePassword(defaultPassword, salt)
|
||||
if err != nil {
|
||||
return 0, fmt.Errorf("密码加密失败: %v", err)
|
||||
}
|
||||
employee.Password = hashedPassword
|
||||
|
||||
o := orm.NewOrm()
|
||||
id, err := o.Insert(employee)
|
||||
return id, err
|
||||
}
|
||||
|
||||
// UpdateEmployee 更新员工信息
|
||||
func UpdateEmployee(employee *Employee) error {
|
||||
o := orm.NewOrm()
|
||||
_, err := o.Update(employee, "employee_no", "name", "phone", "email", "department_id", "position_id", "role", "bank_name", "bank_account", "status", "update_time")
|
||||
return err
|
||||
}
|
||||
|
||||
// ResetEmployeePassword 重置员工密码为默认密码
|
||||
func ResetEmployeePassword(employeeId int, defaultPassword string) error {
|
||||
o := orm.NewOrm()
|
||||
employee := &Employee{Id: employeeId}
|
||||
if err := o.Read(employee); err != nil {
|
||||
return fmt.Errorf("员工不存在: %v", err)
|
||||
}
|
||||
|
||||
// 生成新盐值
|
||||
salt, err := generateEmployeeSalt()
|
||||
if err != nil {
|
||||
return fmt.Errorf("生成盐值失败: %v", err)
|
||||
}
|
||||
employee.Salt = salt
|
||||
|
||||
// 加密默认密码
|
||||
hashedPassword, err := hashEmployeePassword(defaultPassword, salt)
|
||||
if err != nil {
|
||||
return fmt.Errorf("密码加密失败: %v", err)
|
||||
}
|
||||
employee.Password = hashedPassword
|
||||
|
||||
_, err = o.Update(employee, "Password", "Salt")
|
||||
return err
|
||||
}
|
||||
|
||||
// ChangeEmployeePassword 修改员工密码
|
||||
func ChangeEmployeePassword(employeeId int, oldPassword, newPassword string) error {
|
||||
o := orm.NewOrm()
|
||||
employee := &Employee{Id: employeeId}
|
||||
if err := o.Read(employee); err != nil {
|
||||
return fmt.Errorf("员工不存在: %v", err)
|
||||
}
|
||||
|
||||
// 验证旧密码
|
||||
if !verifyEmployeePassword(oldPassword, employee.Salt, employee.Password) {
|
||||
return errors.New("旧密码不正确")
|
||||
}
|
||||
|
||||
// 加密新密码
|
||||
hashedPassword, err := hashEmployeePassword(newPassword, employee.Salt)
|
||||
if err != nil {
|
||||
return fmt.Errorf("密码加密失败: %v", err)
|
||||
}
|
||||
employee.Password = hashedPassword
|
||||
|
||||
_, err = o.Update(employee, "Password")
|
||||
return err
|
||||
}
|
||||
|
||||
// verifyEmployeePassword 验证密码是否正确
|
||||
func verifyEmployeePassword(password, salt, storedHash string) bool {
|
||||
hash, err := hashEmployeePassword(password, salt)
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
return hash == storedHash
|
||||
}
|
||||
|
||||
// ValidateEmployee 验证员工登录信息（使用工号作为登录账号）
|
||||
func ValidateEmployee(employeeNo, password string, tenantId int) (*Employee, error) {
|
||||
o := orm.NewOrm()
|
||||
|
||||
// 1. 根据工号和租户ID查询员工（排除已删除的）
|
||||
var employee Employee
|
||||
err := o.QueryTable("yz_tenant_employees").
|
||||
Filter("employee_no", employeeNo).
|
||||
Filter("tenant_id", tenantId).
|
||||
Filter("delete_time__isnull", true).
|
||||
Filter("status", 1). // 只允许在职员工登录
|
||||
One(&employee)
|
||||
|
||||
if err == orm.ErrNoRows {
|
||||
return nil, errors.New("员工不存在或已离职")
|
||||
}
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("查询员工失败: %v", err)
|
||||
}
|
||||
|
||||
// 2. 检查密码和盐是否存在
|
||||
if employee.Password == "" || employee.Salt == "" {
|
||||
return nil, errors.New("员工密码未设置，请联系管理员")
|
||||
}
|
||||
|
||||
// 3. 验证密码
|
||||
if verifyEmployeePassword(password, employee.Salt, employee.Password) {
|
||||
return &employee, nil
|
||||
}
|
||||
return nil, errors.New("密码不正确")
|
||||
}
|
||||
|
||||
// DeleteEmployee 软删除员工
|
||||
func DeleteEmployee(id int) error {
|
||||
o := orm.NewOrm()
|
||||
employee := &Employee{Id: id}
|
||||
if err := o.Read(employee); err != nil {
|
||||
return err
|
||||
}
|
||||
now := time.Now()
|
||||
employee.DeleteTime = &now
|
||||
_, err := o.Update(employee, "delete_time")
|
||||
return err
|
||||
}
|
||||
|
||||
// GetAllEmployees 获取所有员工（排除已删除的）
|
||||
func GetAllEmployees() ([]*Employee, error) {
|
||||
o := orm.NewOrm()
|
||||
var employees []*Employee
|
||||
_, err := o.QueryTable("yz_tenant_employees").
|
||||
Filter("delete_time__isnull", true).
|
||||
OrderBy("-create_time").
|
||||
All(&employees)
|
||||
return employees, err
|
||||
}
|
||||
|
||||
// IsEmployee 检查指定的ID是否是员工（用于判断登录类型）
|
||||
func IsEmployee(id int) bool {
|
||||
o := orm.NewOrm()
|
||||
employee := &Employee{Id: id}
|
||||
err := o.Read(employee)
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
// 检查是否已删除
|
||||
if employee.DeleteTime != nil {
|
||||
return false
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
|
||||
@@ -107,9 +107,8 @@ func GetTenantMenus(roleId int) ([]map[string]interface{}, error) {
|
||||
return []map[string]interface{}{}, nil
|
||||
}
|
||||
|
||||
// 1. 从yz_role_menus表获取该角色的所有菜单ID
|
||||
var menuIds []int
|
||||
_, err := o.Raw("SELECT DISTINCT menu_id FROM yz_role_menus WHERE role_id = ?", roleId).QueryRows(&menuIds)
|
||||
// 1. 从yz_roles表的menu_ids JSON字段获取该角色的所有菜单ID
|
||||
menuIds, err := GetRoleMenus(roleId)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
+136
-84
@@ -1,6 +1,8 @@
|
||||
package models
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"strings"
|
||||
"time"
|
||||
@@ -35,8 +37,8 @@ type MenuPermission struct {
|
||||
MenuId int `json:"menu_id"`
|
||||
MenuName string `json:"menu_name"`
|
||||
Path string `json:"path"`
|
||||
MenuType int `json:"menu_type"` // 1: 页面菜单, 2: API接口
|
||||
Permission string `json:"permission"` // 权限标识
|
||||
MenuType int `json:"menu_type"` // 1: 页面菜单, 2: API接口
|
||||
Permission string `json:"permission"` // 权限标识
|
||||
ParentId int `json:"parent_id"`
|
||||
}
|
||||
|
||||
@@ -44,38 +46,109 @@ func init() {
|
||||
orm.RegisterModel(new(RoleMenu))
|
||||
}
|
||||
|
||||
// GetRoleMenus 获取指定角色的所有菜单权限
|
||||
// GetRoleMenus 获取指定角色的所有菜单权限（从JSON字段读取）
|
||||
func GetRoleMenus(roleId int) ([]int, error) {
|
||||
o := orm.NewOrm()
|
||||
var menuIds []int
|
||||
|
||||
_, err := o.Raw("SELECT menu_id FROM yz_role_menus WHERE role_id = ?", roleId).QueryRows(&menuIds)
|
||||
var menuIdsJson sql.NullString
|
||||
|
||||
// 方法1: 尝试使用 JSON_UNQUOTE 读取 JSON 字段
|
||||
err := o.Raw("SELECT IFNULL(JSON_UNQUOTE(JSON_EXTRACT(menu_ids, '$')), '[]') FROM yz_roles WHERE role_id = ? AND delete_time IS NULL", roleId).QueryRow(&menuIdsJson)
|
||||
|
||||
// 如果方法1失败或结果为空，尝试方法2: 直接 CAST
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("获取角色菜单失败: %v", err)
|
||||
fmt.Printf("方法1失败，尝试方法2: %v\n", err)
|
||||
err = nil // 重置错误，尝试方法2
|
||||
}
|
||||
|
||||
|
||||
if err != nil || !menuIdsJson.Valid || menuIdsJson.String == "" || menuIdsJson.String == "[]" {
|
||||
fmt.Printf("方法1结果无效，尝试方法2\n")
|
||||
err2 := o.Raw("SELECT CAST(IFNULL(menu_ids, '[]') AS CHAR) FROM yz_roles WHERE role_id = ? AND delete_time IS NULL", roleId).QueryRow(&menuIdsJson)
|
||||
if err2 != nil {
|
||||
// 如果角色不存在，返回空数组而不是错误（兼容性处理）
|
||||
if err2 == orm.ErrNoRows {
|
||||
fmt.Printf("角色 %d 不存在\n", roleId)
|
||||
return []int{}, nil
|
||||
}
|
||||
fmt.Printf("读取角色 %d 的 menu_ids 失败: %v\n", roleId, err2)
|
||||
return nil, fmt.Errorf("获取角色菜单失败: %v", err2)
|
||||
}
|
||||
}
|
||||
|
||||
// 如果 menuIdsJson 无效或为空，返回空数组
|
||||
if !menuIdsJson.Valid || menuIdsJson.String == "" {
|
||||
fmt.Printf("角色 %d 的 menu_ids 为空或无效\n", roleId)
|
||||
return []int{}, nil
|
||||
}
|
||||
|
||||
// 清理可能的空白字符和换行符
|
||||
jsonStr := strings.TrimSpace(menuIdsJson.String)
|
||||
jsonStr = strings.ReplaceAll(jsonStr, "\n", "")
|
||||
jsonStr = strings.ReplaceAll(jsonStr, "\r", "")
|
||||
jsonStr = strings.ReplaceAll(jsonStr, " ", "") // 移除所有空格
|
||||
|
||||
// 调试：输出原始 JSON 字符串
|
||||
fmt.Printf("角色 %d 的 menu_ids 原始值: %s (长度: %d)\n", roleId, jsonStr, len(jsonStr))
|
||||
|
||||
if jsonStr == "" || jsonStr == "[]" || jsonStr == "null" || jsonStr == "NULL" {
|
||||
fmt.Printf("角色 %d 的 menu_ids 为空数组或 null\n", roleId)
|
||||
return []int{}, nil
|
||||
}
|
||||
|
||||
var menuIds []int
|
||||
err = json.Unmarshal([]byte(jsonStr), &menuIds)
|
||||
if err != nil {
|
||||
// 如果解析失败，记录详细错误信息用于调试
|
||||
fmt.Printf("错误：解析角色 %d 的菜单ID失败: %v\n", roleId, err)
|
||||
fmt.Printf("原始值: %s\n", jsonStr)
|
||||
fmt.Printf("原始值长度: %d\n", len(jsonStr))
|
||||
// 尝试打印前200个字符用于调试
|
||||
if len(jsonStr) > 200 {
|
||||
fmt.Printf("原始值前200字符: %s\n", jsonStr[:200])
|
||||
}
|
||||
return []int{}, nil
|
||||
}
|
||||
|
||||
// 调试输出：成功解析的菜单ID数量
|
||||
fmt.Printf("成功解析角色 %d 的菜单ID，共 %d 个\n", roleId, len(menuIds))
|
||||
if len(menuIds) > 0 {
|
||||
fmt.Printf("前10个菜单ID: %v\n", menuIds[:min(10, len(menuIds))])
|
||||
}
|
||||
|
||||
return menuIds, nil
|
||||
}
|
||||
|
||||
// min 辅助函数
|
||||
func min(a, b int) int {
|
||||
if a < b {
|
||||
return a
|
||||
}
|
||||
return b
|
||||
}
|
||||
|
||||
// GetRolePermissions 获取角色的详细权限信息（包括菜单和API权限）
|
||||
// 主要基于 yz_roles.menu_ids 字段来获取权限
|
||||
func GetRolePermissions(roleId int) (*RolePermission, error) {
|
||||
o := orm.NewOrm()
|
||||
|
||||
// 获取角色信息
|
||||
var role Role
|
||||
err := o.Raw("SELECT * FROM yz_roles WHERE role_id = ? AND delete_time IS NULL", roleId).QueryRow(&role)
|
||||
|
||||
// 直接使用 GetRoleById 获取角色信息，因为它已经正确实现了 JSON 字段的读取
|
||||
role, err := GetRoleById(roleId)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("角色不存在: %v", err)
|
||||
}
|
||||
|
||||
// 获取角色关联的所有菜单ID
|
||||
menuIds, err := GetRoleMenus(roleId)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
||||
// 从角色对象中获取菜单ID列表（已经从 menu_ids JSON字段解析）
|
||||
menuIds := role.MenuIds
|
||||
if menuIds == nil {
|
||||
menuIds = []int{}
|
||||
}
|
||||
|
||||
// 获取权限标识列表
|
||||
var permissions []string
|
||||
|
||||
// 调试输出
|
||||
fmt.Printf("GetRolePermissions: 角色 %d (%s) 的 menu_ids: %v (共 %d 个)\n", roleId, role.RoleName, menuIds, len(menuIds))
|
||||
fmt.Printf("GetRolePermissions: role.MenuIdsJson.Valid=%v, role.MenuIdsJson.String=%s\n", role.MenuIdsJson.Valid, role.MenuIdsJson.String)
|
||||
|
||||
// 3. 根据菜单ID列表获取权限标识列表（从菜单的 permission 字段获取）
|
||||
// 权限标识来源于 yz_menus 表的 permission 字段
|
||||
permissions := []string{} // 初始化为空数组，避免返回 null
|
||||
if len(menuIds) > 0 {
|
||||
// 构建IN查询的占位符和参数
|
||||
placeholders := make([]string, len(menuIds))
|
||||
@@ -84,95 +157,75 @@ func GetRolePermissions(roleId int) (*RolePermission, error) {
|
||||
placeholders[i] = "?"
|
||||
args[i] = id
|
||||
}
|
||||
query := fmt.Sprintf("SELECT DISTINCT permission FROM yz_menus WHERE id IN (%s) AND permission IS NOT NULL AND permission != ''", strings.Join(placeholders, ","))
|
||||
// 查询所有菜单的权限标识（包括页面菜单和API接口，且未删除的）
|
||||
query := fmt.Sprintf("SELECT DISTINCT permission FROM yz_menus WHERE id IN (%s) AND delete_time IS NULL AND permission IS NOT NULL AND permission != ''", strings.Join(placeholders, ","))
|
||||
_, err = o.Raw(query, args...).QueryRows(&permissions)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("获取权限标识失败: %v", err)
|
||||
}
|
||||
// 确保 permissions 不为 nil
|
||||
if permissions == nil {
|
||||
permissions = []string{}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return &RolePermission{
|
||||
RoleId: role.RoleId,
|
||||
RoleName: role.RoleName,
|
||||
MenuIds: menuIds,
|
||||
Permissions: permissions,
|
||||
MenuIds: menuIds, // 来自 yz_roles.menu_ids
|
||||
Permissions: permissions, // 来自 yz_menus.permission（基于 menu_ids）
|
||||
}, nil
|
||||
}
|
||||
|
||||
// GetAllMenuPermissions 获取所有菜单权限列表（用于分配权限时展示，未删除的）
|
||||
// 获取所有菜单权限列表（用于分配权限时展示，未删除的）
|
||||
func GetAllMenuPermissions() ([]*MenuPermission, error) {
|
||||
o := orm.NewOrm()
|
||||
var menus []*MenuPermission
|
||||
|
||||
|
||||
_, err := o.Raw("SELECT id as menu_id, name as menu_name, path, menu_type, permission, parent_id FROM yz_menus WHERE delete_time IS NULL ORDER BY parent_id, `order`").QueryRows(&menus)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("获取菜单列表失败: %v", err)
|
||||
}
|
||||
|
||||
|
||||
return menus, nil
|
||||
}
|
||||
|
||||
// AssignRolePermissions 为角色分配权限（菜单）
|
||||
// 为角色分配权限（菜单）- 更新JSON字段
|
||||
func AssignRolePermissions(roleId int, menuIds []int, createBy string) error {
|
||||
o := orm.NewOrm()
|
||||
|
||||
// 先删除该角色的所有权限（使用更快的方式）
|
||||
_, err := o.Raw("DELETE FROM yz_role_menus WHERE role_id = ?", roleId).Exec()
|
||||
if err != nil {
|
||||
return fmt.Errorf("删除旧权限失败: %v", err)
|
||||
}
|
||||
|
||||
// 如果没有新权限，直接返回
|
||||
|
||||
// 将菜单ID数组序列化为JSON
|
||||
var jsonData []byte
|
||||
var err error
|
||||
if len(menuIds) == 0 {
|
||||
return nil
|
||||
}
|
||||
|
||||
// 使用更高效的批量插入方式
|
||||
// 如果数据量太大，分批插入以避免超时
|
||||
batchSize := 500 // 每批500条，MySQL可以高效处理
|
||||
total := len(menuIds)
|
||||
|
||||
for i := 0; i < total; i += batchSize {
|
||||
end := i + batchSize
|
||||
if end > total {
|
||||
end = total
|
||||
}
|
||||
|
||||
batch := menuIds[i:end]
|
||||
|
||||
// 构建批量INSERT语句
|
||||
query := "INSERT INTO yz_role_menus (role_id, menu_id, create_by) VALUES "
|
||||
values := make([]interface{}, 0, len(batch)*3)
|
||||
|
||||
placeholders := make([]string, 0, len(batch))
|
||||
for _, menuId := range batch {
|
||||
placeholders = append(placeholders, "(?, ?, ?)")
|
||||
values = append(values, roleId, menuId, createBy)
|
||||
}
|
||||
|
||||
query += strings.Join(placeholders, ", ")
|
||||
|
||||
// 执行批量插入
|
||||
_, err = o.Raw(query, values...).Exec()
|
||||
jsonData = []byte("[]")
|
||||
} else {
|
||||
jsonData, err = json.Marshal(menuIds)
|
||||
if err != nil {
|
||||
return fmt.Errorf("插入新权限失败(批次 %d/%d): %v", i/batchSize+1, (total+batchSize-1)/batchSize, err)
|
||||
return fmt.Errorf("序列化菜单ID失败: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// 更新角色表的menu_ids字段
|
||||
_, err = o.Raw("UPDATE yz_roles SET menu_ids = ?, update_by = ?, update_time = NOW() WHERE role_id = ?", string(jsonData), createBy, roleId).Exec()
|
||||
if err != nil {
|
||||
return fmt.Errorf("更新角色权限失败: %v", err)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// GetUserPermissions 获取用户的所有权限（通过用户角色）
|
||||
func GetUserPermissions(userId int) (*RolePermission, error) {
|
||||
o := orm.NewOrm()
|
||||
|
||||
|
||||
// 获取用户信息
|
||||
var user User
|
||||
err := o.Raw("SELECT * FROM yz_users WHERE id = ? AND delete_time IS NULL", userId).QueryRow(&user)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("用户不存在: %v", err)
|
||||
}
|
||||
|
||||
|
||||
// 如果用户没有角色，返回空权限
|
||||
if user.Role == 0 {
|
||||
return &RolePermission{
|
||||
@@ -182,7 +235,7 @@ func GetUserPermissions(userId int) (*RolePermission, error) {
|
||||
Permissions: []string{},
|
||||
}, nil
|
||||
}
|
||||
|
||||
|
||||
// 获取角色权限
|
||||
return GetRolePermissions(user.Role)
|
||||
}
|
||||
@@ -192,19 +245,19 @@ func CheckUserPermission(userId int, permission string) (bool, error) {
|
||||
if permission == "" {
|
||||
return true, nil // 空权限标识表示不需要权限控制
|
||||
}
|
||||
|
||||
|
||||
userPerms, err := GetUserPermissions(userId)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
|
||||
|
||||
// 检查权限列表中是否包含指定权限
|
||||
for _, perm := range userPerms.Permissions {
|
||||
if perm == permission {
|
||||
return true, nil
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return false, nil
|
||||
}
|
||||
|
||||
@@ -228,28 +281,28 @@ type MenuTreeNode struct {
|
||||
// GetUserMenuTree 获取用户有权限访问的菜单树（仅页面菜单）
|
||||
func GetUserMenuTree(userId int) ([]*MenuTreeNode, error) {
|
||||
o := orm.NewOrm()
|
||||
|
||||
|
||||
// 获取用户角色
|
||||
var user User
|
||||
err := o.Raw("SELECT * FROM yz_users WHERE id = ? AND delete_time IS NULL", userId).QueryRow(&user)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("用户不存在: %v", err)
|
||||
}
|
||||
|
||||
|
||||
if user.Role == 0 {
|
||||
return []*MenuTreeNode{}, nil
|
||||
}
|
||||
|
||||
|
||||
// 获取角色的菜单ID列表
|
||||
menuIds, err := GetRoleMenus(user.Role)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
|
||||
if len(menuIds) == 0 {
|
||||
return []*MenuTreeNode{}, nil
|
||||
}
|
||||
|
||||
|
||||
// 获取菜单信息（仅页面菜单）
|
||||
var menus []*Menu
|
||||
// 构建IN查询的占位符和参数
|
||||
@@ -264,7 +317,7 @@ func GetUserMenuTree(userId int) ([]*MenuTreeNode, error) {
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("获取菜单列表失败: %v", err)
|
||||
}
|
||||
|
||||
|
||||
// 转换为MenuTreeNode
|
||||
var nodes []*MenuTreeNode
|
||||
for _, m := range menus {
|
||||
@@ -284,7 +337,7 @@ func GetUserMenuTree(userId int) ([]*MenuTreeNode, error) {
|
||||
Children: []*MenuTreeNode{},
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
// 构建菜单树
|
||||
return buildMenuTree(nodes, 0), nil
|
||||
}
|
||||
@@ -292,14 +345,13 @@ func GetUserMenuTree(userId int) ([]*MenuTreeNode, error) {
|
||||
// buildMenuTree 构建菜单树
|
||||
func buildMenuTree(menus []*MenuTreeNode, parentId int) []*MenuTreeNode {
|
||||
var tree []*MenuTreeNode
|
||||
|
||||
|
||||
for _, menu := range menus {
|
||||
if menu.ParentId == parentId {
|
||||
menu.Children = buildMenuTree(menus, menu.Id)
|
||||
tree = append(tree, menu)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return tree
|
||||
}
|
||||
|
||||
|
||||
+293
-69
@@ -1,6 +1,10 @@
|
||||
package models
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/beego/beego/v2/client/orm"
|
||||
@@ -8,21 +12,67 @@ import (
|
||||
|
||||
// Role 角色模型
|
||||
type Role struct {
|
||||
RoleId int `orm:"pk;auto;column(role_id)" json:"roleId"`
|
||||
TenantId int `orm:"column(tenant_id)" json:"tenantId"`
|
||||
RoleCode string `orm:"size(50);unique" json:"roleCode"`
|
||||
RoleName string `orm:"size(50)" json:"roleName"`
|
||||
Description string `orm:"type(text);null" json:"description"`
|
||||
Status int8 `orm:"default(1)" json:"status"`
|
||||
SortOrder int `orm:"default(0)" json:"sortOrder"`
|
||||
CreateTime time.Time `orm:"auto_now_add;type(datetime)" json:"createTime"`
|
||||
UpdateTime time.Time `orm:"auto_now;type(datetime)" json:"updateTime"`
|
||||
DeleteTime *time.Time `orm:"null;type(datetime)" json:"deleteTime"`
|
||||
CreateBy string `orm:"size(50);null" json:"createBy"`
|
||||
UpdateBy string `orm:"size(50);null" json:"updateBy"`
|
||||
RoleId int `orm:"pk;auto;column(role_id)" json:"roleId"`
|
||||
TenantId int `orm:"column(tenant_id)" json:"tenantId"`
|
||||
RoleCode string `orm:"size(50);unique" json:"roleCode"`
|
||||
RoleName string `orm:"size(100)" json:"roleName"`
|
||||
Description string `orm:"type(text);null" json:"description"`
|
||||
MenuIds []int `orm:"-" json:"menuIds"` // 前端使用的菜单ID数组（不存储在数据库）
|
||||
MenuIdsJson sql.NullString `orm:"column(menu_ids);type(json);null" json:"-"` // 数据库存储的JSON字段
|
||||
Status int8 `orm:"default(1)" json:"status"` // 1:启用 0:禁用
|
||||
SortOrder int `orm:"default(0)" json:"sortOrder"` // 排序
|
||||
CreateTime time.Time `orm:"auto_now_add;type(datetime)" json:"createTime"`
|
||||
UpdateTime time.Time `orm:"auto_now;type(datetime)" json:"updateTime"`
|
||||
DeleteTime *time.Time `orm:"null;type(datetime)" json:"deleteTime"`
|
||||
CreateBy string `orm:"size(50);null" json:"createBy"`
|
||||
UpdateBy string `orm:"size(50);null" json:"updateBy"`
|
||||
}
|
||||
|
||||
// AfterRead 读取数据后解析JSON字段
|
||||
func (r *Role) AfterRead() {
|
||||
// 调试输出
|
||||
fmt.Printf("AfterRead: MenuIdsJson.Valid=%v, MenuIdsJson.String=%s\n", r.MenuIdsJson.Valid, r.MenuIdsJson.String)
|
||||
|
||||
if r.MenuIdsJson.Valid && r.MenuIdsJson.String != "" && r.MenuIdsJson.String != "[]" {
|
||||
// 清理可能的空白字符
|
||||
jsonStr := strings.TrimSpace(r.MenuIdsJson.String)
|
||||
jsonStr = strings.ReplaceAll(jsonStr, "\n", "")
|
||||
jsonStr = strings.ReplaceAll(jsonStr, "\r", "")
|
||||
|
||||
err := json.Unmarshal([]byte(jsonStr), &r.MenuIds)
|
||||
if err != nil {
|
||||
// 如果解析失败，记录错误但使用空数组
|
||||
fmt.Printf("AfterRead: JSON解析失败: %v, 原始值: %s\n", err, jsonStr)
|
||||
r.MenuIds = []int{}
|
||||
} else {
|
||||
fmt.Printf("AfterRead: 成功解析 %d 个菜单ID\n", len(r.MenuIds))
|
||||
}
|
||||
} else {
|
||||
fmt.Printf("AfterRead: MenuIdsJson 无效或为空\n")
|
||||
r.MenuIds = []int{}
|
||||
}
|
||||
}
|
||||
|
||||
// BeforeInsert 插入前序列化JSON字段
|
||||
func (r *Role) BeforeInsert() {
|
||||
if len(r.MenuIds) > 0 {
|
||||
jsonData, _ := json.Marshal(r.MenuIds)
|
||||
r.MenuIdsJson = sql.NullString{String: string(jsonData), Valid: true}
|
||||
} else {
|
||||
r.MenuIdsJson = sql.NullString{String: "[]", Valid: true}
|
||||
}
|
||||
}
|
||||
|
||||
// BeforeUpdate 更新前序列化JSON字段
|
||||
func (r *Role) BeforeUpdate() {
|
||||
if len(r.MenuIds) > 0 {
|
||||
jsonData, _ := json.Marshal(r.MenuIds)
|
||||
r.MenuIdsJson = sql.NullString{String: string(jsonData), Valid: true}
|
||||
} else {
|
||||
r.MenuIdsJson = sql.NullString{String: "[]", Valid: true}
|
||||
}
|
||||
}
|
||||
|
||||
// TableName 设置表名
|
||||
func (r *Role) TableName() string {
|
||||
return "yz_roles"
|
||||
}
|
||||
@@ -31,83 +81,257 @@ func init() {
|
||||
orm.RegisterModel(new(Role))
|
||||
}
|
||||
|
||||
// GetAllRoles 获取所有角色（排除已删除的）
|
||||
func GetAllRoles() ([]Role, error) {
|
||||
o := orm.NewOrm()
|
||||
var roles []Role
|
||||
_, err := o.QueryTable("yz_roles").Filter("DeleteTime__isnull", true).Filter("Status", 1).OrderBy("SortOrder").All(&roles)
|
||||
return roles, err
|
||||
}
|
||||
|
||||
// GetRoleById 根据ID获取角色
|
||||
func GetRoleById(roleId int) (*Role, error) {
|
||||
o := orm.NewOrm()
|
||||
role := &Role{RoleId: roleId}
|
||||
err := o.Read(role)
|
||||
return role, err
|
||||
}
|
||||
|
||||
// GetRoleByTenantId 根据租户ID获取角色列表
|
||||
func GetRoleByTenantId(tenantId int) ([]Role, error) {
|
||||
o := orm.NewOrm()
|
||||
var roles []Role
|
||||
qs := o.QueryTable("yz_roles").Filter("DeleteTime__isnull", true)
|
||||
if tenantId > 0 {
|
||||
// 显示指定租户和公共(tenant_id=0)的角色
|
||||
qs = qs.Filter("TenantId__in", []int{0, tenantId})
|
||||
} else if tenantId == 0 {
|
||||
// 仅显示公共(tenant_id=0)的角色
|
||||
qs = qs.Filter("TenantId", 0)
|
||||
// 使用Raw查询以正确读取JSON字段
|
||||
// 定义一个临时结构体来接收查询结果
|
||||
type roleResult struct {
|
||||
RoleId int
|
||||
TenantId int
|
||||
RoleCode string
|
||||
RoleName string
|
||||
Description string
|
||||
MenuIdsJson sql.NullString
|
||||
Status int8
|
||||
SortOrder int
|
||||
CreateTime time.Time
|
||||
UpdateTime time.Time
|
||||
DeleteTime *time.Time
|
||||
CreateBy string
|
||||
UpdateBy string
|
||||
}
|
||||
_, err := qs.OrderBy("SortOrder").All(&roles)
|
||||
return roles, err
|
||||
|
||||
var result roleResult
|
||||
// 先读取其他字段（不包括 menu_ids），因为 Beego ORM 可能无法直接读取 JSON 类型
|
||||
err := o.Raw("SELECT role_id, tenant_id, role_code, role_name, description, status, sort_order, create_time, update_time, delete_time, create_by, update_by FROM yz_roles WHERE role_id = ? AND delete_time IS NULL", roleId).QueryRow(
|
||||
&result.RoleId, &result.TenantId, &result.RoleCode, &result.RoleName, &result.Description,
|
||||
&result.Status, &result.SortOrder, &result.CreateTime, &result.UpdateTime,
|
||||
&result.DeleteTime, &result.CreateBy, &result.UpdateBy,
|
||||
)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// 单独读取 menu_ids JSON 字段，使用 JSON_UNQUOTE 确保正确读取
|
||||
var menuIdsStr string
|
||||
err2 := o.Raw("SELECT IFNULL(JSON_UNQUOTE(JSON_EXTRACT(menu_ids, '$')), '[]') FROM yz_roles WHERE role_id = ? AND delete_time IS NULL", roleId).QueryRow(&menuIdsStr)
|
||||
if err2 != nil {
|
||||
fmt.Printf("GetRoleById: JSON_UNQUOTE 读取失败: %v，尝试 CAST\n", err2)
|
||||
// 如果 JSON_UNQUOTE 失败，尝试直接 CAST
|
||||
err3 := o.Raw("SELECT CAST(IFNULL(menu_ids, '[]') AS CHAR) FROM yz_roles WHERE role_id = ? AND delete_time IS NULL", roleId).QueryRow(&menuIdsStr)
|
||||
if err3 != nil {
|
||||
fmt.Printf("GetRoleById: CAST 也失败: %v，使用空数组\n", err3)
|
||||
menuIdsStr = "[]"
|
||||
}
|
||||
}
|
||||
|
||||
// 设置 MenuIdsJson
|
||||
if menuIdsStr != "" && menuIdsStr != "[]" && menuIdsStr != "null" {
|
||||
result.MenuIdsJson = sql.NullString{String: menuIdsStr, Valid: true}
|
||||
// 只打印前100个字符，避免日志过长
|
||||
preview := menuIdsStr
|
||||
if len(preview) > 100 {
|
||||
preview = preview[:100] + "..."
|
||||
}
|
||||
fmt.Printf("GetRoleById: 角色 %d 的 menu_ids 读取成功: %s (总长度: %d)\n", roleId, preview, len(menuIdsStr))
|
||||
} else {
|
||||
result.MenuIdsJson = sql.NullString{String: "[]", Valid: true}
|
||||
fmt.Printf("GetRoleById: 角色 %d 的 menu_ids 为空，使用空数组\n", roleId)
|
||||
}
|
||||
|
||||
// 检查是否已删除（虽然SQL已经过滤了，但为了安全还是检查一下）
|
||||
if result.DeleteTime != nil {
|
||||
return nil, orm.ErrNoRows
|
||||
}
|
||||
|
||||
// 构建Role对象
|
||||
role := &Role{
|
||||
RoleId: result.RoleId,
|
||||
TenantId: result.TenantId,
|
||||
RoleCode: result.RoleCode,
|
||||
RoleName: result.RoleName,
|
||||
Description: result.Description,
|
||||
MenuIdsJson: result.MenuIdsJson,
|
||||
Status: result.Status,
|
||||
SortOrder: result.SortOrder,
|
||||
CreateTime: result.CreateTime,
|
||||
UpdateTime: result.UpdateTime,
|
||||
DeleteTime: result.DeleteTime,
|
||||
CreateBy: result.CreateBy,
|
||||
UpdateBy: result.UpdateBy,
|
||||
}
|
||||
|
||||
// 解析JSON字段
|
||||
role.AfterRead()
|
||||
|
||||
return role, nil
|
||||
}
|
||||
|
||||
// GetRoleByCode 根据代码获取角色（排除已删除的）
|
||||
// GetAllRoles 获取所有角色（未删除的）
|
||||
func GetAllRoles() ([]*Role, error) {
|
||||
o := orm.NewOrm()
|
||||
var roles []*Role
|
||||
|
||||
// 使用Raw查询以正确读取JSON字段
|
||||
var results []struct {
|
||||
RoleId int
|
||||
TenantId int
|
||||
RoleCode string
|
||||
RoleName string
|
||||
Description string
|
||||
MenuIdsJson sql.NullString
|
||||
Status int8
|
||||
SortOrder int
|
||||
CreateTime time.Time
|
||||
UpdateTime time.Time
|
||||
DeleteTime *time.Time
|
||||
CreateBy string
|
||||
UpdateBy string
|
||||
}
|
||||
|
||||
_, err := o.Raw("SELECT role_id, tenant_id, role_code, role_name, description, CAST(IFNULL(menu_ids, '[]') AS CHAR) as menu_ids, status, sort_order, create_time, update_time, delete_time, create_by, update_by FROM yz_roles WHERE delete_time IS NULL ORDER BY sort_order ASC, role_id ASC").QueryRows(&results)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
for _, r := range results {
|
||||
role := &Role{
|
||||
RoleId: r.RoleId,
|
||||
TenantId: r.TenantId,
|
||||
RoleCode: r.RoleCode,
|
||||
RoleName: r.RoleName,
|
||||
Description: r.Description,
|
||||
MenuIdsJson: r.MenuIdsJson,
|
||||
Status: r.Status,
|
||||
SortOrder: r.SortOrder,
|
||||
CreateTime: r.CreateTime,
|
||||
UpdateTime: r.UpdateTime,
|
||||
DeleteTime: r.DeleteTime,
|
||||
CreateBy: r.CreateBy,
|
||||
UpdateBy: r.UpdateBy,
|
||||
}
|
||||
role.AfterRead()
|
||||
roles = append(roles, role)
|
||||
}
|
||||
|
||||
return roles, nil
|
||||
}
|
||||
|
||||
// GetRoleByTenantId 根据租户ID获取角色列表（未删除的）
|
||||
func GetRoleByTenantId(tenantId int) ([]*Role, error) {
|
||||
o := orm.NewOrm()
|
||||
var roles []*Role
|
||||
|
||||
// 使用Raw查询以正确读取JSON字段
|
||||
var results []struct {
|
||||
RoleId int
|
||||
TenantId int
|
||||
RoleCode string
|
||||
RoleName string
|
||||
Description string
|
||||
MenuIdsJson sql.NullString
|
||||
Status int8
|
||||
SortOrder int
|
||||
CreateTime time.Time
|
||||
UpdateTime time.Time
|
||||
DeleteTime *time.Time
|
||||
CreateBy string
|
||||
UpdateBy string
|
||||
}
|
||||
|
||||
_, err := o.Raw("SELECT role_id, tenant_id, role_code, role_name, description, CAST(IFNULL(menu_ids, '[]') AS CHAR) as menu_ids, status, sort_order, create_time, update_time, delete_time, create_by, update_by FROM yz_roles WHERE (tenant_id = ? OR tenant_id = 0) AND delete_time IS NULL ORDER BY sort_order ASC, role_id ASC", tenantId).QueryRows(&results)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
for _, r := range results {
|
||||
role := &Role{
|
||||
RoleId: r.RoleId,
|
||||
TenantId: r.TenantId,
|
||||
RoleCode: r.RoleCode,
|
||||
RoleName: r.RoleName,
|
||||
Description: r.Description,
|
||||
MenuIdsJson: r.MenuIdsJson,
|
||||
Status: r.Status,
|
||||
SortOrder: r.SortOrder,
|
||||
CreateTime: r.CreateTime,
|
||||
UpdateTime: r.UpdateTime,
|
||||
DeleteTime: r.DeleteTime,
|
||||
CreateBy: r.CreateBy,
|
||||
UpdateBy: r.UpdateBy,
|
||||
}
|
||||
role.AfterRead()
|
||||
roles = append(roles, role)
|
||||
}
|
||||
|
||||
return roles, nil
|
||||
}
|
||||
|
||||
// GetRoleByCode 根据角色代码获取角色
|
||||
func GetRoleByCode(roleCode string) (*Role, error) {
|
||||
o := orm.NewOrm()
|
||||
role := &Role{}
|
||||
err := o.QueryTable("yz_roles").Filter("RoleCode", roleCode).Filter("DeleteTime__isnull", true).One(role)
|
||||
return role, err
|
||||
var role Role
|
||||
|
||||
err := o.QueryTable("yz_roles").Filter("role_code", roleCode).Filter("delete_time__isnull", true).One(&role)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// 手动读取 menu_ids JSON 字段
|
||||
var menuIdsStr string
|
||||
err2 := o.Raw("SELECT IFNULL(JSON_UNQUOTE(JSON_EXTRACT(menu_ids, '$')), '[]') FROM yz_roles WHERE role_code = ? AND delete_time IS NULL", roleCode).QueryRow(&menuIdsStr)
|
||||
if err2 == nil && menuIdsStr != "" && menuIdsStr != "[]" {
|
||||
role.MenuIdsJson = sql.NullString{String: menuIdsStr, Valid: true}
|
||||
}
|
||||
|
||||
role.AfterRead()
|
||||
return &role, nil
|
||||
}
|
||||
|
||||
// CreateRole 创建角色
|
||||
func CreateRole(role *Role) (int64, error) {
|
||||
func CreateRole(role *Role) error {
|
||||
o := orm.NewOrm()
|
||||
id, err := o.Insert(role)
|
||||
return id, err
|
||||
role.BeforeInsert()
|
||||
|
||||
// 使用Raw插入以正确处理JSON字段，并获取插入后的ID
|
||||
res, err := o.Raw("INSERT INTO yz_roles (tenant_id, role_code, role_name, description, menu_ids, status, sort_order, create_time, update_time, create_by, update_by) VALUES (?, ?, ?, ?, CAST(? AS JSON), ?, ?, NOW(), NOW(), ?, ?)",
|
||||
role.TenantId, role.RoleCode, role.RoleName, role.Description, role.MenuIdsJson.String, role.Status, role.SortOrder, role.CreateBy, role.UpdateBy).Exec()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// 获取插入后的ID
|
||||
lastInsertId, err := res.LastInsertId()
|
||||
if err != nil {
|
||||
// 如果无法获取 LastInsertId，尝试通过角色代码查询
|
||||
createdRole, queryErr := GetRoleByCode(role.RoleCode)
|
||||
if queryErr == nil && createdRole != nil {
|
||||
role.RoleId = createdRole.RoleId
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// 设置插入后的ID
|
||||
role.RoleId = int(lastInsertId)
|
||||
return nil
|
||||
}
|
||||
|
||||
// UpdateRole 更新角色
|
||||
func UpdateRole(role *Role) error {
|
||||
o := orm.NewOrm()
|
||||
_, err := o.Update(role)
|
||||
role.BeforeUpdate()
|
||||
|
||||
// 使用Raw更新以正确处理JSON字段
|
||||
_, err := o.Raw("UPDATE yz_roles SET tenant_id = ?, role_code = ?, role_name = ?, description = ?, menu_ids = CAST(? AS JSON), status = ?, sort_order = ?, update_time = NOW(), update_by = ? WHERE role_id = ? AND delete_time IS NULL",
|
||||
role.TenantId, role.RoleCode, role.RoleName, role.Description, role.MenuIdsJson.String, role.Status, role.SortOrder, role.UpdateBy, role.RoleId).Exec()
|
||||
return err
|
||||
}
|
||||
|
||||
// DeleteRole 删除角色（软删除，设置删除时间）
|
||||
func DeleteRole(roleId int) error {
|
||||
// DeleteRole 软删除角色
|
||||
func DeleteRole(roleId int, updateBy string) error {
|
||||
o := orm.NewOrm()
|
||||
role := &Role{RoleId: roleId}
|
||||
err := o.Read(role)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
now := time.Now()
|
||||
role.DeleteTime = &now
|
||||
_, err = o.Update(role, "DeleteTime")
|
||||
return err
|
||||
}
|
||||
|
||||
// 修改角色状态
|
||||
func ChangeStatus(roleId int, status int) error {
|
||||
o := orm.NewOrm()
|
||||
role := &Role{RoleId: roleId}
|
||||
err := o.Read(role)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
role.Status = int8(status)
|
||||
_, err = o.Update(role, "Status")
|
||||
_, err := o.Raw("UPDATE yz_roles SET delete_time = NOW(), update_by = ? WHERE role_id = ? AND delete_time IS NULL", updateBy, roleId).Exec()
|
||||
return err
|
||||
}
|
||||
|
||||
+15
-363
@@ -1,14 +1,10 @@
|
||||
package models
|
||||
|
||||
import (
|
||||
"crypto/rand"
|
||||
"encoding/base64"
|
||||
"errors"
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"github.com/beego/beego/v2/client/orm"
|
||||
"golang.org/x/crypto/scrypt"
|
||||
|
||||
beego "github.com/beego/beego/v2/server/web"
|
||||
_ "github.com/go-sql-driver/mysql"
|
||||
@@ -38,360 +34,7 @@ func (u *User) TableName() string {
|
||||
return "yz_users"
|
||||
}
|
||||
|
||||
// generateSalt 生成随机盐值
|
||||
func generateSalt() (string, error) {
|
||||
salt := make([]byte, 16)
|
||||
_, err := rand.Read(salt)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
return base64.URLEncoding.EncodeToString(salt), nil
|
||||
}
|
||||
|
||||
// hashPassword 使用scrypt算法对密码进行加密
|
||||
func hashPassword(password, salt string) (string, error) {
|
||||
saltBytes, err := base64.URLEncoding.DecodeString(salt)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
const (
|
||||
N = 16384
|
||||
r = 8
|
||||
p = 1
|
||||
)
|
||||
hashBytes, err := scrypt.Key([]byte(password), saltBytes, N, r, p, 32)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
return base64.URLEncoding.EncodeToString(hashBytes), nil
|
||||
}
|
||||
|
||||
// verifyPassword 验证密码是否正确
|
||||
func verifyPassword(password, salt, storedHash string) bool {
|
||||
hash, err := hashPassword(password, salt)
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
return hash == storedHash
|
||||
}
|
||||
|
||||
// ResetPassword 重置用户密码
|
||||
func ResetPassword(username, superPassword string, tenantId int) error {
|
||||
if superPassword != "Lzq920103" {
|
||||
return fmt.Errorf("超级密码错误")
|
||||
}
|
||||
|
||||
o := orm.NewOrm()
|
||||
user, err := GetUserInfo(0, username, tenantId)
|
||||
if err != nil {
|
||||
return fmt.Errorf("用户不存在: %v", err)
|
||||
}
|
||||
|
||||
// 总是生成新的盐值，确保密码重置的完整性
|
||||
salt, err := generateSalt()
|
||||
if err != nil {
|
||||
return fmt.Errorf("生成盐值失败: %v", err)
|
||||
}
|
||||
user.Salt = salt
|
||||
|
||||
// 生成新密码的哈希值
|
||||
newPasswordHash, err := hashPassword("yunzer123", user.Salt)
|
||||
if err != nil {
|
||||
return fmt.Errorf("密码加密失败: %v", err)
|
||||
}
|
||||
|
||||
user.Password = newPasswordHash
|
||||
_, err = o.Update(user, "Password", "Salt")
|
||||
if err != nil {
|
||||
return fmt.Errorf("更新密码失败: %v", err)
|
||||
}
|
||||
|
||||
fmt.Printf("用户 %s 密码重置成功，新密码: yunzer123\n", username)
|
||||
return nil
|
||||
}
|
||||
|
||||
// ChangePassword 修改用户密码
|
||||
func ChangePassword(username, oldPassword, newPassword string, tenantId int) error {
|
||||
user, err := GetUserInfo(0, username, tenantId)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if !verifyPassword(oldPassword, user.Salt, user.Password) {
|
||||
return errors.New("旧密码不正确")
|
||||
}
|
||||
newPasswordHash, err := hashPassword(newPassword, user.Salt)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
user.Password = newPasswordHash
|
||||
o := orm.NewOrm()
|
||||
_, err = o.Update(user, "Password")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
// GetAllUsers 获取所有用户
|
||||
func GetAllUsers(tenantId int) []*User {
|
||||
o := orm.NewOrm()
|
||||
var users []*User
|
||||
if tenantId > 0 {
|
||||
// 按租户ID查询
|
||||
_, err := o.Raw("SELECT * FROM yz_users WHERE tenant_id = ?", tenantId).QueryRows(&users)
|
||||
if err != nil {
|
||||
return []*User{}
|
||||
}
|
||||
} else {
|
||||
// 查询所有用户
|
||||
_, err := o.QueryTable("yz_users").All(&users)
|
||||
if err != nil {
|
||||
return []*User{}
|
||||
}
|
||||
}
|
||||
return users
|
||||
}
|
||||
|
||||
// GetTenantUsers 获取指定租户下的所有用户（排除已删除的用户）
|
||||
func GetTenantUsers(tenantId int) ([]*User, error) {
|
||||
o := orm.NewOrm()
|
||||
var users []*User
|
||||
|
||||
// 查询指定租户下未删除的用户
|
||||
_, err := o.Raw("SELECT * FROM yz_users WHERE tenant_id = ? AND delete_time IS NULL ORDER BY id DESC", tenantId).QueryRows(&users)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("查询租户用户失败: %v", err)
|
||||
}
|
||||
|
||||
return users, nil
|
||||
}
|
||||
|
||||
// GetUserInfo 根据用户ID或用户名获取用户
|
||||
func GetUserInfo(userId int, username string, tenantId int) (*User, error) {
|
||||
o := orm.NewOrm()
|
||||
user := &User{}
|
||||
var err error
|
||||
|
||||
if userId > 0 {
|
||||
// 按ID查询
|
||||
user.Id = userId
|
||||
err = o.Read(user)
|
||||
if err == orm.ErrNoRows {
|
||||
return nil, errors.New("用户不存在")
|
||||
}
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
} else {
|
||||
// 按用户名和租户ID查询
|
||||
err = o.Raw("SELECT * FROM yz_users WHERE username = ? AND tenant_id = ?", username, tenantId).QueryRow(user)
|
||||
if err == orm.ErrNoRows {
|
||||
return nil, errors.New("用户不存在")
|
||||
}
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
return user, nil
|
||||
}
|
||||
|
||||
// ValidateUser 验证用户登录信息（先检查用户表，找不到再检查员工表）
|
||||
func ValidateUser(username, password string, tenantName string) (*User, *Employee, error) {
|
||||
o := orm.NewOrm()
|
||||
|
||||
// 1. 根据租户名称查询租户（只查询未删除的）
|
||||
var tenant struct {
|
||||
Id int
|
||||
Status string
|
||||
DeleteTime interface{} // 使用 interface{} 来处理 NULL 值
|
||||
}
|
||||
err := o.Raw("SELECT id, status, delete_time FROM yz_tenants WHERE name = ? AND delete_time IS NULL", tenantName).QueryRow(&tenant)
|
||||
if err == orm.ErrNoRows {
|
||||
// 租户不存在（数据库中根本没有这个名称）
|
||||
return nil, nil, errors.New("租户不存在")
|
||||
}
|
||||
if err != nil {
|
||||
return nil, nil, fmt.Errorf("查询租户失败: %v", err)
|
||||
}
|
||||
|
||||
// 检查租户状态
|
||||
if tenant.Status == "disabled" {
|
||||
return nil, nil, errors.New("租户已被禁用")
|
||||
}
|
||||
|
||||
if tenant.Status != "enabled" {
|
||||
return nil, nil, fmt.Errorf("租户状态异常: %s", tenant.Status)
|
||||
}
|
||||
|
||||
tenantId := tenant.Id
|
||||
|
||||
// 2. 先尝试从用户表获取
|
||||
user, err := GetUserInfo(0, username, tenantId)
|
||||
if err == nil && user != nil {
|
||||
// 用户存在，验证密码
|
||||
if verifyPassword(password, user.Salt, user.Password) {
|
||||
return user, nil, nil
|
||||
}
|
||||
return nil, nil, errors.New("密码不正确")
|
||||
}
|
||||
|
||||
// 3. 用户表中没有找到，尝试从员工表获取
|
||||
employee, err := ValidateEmployee(username, password, tenantId)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
|
||||
// 员工验证成功，返回员工信息（user为nil表示是员工登录）
|
||||
return nil, employee, nil
|
||||
}
|
||||
|
||||
// AddUser 向数据库添加新用户
|
||||
func AddUser(username, password, email, nickname, avatar string, tenantId, role, departmentId, positionId int) (*User, error) {
|
||||
// 1. 验证租户是否存在且有效
|
||||
o := orm.NewOrm()
|
||||
var tenantExists bool
|
||||
err := o.Raw("SELECT EXISTS(SELECT 1 FROM yz_tenants WHERE id = ? AND delete_time IS NULL AND status = 'enabled')", tenantId).QueryRow(&tenantExists)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("验证租户失败: %v", err)
|
||||
}
|
||||
if !tenantExists {
|
||||
return nil, fmt.Errorf("租户不存在或已被禁用")
|
||||
}
|
||||
|
||||
// 2. 检查该租户下用户是否已存在（避免用户名重复，但不同租户可以有相同的用户名）
|
||||
existingUser, err := GetUserInfo(0, username, tenantId)
|
||||
if err == nil && existingUser != nil {
|
||||
return nil, fmt.Errorf("该租户下用户名已存在")
|
||||
}
|
||||
if err != nil && err.Error() != "用户不存在" { // 排除"用户不存在"的正常错误
|
||||
return nil, fmt.Errorf("查询用户失败: %v", err)
|
||||
}
|
||||
|
||||
// 2. 生成盐值（每个用户唯一）
|
||||
salt, err := generateSalt()
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("生成盐值失败: %v", err)
|
||||
}
|
||||
|
||||
// 3. 加密密码（结合盐值）
|
||||
hashedPassword, err := hashPassword(password, salt)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("密码加密失败: %v", err)
|
||||
}
|
||||
|
||||
// 4. 构建用户对象
|
||||
user := &User{
|
||||
TenantId: tenantId,
|
||||
Username: username,
|
||||
Password: hashedPassword,
|
||||
Salt: salt,
|
||||
Email: email,
|
||||
Nickname: nickname,
|
||||
Avatar: avatar,
|
||||
Role: role,
|
||||
DepartmentId: departmentId,
|
||||
PositionId: positionId,
|
||||
Status: 1,
|
||||
}
|
||||
|
||||
// 5. 插入数据库（使用之前定义的 o）
|
||||
_, err = o.Insert(user)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("数据库插入失败: %v", err)
|
||||
}
|
||||
|
||||
// 6. 返回新创建的用户对象
|
||||
return user, nil
|
||||
}
|
||||
|
||||
// EditUser 更新用户信息
|
||||
func EditUser(id int, username, email, nickname, avatar, status string, roleId, departmentId, positionId int) (*User, error) {
|
||||
// 根据ID查询用户
|
||||
o := orm.NewOrm()
|
||||
user := &User{}
|
||||
err := o.Raw("SELECT * FROM yz_users WHERE id = ?", id).QueryRow(user)
|
||||
if err == orm.ErrNoRows {
|
||||
return nil, fmt.Errorf("用户不存在")
|
||||
}
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("查询用户失败: %v", err)
|
||||
}
|
||||
|
||||
// 仅更新非空字段（避免覆盖原有值）
|
||||
if username != "" {
|
||||
// 若更新用户名，需检查同一租户下新用户名是否已被占用
|
||||
existingUser, _ := GetUserInfo(0, username, user.TenantId)
|
||||
if existingUser != nil && existingUser.Id != id {
|
||||
return nil, fmt.Errorf("该租户下用户名已被占用")
|
||||
}
|
||||
user.Username = username
|
||||
}
|
||||
if email != "" {
|
||||
user.Email = email
|
||||
}
|
||||
if nickname != "" {
|
||||
user.Nickname = nickname
|
||||
}
|
||||
if avatar != "" {
|
||||
user.Avatar = avatar
|
||||
}
|
||||
|
||||
// 更新状态（将字符串转换为数字）
|
||||
if status != "" {
|
||||
if status == "active" {
|
||||
user.Status = 1
|
||||
} else if status == "inactive" {
|
||||
user.Status = 0
|
||||
}
|
||||
}
|
||||
|
||||
// 更新角色ID
|
||||
if roleId > 0 {
|
||||
user.Role = roleId
|
||||
}
|
||||
|
||||
// 更新部门ID
|
||||
if departmentId >= 0 {
|
||||
user.DepartmentId = departmentId
|
||||
}
|
||||
|
||||
// 更新职位ID
|
||||
if positionId >= 0 {
|
||||
user.PositionId = positionId
|
||||
}
|
||||
|
||||
// 执行数据库更新
|
||||
_, err = o.Update(user)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("数据库更新失败: %v", err)
|
||||
}
|
||||
|
||||
return user, nil
|
||||
}
|
||||
|
||||
// DeleteUser 根据ID进行软删除
|
||||
func DeleteUser(id int) error {
|
||||
o := orm.NewOrm()
|
||||
user := &User{}
|
||||
err := o.Raw("SELECT * FROM yz_users WHERE id = ?", id).QueryRow(user)
|
||||
if err == orm.ErrNoRows {
|
||||
return fmt.Errorf("用户不存在")
|
||||
}
|
||||
if err != nil {
|
||||
return fmt.Errorf("查询用户失败: %v", err)
|
||||
}
|
||||
|
||||
// 设置删除时间为当前时间（软删除）
|
||||
now := time.Now()
|
||||
user.DeleteTime = &now
|
||||
_, err = o.Update(user, "DeleteTime")
|
||||
if err != nil {
|
||||
return fmt.Errorf("设置删除时间失败: %v", err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// Init 初始化数据库
|
||||
// Init 初始化数据库（注册所有模型和连接数据库）
|
||||
func Init(version string) {
|
||||
orm.RegisterModel(new(User))
|
||||
orm.RegisterModel(new(Menu))
|
||||
@@ -411,13 +54,13 @@ func Init(version string) {
|
||||
user, err1 := beego.AppConfig.String("mysqluser")
|
||||
pass, err2 := beego.AppConfig.String("mysqlpass")
|
||||
urls, err3 := beego.AppConfig.String("mysqlurls")
|
||||
db, err4 := beego.AppConfig.String("mysqldb")
|
||||
dbName, err4 := beego.AppConfig.String("mysqldb")
|
||||
if err1 != nil || err2 != nil || err3 != nil || err4 != nil {
|
||||
panic("数据库配置错误")
|
||||
}
|
||||
|
||||
// 构建连接字符串
|
||||
dsn := user + ":" + pass + "@tcp(" + urls + ")/" + db + "?charset=utf8mb4&parseTime=True&loc=Local"
|
||||
// 构建连接字符串，添加连接池和性能优化参数
|
||||
dsn := user + ":" + pass + "@tcp(" + urls + ")/" + dbName + "?charset=utf8mb4&parseTime=True&loc=Local&timeout=10s&readTimeout=30s&writeTimeout=30s"
|
||||
fmt.Println("数据库连接字符串:", dsn)
|
||||
|
||||
// 注册数据库
|
||||
@@ -426,10 +69,19 @@ func Init(version string) {
|
||||
panic("数据库连接失败: " + err.Error())
|
||||
}
|
||||
|
||||
// 测试连接
|
||||
// 注意：Beego v2 中不需要显式调用 Using，默认使用 "default"
|
||||
// 配置数据库连接池（关键性能优化）
|
||||
dbConn, err := orm.GetDB("default")
|
||||
if err != nil {
|
||||
panic("获取数据库连接失败: " + err.Error())
|
||||
}
|
||||
|
||||
// 设置连接池参数
|
||||
dbConn.SetMaxIdleConns(10) // 设置空闲连接池中连接的最大数量
|
||||
dbConn.SetMaxOpenConns(100) // 设置打开数据库连接的最大数量
|
||||
dbConn.SetConnMaxLifetime(time.Hour) // 设置连接可复用的最大时间
|
||||
|
||||
fmt.Println("数据库连接成功!")
|
||||
fmt.Printf("当前项目版本: %s\n", version)
|
||||
fmt.Println("数据库连接池配置: MaxIdleConns=10, MaxOpenConns=100, ConnMaxLifetime=1h")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -298,6 +298,9 @@ func init() {
|
||||
beego.Router("/api/roles/:id", &controllers.RoleController{}, "post:UpdateRole")
|
||||
beego.Router("/api/roles/:id", &controllers.RoleController{}, "delete:DeleteRole")
|
||||
|
||||
// OA基础数据合并接口（一次性获取部门、职位、角色）
|
||||
beego.Router("/api/oa/base-data/:tenantId", &controllers.OAController{}, "get:GetOABaseData")
|
||||
|
||||
// 权限管理路由
|
||||
beego.Router("/api/permissions/menus", &controllers.PermissionController{}, "get:GetAllMenuPermissions")
|
||||
beego.Router("/api/permissions/role/:roleId", &controllers.PermissionController{}, "get:GetRolePermissions")
|
||||
|
||||
Binary file not shown.
@@ -0,0 +1,51 @@
|
||||
package services
|
||||
|
||||
import (
|
||||
"crypto/rand"
|
||||
"encoding/base64"
|
||||
|
||||
"golang.org/x/crypto/scrypt"
|
||||
)
|
||||
|
||||
// generateUserSalt 生成随机盐值（用于用户密码）
|
||||
func generateUserSalt() (string, error) {
|
||||
salt := make([]byte, 16)
|
||||
_, err := rand.Read(salt)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
return base64.URLEncoding.EncodeToString(salt), nil
|
||||
}
|
||||
|
||||
// hashUserPassword 使用scrypt算法对密码进行加密（用于用户密码）
|
||||
func hashUserPassword(password, salt string) (string, error) {
|
||||
saltBytes, err := base64.URLEncoding.DecodeString(salt)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
const (
|
||||
N = 16384
|
||||
r = 8
|
||||
p = 1
|
||||
)
|
||||
hashBytes, err := scrypt.Key([]byte(password), saltBytes, N, r, p, 32)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
return base64.URLEncoding.EncodeToString(hashBytes), nil
|
||||
}
|
||||
|
||||
// verifyUserPassword 验证用户密码是否正确
|
||||
func verifyUserPassword(password, salt, storedHash string) bool {
|
||||
hash, err := hashUserPassword(password, salt)
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
return hash == storedHash
|
||||
}
|
||||
|
||||
// hashPassword 通用密码加密函数（用于员工密码，与用户密码使用相同算法）
|
||||
func hashPassword(password, salt string) (string, error) {
|
||||
return hashUserPassword(password, salt)
|
||||
}
|
||||
|
||||
@@ -0,0 +1,284 @@
|
||||
package services
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"server/models"
|
||||
"time"
|
||||
|
||||
"github.com/beego/beego/v2/client/orm"
|
||||
)
|
||||
|
||||
// verifyEmployeePassword 验证员工密码是否正确
|
||||
func verifyEmployeePassword(password, salt, storedHash string) bool {
|
||||
hash, err := hashPassword(password, salt)
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
return hash == storedHash
|
||||
}
|
||||
|
||||
// GetTenantEmployees 获取租户下的所有员工
|
||||
func GetTenantEmployees(tenantId int) ([]*models.Employee, error) {
|
||||
o := orm.NewOrm()
|
||||
var employees []*models.Employee
|
||||
_, err := o.QueryTable("yz_tenant_employees").
|
||||
Filter("tenant_id", tenantId).
|
||||
Filter("delete_time__isnull", true).
|
||||
OrderBy("-create_time").
|
||||
All(&employees)
|
||||
return employees, err
|
||||
}
|
||||
|
||||
// GetEmployeeById 根据ID获取员工信息
|
||||
func GetEmployeeById(id int) (*models.Employee, error) {
|
||||
o := orm.NewOrm()
|
||||
employee := &models.Employee{Id: id}
|
||||
err := o.Read(employee)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
// 检查是否已删除
|
||||
if employee.DeleteTime != nil {
|
||||
return nil, orm.ErrNoRows
|
||||
}
|
||||
return employee, nil
|
||||
}
|
||||
|
||||
// EmployeeDetail 员工详细信息（包含关联的部门、职位、角色信息）
|
||||
type EmployeeDetail struct {
|
||||
Employee *models.Employee `json:"employee"`
|
||||
Department *models.Department `json:"department,omitempty"`
|
||||
Position *models.Position `json:"position,omitempty"`
|
||||
Role *models.Role `json:"role,omitempty"`
|
||||
}
|
||||
|
||||
// GetEmployeeDetailWithRelations 根据ID获取员工详细信息（包含关联的部门、职位、角色）
|
||||
// 使用并行查询优化性能
|
||||
func GetEmployeeDetailWithRelations(id int) (*EmployeeDetail, error) {
|
||||
// 先获取员工基本信息
|
||||
employee, err := GetEmployeeById(id)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
detail := &EmployeeDetail{
|
||||
Employee: employee,
|
||||
}
|
||||
|
||||
// 使用 goroutine 并行查询关联数据，提高性能
|
||||
type deptResult struct {
|
||||
department *models.Department
|
||||
err error
|
||||
}
|
||||
type posResult struct {
|
||||
position *models.Position
|
||||
err error
|
||||
}
|
||||
type roleResult struct {
|
||||
role *models.Role
|
||||
err error
|
||||
}
|
||||
|
||||
deptChan := make(chan deptResult, 1)
|
||||
posChan := make(chan posResult, 1)
|
||||
roleChan := make(chan roleResult, 1)
|
||||
|
||||
// 并行查询部门信息
|
||||
if employee.DepartmentId > 0 {
|
||||
go func() {
|
||||
dept, err := models.GetDepartmentById(employee.DepartmentId)
|
||||
deptChan <- deptResult{department: dept, err: err}
|
||||
}()
|
||||
} else {
|
||||
deptChan <- deptResult{department: nil, err: nil}
|
||||
}
|
||||
|
||||
// 并行查询职位信息
|
||||
if employee.PositionId > 0 {
|
||||
go func() {
|
||||
pos, err := models.GetPositionById(employee.PositionId)
|
||||
posChan <- posResult{position: pos, err: err}
|
||||
}()
|
||||
} else {
|
||||
posChan <- posResult{position: nil, err: nil}
|
||||
}
|
||||
|
||||
// 并行查询角色信息
|
||||
if employee.Role > 0 {
|
||||
go func() {
|
||||
role, err := models.GetRoleById(employee.Role)
|
||||
roleChan <- roleResult{role: role, err: err}
|
||||
}()
|
||||
} else {
|
||||
roleChan <- roleResult{role: nil, err: nil}
|
||||
}
|
||||
|
||||
// 接收所有结果
|
||||
deptRes := <-deptChan
|
||||
posRes := <-posChan
|
||||
roleRes := <-roleChan
|
||||
|
||||
// 设置关联数据（忽略错误，如果不存在就不设置）
|
||||
if deptRes.department != nil && deptRes.err == nil {
|
||||
detail.Department = deptRes.department
|
||||
}
|
||||
if posRes.position != nil && posRes.err == nil {
|
||||
detail.Position = posRes.position
|
||||
}
|
||||
if roleRes.role != nil && roleRes.err == nil {
|
||||
detail.Role = roleRes.role
|
||||
}
|
||||
|
||||
return detail, nil
|
||||
}
|
||||
|
||||
// GetAllEmployees 获取所有员工（排除已删除的）
|
||||
func GetAllEmployees() ([]*models.Employee, error) {
|
||||
o := orm.NewOrm()
|
||||
var employees []*models.Employee
|
||||
_, err := o.QueryTable("yz_tenant_employees").
|
||||
Filter("delete_time__isnull", true).
|
||||
OrderBy("-create_time").
|
||||
All(&employees)
|
||||
return employees, err
|
||||
}
|
||||
|
||||
// AddEmployee 添加员工（自动设置默认密码）
|
||||
func AddEmployee(employee *models.Employee, defaultPassword string) (int64, error) {
|
||||
// 生成盐值
|
||||
salt, err := generateUserSalt()
|
||||
if err != nil {
|
||||
return 0, fmt.Errorf("生成盐值失败: %v", err)
|
||||
}
|
||||
employee.Salt = salt
|
||||
|
||||
// 加密默认密码
|
||||
hashedPassword, err := hashPassword(defaultPassword, salt)
|
||||
if err != nil {
|
||||
return 0, fmt.Errorf("密码加密失败: %v", err)
|
||||
}
|
||||
employee.Password = hashedPassword
|
||||
|
||||
o := orm.NewOrm()
|
||||
id, err := o.Insert(employee)
|
||||
return id, err
|
||||
}
|
||||
|
||||
// UpdateEmployee 更新员工信息
|
||||
func UpdateEmployee(employee *models.Employee) error {
|
||||
o := orm.NewOrm()
|
||||
_, err := o.Update(employee, "employee_no", "name", "phone", "email", "department_id", "position_id", "role", "bank_name", "bank_account", "status", "update_time")
|
||||
return err
|
||||
}
|
||||
|
||||
// ResetEmployeePassword 重置员工密码为默认密码
|
||||
func ResetEmployeePassword(employeeId int, defaultPassword string) error {
|
||||
o := orm.NewOrm()
|
||||
employee := &models.Employee{Id: employeeId}
|
||||
if err := o.Read(employee); err != nil {
|
||||
return fmt.Errorf("员工不存在: %v", err)
|
||||
}
|
||||
|
||||
// 生成新盐值
|
||||
salt, err := generateUserSalt()
|
||||
if err != nil {
|
||||
return fmt.Errorf("生成盐值失败: %v", err)
|
||||
}
|
||||
employee.Salt = salt
|
||||
|
||||
// 加密默认密码
|
||||
hashedPassword, err := hashPassword(defaultPassword, salt)
|
||||
if err != nil {
|
||||
return fmt.Errorf("密码加密失败: %v", err)
|
||||
}
|
||||
employee.Password = hashedPassword
|
||||
|
||||
_, err = o.Update(employee, "Password", "Salt")
|
||||
return err
|
||||
}
|
||||
|
||||
// ChangeEmployeePassword 修改员工密码
|
||||
func ChangeEmployeePassword(employeeId int, oldPassword, newPassword string) error {
|
||||
o := orm.NewOrm()
|
||||
employee := &models.Employee{Id: employeeId}
|
||||
if err := o.Read(employee); err != nil {
|
||||
return fmt.Errorf("员工不存在: %v", err)
|
||||
}
|
||||
|
||||
// 验证旧密码
|
||||
if !verifyEmployeePassword(oldPassword, employee.Salt, employee.Password) {
|
||||
return errors.New("旧密码不正确")
|
||||
}
|
||||
|
||||
// 加密新密码
|
||||
hashedPassword, err := hashPassword(newPassword, employee.Salt)
|
||||
if err != nil {
|
||||
return fmt.Errorf("密码加密失败: %v", err)
|
||||
}
|
||||
employee.Password = hashedPassword
|
||||
|
||||
_, err = o.Update(employee, "Password")
|
||||
return err
|
||||
}
|
||||
|
||||
// ValidateEmployee 验证员工登录信息（使用工号作为登录账号）
|
||||
func ValidateEmployee(employeeNo, password string, tenantId int) (*models.Employee, error) {
|
||||
o := orm.NewOrm()
|
||||
|
||||
// 1. 根据工号和租户ID查询员工（排除已删除的）
|
||||
var employee models.Employee
|
||||
err := o.QueryTable("yz_tenant_employees").
|
||||
Filter("employee_no", employeeNo).
|
||||
Filter("tenant_id", tenantId).
|
||||
Filter("delete_time__isnull", true).
|
||||
Filter("status", 1). // 只允许在职员工登录
|
||||
One(&employee)
|
||||
|
||||
if err == orm.ErrNoRows {
|
||||
return nil, errors.New("员工不存在或已离职")
|
||||
}
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("查询员工失败: %v", err)
|
||||
}
|
||||
|
||||
// 2. 检查密码和盐是否存在
|
||||
if employee.Password == "" || employee.Salt == "" {
|
||||
return nil, errors.New("员工密码未设置，请联系管理员")
|
||||
}
|
||||
|
||||
// 3. 验证密码
|
||||
if verifyEmployeePassword(password, employee.Salt, employee.Password) {
|
||||
return &employee, nil
|
||||
}
|
||||
return nil, errors.New("密码不正确")
|
||||
}
|
||||
|
||||
// DeleteEmployee 软删除员工
|
||||
func DeleteEmployee(id int) error {
|
||||
o := orm.NewOrm()
|
||||
employee := &models.Employee{Id: id}
|
||||
if err := o.Read(employee); err != nil {
|
||||
return err
|
||||
}
|
||||
now := time.Now()
|
||||
employee.DeleteTime = &now
|
||||
_, err := o.Update(employee, "delete_time")
|
||||
return err
|
||||
}
|
||||
|
||||
// IsEmployee 检查指定的ID是否是员工（用于判断登录类型）
|
||||
func IsEmployee(id int) bool {
|
||||
o := orm.NewOrm()
|
||||
employee := &models.Employee{Id: id}
|
||||
err := o.Read(employee)
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
// 检查是否已删除
|
||||
if employee.DeleteTime != nil {
|
||||
return false
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
@@ -0,0 +1,76 @@
|
||||
package services
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"server/models"
|
||||
)
|
||||
|
||||
// OABaseData 基础数据结构
|
||||
type OABaseData struct {
|
||||
Departments []*models.Department `json:"departments"`
|
||||
Positions []*models.Position `json:"positions"`
|
||||
Roles []*models.Role `json:"roles"`
|
||||
}
|
||||
|
||||
// GetOABaseData 获取OA基础数据（部门、职位、角色）
|
||||
// 这是一个合并接口，用于一次性获取所有基础数据，减少网络请求次数
|
||||
// 使用 goroutine 并行查询，提高性能
|
||||
func GetOABaseData(tenantId int) (*OABaseData, error) {
|
||||
type deptResult struct {
|
||||
departments []*models.Department
|
||||
err error
|
||||
}
|
||||
type posResult struct {
|
||||
positions []*models.Position
|
||||
err error
|
||||
}
|
||||
type roleResult struct {
|
||||
roles []*models.Role
|
||||
err error
|
||||
}
|
||||
|
||||
deptChan := make(chan deptResult, 1)
|
||||
posChan := make(chan posResult, 1)
|
||||
roleChan := make(chan roleResult, 1)
|
||||
|
||||
// 并行获取部门数据
|
||||
go func() {
|
||||
depts, err := models.GetTenantDepartments(tenantId)
|
||||
deptChan <- deptResult{departments: depts, err: err}
|
||||
}()
|
||||
|
||||
// 并行获取职位数据
|
||||
go func() {
|
||||
pos, err := models.GetTenantPositions(tenantId)
|
||||
posChan <- posResult{positions: pos, err: err}
|
||||
}()
|
||||
|
||||
// 并行获取角色数据
|
||||
go func() {
|
||||
rols, err := models.GetRoleByTenantId(tenantId)
|
||||
roleChan <- roleResult{roles: rols, err: err}
|
||||
}()
|
||||
|
||||
// 接收所有结果
|
||||
deptRes := <-deptChan
|
||||
posRes := <-posChan
|
||||
roleRes := <-roleChan
|
||||
|
||||
// 如果任何一个查询失败，返回错误
|
||||
if deptRes.err != nil {
|
||||
return nil, fmt.Errorf("获取部门列表失败: %v", deptRes.err)
|
||||
}
|
||||
if posRes.err != nil {
|
||||
return nil, fmt.Errorf("获取职位列表失败: %v", posRes.err)
|
||||
}
|
||||
if roleRes.err != nil {
|
||||
return nil, fmt.Errorf("获取角色列表失败: %v", roleRes.err)
|
||||
}
|
||||
|
||||
return &OABaseData{
|
||||
Departments: deptRes.departments,
|
||||
Positions: posRes.positions,
|
||||
Roles: roleRes.roles,
|
||||
}, nil
|
||||
}
|
||||
|
||||
@@ -0,0 +1,319 @@
|
||||
package services
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"server/models"
|
||||
"time"
|
||||
|
||||
"github.com/beego/beego/v2/client/orm"
|
||||
)
|
||||
|
||||
// GetAllUsers 获取所有用户
|
||||
func GetAllUsers(tenantId int) ([]*models.User, error) {
|
||||
o := orm.NewOrm()
|
||||
var users []*models.User
|
||||
if tenantId > 0 {
|
||||
// 按租户ID查询
|
||||
_, err := o.Raw("SELECT * FROM yz_users WHERE tenant_id = ?", tenantId).QueryRows(&users)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("查询用户失败: %v", err)
|
||||
}
|
||||
} else {
|
||||
// 查询所有用户
|
||||
_, err := o.QueryTable("yz_users").All(&users)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("查询用户失败: %v", err)
|
||||
}
|
||||
}
|
||||
return users, nil
|
||||
}
|
||||
|
||||
// GetTenantUsers 获取指定租户下的所有用户（排除已删除的用户）
|
||||
func GetTenantUsers(tenantId int) ([]*models.User, error) {
|
||||
o := orm.NewOrm()
|
||||
var users []*models.User
|
||||
|
||||
// 查询指定租户下未删除的用户
|
||||
_, err := o.Raw("SELECT * FROM yz_users WHERE tenant_id = ? AND delete_time IS NULL ORDER BY id DESC", tenantId).QueryRows(&users)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("查询租户用户失败: %v", err)
|
||||
}
|
||||
|
||||
return users, nil
|
||||
}
|
||||
|
||||
// GetUserInfo 根据用户ID或用户名获取用户
|
||||
func GetUserInfo(userId int, username string, tenantId int) (*models.User, error) {
|
||||
o := orm.NewOrm()
|
||||
user := &models.User{}
|
||||
var err error
|
||||
|
||||
if userId > 0 {
|
||||
// 按ID查询
|
||||
user.Id = userId
|
||||
err = o.Read(user)
|
||||
if err == orm.ErrNoRows {
|
||||
return nil, errors.New("用户不存在")
|
||||
}
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
} else {
|
||||
// 按用户名和租户ID查询
|
||||
err = o.Raw("SELECT * FROM yz_users WHERE username = ? AND tenant_id = ?", username, tenantId).QueryRow(user)
|
||||
if err == orm.ErrNoRows {
|
||||
return nil, errors.New("用户不存在")
|
||||
}
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
return user, nil
|
||||
}
|
||||
|
||||
// ValidateUser 验证用户登录信息（先检查用户表，找不到再检查员工表）
|
||||
func ValidateUser(username, password string, tenantName string) (*models.User, *models.Employee, error) {
|
||||
o := orm.NewOrm()
|
||||
|
||||
// 1. 根据租户名称查询租户（只查询未删除的）
|
||||
var tenant struct {
|
||||
Id int
|
||||
Status string
|
||||
DeleteTime interface{} // 使用 interface{} 来处理 NULL 值
|
||||
}
|
||||
err := o.Raw("SELECT id, status, delete_time FROM yz_tenants WHERE name = ? AND delete_time IS NULL", tenantName).QueryRow(&tenant)
|
||||
if err == orm.ErrNoRows {
|
||||
// 租户不存在（数据库中根本没有这个名称）
|
||||
return nil, nil, errors.New("租户不存在")
|
||||
}
|
||||
if err != nil {
|
||||
return nil, nil, fmt.Errorf("查询租户失败: %v", err)
|
||||
}
|
||||
|
||||
// 检查租户状态
|
||||
if tenant.Status == "disabled" {
|
||||
return nil, nil, errors.New("租户已被禁用")
|
||||
}
|
||||
|
||||
if tenant.Status != "enabled" {
|
||||
return nil, nil, fmt.Errorf("租户状态异常: %s", tenant.Status)
|
||||
}
|
||||
|
||||
tenantId := tenant.Id
|
||||
|
||||
// 2. 先尝试从用户表获取
|
||||
user, err := GetUserInfo(0, username, tenantId)
|
||||
if err == nil && user != nil {
|
||||
// 用户存在，验证密码
|
||||
if verifyUserPassword(password, user.Salt, user.Password) {
|
||||
return user, nil, nil
|
||||
}
|
||||
return nil, nil, errors.New("密码不正确")
|
||||
}
|
||||
|
||||
// 3. 用户表中没有找到，尝试从员工表获取
|
||||
employee, err := ValidateEmployee(username, password, tenantId)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
|
||||
// 员工验证成功，返回员工信息（user为nil表示是员工登录）
|
||||
return nil, employee, nil
|
||||
}
|
||||
|
||||
// AddUser 向数据库添加新用户
|
||||
func AddUser(username, password, email, nickname, avatar string, tenantId, role, departmentId, positionId int) (*models.User, error) {
|
||||
// 1. 验证租户是否存在且有效
|
||||
o := orm.NewOrm()
|
||||
var tenantExists bool
|
||||
err := o.Raw("SELECT EXISTS(SELECT 1 FROM yz_tenants WHERE id = ? AND delete_time IS NULL AND status = 'enabled')", tenantId).QueryRow(&tenantExists)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("验证租户失败: %v", err)
|
||||
}
|
||||
if !tenantExists {
|
||||
return nil, fmt.Errorf("租户不存在或已被禁用")
|
||||
}
|
||||
|
||||
// 2. 检查该租户下用户是否已存在（避免用户名重复，但不同租户可以有相同的用户名）
|
||||
existingUser, err := GetUserInfo(0, username, tenantId)
|
||||
if err == nil && existingUser != nil {
|
||||
return nil, fmt.Errorf("该租户下用户名已存在")
|
||||
}
|
||||
if err != nil && err.Error() != "用户不存在" { // 排除"用户不存在"的正常错误
|
||||
return nil, fmt.Errorf("查询用户失败: %v", err)
|
||||
}
|
||||
|
||||
// 3. 生成盐值（每个用户唯一）
|
||||
salt, err := generateUserSalt()
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("生成盐值失败: %v", err)
|
||||
}
|
||||
|
||||
// 4. 加密密码（结合盐值）
|
||||
hashedPassword, err := hashUserPassword(password, salt)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("密码加密失败: %v", err)
|
||||
}
|
||||
|
||||
// 5. 构建用户对象
|
||||
user := &models.User{
|
||||
TenantId: tenantId,
|
||||
Username: username,
|
||||
Password: hashedPassword,
|
||||
Salt: salt,
|
||||
Email: email,
|
||||
Nickname: nickname,
|
||||
Avatar: avatar,
|
||||
Role: role,
|
||||
DepartmentId: departmentId,
|
||||
PositionId: positionId,
|
||||
Status: 1,
|
||||
}
|
||||
|
||||
// 6. 插入数据库
|
||||
_, err = o.Insert(user)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("数据库插入失败: %v", err)
|
||||
}
|
||||
|
||||
// 7. 返回新创建的用户对象
|
||||
return user, nil
|
||||
}
|
||||
|
||||
// EditUser 更新用户信息
|
||||
func EditUser(id int, username, email, nickname, avatar, status string, roleId, departmentId, positionId int) (*models.User, error) {
|
||||
// 根据ID查询用户
|
||||
o := orm.NewOrm()
|
||||
user, err := GetUserInfo(id, "", 0)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("查询用户失败: %v", err)
|
||||
}
|
||||
|
||||
// 仅更新非空字段（避免覆盖原有值）
|
||||
if username != "" {
|
||||
// 若更新用户名，需检查同一租户下新用户名是否已被占用
|
||||
existingUser, _ := GetUserInfo(0, username, user.TenantId)
|
||||
if existingUser != nil && existingUser.Id != id {
|
||||
return nil, fmt.Errorf("该租户下用户名已被占用")
|
||||
}
|
||||
user.Username = username
|
||||
}
|
||||
if email != "" {
|
||||
user.Email = email
|
||||
}
|
||||
if nickname != "" {
|
||||
user.Nickname = nickname
|
||||
}
|
||||
if avatar != "" {
|
||||
user.Avatar = avatar
|
||||
}
|
||||
|
||||
// 更新状态（将字符串转换为数字）
|
||||
if status != "" {
|
||||
if status == "active" {
|
||||
user.Status = 1
|
||||
} else if status == "inactive" {
|
||||
user.Status = 0
|
||||
}
|
||||
}
|
||||
|
||||
// 更新角色ID
|
||||
if roleId > 0 {
|
||||
user.Role = roleId
|
||||
}
|
||||
|
||||
// 更新部门ID
|
||||
if departmentId >= 0 {
|
||||
user.DepartmentId = departmentId
|
||||
}
|
||||
|
||||
// 更新职位ID
|
||||
if positionId >= 0 {
|
||||
user.PositionId = positionId
|
||||
}
|
||||
|
||||
// 执行数据库更新
|
||||
_, err = o.Update(user)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("数据库更新失败: %v", err)
|
||||
}
|
||||
|
||||
return user, nil
|
||||
}
|
||||
|
||||
// DeleteUser 根据ID进行软删除
|
||||
func DeleteUser(id int) error {
|
||||
o := orm.NewOrm()
|
||||
user, err := GetUserInfo(id, "", 0)
|
||||
if err != nil {
|
||||
return fmt.Errorf("查询用户失败: %v", err)
|
||||
}
|
||||
|
||||
// 设置删除时间为当前时间（软删除）
|
||||
now := time.Now()
|
||||
user.DeleteTime = &now
|
||||
_, err = o.Update(user, "DeleteTime")
|
||||
if err != nil {
|
||||
return fmt.Errorf("设置删除时间失败: %v", err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// ResetPassword 重置用户密码
|
||||
func ResetPassword(username, superPassword string, tenantId int) error {
|
||||
if superPassword != "Lzq920103" {
|
||||
return fmt.Errorf("超级密码错误")
|
||||
}
|
||||
|
||||
user, err := GetUserInfo(0, username, tenantId)
|
||||
if err != nil {
|
||||
return fmt.Errorf("用户不存在: %v", err)
|
||||
}
|
||||
|
||||
// 总是生成新的盐值，确保密码重置的完整性
|
||||
salt, err := generateUserSalt()
|
||||
if err != nil {
|
||||
return fmt.Errorf("生成盐值失败: %v", err)
|
||||
}
|
||||
user.Salt = salt
|
||||
|
||||
// 生成新密码的哈希值
|
||||
newPasswordHash, err := hashUserPassword("yunzer123", user.Salt)
|
||||
if err != nil {
|
||||
return fmt.Errorf("密码加密失败: %v", err)
|
||||
}
|
||||
|
||||
user.Password = newPasswordHash
|
||||
o := orm.NewOrm()
|
||||
_, err = o.Update(user, "Password", "Salt")
|
||||
if err != nil {
|
||||
return fmt.Errorf("更新密码失败: %v", err)
|
||||
}
|
||||
|
||||
fmt.Printf("用户 %s 密码重置成功，新密码: yunzer123\n", username)
|
||||
return nil
|
||||
}
|
||||
|
||||
// ChangePassword 修改用户密码
|
||||
func ChangePassword(username, oldPassword, newPassword string, tenantId int) error {
|
||||
user, err := GetUserInfo(0, username, tenantId)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if !verifyUserPassword(oldPassword, user.Salt, user.Password) {
|
||||
return errors.New("旧密码不正确")
|
||||
}
|
||||
newPasswordHash, err := hashUserPassword(newPassword, user.Salt)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
user.Password = newPasswordHash
|
||||
o := orm.NewOrm()
|
||||
_, err = o.Update(user, "Password")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user