|
|
@@ -49,36 +49,53 @@ func (p *Pcsearch) PcSearchIndex() error {
|
|
|
defer util.Catch()
|
|
|
var shareid = p.GetString("id")
|
|
|
p.T["logid"] = config.Seoconfig["jysslby"].(string)
|
|
|
- if len(shareid) == 0 {
|
|
|
- shareid = fmt.Sprintf("%s%d", config.Seoconfig["jysslby"].(string)+fmt.Sprintf("%d", time.Now().UnixNano())[8:14], rand.Intn(9))
|
|
|
- }
|
|
|
- industryData, ok := mongodb.Find("rc_rule", `{"s_name":{$ne:null}}`, `{"i_order":1}`, `{"_id":1,"s_name":1}`, false, -1, -1)
|
|
|
- if ok && industryData != nil && len(*industryData) > 0 {
|
|
|
- industry := map[string][]string{}
|
|
|
- sortArray := []string{}
|
|
|
- for _, v := range *industryData {
|
|
|
- fatFlag := 0
|
|
|
- //childFlag := 0
|
|
|
- industryname, _ := v["s_name"].(string)
|
|
|
- if strings.Contains(industryname, "_") {
|
|
|
- fat := strings.Split(industryname, "_")[0]
|
|
|
- child := strings.Split(industryname, "_")[1]
|
|
|
- if len(industry[fat]) == 0 {
|
|
|
- sortArray = append(sortArray, fat)
|
|
|
+ industryname := config.Sysconfig["industry"].(string)
|
|
|
+ classdata, ok1 := mongodb.FindOneByField("rc_task", `{"s_name":"`+industryname+`"}`, `{"s_class":1}`)
|
|
|
+ if ok1 && len(*classdata) > 0 {
|
|
|
+ log.Println("---:", (*classdata)["s_class"])
|
|
|
+ classid := ""
|
|
|
+ if util.ObjToString((*classdata)["s_class"]) != "" {
|
|
|
+ classids := strings.Split(util.ObjToString((*classdata)["s_class"]), ",")
|
|
|
+ for k, v := range classids {
|
|
|
+ if k > 0 {
|
|
|
+ classid += `,`
|
|
|
}
|
|
|
- for _, fv := range industry[fat] {
|
|
|
- if fv == strings.Trim(child, " ") {
|
|
|
- fatFlag = 1
|
|
|
- break
|
|
|
+ classid += `"` + v + `"`
|
|
|
+ }
|
|
|
+ }
|
|
|
+ log.Println("caid:", classid)
|
|
|
+ if len(shareid) == 0 {
|
|
|
+ shareid = fmt.Sprintf("%s%d", config.Seoconfig["jysslby"].(string)+fmt.Sprintf("%d", time.Now().UnixNano())[8:14], rand.Intn(9))
|
|
|
+ }
|
|
|
+ industryData, ok := mongodb.Find("rc_rule", `{"s_pid":{$ne:""},"s_classid":{$in:["592f8c14e13823494a0ef74d","5955b9d2e13823524f1c83f3","5955e200e13823050ee481ce","595cb06ae138233628af3a44","595cb0b4e138233628af3a45","597ed6cbe1382369578abf54"]}}`, `{"i_order":1}`, `{"_id":1,"s_name":1}`, false, -1, -1)
|
|
|
+ log.Println("chaud:", len(*industryData))
|
|
|
+ if ok && industryData != nil && len(*industryData) > 0 {
|
|
|
+ industry := map[string][]string{}
|
|
|
+ sortArray := []string{}
|
|
|
+ for _, v := range *industryData {
|
|
|
+ fatFlag := 0
|
|
|
+ //childFlag := 0
|
|
|
+ industryname, _ := v["s_name"].(string)
|
|
|
+ if strings.Contains(industryname, "_") {
|
|
|
+ fat := strings.Split(industryname, "_")[0]
|
|
|
+ child := strings.Split(industryname, "_")[1]
|
|
|
+ if len(industry[fat]) == 0 {
|
|
|
+ sortArray = append(sortArray, fat)
|
|
|
+ }
|
|
|
+ for _, fv := range industry[fat] {
|
|
|
+ if fv == strings.Trim(child, " ") {
|
|
|
+ fatFlag = 1
|
|
|
+ break
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if fatFlag != 1 {
|
|
|
+ industry[fat] = append(industry[fat], child)
|
|
|
}
|
|
|
- }
|
|
|
- if fatFlag != 1 {
|
|
|
- industry[fat] = append(industry[fat], child)
|
|
|
}
|
|
|
}
|
|
|
+ p.T["industry"] = industry
|
|
|
+ p.T["sortArray"] = sortArray
|
|
|
}
|
|
|
- p.T["industry"] = industry
|
|
|
- p.T["sortArray"] = sortArray
|
|
|
}
|
|
|
p.DisableHttpCache()
|
|
|
Newbids()
|
|
|
@@ -109,6 +126,7 @@ func Newbids() {
|
|
|
}
|
|
|
for i := 0; i < 10; i++ {
|
|
|
_, list = getLastNewsData("", "", "", "", "", intns[i], true)
|
|
|
+ bidListConvert("", list)
|
|
|
for k, v := range *list {
|
|
|
v["k"] = (k + 1) + i*50
|
|
|
t := time.Unix(util.Int64All(v["publishtime"]), 0)
|
