辽宁日志

spider2/src/client/ecps/ln/downcontent.go

@@ -18,10 +18,10 @@ import (
 )
 
 //下载3级页
-func downloadContent(param map[string]interface{}) bool {
+func downloadContent(param map[string]interface{}) (bool, map[string]interface{}) {
 	query := param["query"]
 	if query == nil {
-		return false
+		return false, nil
 	}
 	//log.Println(query)
 	//query = "211200004026325"
@@ -81,16 +81,16 @@ func downloadContent(param map[string]interface{}) bool {
 	reult_no_int := strings.Index(string(listbs), "您搜索的条件无查询结果")
 	if reult_no_int > -1 {
 		log.Println(query, "无对应查询结果")
-		return false
+		return false, nil
 	}
 	doc, _ := goquery.NewDocumentFromReader(bytes.NewBuffer(listbs))
 	info := getListInfo(doc)
 	if info == nil || info["regno"] == nil {
-		return false
+		return false, nil
 	}
 	regno := info["regno"].(string)
 	if regno == "" {
-		return false
+		return false, nil
 	}
 	pripid := info["pripid"].(string)
 	entname := info["entname"].(string)
@@ -123,7 +123,7 @@ func downloadContent(param map[string]interface{}) bool {
 		DisableKeepAlive: true,
 	})
 	if err != nil {
-		return false
+		return false, nil
 	}
 	entinfo[JBXX] = string(bs)
 
@@ -142,7 +142,7 @@ func downloadContent(param map[string]interface{}) bool {
 		DisableKeepAlive: true,
 	})
 	if err != nil {
-		return false
+		return false, nil
 	}
 	entinfo[TZRXX] = string(bs)
 
@@ -161,7 +161,7 @@ func downloadContent(param map[string]interface{}) bool {
 		DisableKeepAlive: true,
 	})
 	if err != nil {
-		return false
+		return false, nil
 	}
 	entinfo[BGXX] = string(bs)
 
@@ -245,7 +245,7 @@ func downloadContent(param map[string]interface{}) bool {
 		DisableKeepAlive: true,
 	})
 	if err != nil {
-		return false
+		return false, nil
 	}
 	//找出来年报明细
 	arr := []interface{}{}
@@ -288,9 +288,9 @@ func downloadContent(param map[string]interface{}) bool {
 		q := make(map[string]interface{})
 		q["RegNo"] = infoMap["RegNo"]
 		mongodb.Update("entintime", q, ent, true, false)
-		return true
+		return true, infoMap
 	} else {
-		return false
+		return false, nil
 	}
 }
 

spider2/src/client/ecps/ln/spider.go

@@ -85,16 +85,16 @@ func downList() {
 			}
 			ent := *mongodb.FindOne("entintime", `{"$and":[{"intime":{"$gt":`+fmt.Sprint(time.Now().Unix()-int64(rate)*24*60*60)+`}},{"$or":[{"RegNo":"`+fmt.Sprint(tmp["query"])+`"},{"EntName":"`+fmt.Sprint(tmp["query"])+`"}]}]}`)
 			if ent != nil {
-				log.Println(fmt.Sprint(tmp) + ",根据配置频率跳过")
-				putLogs(fmt.Sprint(tmp)+",根据配置频率跳过", 1)
+				log.Println(fmt.Sprint(ent["EntName"]) + ",根据配置频率跳过")
+				putLogs(":"+fmt.Sprint(ent["EntName"])+",根据配置频率跳过", 1)
 				Lists.Remove(e)
 				continue
 			}
-			b := downloadContent(tmp)
+			b, info := downloadContent(tmp)
 			Lists.Remove(e)
 			if b {
-				log.Println("成功下载：", tmp)
-				putLogs("成功下载："+fmt.Sprint(tmp), 1)
+				log.Println("成功下载：", info["EntName"])
+				putLogs("成功下载："+fmt.Sprint(info["EntName"]), 1)
 			} else {
 				log.Println("下载失败：", tmp)
 				putLogs("下载失败："+fmt.Sprint(tmp), 1)