|
@@ -236,13 +236,11 @@ func searchHandle(start, end int64) {
|
|
|
func ContentHandle(start, end int64) {
|
|
|
var AppContentInfo = make(map[string][]map[string]interface{})
|
|
|
var numb int64
|
|
|
- /*startTime := primitive.NewObjectIDFromTimestamp(time.Unix(start, 0))
|
|
|
- endTime := primitive.NewObjectIDFromTimestamp(time.Unix(end, 0))*/
|
|
|
startTime := strconv.FormatInt(start, 16) + "0000000000000000"
|
|
|
endTime := strconv.FormatInt(end, 16) + "0000000000000000"
|
|
|
+ logx.Info("三级页浏览数据start。。。", start, end, startTime, endTime)
|
|
|
sess := MgoLog.GetMgoConn()
|
|
|
defer MgoLog.DestoryMongoConn(sess)
|
|
|
- logx.Info("三级页浏览数据start。。。", start, end, startTime, endTime)
|
|
|
//jylog
|
|
|
it := sess.DB("qfw").C("jy_logs").Find(map[string]interface{}{
|
|
|
"_id": map[string]interface{}{
|
|
@@ -326,6 +324,8 @@ func InformationHandle(m map[string]interface{}, data map[string][]map[string]in
|
|
|
//分类标签,bidding表gov_classify.root,过滤掉只有一级的,取最后一级
|
|
|
rootStr := ""
|
|
|
area := ""
|
|
|
+ city := ""
|
|
|
+ district := ""
|
|
|
if _, ok := biddingInfo[infoId]; !ok {
|
|
|
bidding, _ := MgoBidding.FindById("bidding", infoId, `{"gov_classify":1,"area":1}`)
|
|
|
biddingInfo[infoId] = map[string]interface{}{}
|
|
@@ -343,8 +343,10 @@ func InformationHandle(m map[string]interface{}, data map[string][]map[string]in
|
|
|
if root[i] != "" {
|
|
|
rootStr = root[i]
|
|
|
biddingInfo[infoId] = map[string]interface{}{
|
|
|
- "area": area,
|
|
|
- "rootStr": rootStr,
|
|
|
+ "area": area,
|
|
|
+ "city": city,
|
|
|
+ "district": district,
|
|
|
+ "rootStr": rootStr,
|
|
|
}
|
|
|
break
|
|
|
}
|
|
@@ -354,6 +356,8 @@ func InformationHandle(m map[string]interface{}, data map[string][]map[string]in
|
|
|
} else {
|
|
|
rootStr = gconv.String(biddingInfo[infoId]["rootStr"])
|
|
|
area = gconv.String(biddingInfo[infoId]["area"])
|
|
|
+ city = gconv.String(biddingInfo[infoId]["area"])
|
|
|
+ district = gconv.String(biddingInfo[infoId]["district"])
|
|
|
}
|
|
|
if rootStr == "" {
|
|
|
return
|
|
@@ -364,6 +368,8 @@ func InformationHandle(m map[string]interface{}, data map[string][]map[string]in
|
|
|
"datetimeInt": gconv.Int64(m["date"]), //访问时间
|
|
|
"datetime": time.Unix(gconv.Int64(m["date"]), 0).Format("2006-01-02 15:04:05"), //搜索时间
|
|
|
"area": area,
|
|
|
+ "city": city,
|
|
|
+ "district": district,
|
|
|
}
|
|
|
if _, ok := data[userId]; ok {
|
|
|
data[userId] = append(data[userId], searchMap)
|