Browse Source

语音播报新增编辑响应格式

hsun 2 years ago
parent
commit
88f21d2704
2 changed files with 15 additions and 9 deletions
  1. 11 7
      controller/voice_broadcast/voice_broadcast.go
  2. 4 2
      services/voice_broadcast.go

+ 11 - 7
controller/voice_broadcast/voice_broadcast.go

@@ -102,13 +102,15 @@ func AddBroadcast(c *gin.Context) {
 			return
 		}
 	}
+	userInfo := user.GetInfoByClaims(c)
 	// 新增
-	if e := services.CreateVoiceBroadcast(req.SectionId, req.VarietyId, req.AuthorId, req.BroadcastName, req.SectionName, req.VarietyName,
-		req.Author, req.VoiceSeconds, req.VoiceSize, req.VoiceUrl, req.Imgs); e != nil {
+	resp, e := services.CreateVoiceBroadcast(req.SectionId, req.VarietyId, req.AuthorId, int(userInfo.UserID), req.BroadcastName, req.SectionName, req.VarietyName,
+		req.Author, req.VoiceSeconds, req.VoiceSize, req.VoiceUrl, req.Imgs)
+	if e != nil {
 		response.FailMsg("新增失败", e.Error(), c)
 		return
 	}
-	response.Ok("操作成功", c)
+	response.OkData("操作成功", resp, c)
 }
 
 // EditBroadcast
@@ -162,13 +164,15 @@ func EditBroadcast(c *gin.Context) {
 			return
 		}
 	}
+	userInfo := user.GetInfoByClaims(c)
 	// 编辑
-	if e := services.EditVoiceBroadcast(req.BroadcastId, req.SectionId, req.VarietyId, req.AuthorId, req.BroadcastName, req.SectionName, req.VarietyName,
-		req.Author, req.VoiceSeconds, req.VoiceSize, req.VoiceUrl, req.Imgs); e != nil {
-		response.FailMsg("编辑失败", e.Error(), c)
+	resp, e := services.EditVoiceBroadcast(req.BroadcastId, req.SectionId, req.VarietyId, req.AuthorId, int(userInfo.UserID), req.BroadcastName, req.SectionName, req.VarietyName,
+		req.Author, req.VoiceSeconds, req.VoiceSize, req.VoiceUrl, req.Imgs)
+	if e != nil {
+		response.FailMsg("新增失败", e.Error(), c)
 		return
 	}
-	response.Ok("操作成功", c)
+	response.OkData("操作成功", resp, c)
 }
 
 // PublishBroadcast

+ 4 - 2
services/voice_broadcast.go

@@ -218,7 +218,7 @@ func SendBroadcastMsg(broadcastId, userId int) (errMsg string, err error) {
 }
 
 // CreateVoiceBroadcast 新增语音播报
-func CreateVoiceBroadcast(sectionId, varietyId, authorId int, broadcastName, sectionName, varietyName, author, voiceSeconds, voiceSize, voiceUrl, imgs string) (err error) {
+func CreateVoiceBroadcast(sectionId, varietyId, authorId, userId int, broadcastName, sectionName, varietyName, author, voiceSeconds, voiceSize, voiceUrl, imgs string) (resp response.Broadcast, err error) {
 	nowTime := time.Now().Local()
 	item := &voice_broadcast.VoiceBroadcast{
 		BroadcastName:    broadcastName,
@@ -249,11 +249,12 @@ func CreateVoiceBroadcast(sectionId, varietyId, authorId int, broadcastName, sec
 		err = errors.New("新增语音播报及图片失败, Err: " + e.Error())
 		return
 	}
+	resp = handleBroadcastItem(userId, item, imgList)
 	return
 }
 
 // EditVoiceBroadcast 编辑语音播报
-func EditVoiceBroadcast(broadcastId, sectionId, varietyId, authorId int, broadcastName, sectionName, varietyName, author, voiceSeconds, voiceSize, voiceUrl, imgs string) (err error) {
+func EditVoiceBroadcast(broadcastId, sectionId, varietyId, authorId, userId int, broadcastName, sectionName, varietyName, author, voiceSeconds, voiceSize, voiceUrl, imgs string) (resp response.Broadcast, err error) {
 	if broadcastId <= 0 {
 		return
 	}
@@ -291,6 +292,7 @@ func EditVoiceBroadcast(broadcastId, sectionId, varietyId, authorId int, broadca
 		err = errors.New("更新语音播报及图片失败, Err: " + e.Error())
 		return
 	}
+	resp = handleBroadcastItem(userId, item, imgList)
 	return
 }