joylink/rtss-core
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

冗余代码调整

Browse Source
This commit is contained in:
walker-sheng” 2024-07-02 18:34:39 +08:00
parent 13c25c0ba8
commit 8e20a049a4
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
repo/repo.go
View File

@ -174,30 +174,17 @@ func NewLinkNodeAndLinkAndBuildLinkship(ta model.Turnout, tap model.PipePort, tb
nodeb = repo1.getOrBuildLinkNode(tb) nodeb = repo1.getOrBuildLinkNode(tb)
pla = nil pla = nil
plb = model.NewPipeLink(nodeb, tbp) plb = model.NewPipeLink(nodeb, tbp)
exist, link = repo1.isLinkExist(pla, plb)
if exist {
return
}
link = model.NewLink(pla, plb)
link.SetLinkedElement(model.PipePortB, plb)
nodeb.SetLinkedElement(tbp, model.NewPipeLink(link, model.PipePortB))
} else if tb == nil { } else if tb == nil {
nodea = repo1.getOrBuildLinkNode(ta) nodea = repo1.getOrBuildLinkNode(ta)
nodeb = nil nodeb = nil
pla = model.NewPipeLink(nodea, tap) pla = model.NewPipeLink(nodea, tap)
plb = nil plb = nil
exist, link = repo1.isLinkExist(pla, plb)
if exist {
return
}
link = model.NewLink(pla, plb)
link.SetLinkedElement(model.PipePortA, pla)
nodea.SetLinkedElement(tap, model.NewPipeLink(link, model.PipePortA))
} else { } else {
nodea = repo1.getOrBuildLinkNode(ta) nodea = repo1.getOrBuildLinkNode(ta)
nodeb = repo1.getOrBuildLinkNode(tb) nodeb = repo1.getOrBuildLinkNode(tb)
pla = model.NewPipeLink(nodea, tap) pla = model.NewPipeLink(nodea, tap)
plb = model.NewPipeLink(nodeb, tbp) plb = model.NewPipeLink(nodeb, tbp)
}
exist, link = repo1.isLinkExist(pla, plb) exist, link = repo1.isLinkExist(pla, plb)
if exist { if exist {
return return
@ -205,7 +192,10 @@ func NewLinkNodeAndLinkAndBuildLinkship(ta model.Turnout, tap model.PipePort, tb
link = model.NewLink(pla, plb) link = model.NewLink(pla, plb)
link.SetLinkedElement(model.PipePortA, pla) link.SetLinkedElement(model.PipePortA, pla)
link.SetLinkedElement(model.PipePortB, plb) link.SetLinkedElement(model.PipePortB, plb)
if nodea != nil {
nodea.SetLinkedElement(tap, model.NewPipeLink(link, model.PipePortA)) nodea.SetLinkedElement(tap, model.NewPipeLink(link, model.PipePortA))
}
if nodeb != nil {
nodeb.SetLinkedElement(tbp, model.NewPipeLink(link, model.PipePortB)) nodeb.SetLinkedElement(tbp, model.NewPipeLink(link, model.PipePortB))
} }
return return