|
@@ -688,10 +688,14 @@ func NewTaskRunAll(tt *TTask, budp bool, mapInfo map[string]interface{}) int {
|
|
|
//task
|
|
|
tasksess := tt.MgoTask.GetMgoConn()
|
|
|
defer tt.MgoTask.DestoryMongoConn(tasksess)
|
|
|
- log.Println("运行", tt.S_name, "start")
|
|
|
- log.Println("线程数:", tt.I_thread, "查询语句", q)
|
|
|
- log.Println("查询---", tt.S_mgodb, tt.S_coll, tt.S_collection, tt.S_table)
|
|
|
- log.Println("select:", tt.Task_QueryFieldMap, tt.Task_QueryFieldArr)
|
|
|
+ //通过ID 查询数据时,才打印日志
|
|
|
+ if tt.S_querycon == "1" {
|
|
|
+ log.Println("运行", tt.S_name, "start")
|
|
|
+ log.Println("线程数:", tt.I_thread, "查询语句", q)
|
|
|
+ log.Println("查询---", tt.S_mgodb, tt.S_coll, tt.S_collection, tt.S_table)
|
|
|
+ log.Println("select:", tt.Task_QueryFieldMap, tt.Task_QueryFieldArr)
|
|
|
+ }
|
|
|
+
|
|
|
extractquery := tasksess.DB(tt.S_mgodb).C(tt.S_coll).Find(q).Select(tt.Task_QueryFieldMap).Sort("_id").Iter()
|
|
|
arr := [][]map[string]interface{}{}
|
|
|
if tt.I_wordcount == 1 {
|
|
@@ -830,6 +834,11 @@ func NewTaskRunAll(tt *TTask, budp bool, mapInfo map[string]interface{}) int {
|
|
|
//res[tt.S_attr] = 1
|
|
|
res[tt.S_attr] = tt.AttrVal
|
|
|
}
|
|
|
+ //通过时间 查询数据 分类时,添加分类更新时间;主要针对bidding_nomal bidding_file;
|
|
|
+ if tt.S_querycon != "1" {
|
|
|
+ res["classification_time"] = time.Now().Unix()
|
|
|
+ }
|
|
|
+
|
|
|
if tt.I_fieldUpdate == 1 && tt.I_multiclass == 1 { //I_fieldUpdate 0:覆盖 1:追加
|
|
|
if len(ksmap) > 0 && len(res) > 0 {
|
|
|
update = append(update, map[string]interface{}{
|
|
@@ -877,9 +886,12 @@ func NewTaskRunAll(tt *TTask, budp bool, mapInfo map[string]interface{}) int {
|
|
|
}
|
|
|
|
|
|
total = sum
|
|
|
- log.Println("总数:————", sum)
|
|
|
- if timespan {
|
|
|
- log.Println("current:————", sum)
|
|
|
+ //通过ID 查询分类数据才打印日志
|
|
|
+ if tt.S_querycon == "1" {
|
|
|
+ log.Println("总数:————", sum)
|
|
|
+ if timespan {
|
|
|
+ log.Println("current:————", sum)
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
wg.Wait()
|
|
@@ -939,7 +951,9 @@ func NewTaskRunAll(tt *TTask, budp bool, mapInfo map[string]interface{}) int {
|
|
|
go tools.MgoClass.Update("rc_task", `{"_id":"`+tt.ID+`"}`, settime, false, false)
|
|
|
}
|
|
|
//InitRule()
|
|
|
- log.Println("运行", tt.S_name, "over", oid, " endid:", tt.LastId)
|
|
|
+ if tt.S_querycon == "1" {
|
|
|
+ log.Println("运行", tt.S_name, "over", oid, " endid:", tt.LastId)
|
|
|
+ }
|
|
|
//定时任务完成发送udp信号调抽取
|
|
|
if tools.Extract["preNodeId"] == tt.ID { //常规招标定时任务udp调用抽取
|
|
|
if tt.S_idcoll == "" {
|