浏览代码

no message

xingzai 1 年之前
父节点
当前提交
2d085e309c
共有 4 个文件被更改,包括 14 次插入10 次删除
  1. 1 1
      controllers/cygx/activity.go
  2. 8 8
      models/cygx/activity.go
  3. 4 0
      services/aliyun_ocr.go
  4. 1 1
      services/cygx/activity_ocr.go

+ 1 - 1
controllers/cygx/activity.go

@@ -1525,7 +1525,7 @@ func (this *ActivityCoAntroller) ImgToText() {
 	var mapCompany = make(map[int]string)
 	var lineNum int
 	for k, v := range ocrResp.Ret {
-		if k == 0 {
+		if k == 0 && !strings.Contains(v.Word, "/") {
 			continue
 		}
 		if strings.Contains(v.Word, "/") {

+ 8 - 8
models/cygx/activity.go

@@ -290,15 +290,15 @@ func AddActivity(items []*CygxActivity, industrialActivityItems [][]*CygxIndustr
 				}
 			}
 		}
-	}
 
-	{
-		//添加研选扣点内容
-		if itemPointsSet.PointsObject != "" {
-			itemPointsSet.ActivityId = int(newId)
-			_, err = to.Insert(itemPointsSet)
-			if err != nil {
-				return
+		{
+			//添加研选扣点内容
+			if itemPointsSet.PointsObject != "" {
+				itemPointsSet.ActivityId = int(newId)
+				_, err = to.Insert(itemPointsSet)
+				if err != nil {
+					return
+				}
 			}
 		}
 	}

+ 4 - 0
services/aliyun_ocr.go

@@ -66,6 +66,10 @@ func AliOcrByImageToText(imageurl string) (item *AliOcrByImageToTextResp, err er
 	}
 
 	err = json.Unmarshal(body, &item)
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
 
 	logItem := new(cygx.AliyunOcrLog)
 	logItem.ImgUrl = imageurl

+ 1 - 1
services/cygx/activity_ocr.go

@@ -108,7 +108,7 @@ func MakeActivityReqText(list []*cygx.AliyunOcrTextActivityResp) (req cygx.Activ
 			return
 		}
 		ActivityOcrTmp = strings.Replace(ActivityOcrTmp, "{{TIME}}", v.TitmeYMD+"("+weeknum+")"+v.TitmeHM, -1)
-		if utils.CheckStrHaveLetter(company) {
+		if !utils.CheckStrHaveLetter(company) {
 			ActivityOcrTmp = strings.Replace(ActivityOcrTmp, "{{LANGUAGE}}", "中文", -1)
 		} else {
 			ActivityOcrTmp = strings.Replace(ActivityOcrTmp, "{{LANGUAGE}}", "英文", -1)