diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiBooksServiceImpl.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiBooksServiceImpl.java index fb92bde..335faaf 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiBooksServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiBooksServiceImpl.java @@ -20,6 +20,8 @@ import org.jeecg.modules.demo.appletCourse.entity.AppletCourse; import org.jeecg.modules.demo.appletCourse.service.IAppletCourseService; import org.jeecg.modules.demo.appletCoursePage.entity.AppletCoursePage; import org.jeecg.modules.demo.appletCoursePage.service.IAppletCoursePageService; +import org.jeecg.modules.demo.appletCoursePageWord.entity.AppletCoursePageWord; +import org.jeecg.modules.demo.appletCoursePageWord.service.IAppletCoursePageWordService; import org.jeecg.modules.demo.appletLabel.entity.AppletLabel; import org.jeecg.modules.demo.appletLabel.service.IAppletLabelService; import org.jeecg.modules.demo.appletVip.service.IAppletVipService; @@ -49,6 +51,8 @@ public class AppletApiBooksServiceImpl implements AppletApiBooksService { private IAppletVipService appletVipService; @Autowired private IAppletCoursePageService appletCoursePageService; + @Autowired + private IAppletCoursePageWordService appletCoursePageWordService; /** * 查询书籍列表 @@ -213,7 +217,11 @@ public class AppletApiBooksServiceImpl implements AppletApiBooksService { @Override public List category() { - return appletCategorizeService.list(); + return appletCategorizeService + .lambdaQuery() + .orderByAsc(AppletCategorize::getSort) + .eq(AppletCategorize::getStatus, "Y") + .list(); } @Override @@ -255,7 +263,11 @@ public class AppletApiBooksServiceImpl implements AppletApiBooksService { @Override public AppletCoursePage getCoursesPageDetail(String id){ - return appletCoursePageService.getById(id); + AppletCoursePage page = appletCoursePageService.getById(id); + page.setWords(appletCoursePageWordService.lambdaQuery() + .eq(AppletCoursePageWord::getPageId, id) + .list()); + return page; } } diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiIndexServiceImpl.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiIndexServiceImpl.java index 41164be..e5d21a4 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiIndexServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiIndexServiceImpl.java @@ -5,6 +5,7 @@ import org.jeecg.common.system.util.AppletUserUtil; import org.jeecg.modules.applet.service.AppletApiIndexService; import org.jeecg.modules.demo.appletBanner.entity.AppletBanner; import org.jeecg.modules.demo.appletBanner.service.IAppletBannerService; +import org.jeecg.modules.demo.appletCoursePage.entity.AppletCoursePage; import org.jeecg.modules.demo.appletLink.entity.AppletLink; import org.jeecg.modules.demo.appletLink.service.IAppletLinkService; import org.jeecg.modules.demo.appletRegistration.entity.AppletRegistration; @@ -32,7 +33,11 @@ public class AppletApiIndexServiceImpl implements AppletApiIndexService { */ @Override public List getBanner() { - return appletBannerService.list(); + return appletBannerService + .lambdaQuery() + .eq(AppletBanner::getStatus, "Y") + .orderByAsc(AppletBanner::getSort) + .list(); } /** diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiVipServiceImpl.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiVipServiceImpl.java index c7a43ac..84dc42f 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiVipServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiVipServiceImpl.java @@ -61,12 +61,11 @@ public class AppletApiVipServiceImpl implements AppletApiVipService { */ @Override public List getList(AppletVip appletVip) { -// return appletApiVipService.lambdaQuery() -// .eq(appletVip.getTitle() != null, AppletVip::getTitle, appletVip.getTitle()) -// .eq(appletVip.getImg() != null , AppletVip::getImg, appletVip.getImg()) -// .eq(appletVip.getContent() != null, AppletVip::getContent, appletVip.getContent()) -// .list(); - List list = appletApiVipService.list(); + List list = appletApiVipService + .lambdaQuery() + .orderByAsc(AppletVip::getSort) + .eq(AppletVip::getStatus, "Y") + .list(); for (AppletVip vip : list) { vip.setSetmeals(appletSetmealService .lambdaQuery() diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletBanner/controller/AppletBannerController.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletBanner/controller/AppletBannerController.java index 468c501..acfbfb4 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletBanner/controller/AppletBannerController.java +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletBanner/controller/AppletBannerController.java @@ -41,7 +41,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; /** * @Description: 轮播图 * @Author: jeecg-boot - * @Date: 2025-09-09 + * @Date: 2025-09-19 * @Version: V1.0 */ @Tag(name="轮播图") diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletBanner/entity/AppletBanner.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletBanner/entity/AppletBanner.java index 7e07383..f2fff78 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletBanner/entity/AppletBanner.java +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletBanner/entity/AppletBanner.java @@ -22,7 +22,7 @@ import lombok.experimental.Accessors; /** * @Description: 轮播图 * @Author: jeecg-boot - * @Date: 2025-09-09 + * @Date: 2025-09-19 * @Version: V1.0 */ @Data @@ -63,6 +63,27 @@ public class AppletBanner implements Serializable { /**类型*/ @Excel(name = "类型", width = 15, dicCode = "applett_bnner_type") @Dict(dicCode = "applett_bnner_type") - @Schema(description = "类型:0是富文本 1是课程") + @Schema(description = "类型") private java.lang.String typ; + /**排序*/ + @Excel(name = "排序", width = 15) + @Schema(description = "排序") + private java.lang.Integer sort; + /**书籍*/ + @Excel(name = "书籍", width = 15, dictTable = "applet_books", dicText = "books_name", dicCode = "id") + @Dict(dictTable = "applet_books", dicText = "books_name", dicCode = "id") + @Schema(description = "书籍") + private java.lang.String bookId; + /**视频*/ + @Excel(name = "视频", width = 15) + @Schema(description = "视频") + private java.lang.String video; + /**启用*/ + @Excel(name = "启用", width = 15,replace = {"是_Y","否_N"} ) + @Schema(description = "启用") + private java.lang.String status; + /**富文本*/ + @Excel(name = "富文本", width = 15) + @Schema(description = "富文本") + private java.lang.String content; } diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletBanner/mapper/AppletBannerMapper.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletBanner/mapper/AppletBannerMapper.java index 644e32c..157ae99 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletBanner/mapper/AppletBannerMapper.java +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletBanner/mapper/AppletBannerMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 轮播图 * @Author: jeecg-boot - * @Date: 2025-09-09 + * @Date: 2025-09-19 * @Version: V1.0 */ public interface AppletBannerMapper extends BaseMapper { diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletBanner/service/IAppletBannerService.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletBanner/service/IAppletBannerService.java index ee4c485..4f5aacc 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletBanner/service/IAppletBannerService.java +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletBanner/service/IAppletBannerService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 轮播图 * @Author: jeecg-boot - * @Date: 2025-09-09 + * @Date: 2025-09-19 * @Version: V1.0 */ public interface IAppletBannerService extends IService { diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletBanner/service/impl/AppletBannerServiceImpl.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletBanner/service/impl/AppletBannerServiceImpl.java index 9c21e34..f67f831 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletBanner/service/impl/AppletBannerServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletBanner/service/impl/AppletBannerServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 轮播图 * @Author: jeecg-boot - * @Date: 2025-09-09 + * @Date: 2025-09-19 * @Version: V1.0 */ @Service diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletBanner/uniapp/AppletBannerForm.vue b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletBanner/uniapp/AppletBannerForm.vue index df51373..a87e874 100644 --- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletBanner/uniapp/AppletBannerForm.vue +++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletBanner/uniapp/AppletBannerForm.vue @@ -19,6 +19,36 @@ 类型: + + + + 排序: + + + + + + 书籍: + + + + + + 视频: + + + + + + 启用: + + + + + + 富文本: + +