结构更新

lmxdawn · lmxdawn · commit 5e247400d513 · 2018-11-07T00:21:01.000+08:00
diff --git a/admin-api/src/main/java/com/lmxdawn/admin/controller/HelloController.java b/admin-api/src/main/java/com/lmxdawn/admin/controller/HelloController.java
@@ -16,7 +16,7 @@ public class HelloController {
 
     @GetMapping("/hello")
     public List<AuthAdmin> hello() {
-        List<AuthAdmin> authAdminList = authAdminService.queryList();
+        List<AuthAdmin> authAdminList = authAdminService.findByPage(null, 1, 10);
         System.out.println(authAdminList);
         return authAdminList;
     }
diff --git a/admin-api/src/main/java/com/lmxdawn/admin/dao/AuthAdminDao.java b/admin-api/src/main/java/com/lmxdawn/admin/dao/AuthAdminDao.java
@@ -3,7 +3,9 @@
 import com.lmxdawn.admin.entity.AuthAdmin;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface AuthAdminDao {
@@ -12,34 +14,34 @@ public interface AuthAdminDao {
      * 查询列表
      * @return 列表
      */
-    List<AuthAdmin> queryAuthAdmin();
+    List<AuthAdmin> findByPage(Map<String,Object> map);
     
     /**
      * 根据id查询
      * @param id 传入的id
      * @return
      */
-    AuthAdmin queryAuthAdminById(Long id);
+    AuthAdmin findById(Long id);
     
     /**
      * 插入
      * @param authAdmin
      * @return
      */
-    int insertAuthAdmin(AuthAdmin authAdmin);
+    boolean insert(AuthAdmin authAdmin);
     
     /**
      * 更新
      * @param authAdmin
      * @return
      */
-    int updateAuthAdmin(AuthAdmin authAdmin);
+    boolean update(AuthAdmin authAdmin);
     
     /**
      * 删除
      * @param id
      * @return
      */
-    int deleteAuthAdminById(Long id);
+    boolean delete(Long id);
     
 }
diff --git a/admin-api/src/main/java/com/lmxdawn/admin/service/AuthAdminService.java b/admin-api/src/main/java/com/lmxdawn/admin/service/AuthAdminService.java
@@ -7,6 +7,6 @@
 
 public interface AuthAdminService {
 
-    List<AuthAdmin> queryList();
-
+    List<AuthAdmin> findByPage(String username, Integer currPage, Integer pageSize);
+    
 }
diff --git a/admin-api/src/main/java/com/lmxdawn/admin/service/impl/AuthAdminServiceImpl.java b/admin-api/src/main/java/com/lmxdawn/admin/service/impl/AuthAdminServiceImpl.java
@@ -3,19 +3,28 @@
 import com.lmxdawn.admin.dao.AuthAdminDao;
 import com.lmxdawn.admin.entity.AuthAdmin;
 import com.lmxdawn.admin.service.AuthAdminService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class AuthAdminServiceImpl implements AuthAdminService {
     
-    @Autowired
+    @Resource
     private AuthAdminDao authAdminDao;
     
     @Override
-    public List<AuthAdmin> queryList() {
-        return authAdminDao.queryAuthAdmin();
+    public List<AuthAdmin> findByPage(String username, Integer currPage, Integer pageSize) {
+        currPage = currPage > 0 ? currPage : 1;
+        pageSize = pageSize > 0 && pageSize <= 20 ? pageSize : 20;
+        Map<String, Object> map = new HashMap<>();
+        map.put("username", username);
+        map.put("currIndex", (currPage - 1) * pageSize);
+        map.put("pageSize", pageSize);
+        return authAdminDao.findByPage(map);
     }
+    
 }
diff --git a/admin-api/src/main/resources/application.properties b/admin-api/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 server.port=9998
-spring.datasource.url=jdbc:mysql://localhost/vue-admin
+spring.datasource.url=jdbc:mysql://localhost/vue-admin?useUnicode=true&characterEncoding=UTF-8
 spring.datasource.username=root
 spring.datasource.password=root
 
diff --git a/admin-api/src/main/resources/mybatis/mapper/AuthAdminDao.xml b/admin-api/src/main/resources/mybatis/mapper/AuthAdminDao.xml
@@ -3,11 +3,17 @@
 
 <mapper namespace="com.lmxdawn.admin.dao.AuthAdminDao" >
 
-    <select id="queryAuthAdmin" resultType="com.lmxdawn.admin.entity.AuthAdmin">
+    <select id="findByPage" parameterType="hashmap" resultType="com.lmxdawn.admin.entity.AuthAdmin">
         SELECT id,username
         FROM auth_admin
+        <where>
+            <if test="username != null and '' != username">
+                username = #{username}
+            </if>
+        </where>
         ORDER BY id
         DESC
+        LIMIT #{currIndex} , #{pageSize}
     </select>
 
 </mapper>

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public class HelloController {`
`16`	`16`
`17`	`17`	`@GetMapping("/hello")`
`18`	`18`	`public List<AuthAdmin> hello() {`
`19`		`- List<AuthAdmin> authAdminList = authAdminService.queryList();`
	`19`	`+ List<AuthAdmin> authAdminList = authAdminService.findByPage(null, 1, 10);`
`20`	`20`	`System.out.println(authAdminList);`
`21`	`21`	`return authAdminList;`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@`
`7`	`7`
`8`	`8`	`public interface AuthAdminService {`
`9`	`9`
`10`		`- List<AuthAdmin> queryList();`
`11`		`-`
	`10`	`+ List<AuthAdmin> findByPage(String username, Integer currPage, Integer pageSize);`
	`11`	`+`
`12`	`12`	`}`