Browse Source

no message

xingzai 1 year ago
parent
commit
f5c6809bb0
2 changed files with 21 additions and 13 deletions
  1. 2 2
      controllers/cygx/activity.go
  2. 19 11
      services/aliyun_ocr.go

+ 2 - 2
controllers/cygx/activity.go

@@ -1455,8 +1455,8 @@ func (this *ActivityCoAntroller) DeadlineSet() {
 	br.Data = list
 }
 
-// @Title 删除活动
-// @Description 删除活动接口
+// @Title 根据图片获取建会信息接口
+// @Description 根据图片获取建会信息接口
 // @Param   request	body cygx.ActivityIdRep true "type json string"
 // @Success Ret=200
 // @router /activity/imgToText [post]

+ 19 - 11
services/aliyun_ocr.go

@@ -93,13 +93,21 @@ func AliOcrByImageToText(imageurl string) (item *AliOcrByImageToTextResp, err er
 func ConvertActivityTitmeYMD(TitmeYMD string) (titmeYMDNew string) {
 	titmeYMDNew = TitmeYMD
 	titmeYMDNew = strings.Replace(titmeYMDNew, "/", "月", -1)
-	titmeYMDNew = strings.Replace(titmeYMDNew, "SUN", "日(周日)", -1)
-	titmeYMDNew = strings.Replace(titmeYMDNew, "MON", "日(周一)", -1)
-	titmeYMDNew = strings.Replace(titmeYMDNew, "TUE", "日(周二)", -1)
-	titmeYMDNew = strings.Replace(titmeYMDNew, "WED", "日(周三)", -1)
-	titmeYMDNew = strings.Replace(titmeYMDNew, "THU", "日(周四)", -1)
-	titmeYMDNew = strings.Replace(titmeYMDNew, "FRI", "日(周五)", -1)
-	titmeYMDNew = strings.Replace(titmeYMDNew, "SAT", "日(周六)", -1)
+	//titmeYMDNew = strings.Replace(titmeYMDNew, "SUN", "日(周日)", -1)
+	//titmeYMDNew = strings.Replace(titmeYMDNew, "MON", "日(周一)", -1)
+	//titmeYMDNew = strings.Replace(titmeYMDNew, "TUE", "日(周二)", -1)
+	//titmeYMDNew = strings.Replace(titmeYMDNew, "WED", "日(周三)", -1)
+	//titmeYMDNew = strings.Replace(titmeYMDNew, "THU", "日(周四)", -1)
+	//titmeYMDNew = strings.Replace(titmeYMDNew, "FRI", "日(周五)", -1)
+	//titmeYMDNew = strings.Replace(titmeYMDNew, "SAT", "日(周六)", -1)
+
+	titmeYMDNew = strings.Replace(titmeYMDNew, "SUN", "日", -1)
+	titmeYMDNew = strings.Replace(titmeYMDNew, "MON", "日", -1)
+	titmeYMDNew = strings.Replace(titmeYMDNew, "TUE", "日", -1)
+	titmeYMDNew = strings.Replace(titmeYMDNew, "WED", "日", -1)
+	titmeYMDNew = strings.Replace(titmeYMDNew, "THU", "日", -1)
+	titmeYMDNew = strings.Replace(titmeYMDNew, "FRI", "日", -1)
+	titmeYMDNew = strings.Replace(titmeYMDNew, "SAT", "日", -1)
 	titmeYMDNew = strconv.Itoa(time.Now().Year()) + "年" + titmeYMDNew
 	return
 }
@@ -107,12 +115,12 @@ func ConvertActivityTitmeYMD(TitmeYMD string) (titmeYMDNew string) {
 func ConvertActivityTitmeHM(titmeHM string) (titmeHMNew string) {
 	titmeHMNew = titmeHM
 	var hNum int
-	var amOrPm string
+	//var amOrPm string
 	if strings.Contains(titmeHM, "PM") {
 		hNum = 12
-		amOrPm = "PM"
+		//amOrPm = "PM"
 	} else {
-		amOrPm = "AM"
+		//amOrPm = "AM"
 	}
 	titmeHM = strings.Replace(titmeHM, "AM", "", -1)
 	titmeHM = strings.Replace(titmeHM, "PM", "", -1)
@@ -122,6 +130,6 @@ func ConvertActivityTitmeHM(titmeHM string) (titmeHMNew string) {
 	}
 	hourNum, _ := strconv.Atoi(sliceHm[0])
 	minute := sliceHm[1]
-	titmeHMNew = strconv.Itoa(hNum+hourNum) + ":" + minute + " " + amOrPm
+	titmeHMNew = strconv.Itoa(hNum+hourNum) + ":" + minute
 	return
 }