页面结构调整

src/main/java/com/caimei/www/controller/BaseController.java

@@ -1,7 +1,6 @@
 package com.caimei.www.controller;
 
-import com.caimei.www.pojo.base.FriendLink;
-import com.caimei.www.pojo.base.HelpPageType;
+import com.caimei.www.pojo.base.BaseLink;
 import com.caimei.www.pojo.base.TopMenu;
 import com.caimei.www.service.BaseService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,10 +57,10 @@ public class BaseController {
 		List<TopMenu> menuList = baseService.getNavMenu();
 		model.addAttribute("topMenuList", menuList);
 		// 底部帮助页
-		List<HelpPageType> helpPages = baseService.getHelpPages();
+		List<BaseLink> helpPages = baseService.getHelpPages();
 		model.addAttribute("helpPages", helpPages);
 		// 友情链接
-		List<FriendLink> friendLinks = baseService.getFriendLinks();
+		List<BaseLink> friendLinks = baseService.getFriendLinks();
 		model.addAttribute("friendLinks", friendLinks);
 
 		return model;

src/main/java/com/caimei/www/mapper/BaseDao.java

@@ -30,15 +30,15 @@ public interface BaseDao {
     /**
      * 获取底部链接分类
      */
-    List<HelpPageType> getHelpPageTypes();
+    List<BaseLink> getHelpPageTypes();
 
     /**
      * 根据分类获取底部链接
      */
-    List<HelpPage> getHelpPagesByType(@Param("typeId") Integer typeId);
+    List<BaseLink> getHelpPagesByType(@Param("typeId") Integer typeId);
 
     /**
      * 获取友情链接
      */
-    List<FriendLink> getFriendLinks();
+    List<BaseLink> getFriendLinks();
 }

src/main/java/com/caimei/www/pojo/base/HelpPage.java → src/main/java/com/caimei/www/pojo/base/BaseLink.java

@@ -2,6 +2,8 @@ package com.caimei.www.pojo.base;
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * Description
  *
@@ -9,10 +11,11 @@ import lombok.Data;
  * @date : 2020/6/19
  */
 @Data
-public class HelpPage {
+public class BaseLink {
 	private static final long serialVersionUID = 1L;
-	/** 主键 helpPageID */
 	private Integer id;
 	private Integer typeId;
 	private String name;
+	private String link;
+	private List<BaseLink> linkList;
 }

src/main/java/com/caimei/www/pojo/base/FriendLink.java

@@ -1,17 +0,0 @@
-package com.caimei.www.pojo.base;
-
-import lombok.Data;
-
-/**
- * Description
- *
- * @author : Charles
- * @date : 2020/6/19
- */
-@Data
-public class FriendLink {
-	private static final long serialVersionUID = 1L;
-	private Integer id;
-	private String name;
-	private String link;
-}

src/main/java/com/caimei/www/pojo/base/HelpPageType.java

@@ -1,20 +0,0 @@
-package com.caimei.www.pojo.base;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * Description
- *
- * @author : Charles
- * @date : 2020/6/19
- */
-@Data
-public class HelpPageType {
-	private static final long serialVersionUID = 1L;
-	/** 主键 cHelpPageTypeID */
-	private Integer id;
-	private String name;
-	private List<HelpPage> helpPages;
-}

src/main/java/com/caimei/www/service/BaseService.java

@@ -1,8 +1,6 @@
 package com.caimei.www.service;
 
-import com.caimei.www.pojo.JsonModel;
-import com.caimei.www.pojo.base.FriendLink;
-import com.caimei.www.pojo.base.HelpPageType;
+import com.caimei.www.pojo.base.BaseLink;
 import com.caimei.www.pojo.base.TopMenu;
 
 import java.util.List;
@@ -28,11 +26,11 @@ public interface BaseService {
     /**
      * 底部帮助页
      */
-    List<HelpPageType> getHelpPages();
+    List<BaseLink> getHelpPages();
 
     /**
      * 友情链接
      */
-    List<FriendLink> getFriendLinks();
+    List<BaseLink> getFriendLinks();
 
 }

src/main/java/com/caimei/www/service/impl/BaseServiceImpl.java

@@ -68,11 +68,11 @@ public class BaseServiceImpl implements BaseService {
      */
     @Override
     @Cacheable(value = "getHelpPages", key="'www'", unless="#result == null")
-    public List<HelpPageType> getHelpPages() {
-        List<HelpPageType> typeList = baseDao.getHelpPageTypes();
+    public List<BaseLink> getHelpPages() {
+        List<BaseLink> typeList = baseDao.getHelpPageTypes();
         typeList.forEach(item -> {
-            List<HelpPage> pageList = baseDao.getHelpPagesByType(item.getId());
-            item.setHelpPages(pageList);
+            List<BaseLink> pageList = baseDao.getHelpPagesByType(item.getId());
+            item.setLinkList(pageList);
         });
         return typeList;
     }
@@ -82,7 +82,7 @@ public class BaseServiceImpl implements BaseService {
      */
     @Override
     @Cacheable(value = "getFriendLinks", key="'www'", unless="#result == null")
-    public List<FriendLink> getFriendLinks() {
+    public List<BaseLink> getFriendLinks() {
         return baseDao.getFriendLinks();
     }
 

src/main/resources/mapper/BaseMapper.xml

@@ -31,13 +31,13 @@
 		and firstNavigationId = #{topId}
 		order by sort desc,createDate desc
     </select>
-    <select id="getHelpPageTypes" resultType="com.caimei.www.pojo.base.HelpPageType">
+    <select id="getHelpPageTypes" resultType="com.caimei.www.pojo.base.BaseLink">
 		SELECT
 		c_helpPageTypeID as id,
 		c_helpPageTypeName as name
 		FROM c_helpPageType
     </select>
-    <select id="getHelpPagesByType" resultType="com.caimei.www.pojo.base.HelpPage">
+    <select id="getHelpPagesByType" resultType="com.caimei.www.pojo.base.BaseLink">
 		select
             helpPageID as id,
             helpPageTypeID as typeId,
@@ -47,7 +47,7 @@
 		and helpPageTypeID = #{typeId}
 		order by sortIndex
     </select>
-    <select id="getFriendLinks" resultType="com.caimei.www.pojo.base.FriendLink">
+    <select id="getFriendLinks" resultType="com.caimei.www.pojo.base.BaseLink">
 		select id,name,link
 		from new_page_friendship_link
 		where delFlag = 0 order by id

src/main/resources/templates/components/footer.html

@@ -13,7 +13,7 @@
             <div class="list" th:each="type: ${helpPages}">
                 <span class="tab" th:text="${type.name}"></span>
                 <div class="con">
-                    <a th:each="page: ${type.helpPages}" th:href="@{/help.html( id=${page.id} )}" th:text="${page.name}"></a>
+                    <a th:each="page: ${type.linkList}" th:href="@{/help.html( id=${page.id} )}" th:text="${page.name}"></a>
                 </div>
             </div>
             <div class="list">