feat：完善项目信息

2022-01-12 17:29:05 +08:00
parent 4ec0953a29
commit 5ca8b3f7ff
18 changed files with 281 additions and 255 deletions
--- a/app/api/website/controller/index.go
+++ b/app/api/website/controller/index.go
@ -61,11 +61,26 @@ func (c *Index) industry(src, sep string) map[string]int {
 		_ = utils.FromJSON(value, &_values)

 		for _, v := range _values {
-			if _, has := out[v]; has {
-				out[v]++
+			// 解析
+			title := "未知"
+
+			_industry := make([]string, 0)
+
+			objs := strings.Split(v, "-")
+
+			for _, obj := range objs {
+				if data, has := config2.MemoryForIndustryInfo[obj]; has {
+					_industry = append(_industry, data)
+				}
+			}
+			if len(_industry) > 0 {
+				title = strings.Join(_industry, "-")
+			}
+			if _, has := out[title]; has {
+				out[title]++
 				continue
 			}
-			out[v] = 1
+			out[title] = 1
 		}
 	}
 	return out
@ -85,7 +100,7 @@ func (c *Index) distribution(src []*model.DataAreaDistributionInfo) map[string]*
 				Code:     v.Province,
 				Name:     config2.MemoryForAreaInfo[config.DefaultChinaAreaCode][v.Province],
 				Industry: make(map[string]int, 0),
-				Count:    105,
+				Count:    1,
 				Children: make(map[string]*InstanceDistributionDetailInfo, 0),
 			}
 			goto NEXT1
@ -96,7 +111,7 @@ func (c *Index) distribution(src []*model.DataAreaDistributionInfo) map[string]*
 			if _, has = out[v.Province].Children[v.City]; !has {
 				out[v.Province].Children[v.City] = &InstanceDistributionDetailInfo{
 					Code:     v.City,
-					Count:    105,
+					Count:    1,
 					Name:     config2.MemoryForAreaInfo[v.Province][v.City],
 					Industry: make(map[string]int, 0),
 					Children: make(map[string]*InstanceDistributionDetailInfo, 0),
@ -112,7 +127,7 @@ func (c *Index) distribution(src []*model.DataAreaDistributionInfo) map[string]*
 			if _, has = out[v.Province].Children[v.City].Children[v.District]; !has {
 				out[v.Province].Children[v.City].Children[v.District] = &InstanceDistributionDetailInfo{
 					Code:     v.District,
-					Count:    105,
+					Count:    1,
 					Name:     config2.MemoryForAreaInfo[v.City][v.District],
 					Industry: industrys,
 				}
@ -204,73 +219,6 @@ func (c *Index) DistributionExpert(province, city string) (map[string]*InstanceD
 	}
 	_out := c.distribution(out)
 	c.filter(_out)
-	_out["500000"] = &InstanceDistributionDetailInfo{
-		Code:     "500000",
-		Name:     "重庆",
-		Count:    300,
-		Industry: nil,
-		Children: map[string]*InstanceDistributionDetailInfo{
-			"500100": &InstanceDistributionDetailInfo{
-				Code:     "500100",
-				Name:     "市辖区",
-				Count:    300,
-				Industry: nil,
-				Children: nil,
-			},
-		},
-	}
-	_out["630000"] = &InstanceDistributionDetailInfo{
-		Code:     "630000",
-		Name:     "青海省",
-		Count:    1200,
-		Industry: nil,
-		Children: map[string]*InstanceDistributionDetailInfo{
-			"630200": &InstanceDistributionDetailInfo{
-				Code:     "630200",
-				Name:     "海东市",
-				Count:    1200,
-				Industry: nil,
-				Children: nil,
-			},
-		},
-	}
-	_out["230000"] = &InstanceDistributionDetailInfo{
-		Code:     "230000",
-		Name:     "黑龙江",
-		Count:    6000,
-		Industry: nil,
-		Children: map[string]*InstanceDistributionDetailInfo{
-			"230100": &InstanceDistributionDetailInfo{
-				Code:     "230100",
-				Name:     "哈尔滨市",
-				Count:    3000,
-				Industry: nil,
-				Children: nil,
-			},
-			"230200": &InstanceDistributionDetailInfo{
-				Code:     "230200",
-				Name:     "齐齐哈尔市",
-				Count:    3000,
-				Industry: nil,
-				Children: nil,
-			},
-		},
-	}
-	_out["330000"] = &InstanceDistributionDetailInfo{
-		Code:     "330000",
-		Name:     "浙江省",
-		Count:    5000,
-		Industry: nil,
-		Children: map[string]*InstanceDistributionDetailInfo{
-			"330100": &InstanceDistributionDetailInfo{
-				Code:     "330100",
-				Name:     "杭州市",
-				Count:    5000,
-				Industry: nil,
-				Children: nil,
-			},
-		},
-	}
 	return _out, nil
 }

@ -284,43 +232,6 @@ func (c *Index) DistributionLaboratory(province, city string) (map[string]*Insta
 	}
 	_out := c.distribution(out)
 	c.filter(_out)
-	_out["230000"] = &InstanceDistributionDetailInfo{
-		Code:     "230000",
-		Name:     "黑龙江",
-		Count:    1000,
-		Industry: nil,
-		Children: map[string]*InstanceDistributionDetailInfo{
-			"230100": &InstanceDistributionDetailInfo{
-				Code:     "230100",
-				Name:     "哈尔滨市",
-				Count:    500,
-				Industry: nil,
-				Children: nil,
-			},
-			"230200": &InstanceDistributionDetailInfo{
-				Code:     "230200",
-				Name:     "齐齐哈尔市",
-				Count:    500,
-				Industry: nil,
-				Children: nil,
-			},
-		},
-	}
-	_out["330000"] = &InstanceDistributionDetailInfo{
-		Code:     "330000",
-		Name:     "浙江省",
-		Count:    5000,
-		Industry: nil,
-		Children: map[string]*InstanceDistributionDetailInfo{
-			"330100": &InstanceDistributionDetailInfo{
-				Code:     "330100",
-				Name:     "杭州市",
-				Count:    5000,
-				Industry: nil,
-				Children: nil,
-			},
-		},
-	}
 	return _out, nil
 }

@ -334,43 +245,6 @@ func (c *Index) DistributionDemand(province, city string) (map[string]*InstanceD
 	}
 	_out := c.distribution(out)
 	c.filter(_out)
-	_out["230000"] = &InstanceDistributionDetailInfo{
-		Code:     "230000",
-		Name:     "黑龙江",
-		Count:    6000,
-		Industry: nil,
-		Children: map[string]*InstanceDistributionDetailInfo{
-			"230100": &InstanceDistributionDetailInfo{
-				Code:     "230100",
-				Name:     "哈尔滨市",
-				Count:    3000,
-				Industry: nil,
-				Children: nil,
-			},
-			"230200": &InstanceDistributionDetailInfo{
-				Code:     "230200",
-				Name:     "齐齐哈尔市",
-				Count:    3000,
-				Industry: nil,
-				Children: nil,
-			},
-		},
-	}
-	_out["330000"] = &InstanceDistributionDetailInfo{
-		Code:     "330000",
-		Name:     "浙江省",
-		Count:    5000,
-		Industry: nil,
-		Children: map[string]*InstanceDistributionDetailInfo{
-			"330100": &InstanceDistributionDetailInfo{
-				Code:     "330100",
-				Name:     "杭州市",
-				Count:    5000,
-				Industry: nil,
-				Children: nil,
-			},
-		},
-	}
 	return _out, nil
 }

