From 5b6fc219e3f732d328573fc962108901d6920caf Mon Sep 17 00:00:00 2001
From: zhujunjieit <zhujunjie>
Date: Tue, 22 Jan 2019 23:52:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=B1=BB=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/web/res/images/icon-1.png          | Bin 0 -> 3321 bytes
 .../ruoyi/cms/controller/CmsController.java   |  42 +++++++++++++++---
 .../main/resources/templates/web/index.html   |  34 +++++++++++++-
 3 files changed, 68 insertions(+), 8 deletions(-)
 create mode 100644 ruoyi-admin/src/main/resources/static/web/res/images/icon-1.png

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 0000000000000000000000000000000000000000..9b998522d1407db3412bf638b77ce850101f17e5
GIT binary patch
literal 3321
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
D)f`Ih

literal 0
HcmV?d00001

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<TrainCourseVO> 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<TrainCourseCategory> courseCategories1 = trainCourseCategoryService.selectCategoryList( courseCategory );
+        List<TrainCourseCategory> courseCategories2 = new ArrayList<>();
+        List<TrainCourseCategory> 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<TrainCourseVO> 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<TrainCourseSection> 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;}
+
 
 </style>
 <div class="fly-header layui-bg-black" th:fragment="top">
@@ -187,6 +198,27 @@
   </div>
 </div>
 <div class="layui-container">
+  <section class="filterbox">
+    <ul>
+      <li field="classid"><span>选择分类：</span>
+        <a th:href="@{/web}" th:class="${#strings.isEmpty(selectCategoryId)}?'curr':''">不限</a>
+        <a th:each="category:${courseCategories1}" th:href="@{'/web?parentIds='+${category.parentIds}+','+${category.id}}" th:text="${category.name}"
+           th:class="${category.id}==${selectCategoryId}?'curr':''"></a>
+      </li>
+      <li field="classid"><span>选择分类：</span>
+        <a th:if="${#lists.size(courseCategories3)}>0" th:href="@{'/web?parentIds='+${courseCategories2[0].parentIds}}">不限</a>
+        <a th:if="${#lists.size(courseCategories3)}==0" th:href="@{'/web'}">不限</a>
+        <a th:each="category:${courseCategories2}" th:href="@{'/web?parentIds='+${category.parentIds}+','+${category.id}}" th:text="${category.name}" th:class="${category.id}==${selectCategoryId}?'curr':''"></a>
+
+      </li>
+      <li field="classid"><span>选择分类：</span>
+        <a th:if="${#lists.size(courseCategories3)}>0" th:href="@{'/web?parentIds='+${courseCategories3[0].parentIds}}">不限</a>
+        <a th:if="${#lists.size(courseCategories3)}==0" th:href="@{'/web'}">不限</a>
+        <a th:each="category:${courseCategories3}" th:href="@{'/web?parentIds='+${category.parentIds}+','+${category.id}}" th:text="${category.name}" th:class="${category.id}==${selectCategoryId}?'curr':''"></a>
+
+      </li>
+    </ul>
+  </section>
   <div class="title">
     <em></em>
     <span>所有课程</span>
@@ -200,7 +232,7 @@
             <img th:if="${#strings.isEmpty(course.cover)}" th:src="@{/web/res/images/no_img.png}" th:alt="${course.name}" width="100%" height="180px">
             <img th:if="${not #strings.isEmpty(course.cover)}" th:src="${course.cover}" th:alt="${course.name}" width="100%" height="180px">
             <p class="in01">
-              <span class="f20 c77b" th:text="${course.name}">安全测试基础课程</span>
+              <span class="f20 c77b" th:text="${course.name}"></span>
               <span class="cfff"></span>
             </p>
             </a>