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-04 15:15:11 +08:00
parent 288c74dc41
commit 153df336b8
18 changed files with 898 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controller/basic/struct.go
View File

@ -10,4 +10,10 @@ type (
CommonIDString struct {
ID string `json:"id"`
}
CommonArea struct {
Province string `json:"province"`
City string `json:"city"`
District string `json:"district"`
Address string `json:"address"`
}
)

24
app/controller/config/instance.go Normal file
View File

@ -0,0 +1,24 @@
package config
import (
"ArmedPolice/app/service"
"ArmedPolice/config"
)
type Instance struct{ *service.Session }
type InstanceHandle func(session *service.Session) *Instance
// Area 区域信息
func (c *Instance) Area(key string) map[string]string {
if key == "" {
key = config.DefaultChinaAreaCode
}
return config.SettingAreaInfo[key]
}
func NewInstance() InstanceHandle {
return func(session *service.Session) *Instance {
return &Instance{session}
}
}

136
app/controller/menu/instance.go
View File

@ -1,23 +1,149 @@
package menu
import (
"ArmedPolice/app/controller/basic"
model2 "ArmedPolice/app/common/model"
"ArmedPolice/app/model"
"ArmedPolice/app/service"
"errors"
"time"
)
type Instance struct{ *service.Session }
type InstanceHandle func(session *service.Session) *Instance
func (c *Instance) List() (*basic.ReturnPages, error) {
return &basic.ReturnPages{Data: nil, Count: 0}, nil
type (
// InstanceInfo 菜单信息
InstanceInfo struct {
*model2.SysMenu
Children []*InstanceInfo `json:"children"`
}
// InstanceIdentityInfo 多个身份菜单信息
InstanceIdentityInfo struct {
ID string `json:"id"`
*model2.SysMenuBasic
Checked bool `json:"checked"`
Children []*InstanceIdentityInfo `json:"children"`
}
// InstanceParams 菜单参数
InstanceParams struct {
ID, ParentID uint64
Kind, Auth int
Name, Link, Component, Icon string
Sort, Status int
Remark string
}
)
// tree 树状筛选
func (c *Instance) tree(src []*model2.SysMenu, parentID uint64) []*InstanceInfo {
out := make([]*InstanceInfo, 0)
for _, v := range src {
if v.ParentID == parentID {
out = append(out, &InstanceInfo{
SysMenu: v,
Children: c.tree(src, v.ID),
})
}
}
return out
}
func (c *Instance) Form() error {
// TreeIdentity 树状筛选
func TreeIdentity(src []*model.SysMenuScene, parentID uint64) []*InstanceIdentityInfo {
out := make([]*InstanceIdentityInfo, 0)
for _, v := range src {
if v.ParentID == parentID {
out = append(out, &InstanceIdentityInfo{
SysMenuBasic: v.SysMenuBasic,
Checked: v.SceneID > 0,
Children: TreeIdentity(src, v.ID),
})
}
}
return out
}
// List 列表信息
func (c *Instance) List() ([]*InstanceInfo, error) {
mSysMenu := model.NewSysMenu()
out, err := mSysMenu.Menus()
if err != nil {
return nil, err
}
return c.tree(out, 0), nil
}
// Form 数据操作
func (c *Instance) Form(params *InstanceParams) error {
if params.ID <= 0 {
return model2.Create(&model2.SysMenu{
SysMenuBasic: model2.SysMenuBasic{
ParentID: params.ParentID,
Name: params.Name,
Kind: model2.SysMenuKind(params.Kind),
Link: params.Link,
Component: params.Component,
Icon: params.Icon,
},
Auth: model2.SysMenuAuth(params.Auth),
Sort: params.Sort,
Status: model2.SysMenuStatusForNormal,
Remark: params.Remark,
})
}
out := model.NewSysMenu()
out.ID = params.ID
isExist, err := model2.FirstWhere(out.SysMenu)
if err != nil {
return err
} else if !isExist {
return errors.New("菜单信息不存在")
}
out.ParentID = params.ParentID
out.Name = params.Name
out.Kind = model2.SysMenuKind(params.Kind)
out.Link = params.Link
out.Component = params.Component
out.Icon = params.Icon
out.Auth = model2.SysMenuAuth(params.Auth)
out.Sort = params.Sort
out.Status = model2.SysMenuStatus(params.Status)
out.Remark = params.Remark
if err = model2.Save(out); err != nil {
return err
}
return nil
}
func (c *Instance) Delete() error {
// Status 状态操作
func (c *Instance) Status(id uint64, status int) error {
mSysMenu := model.NewSysMenu()
mSysMenu.ID = id
if err := model2.Updates(mSysMenu.SysMenu, map[string]interface{}{
"status": status, "updated_at": time.Now(),
}); err != nil {
return err
}
return nil
}
// Delete 删除操作
func (c *Instance) Delete(id uint64) error {
mSysMenu := model.NewSysMenu()
mSysMenu.ID = id
if err := model2.Delete(mSysMenu.SysMenu); err != nil {
return err
}
return nil
}

72
app/controller/role/instance.go
View File

@ -2,7 +2,6 @@ package role
import (
model2 "ArmedPolice/app/common/model"
"ArmedPolice/app/controller/basic"
"ArmedPolice/app/model"
"ArmedPolice/app/service"
)
@ -11,29 +10,76 @@ type Instance struct{ *service.Session }
type InstanceHandle func(session *service.Session) *Instance
func (c *Instance) List() (*basic.PageDataResponse, error) {
type (
// InstanceInfo 基本信息
InstanceInfo struct {
ID string `json:"id"`
Name string `json:"name"`
Children []*InstanceInfo `json:"children"`
}
// InstanceParams 参数信息
InstanceParams struct {
ID, ParentID uint64
Name, Remark string
Sort int
}
)
func (c *Instance) tree(src []*model2.SysRole, parentID uint64) []*InstanceInfo {
out := make([]*InstanceInfo, 0)
for _, v := range src {
if v.ParentID == parentID {
out = append(out, &InstanceInfo{
ID: v.GetEncodeID(),
Name: v.Name,
Children: c.tree(src, v.ID),
})
}
}
return out
}
// List 列表信息
func (c *Instance) List() ([]*InstanceInfo, error) {
mSysRole := model.NewSysRole()
where := make([]*model2.ModelWhereOrder, 0)
//if {
//
//}
where := []*model2.ModelWhereOrder{
&model2.ModelWhereOrder{
Order: model2.NewOrder("sort", model2.OrderModeToDesc),
},
}
out := make([]*model2.SysRole, 0)
if err := model2.Find(mSysRole.SysRole, &out, where...); err != nil {
return nil, err
}
return &basic.PageDataResponse{Data: nil, Count: 0}, nil
return c.tree(out, 0), nil
}
func (c *Instance) Form() error {
return nil
// Form 数据处理
func (c *Instance) Form(params *InstanceParams) error {
mSysRole := model.NewSysRole()
if params.ID > 0 {
mSysRole.ID = params.ID
return model2.Updates(mSysRole.SysRole, map[string]interface{}{
"parent_id": params.ParentID, "name": params.Name, "remark": params.Remark, "sort": params.Sort,
})
}
mSysRole.ParentID = params.ParentID
mSysRole.Name = params.Name
mSysRole.Remark = params.Remark
mSysRole.Sort = params.Sort
return model2.Create(mSysRole.SysRole)
}
func (c *Instance) Delete() error {
return nil
// Delete 删除操作
func (c *Instance) Delete(id uint64) error {
mSysRole := model.NewSysRole()
mSysRole.ID = id
return model2.Delete(mSysRole.SysRole)
}
func NewInstance() InstanceHandle {

65
app/controller/role/menu.go
View File

@ -1,24 +1,73 @@
package role
import (
"ArmedPolice/app/controller/basic"
model2 "ArmedPolice/app/common/model"
"ArmedPolice/app/controller/menu"
"ArmedPolice/app/model"
"ArmedPolice/app/service"
"ArmedPolice/serve/orm"
"errors"
"gorm.io/gorm"
)
type Menu struct{ *service.Session }
type MenuHandle func(session *service.Session) *Menu
func (c *Menu) List() (*basic.PageDataResponse, error) {
return &basic.PageDataResponse{Data: nil, Count: 0}, nil
// List 菜单列表
func (c *Menu) List(roleID uint64) ([]*menu.InstanceIdentityInfo, error) {
mSysMenu := model.NewSysMenu()
out, err := mSysMenu.RoleMenu(roleID)
if err != nil {
return nil, err
}
return menu.TreeIdentity(out, 0), nil
}
func (c *Menu) Form() error {
return nil
}
// Bind 绑定菜单
func (c *Menu) Bind(roleID uint64, menuIDs []uint64) error {
if len(menuIDs) > 0 {
var count int64
func (c *Menu) Delete() error {
return nil
mSysMenu := model.NewSysMenu()
if err := model2.Count(mSysMenu.SysMenu, &count, model2.NewWhereIn("id", menuIDs),
model2.NewWhere("auth", model2.SysMenuAuthForSystem)); err != nil {
return err
} else if count > 0 {
return errors.New("不可设置超管菜单")
}
}
mSysRoleMenu := model.NewSysRoleMenu()
return orm.GetDB().Transaction(func(tx *gorm.DB) error {
err := model2.DeleteWhere(mSysRoleMenu.SysRoleMenu, []*model2.ModelWhere{model2.NewWhere("role_id", roleID)}, tx)
if err != nil {
return err
}
if len(menuIDs) <= 0 {
return nil
}
menus := make([]*model2.SysRoleMenu, 0)
mark := make(map[uint64]uint64, 0)
for _, v := range menuIDs {
if _, has := mark[v]; has {
continue
}
menus = append(menus, &model2.SysRoleMenu{
ModelTenant: model2.ModelTenant{TenantID: c.TenantID}, RoleID: roleID, MenuID: v,
})
mark[v] = v
}
if err = model2.Creates(mSysRoleMenu.SysRoleMenu, menus, tx); err != nil {
return err
}
return nil
})
}
func NewMenu() MenuHandle {

75
app/controller/tenant/instance.go
View File

@ -5,31 +5,90 @@ import (
"ArmedPolice/app/controller/basic"
"ArmedPolice/app/model"
"ArmedPolice/app/service"
"errors"
)
type Instance struct{ *service.Session }
type InstanceHandle func(session *service.Session) *Instance
func (c *Instance) List(name string, page, pageSize int) (*basic.PageDataResponse, error) {
type (
// InstanceInfo 租户信息
InstanceInfo struct {
ID string `json:"id"`
Name string `json:"name"`
*model2.AreaInfo
Children []*InstanceInfo `json:"children"`
}
// InstanceParams 参数信息
InstanceParams struct {
ID, ParentID uint64
Name, Remark string
basic.CommonArea
}
)
func (c *Instance) tree(src []*model2.SysTenant, parentID uint64) []*InstanceInfo {
out := make([]*InstanceInfo, 0)
for _, v := range src {
if v.ParentID == parentID {
out = append(out, &InstanceInfo{
ID: v.GetEncodeID(),
Name: v.Name,
AreaInfo: v.Area.Format(),
Children: c.tree(src, v.ID),
})
}
}
return out
}
// List 列表信息
func (c *Instance) List() ([]*InstanceInfo, error) {
mSysTenant := model.NewSysTenant()
out := make([]*model2.SysTenant, 0)
var count int64
if err := model2.Pages(mSysTenant.SysTenant, &out, page, pageSize, &count); err != nil {
if err := model2.Find(mSysTenant.SysTenant, &out); err != nil {
return nil, err
}
return &basic.PageDataResponse{Data: nil, Count: 0}, nil
return c.tree(out, 0), nil
}
func (c *Instance) Form() error {
return nil
// Form 数据操作
func (c *Instance) Form(params *InstanceParams) error {
mSysTenant := model.NewSysTenant()
if params.ID > 0 {
mSysTenant.ID = params.ID
isExist, err := model2.First(mSysTenant.SysTenant)
if err != nil {
return err
} else if !isExist {
return errors.New("操作错误，数据不存在")
}
}
mSysTenant.ParentID = params.ParentID
mSysTenant.Name = params.Name
mSysTenant.Area = model2.Area{
Province: params.Province, City: params.City, District: params.District, Address: params.Address,
}
mSysTenant.Remark = params.Remark
if mSysTenant.ID > 0 {
return model2.Updates(mSysTenant.SysTenant, mSysTenant.SysTenant)
}
return model2.Create(mSysTenant.SysTenant)
}
// Delete 删除操作
func (c *Instance) Delete(id uint64) error {
return nil
mSysTenant := model.NewSysTenant()
mSysTenant.ID = id
return model2.Delete(mSysTenant.SysTenant)
}
func NewInstance() InstanceHandle {

27
app/controller/user/menu.go
View File

@ -1,7 +1,8 @@
package user
import (
"ArmedPolice/app/controller/basic"
"ArmedPolice/app/controller/menu"
"ArmedPolice/app/model"
"ArmedPolice/app/service"
)
@ -9,16 +10,24 @@ type Menu struct{ *service.Session }
type MenuHandle func(session *service.Session) *Menu
func (c *Menu) List() (*basic.PageDataResponse, error) {
return &basic.PageDataResponse{Data: nil, Count: 0}, nil
}
// Menu 用户菜单信息
func (c *Menu) Menu() ([]*menu.InstanceIdentityInfo, error) {
mSysMenu := model.NewSysMenu()
func (c *Menu) Form() error {
return nil
}
out := make([]*model.SysMenuScene, 0)
var err error
func (c *Menu) Delete() error {
return nil
if c.IsAdmin {
if out, err = mSysMenu.SystemMenu(); err != nil {
return nil, err
}
goto RETURN
}
if out, err = mSysMenu.UserMenu(c.UID); err != nil {
return nil, err
}
RETURN:
return menu.TreeIdentity(out, 0), nil
}
func NewMenu() MenuHandle {