daihengshun/ArmedPolice
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat：完善项目

Browse Source
This commit is contained in:
henry
2021-11-02 17:01:04 +08:00
parent 20d81825e1
commit 0fa2630933
19 changed files with 171 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
app/model/sys_auth.go
View File

@ -1,9 +1,7 @@
package model
import (
"TenantServe/app/common/model"
"TenantServe/serve/orm"
"fmt"
"ArmedPolice/app/common/model"
)
type SysAuth struct {
@ -16,45 +14,28 @@ type SysAuthScene struct {
SceneID uint64 `json:"scene_id"`
}
// TenantAuth 租户权限
func (m *SysAuth) TenantAuth(tenantID uint64) ([]*SysAuthScene, error) {
mSysTenantAuth := NewSysTenantAuth()
out := make([]*SysAuthScene, 0)
db := orm.GetDB().Table(m.TableName()+" AS a").
Select("a.*, r_a.id AS scene_id").
Joins(fmt.Sprintf("LEFT JOIN %s AS t_a ON t_a.auth_id = a.id AND t_a.tenant_id = %d AND t_a.is_deleted = %d",
mSysTenantAuth.TableName(), tenantID, model.DeleteStatusForNot)).
Where("a.is_deleted = ?", model.DeleteStatusForNot)
if err := db.Scan(&out).Error; err != nil {
return nil, err
}
return out, nil
}
// RoleAuth 角色权限
func (m *SysAuth) RoleAuth(tenantID, roleID uint64) ([]*SysAuthScene, error) {
mSysTenantAuth := NewSysTenantAuth()
mSysRoleAuth := NewSysRoleAuth()
out := make([]*SysAuthScene, 0)
db := orm.GetDB().Table(m.TableName()+" AS a").
Select("a.*, r_a.id AS scene_id").
Joins(fmt.Sprintf("LEFT JOIN %s AS t_a ON t_a.auth_id = a.id AND t_a.tenant_id = %d AND t_a.is_deleted = %d",
mSysTenantAuth.TableName(), tenantID, model.DeleteStatusForNot)).
Joins(fmt.Sprintf("LEFT JOIN %s AS r_a ON r_a.auth_id = a.id AND r_a.role_id = %d AND r_a.is_deleted = %d",
mSysRoleAuth.TableName(), roleID, model.DeleteStatusForNot)).
Where("a.is_deleted = ?", model.DeleteStatusForNot).
Where("t_a.id > ?", 0)
if err := db.Scan(&out).Error; err != nil {
return nil, err
}
return out, nil
//mSysTenantAuth := NewSysTenantAuth()
//
//mSysRoleAuth := NewSysRoleAuth()
//
//out := make([]*SysAuthScene, 0)
//
//db := orm.GetDB().Table(m.TableName()+" AS a").
// Select("a.*, r_a.id AS scene_id").
// Joins(fmt.Sprintf("LEFT JOIN %s AS t_a ON t_a.auth_id = a.id AND t_a.tenant_id = %d AND t_a.is_deleted = %d",
// mSysTenantAuth.TableName(), tenantID, model.DeleteStatusForNot)).
// Joins(fmt.Sprintf("LEFT JOIN %s AS r_a ON r_a.auth_id = a.id AND r_a.role_id = %d AND r_a.is_deleted = %d",
// mSysRoleAuth.TableName(), roleID, model.DeleteStatusForNot)).
// Where("a.is_deleted = ?", model.DeleteStatusForNot).
// Where("t_a.id > ?", 0)
//
//if err := db.Scan(&out).Error; err != nil {
// return nil, err
//}
//return out, nil
return nil, nil
}
func NewSysAuth() *SysAuth {

2
app/model/sys_config.go
View File

@ -1,6 +1,6 @@
package model
import "TenantServe/app/common/model"
import "ArmedPolice/app/common/model"
type SysConfig struct {
*model.SysConfig

2
app/model/sys_deparement.go
View File

@ -1,6 +1,6 @@
package model
import "TenantServe/app/common/model"
import "ArmedPolice/app/common/model"
type SysDepartment struct {
*model.SysDepartment

106
app/model/sys_menu.go
View File

@ -1,117 +1,13 @@
package model
import (
"TenantServe/app/common/model"
"TenantServe/serve/orm"
"fmt"
"ArmedPolice/app/common/model"
)
type SysMenu struct {
*model.SysMenu
}
type SysMenuScene struct {
ID uint64 `json:"id"`
*model.SysMenuBasic
SceneID uint64 `json:"scene_id"` // 场景（租户，角色）
}
// Recursion 递归查询子菜单
func (m *SysMenu) Recursion(id uint64) {
//SELECT
//t3.id, t3.parent_id, t3.`name`, t3.kind
//FROM
//(SELECT
//t1.id, t1.parent_id, t1.name, t1.kind,
// IF(FIND_IN_SET( parent_id, @pids ) > 0, @pids := concat( @pids, ',', id ), 0 ) AS is_child
//FROM
//(SELECT id, parent_id, `name`, kind FROM sys_menu WHERE is_deleted = 0 ORDER BY parent_id ASC, sort DESC) AS t1,
// (SELECT @pids := 1) AS t2
//) AS t3
//WHERE is_child != 0
}
// SystemMenu 系统菜单
func (m *SysMenu) SystemMenu(where ...*model.ModelWhere) ([]*model.SysMenu, error) {
out := make([]*model.SysMenu, 0)
db := orm.GetDB().Table(m.TableName()).
Where("status = ? AND is_deleted = ?", model.SysMenuStatusForNormal, model.DeleteStatusForNot)
if len(where) > 0 {
for _, wo := range where {
db = db.Where(wo.Condition, wo.Value)
}
}
if err := db.Order("parent_id " + model.OrderModeToAsc).Order("sort " + model.OrderModeToDesc).Scan(&out).Error; err != nil {
return nil, err
}
return out, nil
}
// TenantMenu 租户菜单
func (m *SysMenu) TenantMenu(tenantID uint64) ([]*SysMenuScene, error) {
mSysTenantMenu := NewSysTenantMenu()
out := make([]*SysMenuScene, 0)
db := orm.GetDB().Table(m.TableName()+" m").
Select("m.id, m.parent_id, m.name, m.kind, m.link, m.component, m.icon, t_m.id AS scene_id").
Joins(fmt.Sprintf("LEFT JOIN %s AS t_m ON m.id = t_m.menu_id AND t_m.tenant_id = %d AND t_m.is_deleted = %d",
mSysTenantMenu.TableName(), tenantID, model.DeleteStatusForNot)).
Where("m.status = ? AND m.is_deleted = ?", model.SysMenuStatusForNormal, model.DeleteStatusForNot)
if err := db.Order("m.parent_id " + model.OrderModeToAsc).Order("m.sort " + model.OrderModeToDesc).Scan(&out).Error; err != nil {
return nil, err
}
return out, nil
}
// RoleMenu 角色菜单
func (m *SysMenu) RoleMenu(tenantID uint64, roleID uint64) ([]*SysMenuScene, error) {
mSysTenantMenu := NewSysTenantMenu()
mSysRoleMenu := NewSysRoleMenu()
out := make([]*SysMenuScene, 0)
db := orm.GetDB().Table(m.TableName()+" AS m").
Select("m.id, m.parent_id, m.name, m.kind, m.link, m.component, m.icon, r_m.id AS scene_id").
Joins(fmt.Sprintf("LEFT JOIN %s AS t_m ON m.id = t_m.menu_id AND t_m.tenant_id = %d AND t_m.is_deleted = %d",
mSysTenantMenu.TableName(), tenantID, model.DeleteStatusForNot)).
Joins(fmt.Sprintf("LEFT JOIN %s AS r_m ON m.id = r_m.menu_id AND r_m.role_id = %d AND r_m.is_deleted = %d",
mSysRoleMenu.TableName(), roleID, model.DeleteStatusForNot)).
Where("m.status = ? AND m.is_deleted = ?", model.SysMenuStatusForNormal, model.DeleteStatusForNot).
Where("t_m.id > ?", 0)
if err := db.Order("m.parent_id " + model.OrderModeToAsc).Order("m.sort " + model.OrderModeToDesc).Scan(&out).Error; err != nil {
return nil, err
}
return out, nil
}
// UserMenu 用户菜单
func (m *SysMenu) UserMenu(uid uint64) ([]*SysMenuScene, error) {
mSysUserRole := NewSysUserRole()
mSysRoleMenu := NewSysRoleMenu()
out := make([]*SysMenuScene, 0)
db := orm.GetDB().Table(mSysUserRole.TableName()+" AS u_r").
Select("m.id, m.parent_id, m.name, m.kind, m.link, m.component, m.icon").
Joins(fmt.Sprintf("LEFT JOIN %s AS r_m ON u_r.role_id = r_m.id AND r_m.is_deletd = %d",
mSysRoleMenu.TableName(), model.DeleteStatusForNot)).
Joins(fmt.Sprintf("LEFT JOIN %s AS m ON r_m.menu_id = m.id AND m.status = %d AND m.is_deleted = %d",
m.TableName(), model.SysMenuStatusForNormal, model.DeleteStatusForNot)).
Where("u_r.uid = ? AND u_r.is_deleted = ?", uid, model.DeleteStatusForNot)
if err := db.Order("m.parent_id " + model.OrderModeToAsc).Order("m.sort " + model.OrderModeToDesc).Scan(&out).Error; err != nil {
return nil, err
}
return out, nil
}
func NewSysMenu() *SysMenu {
return &SysMenu{SysMenu: model.NewSysMenu()}
}

33
app/model/sys_role.go
View File

@ -1,9 +1,7 @@
package model
import (
"TenantServe/app/common/model"
"TenantServe/serve/orm"
"fmt"
"ArmedPolice/app/common/model"
)
type SysRole struct {
@ -24,20 +22,21 @@ type SysRoleUserInfo struct {
// UserRole 用户角色信息
func (m *SysRole) UserRole(uid uint64) ([]*SysRoleUserInfo, error) {
mSysUserRole := NewSysUserRole()
db := orm.GetDB().Table(m.TableName()+" AS r").
Select("r.is, r.name, u_r.id AS user_role_id").
Joins(fmt.Sprintf("LEFT JOIN %s AS u_r ON r.id = u_r.role_id AND u_r.uid = %d AND u_r.is_deleted = %d",
mSysUserRole.TableName(), uid, model.DeleteStatusForNot)).
Where("r.is_deleted = ?", model.DeleteStatusForNot)
out := make([]*SysRoleUserInfo, 0)
if err := db.Order("r.id " + model.OrderModeToDesc).Scan(&out).Error; err != nil {
return nil, err
}
return out, nil
//mSysUserRole := NewSysUserRole()
//
//db := orm.GetDB().Table(m.TableName()+" AS r").
// Select("r.is, r.name, u_r.id AS user_role_id").
// Joins(fmt.Sprintf("LEFT JOIN %s AS u_r ON r.id = u_r.role_id AND u_r.uid = %d AND u_r.is_deleted = %d",
// mSysUserRole.TableName(), uid, model.DeleteStatusForNot)).
// Where("r.is_deleted = ?", model.DeleteStatusForNot)
//
//out := make([]*SysRoleUserInfo, 0)
//
//if err := db.Order("r.id " + model.OrderModeToDesc).Scan(&out).Error; err != nil {
// return nil, err
//}
//return out, nil
return nil, nil
}
func NewSysRole() *SysRole {

36
app/model/sys_role_auth.go
View File

@ -1,47 +1,13 @@
package model
import (
"TenantServe/app/common/model"
"TenantServe/serve/orm"
"fmt"
"ArmedPolice/app/common/model"
)
type SysRoleAuth struct {
*model.SysRoleAuth
}
// SysRoleAuths 权限信息
type SysRoleAuths struct {
ID uint64 `json:"id"`
RoleID uint64 `json:"role_id"`
Auth string `json:"auth"`
}
// Auths 权限信息
func (m *SysRoleAuth) Auths(where ...*model.ModelWhere) ([]*SysRoleAuths, error) {
mSysRole := NewSysRole()
mSysAuth := NewSysAuth()
db := orm.GetDB().Table(m.TableName()+" AS r_a").
Select("r_a.id, r_a.role_id, a.auth").
Joins(fmt.Sprintf("LEFT JOIN %s AS r ON r_a.role_id = r.id", mSysRole.TableName())).
Joins(fmt.Sprintf("LEFT JOIN %s AS a ON r_a.auth_id = a.id", mSysAuth.TableName())).
Where("r_a.is_deleted = ?", model.DeleteStatusForNot)
out := make([]*SysRoleAuths, 0)
if len(where) > 0 {
for _, wo := range where {
db = db.Where(wo.Condition, wo.Value)
}
}
if err := db.Order("r_a.id " + model.OrderModeToDesc).Scan(&out).Error; err != nil {
return nil, err
}
return out, nil
}
func NewSysRoleAuth() *SysRoleAuth {
return &SysRoleAuth{SysRoleAuth: model.NewSysRoleAuth()}
}

8
app/model/sys_role_menu.go
View File

@ -1,13 +1,11 @@
package model
import (
model2 "TenantServe/app/common/model"
)
import "ArmedPolice/app/common/model"
type SysRoleMenu struct {
*model2.SysRoleMenu
*model.SysRoleMenu
}
func NewSysRoleMenu() *SysRoleMenu {
return &SysRoleMenu{SysRoleMenu: model2.NewSysRoleMenu()}
return &SysRoleMenu{SysRoleMenu: model.NewSysRoleMenu()}
}

44
app/model/sys_user.go
View File

@ -1,30 +1,39 @@
package model
import (
model2 "ArmedPolice/app/common/model"
"ArmedPolice/app/common/model"
"ArmedPolice/serve/orm"
"ArmedPolice/utils"
"errors"
"fmt"
"gorm.io/gorm"
)
// SysUser 用户信息
type SysUser struct {
*model2.SysUser
*model.SysUser
}
type (
// SysUserInfo 用户信息
SysUserInfo struct {
*model.SysUser
TenantName string `json:"tenant_name"`
}
)
func (m *SysUser) ValidatePassword(password string) bool {
return utils.HashCompare([]byte(m.Password), []byte(utils.Md5String(password, m.Salt)))
}
func (m *SysUser) IsAdminUser() bool {
return m.IsAdmin == model2.SysUserAdministratorForAdmin
return m.IsAdmin == model.SysUserAdministratorForAdmin
}
func (m *SysUser) GetByAccountOrMobile(param string) (bool, error) {
db := orm.GetDB().Table(m.TableName()).Where("(account = ? OR mobile = ?)", param, param).
Where("is_deleted = ?", model2.DeleteStatusForNot)
Where("is_deleted = ?", model.DeleteStatusForNot)
if err := db.First(m.SysUser).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
@ -35,6 +44,29 @@ func (m *SysUser) GetByAccountOrMobile(param string) (bool, error) {
return true, nil
}
func NewSysUser() *SysUser {
return &SysUser{SysUser: model2.NewSysUser()}
func (m *SysUser) Users(page, pageSize int, count *int64, where ...*model.ModelWhere) ([]*SysUserInfo, error) {
mSysTenant := model.NewSysTenant()
db := orm.GetDB().Table(m.TableName()+" As u").Select("u.*", "t.name AS tenant_name").
Joins(fmt.Sprintf("LEFT JOIN %s AS t ON u.tenant_id = t.id", mSysTenant.TableName())).
Where("u.is_deleted = ?", model.DeleteStatusForNot)
out := make([]*SysUserInfo, 0)
if len(where) > 0 {
for _, wo := range where {
db = db.Where(wo.Condition, wo.Value)
}
}
if err := db.Order("u.id " + model.OrderModeToAsc).Offset((page - 1) * pageSize).Limit(pageSize).Scan(&out).Error; err != nil {
return nil, err
}
if err := db.Count(count).Error; err != nil {
return nil, err
}
return out, nil
}
func NewSysUser() *SysUser {
return &SysUser{SysUser: model.NewSysUser()}
}

4
app/model/sys_user_login_log.go
View File

@ -1,8 +1,8 @@
package model
import (
"TenantServe/app/common/model"
"TenantServe/serve/orm"
"ArmedPolice/app/common/model"
"ArmedPolice/serve/orm"
"fmt"
)

6
app/model/sys_user_role.go
View File

@ -1,13 +1,13 @@
package model
import (
model2 "TenantServe/app/common/model"
"ArmedPolice/app/common/model"
)
type SysUserRole struct {
*model2.SysUserRole
*model.SysUserRole
}
func NewSysUserRole() *SysUserRole {
return &SysUserRole{SysUserRole: model2.NewSysUserRole()}
return &SysUserRole{SysUserRole: model.NewSysUserRole()}
}