TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-11-03 23:20:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

[区域]可以设置区域说明文字

Browse Source
This commit is contained in:
GoEdgeLab
2020-12-10 22:21:21 +08:00
parent 7eecaa1224
commit 806cd069b5
3 changed files with 39 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/db/models/node_region_dao.go
View File

@@ -74,23 +74,25 @@ func (this *NodeRegionDAO) FindNodeRegionName(id int64) (string, error) {
}
// 创建区域
func (this *NodeRegionDAO) CreateRegion(adminId int64, name string) (int64, error) {
func (this *NodeRegionDAO) CreateRegion(adminId int64, name string, description string) (int64, error) {
op := NewNodeRegionOperator()
op.AdminId = adminId
op.Name = name
op.Description = description
op.State = NodeRegionStateEnabled
op.IsOn = true
return this.SaveInt64(op)
}
// 修改区域
func (this *NodeRegionDAO) UpdateRegion(regionId int64, name string, isOn bool) error {
func (this *NodeRegionDAO) UpdateRegion(regionId int64, name string, description string, isOn bool) error {
if regionId <= 0 {
return errors.New("invalid regionId")
}
op := NewNodeRegionOperator()
op.Id = regionId
op.Name = name
op.Description = description
op.IsOn = isOn
return this.Save(op)
}

34
internal/db/models/node_region_model.go
View File

@@ -2,25 +2,27 @@ package models
// 节点区域
type NodeRegion struct {
Id uint32 `field:"id"` // ID
AdminId uint32 `field:"adminId"` // 管理员ID
IsOn uint8 `field:"isOn"` // 是否启用
Name string `field:"name"` // 名称
Order uint32 `field:"order"` // 排序
CreatedAt uint64 `field:"createdAt"` // 创建时间
Prices string `field:"prices"` // 价格
State uint8 `field:"state"` // 状态
Id uint32 `field:"id"` // ID
AdminId uint32 `field:"adminId"` // 管理员ID
IsOn uint8 `field:"isOn"` // 是否启用
Name string `field:"name"` // 名称
Description string `field:"description"` // 描述
Order uint32 `field:"order"` // 排序
CreatedAt uint64 `field:"createdAt"` // 创建时间
Prices string `field:"prices"` // 价格
State uint8 `field:"state"` // 状态
}
type NodeRegionOperator struct {
Id interface{} // ID
AdminId interface{} // 管理员ID
IsOn interface{} // 是否启用
Name interface{} // 名称
Order interface{} // 排序
CreatedAt interface{} // 创建时间
Prices interface{} // 价格
State interface{} // 状态
Id interface{} // ID
AdminId interface{} // 管理员ID
IsOn interface{} // 是否启用
Name interface{} // 名称
Description interface{} // 描述
Order interface{} // 排序
CreatedAt interface{} // 创建时间
Prices interface{} // 价格
State interface{} // 状态
}
func NewNodeRegionOperator() *NodeRegionOperator {

31
internal/rpc/services/service_node_region.go
View File

@@ -17,7 +17,7 @@ func (this *NodeRegionService) CreateNodeRegion(ctx context.Context, req *pb.Cre
if err != nil {
return nil, err
}
regionId, err := models.SharedNodeRegionDAO.CreateRegion(adminId, req.Name)
regionId, err := models.SharedNodeRegionDAO.CreateRegion(adminId, req.Name, req.Description)
if err != nil {
return nil, err
}
@@ -30,7 +30,7 @@ func (this *NodeRegionService) UpdateNodeRegion(ctx context.Context, req *pb.Upd
if err != nil {
return nil, err
}
err = models.SharedNodeRegionDAO.UpdateRegion(req.NodeRegionId, req.Name, req.IsOn)
err = models.SharedNodeRegionDAO.UpdateRegion(req.NodeRegionId, req.Name, req.Description, req.IsOn)
if err != nil {
return nil, err
}
@@ -63,10 +63,11 @@ func (this *NodeRegionService) FindAllEnabledNodeRegions(ctx context.Context, re
result := []*pb.NodeRegion{}
for _, region := range regions {
result = append(result, &pb.NodeRegion{
Id: int64(region.Id),
IsOn: region.IsOn == 1,
Name: region.Name,
PricesJSON: []byte(region.Prices),
Id: int64(region.Id),
IsOn: region.IsOn == 1,
Name: region.Name,
Description: region.Description,
PricesJSON: []byte(region.Prices),
})
}
return &pb.FindAllEnabledNodeRegionsResponse{NodeRegions: result}, nil
@@ -85,10 +86,11 @@ func (this *NodeRegionService) FindAllEnabledAndOnNodeRegions(ctx context.Contex
result := []*pb.NodeRegion{}
for _, region := range regions {
result = append(result, &pb.NodeRegion{
Id: int64(region.Id),
IsOn: region.IsOn == 1,
Name: region.Name,
PricesJSON: []byte(region.Prices),
Id: int64(region.Id),
IsOn: region.IsOn == 1,
Name: region.Name,
Description: region.Description,
PricesJSON: []byte(region.Prices),
})
}
return &pb.FindAllEnabledAndOnNodeRegionsResponse{NodeRegions: result}, nil
@@ -121,10 +123,11 @@ func (this *NodeRegionService) FindEnabledNodeRegion(ctx context.Context, req *p
return &pb.FindEnabledNodeRegionResponse{NodeRegion: nil}, nil
}
return &pb.FindEnabledNodeRegionResponse{NodeRegion: &pb.NodeRegion{
Id: int64(region.Id),
IsOn: region.IsOn == 1,
Name: region.Name,
PricesJSON: []byte(region.Prices),
Id: int64(region.Id),
IsOn: region.IsOn == 1,
Name: region.Name,
Description: region.Description,
PricesJSON: []byte(region.Prices),
}}, nil
}