feat:完善项目
This commit is contained in:
@ -15,6 +15,7 @@ type InstanceHandle func(session *service.Session) *Instance
|
||||
type (
|
||||
// InstanceInfo 菜单信息
|
||||
InstanceInfo struct {
|
||||
ID string `json:"id"`
|
||||
*model2.SysMenu
|
||||
Children []*InstanceInfo `json:"children"`
|
||||
}
|
||||
@ -42,6 +43,7 @@ func (c *Instance) tree(src []*model2.SysMenu, parentID uint64) []*InstanceInfo
|
||||
for _, v := range src {
|
||||
if v.ParentID == parentID {
|
||||
out = append(out, &InstanceInfo{
|
||||
ID: v.GetEncodeID(),
|
||||
SysMenu: v,
|
||||
Children: c.tree(src, v.ID),
|
||||
})
|
||||
@ -51,15 +53,17 @@ func (c *Instance) tree(src []*model2.SysMenu, parentID uint64) []*InstanceInfo
|
||||
}
|
||||
|
||||
// TreeIdentity 树状筛选
|
||||
func TreeIdentity(src []*model.SysMenuScene, parentID uint64) []*InstanceIdentityInfo {
|
||||
func TreeIdentity(iModel model2.IModel, src []*model.SysMenuScene, parentID uint64) []*InstanceIdentityInfo {
|
||||
out := make([]*InstanceIdentityInfo, 0)
|
||||
|
||||
for _, v := range src {
|
||||
if v.ParentID == parentID {
|
||||
iModel.SetID(v.ID)
|
||||
out = append(out, &InstanceIdentityInfo{
|
||||
ID: iModel.GetEncodeID(),
|
||||
SysMenuBasic: v.SysMenuBasic,
|
||||
Checked: v.SceneID > 0,
|
||||
Children: TreeIdentity(src, v.ID),
|
||||
Children: TreeIdentity(iModel, src, v.ID),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
@ -22,7 +22,7 @@ func (c *Menu) List(roleID uint64) ([]*menu.InstanceIdentityInfo, error) {
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return menu.TreeIdentity(out, 0), nil
|
||||
return menu.TreeIdentity(mSysMenu.SysMenu, out, 0), nil
|
||||
}
|
||||
|
||||
// Bind 绑定菜单
|
||||
|
@ -27,7 +27,7 @@ func (c *Menu) Menu() ([]*menu.InstanceIdentityInfo, error) {
|
||||
return nil, err
|
||||
}
|
||||
RETURN:
|
||||
return menu.TreeIdentity(out, 0), nil
|
||||
return menu.TreeIdentity(mSysMenu.SysMenu, out, 0), nil
|
||||
}
|
||||
|
||||
func NewMenu() MenuHandle {
|
||||
|
@ -54,7 +54,8 @@ func (c *Instance) ToDo() {
|
||||
|
||||
}
|
||||
|
||||
func (c *Instance) Form() error {
|
||||
// Launch 发起工单申请
|
||||
func (c *Instance) Launch() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
|
@ -3,12 +3,12 @@ package work
|
||||
import (
|
||||
model2 "ArmedPolice/app/common/model"
|
||||
"ArmedPolice/app/controller/basic"
|
||||
"ArmedPolice/app/handle"
|
||||
"ArmedPolice/app/model"
|
||||
"ArmedPolice/app/service"
|
||||
"ArmedPolice/serve/orm"
|
||||
"ArmedPolice/utils"
|
||||
"errors"
|
||||
"fmt"
|
||||
"gorm.io/gorm"
|
||||
"time"
|
||||
)
|
||||
@ -95,9 +95,12 @@ func (c *Person) Examine(id uint64, status int, remark string, isAssist int) err
|
||||
}
|
||||
// 推送通知
|
||||
go utils.TryCatch(func() {
|
||||
for _, u := range newNextScheduleInfo.Reviewer {
|
||||
for _, v := range newNextScheduleInfo.Reviewer {
|
||||
// Socket通知
|
||||
fmt.Println(u)
|
||||
service.HubMessage.EmitHandle(&service.HubEmit{
|
||||
ID: v,
|
||||
Msg: handle.NewWorkNotice("你有一条待办事项"),
|
||||
})
|
||||
}
|
||||
})
|
||||
FINISH:
|
||||
|
Reference in New Issue
Block a user