浏览代码

更新规则链管理接口

liuxiulin 2 年之前
父节点
当前提交
bd0510216e

+ 1 - 1
services/knowoapi/model/relation.go

@@ -22,7 +22,7 @@ func (a *Relation) Init(db *gorm.DB) *Relation {
 func (a *Relation) Query(pi, ps int, chanId string) (datas []models.Relation, total int, err error) {
 func (a *Relation) Query(pi, ps int, chanId string) (datas []models.Relation, total int, err error) {
 	tx := a.db.Where("1=1")
 	tx := a.db.Where("1=1")
 	if chanId != "" {
 	if chanId != "" {
-		tx = tx.Where("rule_chan_id = ?", chanId)
+		tx = tx.Where("rule_chain_id = ?", chanId)
 	}
 	}
 	err = tx.Limit(ps).Offset((pi - 1) * ps).Find(&datas).Error
 	err = tx.Limit(ps).Offset((pi - 1) * ps).Find(&datas).Error
 	err = tx.Model(&models.Relation{}).Count(&total).Error
 	err = tx.Model(&models.Relation{}).Count(&total).Error

+ 1 - 1
services/knowoapi/model/rule_node.go

@@ -22,7 +22,7 @@ func (a *RuleNode) Init(db *gorm.DB) *RuleNode {
 func (a *RuleNode) Query(pi, ps int, chanId string) (datas []models.RuleNode, total int, err error) {
 func (a *RuleNode) Query(pi, ps int, chanId string) (datas []models.RuleNode, total int, err error) {
 	tx := a.db.Where("1=1")
 	tx := a.db.Where("1=1")
 	if chanId != "" {
 	if chanId != "" {
-		tx = tx.Where("rule_chan_id = ?", chanId)
+		tx = tx.Where("rule_chain_id = ?", chanId)
 	}
 	}
 	err = tx.Limit(ps).Offset((pi - 1) * ps).Find(&datas).Error
 	err = tx.Limit(ps).Offset((pi - 1) * ps).Find(&datas).Error
 	err = tx.Model(&models.RuleNode{}).Count(&total).Error
 	err = tx.Model(&models.RuleNode{}).Count(&total).Error

+ 2 - 2
services/knowoapi/services/rule_chain.go

@@ -166,7 +166,7 @@ func (a ruleChainService) Delete(ruleChain *models.RuleChain) error {
 	reply := new(rpcs.ReplyEmptyResult)
 	reply := new(rpcs.ReplyEmptyResult)
 	err = server.RPCCallByName(nil, rpcs.ControllerName, "Controller.DeleteRuleChain", &params, &reply)
 	err = server.RPCCallByName(nil, rpcs.ControllerName, "Controller.DeleteRuleChain", &params, &reply)
 	if err != nil {
 	if err != nil {
-		server.Log.Errorf("create ruleChan error : %v", err)
+		server.Log.Errorf("delete ruleChan error : %v", err)
 		return err
 		return err
 	}
 	}
 	return nil
 	return nil
@@ -216,7 +216,7 @@ func (a ruleChainService) Update(ruleChain *models.RuleChain) error {
 	reply := new(rpcs.ReplyEmptyResult)
 	reply := new(rpcs.ReplyEmptyResult)
 	err = server.RPCCallByName(nil, rpcs.ControllerName, "Controller.UpdateRuleChain", &params, &reply)
 	err = server.RPCCallByName(nil, rpcs.ControllerName, "Controller.UpdateRuleChain", &params, &reply)
 	if err != nil {
 	if err != nil {
-		server.Log.Errorf("create ruleChan error : %v", err)
+		server.Log.Errorf("update ruleChan error : %v", err)
 		return err
 		return err
 	}
 	}
 	return nil
 	return nil