From 5fdda5bdb6ee548f203dfe031fe2a28907f939f6 Mon Sep 17 00:00:00 2001
From: Zhang Liguo <482370576@qq.com>
Date: Tue, 26 Dec 2023 18:15:04 +0800
Subject: [PATCH] =?UTF-8?q?Nav=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/lovenav/controller/NavController.java       | 3 ++-
 src/main/java/com/lovenav/dao/NavDao.java                     | 4 ++--
 src/main/java/com/lovenav/service/NavService.java             | 3 ++-
 .../java/com/lovenav/service/serviceImpl/NavServiceImpl.java  | 3 ++-
 src/main/resources/mybatis/NavDao.xml                         | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/lovenav/controller/NavController.java b/src/main/java/com/lovenav/controller/NavController.java
index 3df5bfe..f0a41fb 100644
--- a/src/main/java/com/lovenav/controller/NavController.java
+++ b/src/main/java/com/lovenav/controller/NavController.java
@@ -7,6 +7,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.HashMap;
+import java.util.List;
 
 @RestController
 public class NavController {
@@ -36,7 +37,7 @@ public class NavController {
     }
 
     @RequestMapping("/selectAllNav")
-    public HashMap<Integer, Object> selectAllNav(){
+    public List<Nav> selectAllNav(){
         return navService.selectAllNav();
     }
 
diff --git a/src/main/java/com/lovenav/dao/NavDao.java b/src/main/java/com/lovenav/dao/NavDao.java
index 1e8d4f8..c1b2203 100644
--- a/src/main/java/com/lovenav/dao/NavDao.java
+++ b/src/main/java/com/lovenav/dao/NavDao.java
@@ -24,6 +24,6 @@ public interface NavDao {
     int updateByPrimaryKey(Nav record);
 
     Nav selectAlreadyExist(Nav nav);
-@MapKey("id")
-    HashMap<Integer,Object> selectAllNav();
+
+    List<Nav> selectAllNav();
 }
\ No newline at end of file
diff --git a/src/main/java/com/lovenav/service/NavService.java b/src/main/java/com/lovenav/service/NavService.java
index 92d2ccd..fac6fb1 100644
--- a/src/main/java/com/lovenav/service/NavService.java
+++ b/src/main/java/com/lovenav/service/NavService.java
@@ -3,6 +3,7 @@ package com.lovenav.service;
 import com.lovenav.entity.Nav;
 
 import java.util.HashMap;
+import java.util.List;
 
 public interface NavService {
     public String deleteNav(Nav nav);
@@ -10,5 +11,5 @@ public interface NavService {
     public String selectNav(Nav nav);
     public String addNav(Nav nav);
 
-    HashMap<Integer,Object> selectAllNav();
+    List<Nav> selectAllNav();
 }
diff --git a/src/main/java/com/lovenav/service/serviceImpl/NavServiceImpl.java b/src/main/java/com/lovenav/service/serviceImpl/NavServiceImpl.java
index 22535e3..7c49470 100644
--- a/src/main/java/com/lovenav/service/serviceImpl/NavServiceImpl.java
+++ b/src/main/java/com/lovenav/service/serviceImpl/NavServiceImpl.java
@@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
+import java.util.List;
 
 @Service
 public class NavServiceImpl implements NavService {
@@ -62,7 +63,7 @@ public class NavServiceImpl implements NavService {
     }
 
     @Override
-    public HashMap<Integer,Object> selectAllNav() {
+    public List<Nav> selectAllNav() {
         return navDao.selectAllNav();
     }
 }
diff --git a/src/main/resources/mybatis/NavDao.xml b/src/main/resources/mybatis/NavDao.xml
index bd1118a..9bcfe29 100644
--- a/src/main/resources/mybatis/NavDao.xml
+++ b/src/main/resources/mybatis/NavDao.xml
@@ -22,7 +22,7 @@
       from ln_nav
       where nav_name = #{navName,jdbcType=VARCHAR}
     </select>
-  <select id="selectAllNav" resultMap="BaseResultMap">
+  <select id="selectAllNav" resultType="com.lovenav.entity.Nav" resultMap="BaseResultMap">
     select * from ln_nav;
   </select>
   <delete id="deleteByNavName" parameterType="java.lang.String">