public/PandaX
1
0
Fork 0
mirror of https://gitee.com/XM-GO/PandaX.git synced 2026-05-13 15:12:09 +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

6
apps/device/services/device.go
View File

@@ -58,7 +58,7 @@ func getDeviceToken(data *entity.Device) *tool.DeviceAuth {
etoken := &tool.DeviceAuth{
DeviceId: data.Id,
OrgId: data.OrgId,
User: data.Owner,
Owner: data.Owner,
Name: data.Name,
DeviceType: data.DeviceType,
ProductId: data.Pid,
@@ -114,7 +114,7 @@ func (m *deviceModelImpl) FindListPage(page, pageSize int, data entity.Device) (
db = db.Where("parent_id = ?", data.ParentId)
}
// 组织数据访问权限
tool.OrgAuthSet(db, data.RoleId)
tool.OrgAuthSet(db, data.RoleId, data.Owner)
err := db.Count(&total).Error
err = db.Order("create_time").Preload("Product").Preload("DeviceGroup").Limit(pageSize).Offset(offset).Find(&list).Error
@@ -153,7 +153,7 @@ func (m *deviceModelImpl) FindList(data entity.Device) *[]entity.DeviceRes {
if data.ParentId != "" {
db = db.Where("parent_id = ?", data.ParentId)
}
tool.OrgAuthSet(db, data.RoleId)
tool.OrgAuthSet(db, data.RoleId, data.Owner)
db.Preload("Product").Preload("DeviceGroup")
biz.ErrIsNil(db.Order("create_time").Find(&list).Error, "查询设备列表失败")
return &list

4
apps/device/services/device_alarm.go
View File

@@ -4,6 +4,7 @@ import (
"github.com/PandaXGO/PandaKit/biz"
"pandax/apps/device/entity"
"pandax/pkg/global"
"pandax/pkg/tool"
)
type (
@@ -72,6 +73,9 @@ func (m *alarmModelImpl) FindListPage(page, pageSize int, data entity.DeviceAlar
if data.EndTime != "" {
db = db.Where("time < ?", data.EndTime)
}
// 组织数据访问权限
tool.OrgAuthSet(db, data.RoleId, data.Owner)
err := db.Count(&total).Error
err = db.Order("time").Limit(pageSize).Offset(offset).Find(&list).Error
biz.ErrIsNil(err, "查询设备告警分页列表失败")

6
apps/device/services/device_group.go
View File

@@ -5,6 +5,7 @@ import (
"github.com/PandaXGO/PandaKit/biz"
"pandax/apps/device/entity"
"pandax/pkg/global"
"pandax/pkg/tool"
)
type (
@@ -67,6 +68,9 @@ func (m *deviceGroupModelImpl) FindListPage(page, pageSize int, data entity.Devi
if data.Status != "" {
db = db.Where("status = ?", data.Status)
}
// 组织数据访问权限
tool.OrgAuthSet(db, data.RoleId, data.Owner)
err := db.Count(&total).Error
err = db.Order("sort").Limit(pageSize).Offset(offset).Find(&list).Error
biz.ErrIsNil(err, "查询设备分组分页列表失败")
@@ -86,6 +90,8 @@ func (m *deviceGroupModelImpl) FindList(data entity.DeviceGroup) *[]entity.Devic
if data.Status != "" {
db = db.Where("status = ?", data.Status)
}
// 组织数据访问权限
tool.OrgAuthSet(db, data.RoleId, data.Owner)
biz.ErrIsNil(db.Order("sort").Find(&list).Error, "查询设备分组列表失败")
return &list
}

12
apps/device/services/product.go
View File

@@ -62,9 +62,6 @@ func (m *productModelImpl) FindListPage(page, pageSize int, data entity.Product)
if data.DeviceType != "" {
db = db.Where("device_type = ?", data.DeviceType)
}
if data.Id != "" {
db = db.Where("id = ?", data.Id)
}
if data.ProductCategoryId != "" {
db = db.Where("product_category_id = ?", data.ProductCategoryId)
}
@@ -77,9 +74,6 @@ func (m *productModelImpl) FindListPage(page, pageSize int, data entity.Product)
if data.Name != "" {
db = db.Where("name like ?", "%"+data.Name+"%")
}
if data.OrgId != 0 {
db = db.Where("org_id = ?", data.OrgId)
}
if data.RuleChainId != "" {
db = db.Where("rule_chain_id = ?", data.RuleChainId)
}
@@ -99,9 +93,6 @@ func (m *productModelImpl) FindList(data entity.Product) *[]entity.ProductRes {
if data.DeviceType != "" {
db = db.Where("device_type = ?", data.DeviceType)
}
if data.Id != "" {
db = db.Where("id = ?", data.Id)
}
if data.ProductCategoryId != "" {
db = db.Where("product_category_id = ?", data.ProductCategoryId)
}
@@ -114,9 +105,6 @@ func (m *productModelImpl) FindList(data entity.Product) *[]entity.ProductRes {
if data.Name != "" {
db = db.Where("name like ?", "%"+data.Name+"%")
}
if data.OrgId != 0 {
db = db.Where("org_id = ?", data.OrgId)
}
if data.RuleChainId != "" {
db = db.Where("rule_chain_id = ?", data.RuleChainId)
}