重构提取逻辑，新增 area 表

web/services/channel_gost.go

@@ -9,12 +9,14 @@ import (
 	m "platform/web/models"
 	q "platform/web/queries"
 	"strings"
+
+	"gorm.io/gen"
 )
 
 type channelGostProvider struct{}
 
 func (s *channelGostProvider) prepareCreate(ctx *channelCreateContext) (*channelCreateResult, error) {
-	edges, err := s.selectEdge(ctx.Filter, ctx.Count)
+	edges, err := s.selectEdge(ctx.Filter, ctx.Area, ctx.Count)
 	if err != nil {
 		return nil, err
 	}
@@ -131,26 +133,38 @@ func (s *channelGostProvider) selectProxy(count int) (*m.Proxy, error) {
 	return selectProxyByType(m.ProxyTypeGost, count)
 }
 
-func (s *channelGostProvider) selectEdge(filter *EdgeFilter, count int) ([]*m.Edge, error) {
+func (s *channelGostProvider) selectEdge(filter *EdgeFilter, area *m.Area, count int) ([]*m.Edge, error) {
 	if filter == nil {
 		filter = &EdgeFilter{}
 	}
 
-	do := q.Edge.Where(
+	conds := []gen.Condition{
 		q.Edge.Type.Eq(int(m.EdgeTypeGostChain)),
 		q.Edge.Status.Eq(int(m.EdgeStatusNormal)),
-	)
-	if prov := u.N(filter.Prov); prov != nil {
-		do = do.Where(q.Edge.Prov.Eq(*prov))
-	}
-	if city := u.N(filter.City); city != nil {
-		do = do.Where(q.Edge.City.Eq(*city))
 	}
 	if isp := u.X(filter.Isp.String()); isp != nil {
-		do = do.Where(q.Edge.ISP.Eq(int(*filter.Isp)))
+		conds = append(conds, q.Edge.ISP.Eq(int(*filter.Isp)))
 	}
 
-	edges, err := q.Edge.Where(do).Order(q.Edge.ID).Limit(count).Find()
+	query := q.Edge.Where(conds...)
+	if area != nil {
+		switch area.Level {
+		case m.AreaLevelProvince:
+			edgeArea := q.Area.As("EdgeArea")
+			query = query.
+				Join(edgeArea, edgeArea.ID.EqCol(q.Edge.AreaID)).
+				Where(edgeArea.ParentID.Eq(area.ID))
+		case m.AreaLevelCity:
+			query = query.Where(q.Edge.AreaID.Eq(area.ID))
+		default:
+			return nil, core.NewBizErr("地区层级不支持")
+		}
+	}
+
+	edges, err := query.
+		Order(q.Edge.ID).
+		Limit(count).
+		Find()
 	if err != nil {
 		return nil, core.NewBizErr("查询可用节点失败", err)
 	}