public/PandaX
1
0
Fork 0
mirror of https://gitee.com/XM-GO/PandaX.git synced 2026-05-04 19:11:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

[优化] 规则链优化

Browse Source
This commit is contained in:
PandaX
2024-02-25 13:56:14 +08:00
parent 6f7132a009
commit 4eca198425
9 changed files with 112 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,8 @@ func (r *RuleChainApi) GetNodeDebug(rc *restfulx.ReqCtx) {
ruleId := restfulx.QueryParam(rc, "ruleId")
nodeId := restfulx.QueryParam(rc, "nodeId")
total, list := rule_engine.GetDebugDataPage(pageNum, pageSize, ruleId, nodeId)
total, list, err := rule_engine.GetDebugDataPage(pageNum, pageSize, ruleId, nodeId)
biz.ErrIsNil(err, "获取规则测试数据错误")
rc.ResData = model.ResultPage{
Total: total,
PageNum: int64(pageNum),
@@ -50,8 +51,8 @@ func (p *RuleChainApi) GetRuleChainList(rc *restfulx.ReqCtx) {
data.RoleId = rc.LoginAccount.RoleId
data.Owner = rc.LoginAccount.UserName
list, total := p.RuleChainApp.FindListPage(pageNum, pageSize, data)
list, total, err := p.RuleChainApp.FindListPage(pageNum, pageSize, data)
biz.ErrIsNil(err, "获取规则链列表错误")
rc.ResData = model.ResultPage{
Total: total,
PageNum: int64(pageNum),
@@ -63,14 +64,17 @@ func (p *RuleChainApi) GetRuleChainList(rc *restfulx.ReqCtx) {
func (p *RuleChainApi) GetRuleChainListLabel(rc *restfulx.ReqCtx) {
data := entity.RuleChain{}
data.RuleName = restfulx.QueryParam(rc, "ruleName")
list := p.RuleChainApp.FindListBaseLabel(data)
list, err := p.RuleChainApp.FindListBaseLabel(data)
biz.ErrIsNil(err, "获取规则链Label错误")
rc.ResData = list
}
// GetRuleChain 获取规则链
func (p *RuleChainApi) GetRuleChain(rc *restfulx.ReqCtx) {
id := restfulx.PathParam(rc, "id")
rc.ResData = p.RuleChainApp.FindOne(id)
data, err := p.RuleChainApp.FindOne(id)
biz.ErrIsNil(err, "获取规则链信息错误")
rc.ResData = data
}
// InsertRuleChain 添加规则链
@@ -80,33 +84,38 @@ func (p *RuleChainApi) InsertRuleChain(rc *restfulx.ReqCtx) {
data.Id = model2.GenerateID()
data.Owner = rc.LoginAccount.UserName
data.OrgId = rc.LoginAccount.OrganizationId
p.RuleChainApp.Insert(data)
_, err := p.RuleChainApp.Insert(data)
biz.ErrIsNil(err, "添加规则链错误")
}
// UpdateRuleChain 修改规则链
func (p *RuleChainApi) UpdateRuleChain(rc *restfulx.ReqCtx) {
var data entity.RuleChain
restfulx.BindJsonAndValid(rc, &data)
p.RuleChainApp.Update(data)
_, err := p.RuleChainApp.Update(data)
biz.ErrIsNil(err, "修改规则链错误")
}
// DeleteRuleChain 删除规则链
func (p *RuleChainApi) DeleteRuleChain(rc *restfulx.ReqCtx) {
id := restfulx.PathParam(rc, "id")
one := p.RuleChainApp.FindOne(id)
one, err := p.RuleChainApp.FindOne(id)
biz.ErrIsNil(err, "规则链不存在")
biz.IsTrue(!(one.Root == "1"), "主链不可被删除")
ids := strings.Split(id, ",")
p.RuleChainApp.Delete(ids)
biz.ErrIsNil(p.RuleChainApp.Delete(ids), "删除规则链失败")
}
// CloneRuleChain 克隆规则链
func (p *RuleChainApi) CloneRuleChain(rc *restfulx.ReqCtx) {
id := restfulx.PathParam(rc, "id")
one := p.RuleChainApp.FindOne(id)
one, err := p.RuleChainApp.FindOne(id)
biz.ErrIsNil(err, "规则链不存在")
one.RuleName = one.RuleName + "-克隆"
one.Id = model2.GenerateID()
one.Root = "0"
p.RuleChainApp.Insert(*one)
_, err = p.RuleChainApp.Insert(*one)
biz.ErrIsNil(err, "克隆规则链失败")
}
// UpdateRuleRoot 修改根链
@@ -117,5 +126,6 @@ func (p *RuleChainApi) UpdateRuleRoot(rc *restfulx.ReqCtx) {
err := p.RuleChainApp.UpdateByRoot()
biz.ErrIsNil(err, "修改主链错误")
// 修改当前链为主链
p.RuleChainApp.Update(rule)
_, err = p.RuleChainApp.Update(rule)
biz.ErrIsNil(err, "修改当前链为主链错误")
}

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

@@ -3,6 +3,7 @@ package api
import (
"pandax/apps/rule/entity"
"pandax/apps/rule/services"
"pandax/kit/biz"
"pandax/kit/model"
"pandax/kit/restfulx"
"pandax/pkg/rule_engine/nodes"
@@ -27,8 +28,8 @@ func (p *RuleChainMsgLogApi) GetRuleChainMsgLogList(rc *restfulx.ReqCtx) {
data.RoleId = rc.LoginAccount.RoleId
data.Owner = rc.LoginAccount.UserName
list, total := p.RuleChainMsgLogApp.FindListPage(pageNum, pageSize, data)
list, total, err := p.RuleChainMsgLogApp.FindListPage(pageNum, pageSize, data)
biz.ErrIsNil(err, "查询规则链日志列表失败")
rc.ResData = model.ResultPage{
Total: total,
PageNum: int64(pageNum),
@@ -42,5 +43,5 @@ func (p *RuleChainMsgLogApi) DeleteRuleChainMsgLog(rc *restfulx.ReqCtx) {
data := entity.RuleChainMsgLog{}
data.DeviceName = restfulx.QueryParam(rc, "deviceName")
data.MsgType = restfulx.QueryParam(rc, "msgType")
p.RuleChainMsgLogApp.Delete(data)
biz.ErrIsNil(p.RuleChainMsgLogApp.Delete(data), "删除规则链日志失败")
}