|
@@ -41,13 +41,13 @@ type DictResult struct {
|
|
|
ValueTitle string `json:"valueTitle"`
|
|
ValueTitle string `json:"valueTitle"`
|
|
|
MeaningTitle string `json:"meaningTitle"`
|
|
MeaningTitle string `json:"meaningTitle"`
|
|
|
ExtraTitle string `json:"extraTitle"`
|
|
ExtraTitle string `json:"extraTitle"`
|
|
|
- WordCount uint `json:"wordCount"`
|
|
|
|
|
|
|
+ WordsCount uint `json:"wordsCount"`
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 列出所有词库
|
|
// 列出所有词库
|
|
|
func ListDicts(userID uint) ([]DictResult, error) {
|
|
func ListDicts(userID uint) ([]DictResult, error) {
|
|
|
result := []DictResult{}
|
|
result := []DictResult{}
|
|
|
- if err := global.DB.Model(&Dict{}).Select("*, (?) AS word_count", global.DB.Model(&Word{}).Select("COUNT()").Where("dict_id = dicts.id")).Order("id desc").Find(&result, "user_id = ?", userID).Error; err != nil {
|
|
|
|
|
|
|
+ if err := global.DB.Model(&Dict{}).Select("*, (?) AS words_count", global.DB.Model(&Word{}).Select("COUNT()").Where("dict_id = dicts.id")).Order("id desc").Find(&result, "user_id = ?", userID).Error; err != nil {
|
|
|
return nil, err
|
|
return nil, err
|
|
|
}
|
|
}
|
|
|
return result, nil
|
|
return result, nil
|
|
@@ -56,7 +56,7 @@ func ListDicts(userID uint) ([]DictResult, error) {
|
|
|
// 获取词库
|
|
// 获取词库
|
|
|
func GetDict(id, userID uint) (*DictResult, error) {
|
|
func GetDict(id, userID uint) (*DictResult, error) {
|
|
|
result := &DictResult{}
|
|
result := &DictResult{}
|
|
|
- if err := global.DB.Model(&Dict{}).Select("*, (?) AS word_count", global.DB.Model(&Word{}).Select("COUNT()").Where("dict_id = dicts.id")).Take(result, "id = ? AND user_id = ?", id, userID).Error; err != nil {
|
|
|
|
|
|
|
+ if err := global.DB.Model(&Dict{}).Select("*, (?) AS words_count", global.DB.Model(&Word{}).Select("COUNT()").Where("dict_id = dicts.id")).Take(result, "id = ? AND user_id = ?", id, userID).Error; err != nil {
|
|
|
if errors.Is(err, gorm.ErrRecordNotFound) {
|
|
if errors.Is(err, gorm.ErrRecordNotFound) {
|
|
|
return nil, ErrDictNotFound
|
|
return nil, ErrDictNotFound
|
|
|
}
|
|
}
|
|
@@ -94,15 +94,12 @@ func UpdateDict(id uint, name, valueTitle, meaningTitle, extraTitle string) (*Di
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
dict := &Dict{
|
|
dict := &Dict{
|
|
|
- Model: &gorm.Model{
|
|
|
|
|
- ID: id,
|
|
|
|
|
- },
|
|
|
|
|
Name: name,
|
|
Name: name,
|
|
|
ValueTitle: valueTitle,
|
|
ValueTitle: valueTitle,
|
|
|
MeaningTitle: meaningTitle,
|
|
MeaningTitle: meaningTitle,
|
|
|
ExtraTitle: extraTitle,
|
|
ExtraTitle: extraTitle,
|
|
|
}
|
|
}
|
|
|
- if err := global.DB.Model(dict).Select("name", "value_title", "meaning_title", "extra_title").Updates(dict).Error; err != nil {
|
|
|
|
|
|
|
+ if err := global.DB.Where("id = ?", id).Select("name", "value_title", "meaning_title", "extra_title").Updates(dict).Error; err != nil {
|
|
|
return nil, err
|
|
return nil, err
|
|
|
}
|
|
}
|
|
|
return &DictResult{
|
|
return &DictResult{
|
|
@@ -111,7 +108,7 @@ func UpdateDict(id uint, name, valueTitle, meaningTitle, extraTitle string) (*Di
|
|
|
ValueTitle: dict.ValueTitle,
|
|
ValueTitle: dict.ValueTitle,
|
|
|
MeaningTitle: dict.MeaningTitle,
|
|
MeaningTitle: dict.MeaningTitle,
|
|
|
ExtraTitle: dict.ExtraTitle,
|
|
ExtraTitle: dict.ExtraTitle,
|
|
|
- WordCount: uint(count),
|
|
|
|
|
|
|
+ WordsCount: uint(count),
|
|
|
}, nil
|
|
}, nil
|
|
|
}
|
|
}
|
|
|
|
|
|