public/PandaX
1
0
Fork 0
mirror of https://gitee.com/XM-GO/PandaX.git synced 2026-04-23 02:48:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

组织数据读取权限完成

Browse Source
This commit is contained in:
XM-GO
2023-09-15 15:13:39 +08:00
parent b5ee2a54b9
commit 6630ebdb02
37 changed files with 717 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/rule/api/rulechain.go
View File

@@ -35,6 +35,10 @@ func (p *RuleChainApi) GetRuleChainList(rc *restfulx.ReqCtx) {
pageNum := restfulx.QueryInt(rc, "pageNum", 1)
pageSize := restfulx.QueryInt(rc, "pageSize", 10)
data.RuleName = restfulx.QueryParam(rc, "ruleName")
data.RoleId = rc.LoginAccount.RoleId
data.Owner = rc.LoginAccount.UserName
list, total := p.RuleChainApp.FindListPage(pageNum, pageSize, data)
rc.ResData = model.ResultPage{

4
apps/rule/api/rulechain_log.go
View File

@@ -23,6 +23,10 @@ func (p *RuleChainMsgLogApi) GetRuleChainMsgLogList(rc *restfulx.ReqCtx) {
pageSize := restfulx.QueryInt(rc, "pageSize", 10)
data.DeviceName = restfulx.QueryParam(rc, "deviceName")
data.MsgType = restfulx.QueryParam(rc, "msgType")
data.RoleId = rc.LoginAccount.RoleId
data.Owner = rc.LoginAccount.UserName
list, total := p.RuleChainMsgLogApp.FindListPage(pageNum, pageSize, data)
rc.ResData = model.ResultPage{

1
apps/rule/entity/rulechain.go
View File

@@ -33,6 +33,7 @@ func (RuleChain) TableName() string {
type RuleChainMsgLog struct {
MessageId string `gorm:"message_id;type:varchar(64);comment:消息Id" json:"messageId"`
OrgId int64 `json:"orgId" gorm:"type:int;comment:机构ID"`
Owner string `json:"owner" gorm:"type:varchar(64);comment:创建者,所有者"`
MsgType string `gorm:"msg_type;type:varchar(64);comment:消息类型" json:"msgType"`
DeviceId string `gorm:"device_id;type:varchar(64);comment:设备ID" json:"deviceId"`
DeviceName string `gorm:"device_name;type:varchar(255);comment:设备名称" json:"deviceName"`

7
apps/rule/services/rulechain.go
View File

@@ -11,6 +11,7 @@ import (
"pandax/apps/rule/entity"
"pandax/pkg/events"
"pandax/pkg/global"
"pandax/pkg/tool"
)
type (
@@ -78,6 +79,8 @@ func (m *ruleChainModelImpl) FindListPage(page, pageSize int, data entity.RuleCh
if data.RuleRemark != "" {
db = db.Where("rule_remark like ?", "%"+data.RuleRemark+"%")
}
// 组织数据访问权限
tool.OrgAuthSet(db, data.RoleId, data.Owner)
err := db.Count(&total).Error
err = db.Order("create_time").Limit(pageSize).Offset(offset).Find(&list).Error
biz.ErrIsNil(err, "查询规则链分页列表失败")
@@ -97,6 +100,8 @@ func (m *ruleChainModelImpl) FindList(data entity.RuleChain) *[]entity.RuleChain
if data.RuleRemark != "" {
db = db.Where("rule_remark like ?", "%"+data.RuleRemark+"%")
}
// 组织数据访问权限
tool.OrgAuthSet(db, data.RoleId, data.Owner)
biz.ErrIsNil(db.Order("create_time").Find(&list).Error, "查询规则链列表失败")
return &list
}
@@ -111,6 +116,8 @@ func (m *ruleChainModelImpl) FindListBaseLabel(data entity.RuleChain) *[]entity.
if data.RuleName != "" {
db = db.Where("rule_name like ?", "%"+data.RuleName+"%")
}
// 组织数据访问权限
tool.OrgAuthSet(db, data.RoleId, data.Owner)
biz.ErrIsNil(db.Find(&list).Error, "查询规则链列表失败")
return &list
}

3
apps/rule/services/rulechain_log.go
View File

@@ -10,6 +10,7 @@ import (
"github.com/PandaXGO/PandaKit/biz"
"pandax/apps/rule/entity"
"pandax/pkg/global"
"pandax/pkg/tool"
)
type (
@@ -49,6 +50,8 @@ func (m *ruleChainLogModelImpl) FindListPage(page, pageSize int, data entity.Rul
if data.MsgType != "" {
db = db.Where("msg_type = ?", data.MsgType)
}
// 组织数据访问权限
tool.OrgAuthSet(db, data.RoleId, data.Owner)
err := db.Count(&total).Error
err = db.Order("create_at").Limit(pageSize).Offset(offset).Find(&list).Error
biz.ErrIsNil(err, "查询规则链分页列表失败")