|
@@ -19,8 +19,8 @@ import (
|
|
|
)
|
|
|
|
|
|
type KeyType struct {
|
|
|
- Name string
|
|
|
- Url string
|
|
|
+ Name string `json:"name"`
|
|
|
+ Url string `json:"url"`
|
|
|
}
|
|
|
|
|
|
// RegionAndInformationAndTender 1地域 2信息类型 3热门招标
|
|
@@ -61,9 +61,9 @@ func HotSubjectMatter() []map[string]interface{} {
|
|
|
}
|
|
|
|
|
|
// ContentRecommendation 实用内容推荐
|
|
|
-func ContentRecommendation() map[KeyType][]KeyType {
|
|
|
+func ContentRecommendation() []map[KeyType][]KeyType {
|
|
|
if bytes, err := redis.GetBytes(RedisNameNew, "contentRecommendation"); err == nil && bytes != nil {
|
|
|
- rData := make(map[KeyType][]KeyType)
|
|
|
+ var rData []map[KeyType][]KeyType
|
|
|
log.Println()
|
|
|
if err := json.Unmarshal(*bytes, &rData); err != nil {
|
|
|
log.Printf("[MANAGER-ERR]contentRecommendation GetData Error %v \n", err)
|
|
@@ -78,8 +78,8 @@ func ContentRecommendation() map[KeyType][]KeyType {
|
|
|
jySchoolUrl, _ := config.Sysconfig["jySchoolUrl"].(map[string]interface{})
|
|
|
column, ok := mongodb.Find("column", map[string]interface{}{"$or": []map[string]interface{}{
|
|
|
{"pid": "ztbgl"}, {"pid": "hyzx"}, {"pid": "bzzx"},
|
|
|
- }}, "", "", false, -1, -1)
|
|
|
- data := make(map[KeyType][]KeyType)
|
|
|
+ }}, `{"i_order":1}`, "", false, -1, -1)
|
|
|
+ dataMap := make(map[KeyType][]KeyType)
|
|
|
if ok && column != nil && len(*column) > 0 {
|
|
|
for _, v := range *column {
|
|
|
pid := qu.InterfaceToStr(v["pid"])
|
|
@@ -99,11 +99,20 @@ func ContentRecommendation() map[KeyType][]KeyType {
|
|
|
v2.Url = "/helpCenter/index"
|
|
|
v1.Url = fmt.Sprintf("/helpCenter/catalog/%s", code)
|
|
|
}
|
|
|
- data[v2] = append(data[v2], v1)
|
|
|
+ dataMap[v2] = append(dataMap[v2], v1)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ dataArr := []KeyType{{Name: "招投标攻略", Url: qu.InterfaceToStr(jySchoolUrl["homeUrl"])},
|
|
|
+ {"行业资讯", qu.InterfaceToStr(industryInfoUrl["homeUrl"])},
|
|
|
+ {"帮助中心", "/helpCenter/index"}}
|
|
|
+ var data []map[KeyType][]KeyType
|
|
|
+ for _, v := range dataArr {
|
|
|
+ if v1, ok1 := dataMap[v]; ok1 && v1 != nil {
|
|
|
+ data = append(data, map[KeyType][]KeyType{v: dataMap[v]})
|
|
|
}
|
|
|
}
|
|
|
if bytes, err := json.Marshal(data); err == nil && bytes != nil {
|
|
|
- _ = redis.PutBytes(RedisNameNew, "contentRecommendation", &bytes, 2*60*60)
|
|
|
+ _ = redis.PutBytes(RedisNameNew, "contentRecommendation", &bytes, 12*60*60)
|
|
|
}
|
|
|
return data
|
|
|
}
|