From 577b37b768c28421fcdef3a19d7741d3a4d6e446 Mon Sep 17 00:00:00 2001 From: MichaelWin Date: Tue, 28 Oct 2025 14:40:22 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=9B=BD=E9=99=85=E5=8C=96=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/corewing/app/controller/CourseController.java | 7 ++++++- src/main/java/com/corewing/app/entity/Course.java | 5 +++++ src/main/java/com/corewing/app/entity/CourseCategory.java | 5 +++++ src/main/java/com/corewing/app/mapper/CourseMapper.java | 2 +- src/main/java/com/corewing/app/service/CourseService.java | 2 +- .../com/corewing/app/service/impl/CourseServiceImpl.java | 4 ++-- src/main/resources/mapper/CourseMapper.xml | 3 +-- 7 files changed, 21 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/corewing/app/controller/CourseController.java b/src/main/java/com/corewing/app/controller/CourseController.java index ea10563..a4d3daf 100644 --- a/src/main/java/com/corewing/app/controller/CourseController.java +++ b/src/main/java/com/corewing/app/controller/CourseController.java @@ -8,6 +8,8 @@ import com.corewing.app.entity.Course; import com.corewing.app.entity.CourseCategory; import com.corewing.app.service.CourseCategoryService; import com.corewing.app.service.CourseService; +import com.corewing.app.util.I18nUtil; +import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -20,6 +22,7 @@ import java.util.List; */ @RequestMapping("/course") @RestController +@Slf4j public class CourseController { private final CourseService courseService; @@ -40,8 +43,10 @@ public class CourseController { public Result> category( @RequestParam(required = false, defaultValue = "0") Integer firstStatus ) { + log.info("当前语言环境：{}", I18nUtil.getCurrentLocale().getLanguage()); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(firstStatus != 0, CourseCategory::getFirstStatus, firstStatus); + wrapper.eq(CourseCategory::getLang, I18nUtil.getCurrentLocale().getLanguage()); List list = courseCategoryService.list(wrapper); return Result.success(list); } @@ -63,7 +68,7 @@ public class CourseController { @RequestParam(required = false) String courseTitle) { try { Page page = new Page<>(current, size); - IPage pageResult = courseService.pageList(page, categoryId, courseTitle); + IPage pageResult = courseService.pageList(page, categoryId, courseTitle, I18nUtil.getCurrentLocale().getLanguage()); return Result.success(pageResult); } catch (Exception e) { return Result.error(e.getMessage()); diff --git a/src/main/java/com/corewing/app/entity/Course.java b/src/main/java/com/corewing/app/entity/Course.java index 63b0d4a..ee6fe51 100644 --- a/src/main/java/com/corewing/app/entity/Course.java +++ b/src/main/java/com/corewing/app/entity/Course.java @@ -53,6 +53,11 @@ public class Course implements Serializable { */ private Integer status; + /** + * 语言：中文zh，英文：en + */ + private String lang; + /** * 创建时间 */ diff --git a/src/main/java/com/corewing/app/entity/CourseCategory.java b/src/main/java/com/corewing/app/entity/CourseCategory.java index 182c93a..ee9af4e 100644 --- a/src/main/java/com/corewing/app/entity/CourseCategory.java +++ b/src/main/java/com/corewing/app/entity/CourseCategory.java @@ -51,6 +51,11 @@ public class CourseCategory implements Serializable { */ private Integer status; + /** + * 语言：中文zh，英文：en + */ + private String lang; + /** * 创建时间 */ diff --git a/src/main/java/com/corewing/app/mapper/CourseMapper.java b/src/main/java/com/corewing/app/mapper/CourseMapper.java index 61e8981..ead0a19 100644 --- a/src/main/java/com/corewing/app/mapper/CourseMapper.java +++ b/src/main/java/com/corewing/app/mapper/CourseMapper.java @@ -13,5 +13,5 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface CourseMapper extends BaseMapper { - Page pageList(Page page, @Param("categoryId") int categoryId, @Param("courseTitle") String courseTitle); + Page pageList(Page page, @Param("categoryId") int categoryId, @Param("courseTitle") String courseTitle, @Param("lang") String lang); } diff --git a/src/main/java/com/corewing/app/service/CourseService.java b/src/main/java/com/corewing/app/service/CourseService.java index 78caaa1..e56052b 100644 --- a/src/main/java/com/corewing/app/service/CourseService.java +++ b/src/main/java/com/corewing/app/service/CourseService.java @@ -6,5 +6,5 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.corewing.app.entity.Course; public interface CourseService extends IService { - IPage pageList(Page page, int categoryId, String courseTitle); + IPage pageList(Page page, int categoryId, String courseTitle, String lang); } diff --git a/src/main/java/com/corewing/app/service/impl/CourseServiceImpl.java b/src/main/java/com/corewing/app/service/impl/CourseServiceImpl.java index be96b8b..902f6fe 100644 --- a/src/main/java/com/corewing/app/service/impl/CourseServiceImpl.java +++ b/src/main/java/com/corewing/app/service/impl/CourseServiceImpl.java @@ -18,7 +18,7 @@ public class CourseServiceImpl extends ServiceImpl impleme } @Override - public IPage pageList(Page page, int categoryId, String courseTitle) { - return courseMapper.pageList(page, categoryId, courseTitle); + public IPage pageList(Page page, int categoryId, String courseTitle, String lang) { + return courseMapper.pageList(page, categoryId, courseTitle, lang); } } diff --git a/src/main/resources/mapper/CourseMapper.xml b/src/main/resources/mapper/CourseMapper.xml index 27daeb4..5db8871 100644 --- a/src/main/resources/mapper/CourseMapper.xml +++ b/src/main/resources/mapper/CourseMapper.xml @@ -24,13 +24,12 @@ left join app_course_category cc on cc.id = ccr.category_id - -