diff --git a/src/main/java/com/yolo/keyborad/controller/ThemesController.java b/src/main/java/com/yolo/keyborad/controller/ThemesController.java index ddd0529..775a50b 100644 --- a/src/main/java/com/yolo/keyborad/controller/ThemesController.java +++ b/src/main/java/com/yolo/keyborad/controller/ThemesController.java @@ -2,7 +2,9 @@ package com.yolo.keyborad.controller; import com.yolo.keyborad.common.BaseResponse; import com.yolo.keyborad.common.ResultUtils; +import com.yolo.keyborad.model.vo.themes.KeyboardThemeStylesRespVO; import com.yolo.keyborad.model.vo.themes.KeyboradThemesRespVO; +import com.yolo.keyborad.service.KeyboardThemeStylesService; import com.yolo.keyborad.service.KeyboradThemesService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -28,6 +30,12 @@ public class ThemesController { @Resource private KeyboradThemesService themesService; + @Resource + private KeyboradThemesService keyboradThemesService; + + @Resource + private KeyboardThemeStylesService keyboardThemeStylesService; + @GetMapping("/list") @Operation(summary = "查询所有主题", description = "查询所有主题列表接口") public BaseResponse> list() { @@ -40,5 +48,11 @@ public class ThemesController { return ResultUtils.success(themesService.selectThemesByStyle(themeStyleId)); } + @GetMapping("/listAllStyles") + @Operation(summary = "查询所有主题风格", description = "查询所有主题风格列表接口") + public BaseResponse> listAllStyles() { + return ResultUtils.success(keyboardThemeStylesService.selectAllThemeStyles()); + } + } diff --git a/src/main/java/com/yolo/keyborad/model/vo/themes/KeyboardThemeStylesRespVO.java b/src/main/java/com/yolo/keyborad/model/vo/themes/KeyboardThemeStylesRespVO.java new file mode 100644 index 0000000..f3b87a4 --- /dev/null +++ b/src/main/java/com/yolo/keyborad/model/vo/themes/KeyboardThemeStylesRespVO.java @@ -0,0 +1,25 @@ +package com.yolo.keyborad.model.vo.themes; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +/* + * @author: ziin + * @date: 2025/12/9 + */ +@Schema(description = "主题风格返回对象") +@Data +public class KeyboardThemeStylesRespVO { + + /** + * 主键 Id + */ + @Schema(description = "主键 Id") + private Long id; + + /** + * 风格名称 + */ + @Schema(description = "风格名称") + private String styleName; +} diff --git a/src/main/java/com/yolo/keyborad/service/KeyboardThemeStylesService.java b/src/main/java/com/yolo/keyborad/service/KeyboardThemeStylesService.java index 29dfd84..306b20e 100644 --- a/src/main/java/com/yolo/keyborad/service/KeyboardThemeStylesService.java +++ b/src/main/java/com/yolo/keyborad/service/KeyboardThemeStylesService.java @@ -2,12 +2,20 @@ package com.yolo.keyborad.service; import com.yolo.keyborad.model.entity.KeyboardThemeStyles; import com.baomidou.mybatisplus.extension.service.IService; - /* +import com.yolo.keyborad.model.vo.themes.KeyboardThemeStylesRespVO; + +import java.util.List; +/* * @author: ziin * @date: 2025/12/9 15:20 */ public interface KeyboardThemeStylesService extends IService{ + /** + * 查询所有主题风格(未删除) + * @return 主题风格列表 + */ + List selectAllThemeStyles(); } diff --git a/src/main/java/com/yolo/keyborad/service/impl/AppleServiceImpl.java b/src/main/java/com/yolo/keyborad/service/impl/AppleServiceImpl.java index 59d1c9c..3357d7b 100644 --- a/src/main/java/com/yolo/keyborad/service/impl/AppleServiceImpl.java +++ b/src/main/java/com/yolo/keyborad/service/impl/AppleServiceImpl.java @@ -40,8 +40,6 @@ public class AppleServiceImpl implements IAppleService { @Resource private UserService userService; - @Resource - private KeyboardCharacterService keyboardCharacterService; /** * 登录 * 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 43a2880..c65a208 100644 --- a/src/main/java/com/yolo/keyborad/service/impl/KeyboardThemeStylesServiceImpl.java +++ b/src/main/java/com/yolo/keyborad/service/impl/KeyboardThemeStylesServiceImpl.java @@ -1,5 +1,7 @@ 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; @@ -15,4 +17,15 @@ import com.yolo.keyborad.service.KeyboardThemeStylesService; @Service public class KeyboardThemeStylesServiceImpl extends ServiceImpl implements KeyboardThemeStylesService{ + /** + * 查询所有主题风格(未删除) + * @return 主题风格列表 + */ + @Override + public List selectAllThemeStyles() { + List themeStylesList = this.lambdaQuery() + .eq(KeyboardThemeStyles::getDeleted, false) + .list(); + return BeanUtil.copyToList(themeStylesList, KeyboardThemeStylesRespVO.class); + } }