@ -384,43 +258,6 @@ func (c *Index) DistributionPatent(province, city string) (map[string]*InstanceD
 	}
 	_out := c.distribution(out)
 	c.filter(_out)
-	_out["230000"] = &InstanceDistributionDetailInfo{
-		Code:     "230000",
-		Name:     "黑龙江",
-		Count:    6000,
-		Industry: nil,
-		Children: map[string]*InstanceDistributionDetailInfo{
-			"230100": &InstanceDistributionDetailInfo{
-				Code:     "230100",
-				Name:     "哈尔滨市",
-				Count:    3000,
-				Industry: nil,
-				Children: nil,
-			},
-			"230200": &InstanceDistributionDetailInfo{
-				Code:     "230200",
-				Name:     "齐齐哈尔市",
-				Count:    3000,
-				Industry: nil,
-				Children: nil,
-			},
-		},
-	}
-	_out["330000"] = &InstanceDistributionDetailInfo{
-		Code:     "330000",
-		Name:     "浙江省",
-		Count:    5000,
-		Industry: nil,
-		Children: map[string]*InstanceDistributionDetailInfo{
-			"330100": &InstanceDistributionDetailInfo{
-				Code:     "330100",
-				Name:     "杭州市",
-				Count:    5000,
-				Industry: nil,
-				Children: nil,
-			},
-		},
-	}
 	return _out, nil
 }

@ -435,44 +272,6 @@ func (c *Index) DistributionAchievement(province, city string) (map[string]*Inst
 	}
 	_out := c.distribution(out)
 	c.filter(_out)
-
-	_out["230000"] = &InstanceDistributionDetailInfo{
-		Code:     "230000",
-		Name:     "黑龙江",
-		Count:    6000,
-		Industry: nil,
-		Children: map[string]*InstanceDistributionDetailInfo{
-			"230100": &InstanceDistributionDetailInfo{
-				Code:     "230100",
-				Name:     "哈尔滨市",
-				Count:    3000,
-				Industry: nil,
-				Children: nil,
-			},
-			"230200": &InstanceDistributionDetailInfo{
-				Code:     "230200",
-				Name:     "齐齐哈尔市",
-				Count:    3000,
-				Industry: nil,
-				Children: nil,
-			},
-		},
-	}
-	_out["330000"] = &InstanceDistributionDetailInfo{
-		Code:     "330000",
-		Name:     "浙江省",
-		Count:    5000,
-		Industry: nil,
-		Children: map[string]*InstanceDistributionDetailInfo{
-			"330100": &InstanceDistributionDetailInfo{
-				Code:     "330100",
-				Name:     "杭州市",
-				Count:    5000,
-				Industry: nil,
-				Children: nil,
-			},
-		},
-	}
 	return _out, nil
 }

--- a/app/api/website/controller/navigation.go
+++ b/app/api/website/controller/navigation.go
@ -12,6 +12,7 @@ type NavigationHandle func() *Navigation
 type NavigationInfo struct {
 	Title    string            `json:"title"`
 	Link     string            `json:"link"`
+	IsTarget bool              `json:"is_target"`
 	Children []*NavigationInfo `json:"children"`
 }

@ -24,6 +25,7 @@ func (c *Navigation) tree(src []*model2.SysNavigation, parentID uint64) []*Navig
 			out = append(out, &NavigationInfo{
 				Title:    v.Title,
 				Link:     v.Link,
+				IsTarget: v.IsTarget > 0,
 				Children: c.tree(src, v.ID),
 			})
 		}