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

[fix]规则链添加或修改存在多条主链

Browse Source
This commit is contained in:
PandaX
2023-11-21 10:27:07 +08:00
parent 8c4252f1a1
commit 0635e37d73
2 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,7 +114,8 @@ func (p *RuleChainApi) UpdateRuleRoot(rc *restfulx.ReqCtx) {
var rule entity.RuleChain var rule entity.RuleChain
restfulx.BindJsonAndValid(rc, &rule) restfulx.BindJsonAndValid(rc, &rule)
// 修改主链为普通链 // 修改主链为普通链
p.RuleChainApp.UpdateByRoot() err := p.RuleChainApp.UpdateByRoot()
biz.ErrIsNil(err, "修改主链错误")
// 修改当前链为主链 // 修改当前链为主链
p.RuleChainApp.Update(rule) p.RuleChainApp.Update(rule)
} }

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

@@ -19,7 +19,7 @@ type (
Insert(data entity.RuleChain) *entity.RuleChain Insert(data entity.RuleChain) *entity.RuleChain
FindOne(id string) *entity.RuleChain FindOne(id string) *entity.RuleChain
FindOneByRoot() *entity.RuleChain FindOneByRoot() *entity.RuleChain
UpdateByRoot() UpdateByRoot() error
FindListPage(page, pageSize int, data entity.RuleChain) (*[]entity.RuleChainBase, int64) FindListPage(page, pageSize int, data entity.RuleChain) (*[]entity.RuleChainBase, int64)
FindList(data entity.RuleChain) *[]entity.RuleChain FindList(data entity.RuleChain) *[]entity.RuleChain
FindListBaseLabel(data entity.RuleChain) *[]entity.RuleChainBaseLabel FindListBaseLabel(data entity.RuleChain) *[]entity.RuleChainBaseLabel
@@ -37,8 +37,18 @@ var RuleChainModelDao RuleChainModel = &ruleChainModelImpl{
} }
func (m *ruleChainModelImpl) Insert(data entity.RuleChain) *entity.RuleChain { func (m *ruleChainModelImpl) Insert(data entity.RuleChain) *entity.RuleChain {
tx := global.Db.Begin()
// 如果新增的链为主链，那么将原来的设置为普通连
if data.Root == "1" {
err := m.UpdateByRoot()
biz.ErrIsNil(err, "修改主链错误")
}
err := global.Db.Table(m.table).Create(&data).Error err := global.Db.Table(m.table).Create(&data).Error
if err != nil {
tx.Rollback()
}
biz.ErrIsNil(err, "添加规则链失败") biz.ErrIsNil(err, "添加规则链失败")
tx.Commit()
return &data return &data
} }
@@ -60,8 +70,9 @@ func (m *ruleChainModelImpl) FindOneByRoot() *entity.RuleChain {
} }
// UpdateByRoot 修改主链为普通链 // UpdateByRoot 修改主链为普通链
func (m *ruleChainModelImpl) UpdateByRoot() { func (m *ruleChainModelImpl) UpdateByRoot() error {
biz.ErrIsNil(global.Db.Table(m.table).Where("root = ?", "1").Update("root", "0").Error, "修改规则链失败") tx := global.Db.Table(m.table).Where("root = ?", "1").Update("root", "0")
return tx.Error
} }
func (m *ruleChainModelImpl) FindListPage(page, pageSize int, data entity.RuleChain) (*[]entity.RuleChainBase, int64) { func (m *ruleChainModelImpl) FindListPage(page, pageSize int, data entity.RuleChain) (*[]entity.RuleChainBase, int64) {
@@ -114,11 +125,22 @@ func (m *ruleChainModelImpl) FindListBaseLabel(data entity.RuleChain) *[]entity.
} }
func (m *ruleChainModelImpl) Update(data entity.RuleChain) *entity.RuleChain { func (m *ruleChainModelImpl) Update(data entity.RuleChain) *entity.RuleChain {
tx := global.Db.Begin()
// 如果新增的链为主链，那么将原来的设置为普通连
if data.Root == "1" {
err := m.UpdateByRoot()
biz.ErrIsNil(err, "修改主链错误")
}
err := global.Db.Table(m.table).Updates(&data).Error
if err != nil {
tx.Rollback()
}
biz.ErrIsNil(err, "修改规则链失败")
tx.Commit()
//更改本地规则链缓存 //更改本地规则链缓存
if data.RuleDataJson != "" { if data.RuleDataJson != "" {
go global.EventEmitter.Emit(events.ProductChainRuleEvent, data.Id, data.RuleDataJson) go global.EventEmitter.Emit(events.ProductChainRuleEvent, data.Id, data.RuleDataJson)
} }
biz.ErrIsNil(global.Db.Table(m.table).Updates(&data).Error, "修改规则链失败")
return &data return &data
} }