diff --git a/ruoyi-admin/src/main/resources/static/web/res/images/icon-1.png b/ruoyi-admin/src/main/resources/static/web/res/images/icon-1.png new file mode 100644 index 000000000..9b998522d Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/web/res/images/icon-1.png differ diff --git a/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsController.java b/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsController.java index 33bf6f5a3..95f15fd40 100644 --- a/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsController.java +++ b/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsController.java @@ -1,5 +1,6 @@ package com.ruoyi.cms.controller; +import cn.hutool.core.util.StrUtil; import com.ruoyi.common.config.Global; import com.ruoyi.common.utils.file.FileUtils; import com.ruoyi.exam.domain.ExamPractice; @@ -7,6 +8,7 @@ import com.ruoyi.exam.service.IExamPracticeService; import com.ruoyi.framework.web.util.ShiroUtils; import com.ruoyi.system.service.ISysUserService; import com.ruoyi.train.course.domain.TrainCourse; +import com.ruoyi.train.course.domain.TrainCourseCategory; import com.ruoyi.train.course.domain.TrainCourseSection; import com.ruoyi.train.course.domain.TrainCourseVO; import com.ruoyi.train.course.service.ITrainCourseCategoryService; @@ -17,14 +19,13 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; +import java.util.ArrayList; import java.util.List; /** @@ -52,12 +53,38 @@ public class CmsController { @Autowired private IExamPracticeService examPracticeService; - @RequestMapping({"","/index","/index.html"}) + @RequestMapping({"", "/index", "/index.html"}) @GetMapping() - public String user(TrainCourseVO trainCourse, ModelMap map) { - List list = trainCourseService.selectTrainCoursePage( trainCourse ); + public String index(String parentIds, ModelMap map) { + TrainCourseVO trainCourseVO = new TrainCourseVO(); + //三级分类列表根据parentIds判断 + TrainCourseCategory courseCategory = new TrainCourseCategory(); + courseCategory.setParentId( (long) 100 ); + List courseCategories1 = trainCourseCategoryService.selectCategoryList( courseCategory ); + List courseCategories2 = new ArrayList<>(); + List courseCategories3 = new ArrayList<>(); + if (StrUtil.isNotBlank( parentIds ) && parentIds.split( "," ).length >= 3) {//二级分类 + Long parentId = new Long( parentIds.split( "," )[2] ); + courseCategory.setParentId( parentId ); + courseCategories2 = trainCourseCategoryService.selectCategoryList( courseCategory ); + } + if (StrUtil.isNotBlank( parentIds ) && parentIds.split( "," ).length >= 4) {//三级分类 + Long parentId = new Long( parentIds.split( "," )[3] ); + courseCategory.setParentId( parentId ); + courseCategories3 = trainCourseCategoryService.selectCategoryList( courseCategory ); + } + if (StrUtil.isNotBlank( parentIds )) { + trainCourseVO.setTrainCourseCategoryId( new Integer( parentIds.split( "," )[parentIds.split( "," ).length - 1] ) ); + //当前选中的分类id + map.put( "selectCategoryId", parentIds.split( "," )[parentIds.split( "," ).length - 1] ); + } + List list = trainCourseService.selectTrainCoursePage( trainCourseVO ); map.put( "trainCourse", list ); map.put( "user", ShiroUtils.getSysUser() ); + //三级分类列表 + map.put( "courseCategories1", courseCategories1 ); + map.put( "courseCategories2", courseCategories2 ); + map.put( "courseCategories3", courseCategories3 ); return prefix + "/index"; } @@ -77,10 +104,11 @@ public class CmsController { map.put( "user", ShiroUtils.getSysUser() ); return prefix + "/course/courseInfo"; } + @RequestMapping("/course/courseSections.html/{id}") @GetMapping() public String courseSections(@PathVariable("id") Integer id, ModelMap map) { - TrainCourseSection tcs= trainCourseSectionService.selectById( id ); + TrainCourseSection tcs = trainCourseSectionService.selectById( id ); TrainCourseSection trainCourseSection = new TrainCourseSection(); trainCourseSection.setTrainCourseId( tcs.getTrainCourseId() ); List trainCourseSections = trainCourseSectionService.selectTrainCourseSectionList( trainCourseSection ); diff --git a/ruoyi-cms/src/main/resources/templates/web/index.html b/ruoyi-cms/src/main/resources/templates/web/index.html index 2b3c2e25f..7017419e3 100644 --- a/ruoyi-cms/src/main/resources/templates/web/index.html +++ b/ruoyi-cms/src/main/resources/templates/web/index.html @@ -135,6 +135,17 @@ border-radius: 30px; overflow: hidden; } + .filterbox{/*! border:1px solid #ebebeb; */border-radius:4px;background: #fff;margin-top: 40px} + .filterbox ul{ background-color:white; text-indent:20px;border-radius:3px;} + .filterbox li{ position: relative;border-top:1px dashed #ebebeb;padding: 15px 15px 15px 0;margin-left: 140px;} + .filterbox li:first-child{border-top:0px;} + .filterbox li span{width: 140px;font-size: 16px;line-height:34px;position: absolute;left:-150px;top:15px; color:#fff;background:url(web/res/images/icon-1.png) #ff9f37 no-repeat right center;} + .filterbox li a{float: left;margin:0px 15px 0px 0;font-size: 14px;color: #828282;line-height: 34px;} + .filterbox li a.curr, + .filterbox li a:hover{color:#0288d1;} + .filterbox li:after{content:".";display:block;height:0;clear:both;visibility:hidden} + .filterbox .path-now{font-size: 16px;color: #333;margin-bottom:20px;} +
@@ -187,6 +198,27 @@
+
+ +
所有课程 @@ -200,7 +232,7 @@

- 安全测试基础课程 +