Bladeren bron

获取易董活动详情,添加日志信息记录

xingzai 2 jaren geleden
bovenliggende
commit
5911b00c11
4 gewijzigde bestanden met toevoegingen van 62 en 11 verwijderingen
  1. 1 0
      models/db.go
  2. 30 0
      models/three_api_log.go
  3. 22 11
      services/yidong.go
  4. 9 0
      utils/common.go

+ 1 - 0
models/db.go

@@ -116,6 +116,7 @@ func init() {
 		new(CygxYidongActivityMeetingApiLog),
 		new(CygxIndustrialActivityGroupManagement),
 		new(CygxIndustrialActivityGroupSubject),
+		new(CygxThreeApiLog),
 	)
 	// 记录ORM查询日志
 	orm.Debug = true

+ 30 - 0
models/three_api_log.go

@@ -0,0 +1,30 @@
+package models
+
+import (
+	"github.com/beego/beego/v2/client/orm"
+	"time"
+)
+
+type CygxThreeApiLog struct {
+	Id         int       `orm:"column(id);pk"`
+	Url        string    `description:"链接"`
+	Body       string    `description:"请求参数"`
+	Result     string    `description:"返回参数"`
+	CreateTime time.Time `description:"活动模板,带P标签"`
+	Source     int       `description:"来源1,易董"`
+}
+
+//添加日志记录
+func AddCygxThreeApiLog(item *CygxThreeApiLog) (lastId int64, err error) {
+	o := orm.NewOrm()
+	lastId, err = o.Insert(item)
+	return
+}
+
+//三十天之后的日志自行删除
+func DeleteCygxThreeApiLog() (err error) {
+	o := orm.NewOrm()
+	sql := `DELETE FROM cygx_three_api_log WHERE  DATE_SUB(CURDATE(), INTERVAL 30 DAY) > date(create_time)`
+	_, err = o.Raw(sql).Exec()
+	return
+}

+ 22 - 11
services/yidong.go

@@ -215,8 +215,16 @@ func GetYiDongActivity(cont context.Context) (err error) {
 		utils.FileLog.Info(err.Error())
 		return
 	}
-	fmt.Println(body)
-	utils.FileLog.Info(string(body))
+
+	//添加请求日志记录
+	itemApiLog := new(models.CygxThreeApiLog)
+	itemApiLog.CreateTime = time.Now()
+	itemApiLog.Source = 1
+	itemApiLog.Url = url
+	itemApiLog.Body = utils.ReplaceSpaceAndWrap(fmt.Sprint(payload))
+	itemApiLog.Result = string(body)
+	go models.AddCygxThreeApiLog(itemApiLog)
+
 	err = json.Unmarshal(body, &ApifoxModal)
 	if err != nil {
 		fmt.Println("Getres.PublicGetDate Err:", err.Error())
@@ -227,6 +235,7 @@ func GetYiDongActivity(cont context.Context) (err error) {
 	if err != nil {
 		fmt.Println(err)
 		utils.FileLog.Info(string(err.Error()))
+		return
 	}
 	mapOldYiDong := make(map[string]string)
 	mapOldYiDongBody := make(map[string]string)
@@ -234,7 +243,6 @@ func GetYiDongActivity(cont context.Context) (err error) {
 		mapOldYiDong[v.YidongActivityId] = v.YidongActivityId
 		mapOldYiDongBody[v.YidongActivityId] = fmt.Sprint(v.ActivityName, v.Label, v.ChartPermissionId, v.ActivityTime, v.YidongActivityEndTime, v.DistinguishedGuest)
 	}
-	fmt.Println(mapOldYiDongBody)
 	var itemsAdd []*models.CygxActivity
 	if len(ApifoxModal.Result) > 0 {
 		actList := ApifoxModal.Result
@@ -273,6 +281,7 @@ func GetYiDongActivity(cont context.Context) (err error) {
 				if err != nil {
 					fmt.Println(err)
 					utils.FileLog.Info(string(err.Error()))
+					return err
 				}
 
 				//把公司名称当做标的 对活动进行产业标的的关联
@@ -280,9 +289,6 @@ func GetYiDongActivity(cont context.Context) (err error) {
 			} else {
 				//如果内容主体有做变更,就修改内容
 				if mapOldYiDongBody[v.ID] != fmt.Sprint(item.ActivityName, item.Label, item.ChartPermissionId, item.ActivityTime, item.YidongActivityEndTime, item.DistinguishedGuest) {
-					//fmt.Println("修改")
-					//fmt.Println(mapOldYiDongBody[v.ID])
-					//fmt.Println(fmt.Sprint(item.ActivityName, item.Label, item.ChartPermissionId, item.ActivityTime, item.DistinguishedGuest))
 					updateParams := make(map[string]interface{})
 					updateParams["ActivityName"] = item.ActivityName
 					updateParams["Label"] = item.Label
@@ -344,7 +350,16 @@ func GetYiDongActivityDetail(activityId string) (detail *models.ApifoxModaldetai
 		utils.FileLog.Info(err.Error())
 		return
 	}
-	utils.FileLog.Info(string(body))
+
+	//添加请求日志记录
+	//itemApiLog := new(models.CygxThreeApiLog)
+	//itemApiLog.CreateTime = time.Now()
+	//itemApiLog.Source = 1
+	//itemApiLog.Url = url
+	//itemApiLog.Body = utils.ReplaceSpaceAndWrap(fmt.Sprint(payload))
+	//itemApiLog.Result = string(body)
+	//go models.AddCygxThreeApiLog(itemApiLog)
+
 	err = json.Unmarshal(body, &ApifoxModal)
 	if err != nil {
 		fmt.Println("Getres.PublicGetDate Err:", err.Error())
@@ -395,8 +410,6 @@ func GetYiDongCreateUserInfo(user *models.WxUserItem) (userTgc string, err error
 		utils.FileLog.Info(err.Error())
 		return
 	}
-	utils.FileLog.Info(string(body))
-	fmt.Println(string(body))
 	err = json.Unmarshal(body, &ApifoxModal)
 	if err != nil {
 		fmt.Println("Getres.PublicGetDate Err:", err.Error())
@@ -464,7 +477,6 @@ func GetYiDongActivityMeeting(cont context.Context) (err error) {
 		fmt.Println("GetActivityListByYidong Err:", err.Error())
 		return err
 	}
-	fmt.Println(artivityListYidong)
 	//return err
 	if len(artivityListYidong) == 0 {
 		return err
@@ -579,7 +591,6 @@ func YidongActivityGroup(subjectName string, activityId int) (err error) {
 			subjectActivityItems = append(subjectActivityItems, subjectActivityItem)
 			mapSubjectName[v.SubjectName] = v.SubjectName
 		}
-		fmt.Println(v)
 	}
 	err = models.AddCygxActiuvityGroupMulti(industrialActivityItems, subjectActivityItems)
 	if err != nil {

+ 9 - 0
utils/common.go

@@ -723,3 +723,12 @@ func StrDateTimeToWeek(strTime string) string {
 	staweek_int := startday.Weekday().String()
 	return WeekDayMap[staweek_int]
 }
+
+//ReplaceSpaceAndWrap 去除空格跟换行
+func ReplaceSpaceAndWrap(str string) string {
+	// 去除空格
+	str = strings.Replace(str, " ", "", -1)
+	// 去除换行符
+	str = strings.Replace(str, "\n", "", -1)
+	return str
+}