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

调整部分命名

Browse Source
This commit is contained in:
GoEdgeLab
2021-09-14 19:38:44 +08:00
parent 5e5e6dc035
commit c310160d3c
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/db/models/node_ip_address_threshold_dao.go
View File

@@ -115,7 +115,7 @@ func (this *NodeIPAddressThresholdDAO) UpdateThresholdNotifiedAt(tx *dbs.Tx, thr
} }
// CreateThreshold 创建阈值 // CreateThreshold 创建阈值
func (this *NodeIPAddressThresholdDAO) CreateThreshold(tx *dbs.Tx, addressId int64, items []*nodeconfigs.NodeValueThresholdItemConfig, actions []*nodeconfigs.NodeValueThresholdActionConfig, order int) (int64, error) { func (this *NodeIPAddressThresholdDAO) CreateThreshold(tx *dbs.Tx, addressId int64, items []*nodeconfigs.IPAddressThresholdItemConfig, actions []*nodeconfigs.IPAddressThresholdActionConfig, order int) (int64, error) {
if addressId <= 0 { if addressId <= 0 {
return 0, errors.New("invalid addressId") return 0, errors.New("invalid addressId")
} }
@@ -148,7 +148,7 @@ func (this *NodeIPAddressThresholdDAO) CreateThreshold(tx *dbs.Tx, addressId int
} }
// UpdateThreshold 修改阈值 // UpdateThreshold 修改阈值
func (this *NodeIPAddressThresholdDAO) UpdateThreshold(tx *dbs.Tx, thresholdId int64, items []*nodeconfigs.NodeValueThresholdItemConfig, actions []*nodeconfigs.NodeValueThresholdActionConfig, order int) error { func (this *NodeIPAddressThresholdDAO) UpdateThreshold(tx *dbs.Tx, thresholdId int64, items []*nodeconfigs.IPAddressThresholdItemConfig, actions []*nodeconfigs.IPAddressThresholdActionConfig, order int) error {
if thresholdId <= 0 { if thresholdId <= 0 {
return errors.New("invalid thresholdId") return errors.New("invalid thresholdId")
} }

4
internal/db/models/node_ip_address_threshold_model_ext.go
View File

@@ -6,7 +6,7 @@ import (
"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
) )
func (this *NodeIPAddressThreshold) DecodeItems() (result []*nodeconfigs.NodeValueThresholdItemConfig) { func (this *NodeIPAddressThreshold) DecodeItems() (result []*nodeconfigs.IPAddressThresholdItemConfig) {
if len(this.Items) == 0 { if len(this.Items) == 0 {
return return
} }
@@ -18,7 +18,7 @@ func (this *NodeIPAddressThreshold) DecodeItems() (result []*nodeconfigs.NodeVal
return return
} }
func (this *NodeIPAddressThreshold) DecodeActions() (result []*nodeconfigs.NodeValueThresholdActionConfig) { func (this *NodeIPAddressThreshold) DecodeActions() (result []*nodeconfigs.IPAddressThresholdActionConfig) {
if len(this.Actions) == 0 { if len(this.Actions) == 0 {
return return
} }

10
internal/rpc/services/service_node_ip_address_threshold.go
View File

@@ -24,7 +24,7 @@ func (this *NodeIPAddressThresholdService) CreateNodeIPAddressThreshold(ctx cont
} }
var tx = this.NullTx() var tx = this.NullTx()
var items = []*nodeconfigs.NodeValueThresholdItemConfig{} var items = []*nodeconfigs.IPAddressThresholdItemConfig{}
if len(req.ItemsJSON) > 0 { if len(req.ItemsJSON) > 0 {
err = json.Unmarshal(req.ItemsJSON, &items) err = json.Unmarshal(req.ItemsJSON, &items)
if err != nil { if err != nil {
@@ -32,7 +32,7 @@ func (this *NodeIPAddressThresholdService) CreateNodeIPAddressThreshold(ctx cont
} }
} }
var actions = []*nodeconfigs.NodeValueThresholdActionConfig{} var actions = []*nodeconfigs.IPAddressThresholdActionConfig{}
if len(req.ActionsJSON) > 0 { if len(req.ActionsJSON) > 0 {
err = json.Unmarshal(req.ActionsJSON, &actions) err = json.Unmarshal(req.ActionsJSON, &actions)
if err != nil { if err != nil {
@@ -55,7 +55,7 @@ func (this *NodeIPAddressThresholdService) UpdateNodeIPAddressThreshold(ctx cont
} }
var tx = this.NullTx() var tx = this.NullTx()
var items = []*nodeconfigs.NodeValueThresholdItemConfig{} var items = []*nodeconfigs.IPAddressThresholdItemConfig{}
if len(req.ItemsJSON) > 0 { if len(req.ItemsJSON) > 0 {
err = json.Unmarshal(req.ItemsJSON, &items) err = json.Unmarshal(req.ItemsJSON, &items)
if err != nil { if err != nil {
@@ -63,7 +63,7 @@ func (this *NodeIPAddressThresholdService) UpdateNodeIPAddressThreshold(ctx cont
} }
} }
var actions = []*nodeconfigs.NodeValueThresholdActionConfig{} var actions = []*nodeconfigs.IPAddressThresholdActionConfig{}
if len(req.ActionsJSON) > 0 { if len(req.ActionsJSON) > 0 {
err = json.Unmarshal(req.ActionsJSON, &actions) err = json.Unmarshal(req.ActionsJSON, &actions)
if err != nil { if err != nil {
@@ -140,7 +140,7 @@ func (this *NodeIPAddressThresholdService) UpdateAllNodeIPAddressThresholds(ctx
var tx = this.NullTx() var tx = this.NullTx()
var thresholds = []*nodeconfigs.NodeValueThresholdConfig{} var thresholds = []*nodeconfigs.IPAddressThresholdConfig{}
err = json.Unmarshal(req.NodeIPAddressThresholdsJSON, &thresholds) err = json.Unmarshal(req.NodeIPAddressThresholdsJSON, &thresholds)
if err != nil { if err != nil {
return nil, errors.New("decode thresholds failed: " + err.Error()) return nil, errors.New("decode thresholds failed: " + err.Error())