修改分页信息

resources/jdbc.properties

@@ -2,7 +2,7 @@
 db.table.prefix=foc_
 jdbc.type=mysql
 jdbc.driver.class=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://81.69.44.115:5508/jd_foc?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
+jdbc.url=jdbc:mysql://81.69.44.115:5508/jd_foc?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
 jdbc.username=sms_develop
 jdbc.password=Develop2018!@#
 #\u521d\u59cb\u5316\u8fde\u63a5

resources/mappings/modules/sys/IpBlacklistDao.xml

@@ -8,6 +8,10 @@
 
     <select id="findList" resultType="com.ejweb.modules.sys.entity.SysLoginBlacklist">
 		select id,black_ip,create_time from sys_login_blacklist
+		where 1=1
+		<if test="blackIp !=null and blackIp !='' ">
+			and black_ip like CONCAT('%', #{blackIp}, '%')
+		</if>
 	</select>
 
     <delete id="deleteByIp" parameterType="string">

src/com/ejweb/modules/sys/dao/IpBlacklistDao.java

@@ -3,8 +3,6 @@ package com.ejweb.modules.sys.dao;
 import com.ejweb.core.persistence.CrudDao;
 import com.ejweb.modules.sys.entity.SysLoginBlacklist;
 
-import java.util.List;
-
 /**
  * @author LEGION
  */
@@ -17,13 +15,6 @@ public interface IpBlacklistDao extends CrudDao<SysLoginBlacklist> {
      */
     SysLoginBlacklist findByIp(String ip);
 
-    /**
-     * 根据IP查询黑名单
-     *
-     * @param
-     * @return
-     */
-    List<SysLoginBlacklist> findList();
 
     /**
      * 删除黑名单

src/com/ejweb/modules/sys/service/AccountBlacklistService.java

@@ -51,6 +51,7 @@ public class AccountBlacklistService {
             }
         }
         page.setList(list);
+        page.setCount(list.size());
         return page;
     }
 

src/com/ejweb/modules/sys/service/IpBlacklistService.java

 package com.ejweb.modules.sys.service;
 
 import com.ejweb.core.persistence.Page;
-import com.ejweb.core.utils.StringUtils;
 import com.ejweb.modules.sys.dao.IpBlacklistDao;
 import com.ejweb.modules.sys.entity.SysLoginBlacklist;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,7 +8,6 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * @author LEGION
@@ -25,16 +23,8 @@ public class IpBlacklistService {
     }
 
     public Page<SysLoginBlacklist> getPage(Page<SysLoginBlacklist> page, SysLoginBlacklist ipBlacklist) {
-        List<SysLoginBlacklist> list = new ArrayList<>();
         ipBlacklist.setPage(page);
-        if (!StringUtils.isEmpty(ipBlacklist.getBlackIp())) {
-            ipBlacklist = ipBlacklistDao.findByIp(ipBlacklist.getBlackIp());
-            if (Objects.nonNull(ipBlacklist)) {
-                list.add(ipBlacklist);
-            }
-        } else {
-            list = ipBlacklistDao.findList(ipBlacklist);
-        }
+        List<SysLoginBlacklist> list = ipBlacklistDao.findList(ipBlacklist);
         page.setList(list);
         return page;
     }