diff --git a/src/main/java/com/yolo/keyborad/controller/ThemesController.java b/src/main/java/com/yolo/keyborad/controller/ThemesController.java index 32059de..688bf71 100644 --- a/src/main/java/com/yolo/keyborad/controller/ThemesController.java +++ b/src/main/java/com/yolo/keyborad/controller/ThemesController.java @@ -54,8 +54,11 @@ public class ThemesController { @GetMapping("/listAllStyles") @Operation(summary = "查询所有主题风格", description = "查询所有主题风格列表接口") - public BaseResponse> listAllStyles() { - return ResultUtils.success(keyboardThemeStylesService.selectAllThemeStyles()); + public BaseResponse> listAllStyles( + @RequestHeader(value = "Accept-Language", required = false) String acceptLanguage + ) { + String local = RequestLocaleUtils.resolveLanguage(acceptLanguage); + return ResultUtils.success(keyboardThemeStylesService.selectAllThemeStyles(local)); } @PostMapping("/purchase") diff --git a/src/main/java/com/yolo/keyborad/model/entity/KeyboardThemeStyles.java b/src/main/java/com/yolo/keyborad/model/entity/KeyboardThemeStyles.java index 9e88dbc..e9bf1bd 100644 --- a/src/main/java/com/yolo/keyborad/model/entity/KeyboardThemeStyles.java +++ b/src/main/java/com/yolo/keyborad/model/entity/KeyboardThemeStyles.java @@ -45,4 +45,8 @@ public class KeyboardThemeStyles { @TableField(value = "updated_at") @Schema(description="") private Date updatedAt; -} \ No newline at end of file + + @TableField(value = "local") + @Schema(description = "所属国家") + private String local; +} diff --git a/src/main/java/com/yolo/keyborad/service/KeyboardThemeStylesService.java b/src/main/java/com/yolo/keyborad/service/KeyboardThemeStylesService.java index 306b20e..3b1dddd 100644 --- a/src/main/java/com/yolo/keyborad/service/KeyboardThemeStylesService.java +++ b/src/main/java/com/yolo/keyborad/service/KeyboardThemeStylesService.java @@ -14,8 +14,9 @@ public interface KeyboardThemeStylesService extends IService selectAllThemeStyles(); + List selectAllThemeStyles(String local); } diff --git a/src/main/java/com/yolo/keyborad/service/impl/KeyboardThemeStylesServiceImpl.java b/src/main/java/com/yolo/keyborad/service/impl/KeyboardThemeStylesServiceImpl.java index c65a208..f82c226 100644 --- a/src/main/java/com/yolo/keyborad/service/impl/KeyboardThemeStylesServiceImpl.java +++ b/src/main/java/com/yolo/keyborad/service/impl/KeyboardThemeStylesServiceImpl.java @@ -2,13 +2,14 @@ package com.yolo.keyborad.service.impl; import cn.hutool.core.bean.BeanUtil; import com.yolo.keyborad.model.vo.themes.KeyboardThemeStylesRespVO; -import org.springframework.stereotype.Service; -import org.springframework.beans.factory.annotation.Autowired; -import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.yolo.keyborad.mapper.KeyboardThemeStylesMapper; import com.yolo.keyborad.model.entity.KeyboardThemeStyles; import com.yolo.keyborad.service.KeyboardThemeStylesService; +import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; + +import java.util.List; /* * @author: ziin * @date: 2025/12/9 15:20 @@ -22,9 +23,10 @@ public class KeyboardThemeStylesServiceImpl extends ServiceImpl selectAllThemeStyles() { + public List selectAllThemeStyles(String local) { List themeStylesList = this.lambdaQuery() .eq(KeyboardThemeStyles::getDeleted, false) + .eq(StringUtils.hasText(local), KeyboardThemeStyles::getLocal, local) .list(); return BeanUtil.copyToList(themeStylesList, KeyboardThemeStylesRespVO.class); } diff --git a/src/main/resources/mapper/KeyboardThemeStylesMapper.xml b/src/main/resources/mapper/KeyboardThemeStylesMapper.xml index b788332..1b3fcac 100644 --- a/src/main/resources/mapper/KeyboardThemeStylesMapper.xml +++ b/src/main/resources/mapper/KeyboardThemeStylesMapper.xml @@ -9,9 +9,10 @@ + - id, style_name, deleted, created_at, updated_at + id, style_name, deleted, created_at, updated_at, local - \ No newline at end of file +