处理分享2

api/dto/Question.go

@@ -16,7 +16,7 @@ type QuestionDto struct {
 	IsDelete         int                  `json:"is_delete"`         // 是否删除（0:否 1:是）
 	QuestionSource   int                  `json:"question_source"`   // 题目来源（1:本题库 2:外部数据）
 	QuestionImage    []string             `json:"question_image"`    // 题目图片（逗号分隔）
-	QuestionAnswer   string               `json:"question_answer"`   // 答案
+	QuestionAnswer   []string             `json:"question_answer"`   // 答案
 	QuestionAnalysis string               `json:"question_analysis"` // 解析
 	Difficulty       int                  `json:"difficulty"`        // 难度（0:未知 1:低 2:中 3:高）
 	FirstLabelId     string               `json:"first_label_id"`    // 一级标签id
@@ -30,17 +30,6 @@ type QuestionDto struct {
 
 // GetQuestionDto 题目详情
 func GetQuestionDto(m *model.Question) *QuestionDto {
-	var questionImage []string
-	if m.QuestionImage != "" {
-		result := strings.Split(m.QuestionImage, ",")
-		if len(result) > 0 {
-			for _, v := range result {
-				v = utils.AddOssDomain(v)
-				questionImage = append(questionImage, v)
-			}
-		}
-	}
-
 	return &QuestionDto{
 		QuestionId:       fmt.Sprintf("%d", m.QuestionId),
 		QuestionName:     m.QuestionName,
@@ -48,8 +37,8 @@ func GetQuestionDto(m *model.Question) *QuestionDto {
 		QuestionStatus:   m.QuestionStatus,
 		IsDelete:         m.IsDelete,
 		QuestionSource:   m.QuestionSource,
-		QuestionImage:    questionImage,
-		QuestionAnswer:   m.QuestionAnswer,
+		QuestionImage:    []string{},
+		QuestionAnswer:   []string{},
 		QuestionAnalysis: m.QuestionAnalysis,
 		Difficulty:       m.Difficulty,
 		FirstLabelId:     fmt.Sprintf("%d", *m.FirstLabelId),
@@ -66,17 +55,6 @@ func GetQuestionListDto(m []*model.Question) []*QuestionDto {
 
 	if len(m) > 0 {
 		for i, v := range m {
-			var questionImage []string
-			if v.QuestionImage != "" {
-				result := strings.Split(v.QuestionImage, ",")
-				if len(result) > 0 {
-					for _, v := range result {
-						v = utils.AddOssDomain(v)
-						questionImage = append(questionImage, v)
-					}
-				}
-			}
-
 			response := &QuestionDto{
 				QuestionId:       fmt.Sprintf("%d", v.QuestionId),
 				QuestionName:     v.QuestionName,
@@ -84,8 +62,8 @@ func GetQuestionListDto(m []*model.Question) []*QuestionDto {
 				QuestionStatus:   v.QuestionStatus,
 				IsDelete:         v.IsDelete,
 				QuestionSource:   v.QuestionSource,
-				QuestionImage:    questionImage,
-				QuestionAnswer:   v.QuestionAnswer,
+				QuestionImage:    []string{},
+				QuestionAnswer:   []string{},
 				QuestionAnalysis: v.QuestionAnalysis,
 				Difficulty:       v.Difficulty,
 				FirstLabelId:     fmt.Sprintf("%d", *v.FirstLabelId),
@@ -104,6 +82,16 @@ func GetQuestionListDto(m []*model.Question) []*QuestionDto {
 				response = response.LoadSecondLabel(v.SecondLabel)
 			}
 
+			// 加载图片
+			if v.QuestionImage != "" {
+				response = response.LoadQuestionImage(v.QuestionImage)
+			}
+
+			// 加载答案
+			if v.QuestionAnswer != "" {
+				response = response.LoadQuestionAnswer(v.QuestionAnswer)
+			}
+
 			// 将转换后的结构体添加到新切片中
 			responses[i] = response
 		}
@@ -114,23 +102,13 @@ func GetQuestionListDto(m []*model.Question) []*QuestionDto {
 
 // GetShareQuestionDto 题目详情-分享
 func GetShareQuestionDto(m *model.Question) *QuestionDto {
-	var questionImage []string
-	if m.QuestionImage != "" {
-		result := strings.Split(m.QuestionImage, ",")
-		if len(result) > 0 {
-			for _, v := range result {
-				v = utils.AddOssDomain(v)
-				questionImage = append(questionImage, v)
-			}
-		}
-	}
-
 	return &QuestionDto{
 		QuestionId:       fmt.Sprintf("%d", m.QuestionId),
 		QuestionName:     m.QuestionName,
 		QuestionType:     m.QuestionType,
 		QuestionSource:   m.QuestionSource,
-		QuestionImage:    questionImage,
+		QuestionImage:    []string{},
+		QuestionAnswer:   []string{},
 		QuestionAnalysis: m.QuestionAnalysis,
 		Difficulty:       m.Difficulty,
 		CreatedAt:        m.CreatedAt,
@@ -161,3 +139,30 @@ func (r *QuestionDto) LoadQuestionOption(m []*model.QuestionOption) *QuestionDto
 	}
 	return r
 }
+
+// LoadQuestionImage 加载图片
+func (r *QuestionDto) LoadQuestionImage(s string) *QuestionDto {
+	if s != "" {
+		result := strings.Split(s, ",")
+		if len(result) > 0 {
+			for _, v := range result {
+				v = utils.AddOssDomain(v)
+				r.QuestionImage = append(r.QuestionImage, v)
+			}
+		}
+	}
+	return r
+}
+
+// LoadQuestionAnswer 加载答案
+func (r *QuestionDto) LoadQuestionAnswer(s string) *QuestionDto {
+	if s != "" {
+		result := strings.Split(s, ",")
+		if len(result) > 0 {
+			for _, v := range result {
+				r.QuestionAnswer = append(r.QuestionAnswer, v)
+			}
+		}
+	}
+	return r
+}

api/dto/QuestionQaItem.go

@@ -89,6 +89,12 @@ func (r *QuestionQaItemDto) LoadSecondLabel(m *model.Label) *QuestionQaItemDto {
 func (r *QuestionQaItemDto) LoadQuestion(m *model.Question) *QuestionQaItemDto {
 	if m != nil {
 		r.Question = GetQuestionDto(m)
+
+		// 加载图片
+		r.Question = r.Question.LoadQuestionImage(m.QuestionImage)
+
+		// 加载答案
+		r.Question = r.Question.LoadQuestionAnswer(m.QuestionAnswer)
 	}
 	return r
 }