瀏覽代碼

是否开启品牌抽取容错

maxiaoshan 6 年之前
父節點
當前提交
e3dc6b5d45
共有 3 個文件被更改,包括 5 次插入10 次删除
  1. 1 1
      src/jy/admin/resulttrack.go
  2. 3 6
      src/jy/extract/extract.go
  3. 1 3
      src/jy/extract/extractudp.go

+ 1 - 1
src/jy/admin/resulttrack.go

@@ -98,7 +98,7 @@ func ClearColl(c *gin.Context) {
 //根据版本查询启用的字段
 func GetVersionInfo(c *gin.Context) {
 	version, _ := c.GetPostForm("version")
-	v, _ := Mgo.FindOne("version", `{"version":"`+version+`"}`)
+	v, _ := Mgo.FindOne("version", `{"version":"`+version+`","delete":false}`)
 	if v != nil && len(*v) > 0 {
 		vid := (*v)["_id"].(bson.ObjectId).Hex()
 		query := map[string]interface{}{

+ 3 - 6
src/jy/extract/extract.go

@@ -56,9 +56,8 @@ func StartExtractTestTask(taskId, startId, num, resultcoll, trackcoll string) bo
 	ext.InitAuditRecogField()
 
 	//品牌抽取是否开启
-	if ju.Config["brandgoods"] != nil {
-		ju.IsBrandGoods = ju.Config["brandgoods"].(bool)
-	}
+	ju.IsBrandGoods, _ = ju.Config["brandgoods"].(bool)
+
 	return RunExtractTestTask(ext, startId, num)
 }
 
@@ -122,9 +121,7 @@ func StartExtractTaskId(taskId string) bool {
 	ext.InitAuditRecogField()
 
 	//品牌抽取是否开启
-	if ju.Config["brandgoods"] != nil {
-		ju.IsBrandGoods = ju.Config["brandgoods"].(bool)
-	}
+	ju.IsBrandGoods, _ = ju.Config["brandgoods"].(bool)
 
 	ext.IsRun = true
 	go ext.ResultSave()

+ 1 - 3
src/jy/extract/extractudp.go

@@ -105,9 +105,7 @@ func ExtractByUdp(sid, eid string, instanceId ...string) {
 	ext.InitAuditRecogField()
 
 	//品牌抽取是否开启
-	if ju.Config["brandgoods"] != nil {
-		ju.IsBrandGoods = ju.Config["brandgoods"].(bool)
-	}
+	ju.IsBrandGoods, _ = ju.Config["brandgoods"].(bool)
 
 	go ext.ResultSave()
 	go ext.BidSave()