|
@@ -146,7 +146,7 @@ func UserHandle() {
|
|
func searchHandle(start, end int64) {
|
|
func searchHandle(start, end int64) {
|
|
startTime := primitive.NewObjectIDFromTimestamp(time.Unix(start, 0))
|
|
startTime := primitive.NewObjectIDFromTimestamp(time.Unix(start, 0))
|
|
endTime := primitive.NewObjectIDFromTimestamp(time.Unix(end, 0))
|
|
endTime := primitive.NewObjectIDFromTimestamp(time.Unix(end, 0))
|
|
- logx.Info("start。。。", start, end)
|
|
|
|
|
|
+ logx.Info("start。。。", start, end, startTime, endTime)
|
|
sess := MgoLog.GetMgoConn()
|
|
sess := MgoLog.GetMgoConn()
|
|
defer MgoLog.DestoryMongoConn(sess)
|
|
defer MgoLog.DestoryMongoConn(sess)
|
|
it := sess.DB("qfw").C("jy_search_log").Find(map[string]interface{}{
|
|
it := sess.DB("qfw").C("jy_search_log").Find(map[string]interface{}{
|
|
@@ -238,7 +238,11 @@ func ContentHandle(start, end int64) {
|
|
"$gte": startTime,
|
|
"$gte": startTime,
|
|
"$lt": endTime,
|
|
"$lt": endTime,
|
|
},
|
|
},
|
|
- }).Sort("_id").Select(map[string]interface{}{}).Iter()
|
|
|
|
|
|
+ }).Sort("_id").Select(map[string]interface{}{
|
|
|
|
+ "date": 1,
|
|
|
|
+ "url": 1,
|
|
|
|
+ "userid": 1,
|
|
|
|
+ }).Iter()
|
|
for m := make(map[string]interface{}); it.Next(&m); {
|
|
for m := make(map[string]interface{}); it.Next(&m); {
|
|
numb++
|
|
numb++
|
|
if numb%1000 == 0 {
|
|
if numb%1000 == 0 {
|
|
@@ -255,7 +259,11 @@ func ContentHandle(start, end int64) {
|
|
"$gte": startTime,
|
|
"$gte": startTime,
|
|
"$lt": endTime,
|
|
"$lt": endTime,
|
|
},
|
|
},
|
|
- }).Sort("_id").Select(map[string]interface{}{}).Iter()
|
|
|
|
|
|
+ }).Sort("_id").Select(map[string]interface{}{
|
|
|
|
+ "date": 1,
|
|
|
|
+ "url": 1,
|
|
|
|
+ "userid": 1,
|
|
|
|
+ }).Iter()
|
|
for m := make(map[string]interface{}); it1.Next(&m); {
|
|
for m := make(map[string]interface{}); it1.Next(&m); {
|
|
numb++
|
|
numb++
|
|
if numb%1000 == 0 {
|
|
if numb%1000 == 0 {
|
|
@@ -307,18 +315,18 @@ func InformationHandle(m map[string]interface{}, data map[string][]map[string]in
|
|
//分类标签,bidding表gov_classify.root,过滤掉只有一级的,取最后一级
|
|
//分类标签,bidding表gov_classify.root,过滤掉只有一级的,取最后一级
|
|
rootStr := ""
|
|
rootStr := ""
|
|
if _, ok := biddingInfo[infoId]; !ok {
|
|
if _, ok := biddingInfo[infoId]; !ok {
|
|
- bidding, _ := MgoBidding.FindById("bidding", infoId, "gov_classify")
|
|
|
|
|
|
+ bidding, _ := MgoBidding.FindById("bidding", infoId, `{"gov_classify":1}`)
|
|
biddingInfo[infoId] = ""
|
|
biddingInfo[infoId] = ""
|
|
- if bidding != nil {
|
|
|
|
|
|
+ if bidding == nil {
|
|
return
|
|
return
|
|
}
|
|
}
|
|
gov_classify := gconv.Map((*bidding)["gov_classify"])
|
|
gov_classify := gconv.Map((*bidding)["gov_classify"])
|
|
- if gov_classify == nil {
|
|
|
|
|
|
+ if gov_classify != nil {
|
|
root := strings.Split(gconv.String(gov_classify["root"]), "/")
|
|
root := strings.Split(gconv.String(gov_classify["root"]), "/")
|
|
if len(root) == 0 {
|
|
if len(root) == 0 {
|
|
return
|
|
return
|
|
} else {
|
|
} else {
|
|
- for i := len(root) - 1; i >= 0; i-- {
|
|
|
|
|
|
+ for i := len(root) - 1; i >= 1; i-- {
|
|
if root[i] != "" {
|
|
if root[i] != "" {
|
|
rootStr = root[i]
|
|
rootStr = root[i]
|
|
biddingInfo[infoId] = rootStr
|
|
biddingInfo[infoId] = rootStr
|