处理分享

2024-09-29 11:42:18 +08:00
parent ba6dbcc2c7
commit c209dafac5
7 changed files with 196 additions and 70 deletions
@@ -112,6 +112,32 @@ func GetQuestionListDto(m []*model.Question) []*QuestionDto {
 	return responses
 }

+// 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,
+		QuestionAnalysis: m.QuestionAnalysis,
+		Difficulty:       m.Difficulty,
+		CreatedAt:        m.CreatedAt,
+		UpdatedAt:        m.UpdatedAt,
+	}
+}
+
 // LoadFirstLabel 加载一级标签
 func (r *QuestionDto) LoadFirstLabel(m *model.Label) *QuestionDto {
 	if m != nil {
@@ -2,50 +2,49 @@ package dto

 import (
 	"knowledge/api/model"
-	"knowledge/utils"
-	"strings"
 )

 type ShareDto struct {
-	QuestionQa *QuestionQaDto      `json:"question_qa"` // 题库数据
-	Question   []*ShareQuestionDto `json:"question"`    // 题目数据
+	QuestionQa    *QuestionQaDto      `json:"question_qa"`     // 题库数据
+	Question      []*QuestionDto      `json:"question"`        // 题库关联题目列表
+	BaseTokenItem []*BaseTokenItemDto `json:"base_token_item"` // 题库关联飞花令-列表
 }

-// ShareQuestionDto 题目数据
-type ShareQuestionDto struct {
-	QuestionName     string   `json:"question_name"`     // 题目名称
-	QuestionType     int      `json:"question_type"`     // 题目类型(1:单选 2:多选 3:问答 4:判断)
-	QuestionSource   int      `json:"question_source"`   // 题目来源（1:本题库 2:外部数据）
-	QuestionImage    []string `json:"question_image"`    // 题目图片
-	QuestionAnswer   string   `json:"question_answer"`   // 答案
-	QuestionAnalysis string   `json:"question_analysis"` // 解析
-	Difficulty       int      `json:"difficulty"`        // 难度（0:未知 1:低 2:中 3:高）
-	IsMustSelect     int      `json:"is_must_select"`    // 是否必被选中
-}
-
-// GetShareQuestionDto 分享题目详情
-func GetShareQuestionDto(m *model.Question) *ShareQuestionDto {
-	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 &ShareQuestionDto{
-		QuestionName:     m.QuestionName,
-		QuestionType:     m.QuestionType,
-		QuestionSource:   m.QuestionSource,
-		QuestionImage:    questionImage,
-		QuestionAnswer:   m.QuestionAnswer,
-		QuestionAnalysis: m.QuestionAnalysis,
-		Difficulty:       m.Difficulty,
-	}
-}
+//// ShareQuestionDto 题目数据
+//type ShareQuestionDto struct {
+//	QuestionName     string   `json:"question_name"`     // 题目名称
+//	QuestionType     int      `json:"question_type"`     // 题目类型(1:单选 2:多选 3:问答 4:判断)
+//	QuestionSource   int      `json:"question_source"`   // 题目来源（1:本题库 2:外部数据）
+//	QuestionImage    []string `json:"question_image"`    // 题目图片
+//	QuestionAnswer   string   `json:"question_answer"`   // 答案
+//	QuestionAnalysis string   `json:"question_analysis"` // 解析
+//	Difficulty       int      `json:"difficulty"`        // 难度（0:未知 1:低 2:中 3:高）
+//	IsMustSelect     int      `json:"is_must_select"`    // 是否必被选中
+//}
+//
+//// GetShareQuestionDto 分享题目详情
+//func GetShareQuestionDto(m *model.Question) *ShareQuestionDto {
+//	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 &ShareQuestionDto{
+//		QuestionName:     m.QuestionName,
+//		QuestionType:     m.QuestionType,
+//		QuestionSource:   m.QuestionSource,
+//		QuestionImage:    questionImage,
+//		QuestionAnswer:   m.QuestionAnswer,
+//		QuestionAnalysis: m.QuestionAnalysis,
+//		Difficulty:       m.Difficulty,
+//	}
+//}

 // LoadQuestionQa 加载题库数据
 func (r *ShareDto) LoadQuestionQa(m *model.QuestionQa) *ShareDto {
@@ -54,3 +53,19 @@ func (r *ShareDto) LoadQuestionQa(m *model.QuestionQa) *ShareDto {
 	}
 	return r
 }
+
+// LoadQuestion 加载题库关联题目列表
+func (r *ShareDto) LoadQuestion(m []*model.Question) *ShareDto {
+	if len(m) > 0 {
+		r.Question = GetQuestionListDto(m)
+	}
+	return r
+}
+
+// LoadBaseTokenItem 加载题库关联飞花令-列表
+func (r *ShareDto) LoadBaseTokenItem(m []*model.BaseTokenItem) *ShareDto {
+	if len(m) > 0 {
+		r.BaseTokenItem = GetBaseTokenItemListDto(m)
+	}
+	return r
+}