update beetlsql3,springboot 2.5

admin-console/src/main/java/com/ibeetl/admin/console/dao/AuditConsoleDao.java

 package com.ibeetl.admin.console.dao;
 
-import org.beetl.sql.core.annotatoin.SqlResource;
-import org.beetl.sql.core.engine.PageQuery;
-import org.beetl.sql.core.mapper.BaseMapper;
 
 import com.ibeetl.admin.core.entity.CoreAudit;
+import org.beetl.sql.core.page.PageRequest;
+import org.beetl.sql.core.page.PageResult;
+import org.beetl.sql.mapper.BaseMapper;
+import org.beetl.sql.mapper.annotation.Root;
+import org.beetl.sql.mapper.annotation.SqlResource;
+
+import java.util.Map;
 
 @SqlResource("console.audit")
 public interface AuditConsoleDao extends BaseMapper<CoreAudit> {
 
-    PageQuery<CoreAudit> queryByCondtion(PageQuery<CoreAudit> query);
+    PageResult<CoreAudit> queryByCondtion(PageRequest<CoreAudit> query, @Root Map paras);
 
 }
 

admin-console/src/main/java/com/ibeetl/admin/console/dao/DictConsoleDao.java

 package com.ibeetl.admin.console.dao;
 
 import java.util.List;
+import java.util.Map;
 
-import org.beetl.sql.core.annotatoin.SqlResource;
-import org.beetl.sql.core.engine.PageQuery;
-import org.beetl.sql.core.mapper.BaseMapper;
 
 import com.ibeetl.admin.core.entity.CoreDict;
+import org.beetl.sql.core.page.PageRequest;
+import org.beetl.sql.core.page.PageResult;
+import org.beetl.sql.mapper.BaseMapper;
+import org.beetl.sql.mapper.annotation.Root;
+import org.beetl.sql.mapper.annotation.SqlResource;
 
 /**
  * CoreDict Dao
  */
 @SqlResource("console.dict")
-public interface DictConsoleDao extends BaseMapper<CoreDict>{
-    public PageQuery<CoreDict> queryByCondition(PageQuery query);
-    public void batchDelCoreDictByIds( List<Long> ids);
+public interface DictConsoleDao extends BaseMapper<CoreDict> {
+     PageResult<CoreDict> queryByCondition(PageRequest query, @Root Map params);
+     void batchDelCoreDictByIds( List<Long> ids);
 }
\ No newline at end of file

admin-console/src/main/java/com/ibeetl/admin/console/dao/FunctionConsoleDao.java

 package com.ibeetl.admin.console.dao;
 
-import org.beetl.sql.core.annotatoin.SqlResource;
-import org.beetl.sql.core.engine.PageQuery;
-import org.beetl.sql.core.mapper.BaseMapper;
 
 import com.ibeetl.admin.core.entity.CoreFunction;
+import org.beetl.sql.core.page.PageRequest;
+import org.beetl.sql.core.page.PageResult;
+import org.beetl.sql.mapper.BaseMapper;
+import org.beetl.sql.mapper.annotation.Root;
+import org.beetl.sql.mapper.annotation.SqlResource;
+
+import java.util.Map;
 
 @SqlResource("console.function")
 public interface FunctionConsoleDao extends BaseMapper<CoreFunction> {
@@ -14,5 +18,5 @@ public interface FunctionConsoleDao extends BaseMapper<CoreFunction> {
      *
      * @param query
      */
-    public void queryByCondtion(PageQuery query);
+    PageResult<CoreFunction> queryByCondtion(PageRequest query, @Root Map params);
 }

admin-console/src/main/java/com/ibeetl/admin/console/dao/MenuConsoleDao.java

 package com.ibeetl.admin.console.dao;
 
-import org.beetl.sql.core.annotatoin.SqlResource;
-import org.beetl.sql.core.engine.PageQuery;
-import org.beetl.sql.core.mapper.BaseMapper;
+
 
 import com.ibeetl.admin.core.entity.CoreMenu;
+import org.beetl.sql.core.page.PageRequest;
+import org.beetl.sql.core.page.PageResult;
+import org.beetl.sql.mapper.BaseMapper;
+import org.beetl.sql.mapper.annotation.Root;
+import org.beetl.sql.mapper.annotation.SqlResource;
+
+import java.util.Map;
 
 @SqlResource("console.menu")
 public interface MenuConsoleDao extends BaseMapper<CoreMenu> {
@@ -13,7 +18,7 @@ public interface MenuConsoleDao extends BaseMapper<CoreMenu> {
      * 根据条件分页查询
      * @param query 查询条件
      */
-    void queryByCondtion(PageQuery query);
+    PageResult<CoreMenu> queryByCondition(PageRequest query, @Root Map params);
 
 
 }

admin-console/src/main/java/com/ibeetl/admin/console/dao/OrgConsoleDao.java

 package com.ibeetl.admin.console.dao;
 
 import java.util.List;
+import java.util.Map;
+
 
-import org.beetl.sql.core.annotatoin.Param;
-import org.beetl.sql.core.annotatoin.SqlResource;
-import org.beetl.sql.core.annotatoin.SqlStatement;
-import org.beetl.sql.core.annotatoin.SqlStatementType;
 import org.beetl.sql.core.engine.PageQuery;
-import org.beetl.sql.core.mapper.BaseMapper;
 
 import com.ibeetl.admin.core.entity.CoreOrg;
 import com.ibeetl.admin.core.entity.CoreUser;
+import org.beetl.sql.core.page.PageRequest;
+import org.beetl.sql.core.page.PageResult;
+import org.beetl.sql.mapper.BaseMapper;
+import org.beetl.sql.mapper.annotation.Root;
+import org.beetl.sql.mapper.annotation.SqlResource;
 
 @SqlResource("console.org")
 public interface OrgConsoleDao extends BaseMapper<CoreOrg> {
 
-   
- 
+    PageResult<CoreOrg> queryByCondition(PageRequest query, @Root Map params);
+	PageResult<CoreUser> queryUserByCondition(PageRequest<CoreUser> query,@Root Map params);
 
-    void queryByCondtion(PageQuery<CoreOrg> query);
-    @SqlStatement(type=SqlStatementType.SELECT)
-    void queryUserByCondtion(PageQuery<CoreUser> query);
-    void batchDelByIds(@Param(value = "ids") List<Long> ids);
 }

admin-console/src/main/java/com/ibeetl/admin/console/dao/RoleConsoleDao.java

 package com.ibeetl.admin.console.dao;
 
 import java.util.List;
+import java.util.Map;
 
-import org.beetl.sql.core.annotatoin.SqlResource;
-import org.beetl.sql.core.engine.PageQuery;
-import org.beetl.sql.core.mapper.BaseMapper;
 
 import com.ibeetl.admin.console.web.query.RoleUserQuery;
 import com.ibeetl.admin.core.entity.CoreRole;
 import com.ibeetl.admin.core.entity.CoreUser;
+import org.beetl.sql.core.page.PageRequest;
+import org.beetl.sql.core.page.PageResult;
+import org.beetl.sql.mapper.BaseMapper;
+import org.beetl.sql.mapper.annotation.Root;
+import org.beetl.sql.mapper.annotation.SqlResource;
 
 @SqlResource("console.role")
 public interface RoleConsoleDao extends BaseMapper<CoreRole> {
@@ -17,7 +20,7 @@ public interface RoleConsoleDao extends BaseMapper<CoreRole> {
      * 根据条件分页查询
      * @param query 查询条件
      */
-    void queryByCondtion(PageQuery query);
+    PageResult<CoreRole> queryByCondition(PageRequest query, Map params);
 
     /**
      * 批量删除角色
@@ -28,9 +31,9 @@ public interface RoleConsoleDao extends BaseMapper<CoreRole> {
     void batchDeleteRoleFunction(List<Long> ids);
     void batchDeleteRoleMenu(List<Long> ids);
     void batchDeleteUserRole(List<Long> ids);
-    
-    
-    PageQuery<CoreUser>  queryUser(PageQuery query);
+
+
+	PageResult<CoreUser> queryUser(PageRequest query, @Root Map params);
     
 
 

admin-console/src/main/java/com/ibeetl/admin/console/dao/RoleFunctionConsoleDao.java

@@ -2,12 +2,10 @@ package com.ibeetl.admin.console.dao;
 
 import java.util.List;
 
-import org.beetl.sql.core.annotatoin.Param;
-import org.beetl.sql.core.annotatoin.SqlResource;
-import org.beetl.sql.core.mapper.BaseMapper;
-
 import com.ibeetl.admin.console.web.dto.RoleDataAccessFunction;
 import com.ibeetl.admin.core.entity.CoreRoleFunction;
+import org.beetl.sql.mapper.BaseMapper;
+import org.beetl.sql.mapper.annotation.SqlResource;
 
 @SqlResource("console.roleFunction")
 public interface RoleFunctionConsoleDao extends BaseMapper<CoreRoleFunction> {

admin-console/src/main/java/com/ibeetl/admin/console/dao/UserConsoleDao.java

 package com.ibeetl.admin.console.dao;
 
-import org.beetl.sql.core.annotatoin.Param;
-import org.beetl.sql.core.annotatoin.SqlResource;
-import org.beetl.sql.core.engine.PageQuery;
-import org.beetl.sql.core.mapper.BaseMapper;
+
 
 import com.ibeetl.admin.core.entity.CoreUser;
 import com.ibeetl.admin.core.entity.CoreUserRole;
 import com.ibeetl.admin.core.util.enums.GeneralStateEnum;
+import org.beetl.sql.core.page.PageRequest;
+import org.beetl.sql.core.page.PageResult;
+import org.beetl.sql.mapper.BaseMapper;
+import org.beetl.sql.mapper.annotation.Root;
+import org.beetl.sql.mapper.annotation.SqlResource;
 
 import java.util.List;
+import java.util.Map;
 
 @SqlResource("console.user")
 public interface UserConsoleDao extends BaseMapper<CoreUser> {
 
-    PageQuery<CoreUser> queryByCondtion(PageQuery<CoreUser> query);
+    PageResult<CoreUser> queryByCondition(PageRequest<CoreUser> query, @Root Map params);
 
     void batchDelUserByIds( List<Long> ids);
 

admin-console/src/main/java/com/ibeetl/admin/console/service/AuditConsoleService.java

 package com.ibeetl.admin.console.service;
 
+import com.ibeetl.admin.console.web.query.AuditQuery;
 import org.beetl.sql.core.engine.PageQuery;
+import org.beetl.sql.core.page.PageRequest;
+import org.beetl.sql.core.page.PageResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -9,6 +12,8 @@ import com.ibeetl.admin.console.dao.AuditConsoleDao;
 import com.ibeetl.admin.core.entity.CoreAudit;
 import com.ibeetl.admin.core.service.CoreBaseService;
 
+import java.util.Map;
+
 @Service
 @Transactional
 public class AuditConsoleService extends CoreBaseService<CoreAudit> {
@@ -19,11 +24,14 @@ public class AuditConsoleService extends CoreBaseService<CoreAudit> {
 	/**
 	 * 根据条件查询
 	 *
-	 * @param query
+	 * @param condition
 	 */
-	public void queryByCondtion(PageQuery<CoreAudit> query) {
-		PageQuery<CoreAudit> ret = auditConsoleDao.queryByCondtion(query);
+	public PageResult<CoreAudit> queryByCondtion(AuditQuery condition) {
+		PageRequest pageRequest = condition.getPageRequest();
+		Map params = condition.getPageParam();
+		PageResult<CoreAudit> ret = auditConsoleDao.queryByCondtion(pageRequest,params);
 		queryListAfter(ret.getList());
+		return ret;
 	}
 
 	

admin-console/src/main/java/com/ibeetl/admin/console/service/DictConsoleService.java

@@ -5,8 +5,11 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.ibeetl.admin.console.web.query.CoreDictQuery;
 import org.apache.poi.ss.util.CellReference;
 import org.beetl.sql.core.engine.PageQuery;
+import org.beetl.sql.core.page.PageRequest;
+import org.beetl.sql.core.page.PageResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -29,8 +32,10 @@ public class DictConsoleService extends CoreBaseService<CoreDict> {
 
     @Autowired private DictConsoleDao dictDao;
 
-    public PageQuery<CoreDict>queryByCondition(PageQuery query){
-        PageQuery ret =  dictDao.queryByCondition(query);
+    public PageResult<CoreDict> queryByCondition(CoreDictQuery query){
+		PageRequest pageRequest = query.getPageRequest();
+		Map params = query.getPageParam();
+        PageResult<CoreDict> ret =  dictDao.queryByCondition(pageRequest,params);
         queryListAfter(ret.getList());
         return ret;
     }
@@ -43,9 +48,9 @@ public class DictConsoleService extends CoreBaseService<CoreDict> {
             throw new PlatformException("批量删除CoreDict失败", e);
         }
     }
-    public List<CoreDict> queryExcel(PageQuery<CoreUser> query) {
+    public List<CoreDict> queryExcel(PageRequest query) {
         //同查询，不需要额外数据
-        PageQuery ret =  dictDao.queryByCondition(query);
+        PageResult<CoreDict> ret =  dictDao.queryByCondition(query,null);
         queryListAfter(ret.getList());
         return ret.getList();
         

admin-console/src/main/java/com/ibeetl/admin/console/service/FunctionConsoleService.java

@@ -3,8 +3,12 @@ package com.ibeetl.admin.console.service;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
+import com.ibeetl.admin.console.web.query.FunctionQuery;
 import org.beetl.sql.core.engine.PageQuery;
+import org.beetl.sql.core.page.PageRequest;
+import org.beetl.sql.core.page.PageResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -42,9 +46,11 @@ public class FunctionConsoleService  extends CoreBaseService<CoreFunction> {
 	CorePlatformService platformService;
 	
 	
-	public void queryByCondtion(PageQuery<CoreFunction> query) {
-		functionDao.queryByCondtion(query);
-		List<CoreFunction> list = query.getList();
+	public PageResult<CoreFunction> queryByCondtion(FunctionQuery query) {
+		PageRequest pageRequest = query.getPageRequest();
+		Map params = query.getPageParam();
+		PageResult<CoreFunction> pageResult = functionDao.queryByCondtion(pageRequest,params);
+		List<CoreFunction> list = pageResult.getList();
 		this.queryListAfter(list);
 		//处理父功能名称显示
 		FunctionItem root = platformService.buildFunction();
@@ -57,13 +63,13 @@ public class FunctionConsoleService  extends CoreBaseService<CoreFunction> {
         	}
         	function.set("parentFunctionText", name);
         }
+        return pageResult;
 		
 	}
 	
 	
 	public Long saveFunction(CoreFunction function){
-		
-		functionDao.insert(function,true);
+		functionDao.insert(function);
 		platformService.clearFunctionCache();
 		return  function.getId();
 	}
@@ -125,7 +131,6 @@ public class FunctionConsoleService  extends CoreBaseService<CoreFunction> {
 	}
 	/**
 	 * 更新角色对应的功能点所有,
-	 * @param roleId
 	 * @param data，必须包含id,和 dataAcerssType，采用模板更新
 	 */
 	public void updateFunctionAccessByRole(List<RoleDataAccessFunction> data ){
@@ -153,7 +158,6 @@ public class FunctionConsoleService  extends CoreBaseService<CoreFunction> {
 	
 	/** 给角色赋予功能同时，根据赋予的功能权限，更新能访问的菜单
 	 * @param adds
-	 * @param updates
 	 * @param dels
 	 * @return  返回增加的项的id，用于前端
 	 */

admin-console/src/main/java/com/ibeetl/admin/console/service/MenuConsoleService.java

 package com.ibeetl.admin.console.service;
 
 import com.ibeetl.admin.console.dao.MenuConsoleDao;
+import com.ibeetl.admin.console.web.query.MenuQuery;
 import com.ibeetl.admin.core.dao.CoreRoleMenuDao;
 import com.ibeetl.admin.core.entity.CoreMenu;
 import com.ibeetl.admin.core.rbac.tree.MenuItem;
@@ -9,12 +10,15 @@ import com.ibeetl.admin.core.service.CorePlatformService;
 import com.ibeetl.admin.core.util.PlatformException;
 
 import org.beetl.sql.core.engine.PageQuery;
+import org.beetl.sql.core.page.PageRequest;
+import org.beetl.sql.core.page.PageResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 @Service
 @Transactional
@@ -28,9 +32,12 @@ public class MenuConsoleService extends CoreBaseService<CoreMenu> {
     @Autowired
     CorePlatformService platformService;
 
-    public void queryByCondtion(PageQuery<CoreMenu> query) {
-        menuDao.queryByCondtion(query);
-        queryListAfter(query.getList());
+    public PageResult<CoreMenu> queryByCondition(MenuQuery condition) {
+		PageRequest pageRequest = condition.getPageRequest();
+		Map params = condition.getPageParam();
+        PageResult<CoreMenu> pageResult = menuDao.queryByCondition(pageRequest,params);
+        queryListAfter(pageResult.getList());
+        return  pageResult;
     }
 
     public Long saveMenu(CoreMenu menu) {
@@ -40,7 +47,7 @@ public class MenuConsoleService extends CoreBaseService<CoreMenu> {
         if (queryCount > 0) {
             throw new PlatformException("菜单编码已存在");
         }
-        menuDao.insert(menu, true);
+        menuDao.insert(menu);
         platformService.clearMenuCache();
         return menu.getId();
     }

admin-console/src/main/java/com/ibeetl/admin/console/service/OrgConsoleService.java

@@ -2,8 +2,13 @@ package com.ibeetl.admin.console.service;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
+import com.ibeetl.admin.console.web.query.OrgQuery;
+import com.ibeetl.admin.console.web.query.OrgUserQuery;
 import org.beetl.sql.core.engine.PageQuery;
+import org.beetl.sql.core.page.PageRequest;
+import org.beetl.sql.core.page.PageResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -34,9 +39,11 @@ public class OrgConsoleService extends CoreBaseService<CoreOrg> {
      * 根据条件查询
      * @param query
      */
-    public void queryByCondtion(PageQuery<CoreOrg> query) {
-        orgDao.queryByCondtion(query);
-        List<CoreOrg> list = query.getList();
+    public PageResult<CoreOrg> queryByCondition(OrgQuery condition) {
+		PageRequest request = condition.getPageRequest();
+		Map params = condition.getPageParam();
+		PageResult<CoreOrg> pageResult =  orgDao.queryByCondition(request,params);
+        List<CoreOrg> list = pageResult.getList();
         queryListAfter(list);
         OrgItem root = platformService.buildOrg();
         //处理父机构名称显示，没有用sql查询是考虑到跨数据库
@@ -46,11 +53,15 @@ public class OrgConsoleService extends CoreBaseService<CoreOrg> {
         	String name = item!=null?item.getName():"";
         	org.set("parentOrgText", name);
         }
+        return pageResult;
     }
     
-    public void queryUserByCondition(PageQuery<CoreUser> query) {
-    	orgDao.queryUserByCondtion(query);
-    	queryListAfter(query.getList());
+    public PageResult<CoreUser> queryUserByCondition(OrgUserQuery condition) {
+    	PageRequest pageRequest = condition.getPageRequest();
+    	Map param = condition.getPageParam();
+		PageResult<CoreUser> pageResult = orgDao.queryUserByCondition(pageRequest,param);
+    	queryListAfter(pageResult.getList());
+    	return pageResult;
     }
 
 

admin-console/src/main/java/com/ibeetl/admin/console/service/RoleConsoleService.java

 package com.ibeetl.admin.console.service;
 
 import java.util.List;
+import java.util.Map;
 
+import com.ibeetl.admin.console.web.query.RoleQuery;
+import com.ibeetl.admin.console.web.query.RoleUserQuery;
 import org.beetl.sql.core.SQLManager;
 import org.beetl.sql.core.engine.PageQuery;
+import org.beetl.sql.core.page.PageRequest;
+import org.beetl.sql.core.page.PageResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,17 +59,22 @@ public class RoleConsoleService extends CoreBaseService<CoreRole> {
 
     /**
      * 根据条件查询
-     * @param query
+     * @param condition
      */
-    public void queryByCondtion(PageQuery query) {
-        roleDao.queryByCondtion(query);
-        super.queryListAfter(query.getList());
+    public PageResult<CoreRole> queryByCondition(RoleQuery condition) {
+		PageRequest pageRequest = condition.getPageRequest();
+		Map params = condition.getPageParam();
+		PageResult<CoreRole> pageResult =  roleDao.queryByCondition(pageRequest,params);
+        super.queryListAfter(pageResult.getList());
+        return pageResult;
     }
 
     
-    public PageQuery<CoreUser> queryRoleUser(PageQuery query) {
+    public PageResult<CoreUser> queryRoleUser(RoleUserQuery condition) {
     	OrgItem root = platformService.buildOrg();
-    	PageQuery<CoreUser>  ret = roleDao.queryUser(query);
+    	PageRequest pageRequest = condition.getPageRequest();
+    	Map params = condition.getPageParam();
+		PageResult<CoreUser>  ret = roleDao.queryUser(pageRequest,params);
     	List<CoreUser> list = ret.getList();
     	//从缓存里取出组织机构名称
     	for(CoreUser user:list) {

admin-console/src/main/java/com/ibeetl/admin/console/service/UserConsoleService.java

@@ -3,10 +3,14 @@ package com.ibeetl.admin.console.service;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
+import com.ibeetl.admin.console.web.query.UserQuery;
 import org.apache.catalina.User;
 import org.apache.commons.lang3.StringUtils;
 import org.beetl.sql.core.engine.PageQuery;
+import org.beetl.sql.core.page.PageRequest;
+import org.beetl.sql.core.page.PageResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -52,11 +56,14 @@ public class UserConsoleService extends CoreBaseService<CoreUser> {
 	/**
 	 * 根据条件查询
 	 *
-	 * @param query
+	 * @param condition
 	 */
-	public void queryByCondtion(PageQuery<CoreUser> query) {
-		PageQuery<CoreUser> ret = userDao.queryByCondtion(query);
+	public PageResult<CoreUser> queryByCondition(UserQuery condition) {
+		PageRequest pageRequest = condition.getPageRequest();
+		Map params = condition.getPageParam();
+		PageResult<CoreUser> ret = userDao.queryByCondition(pageRequest,params);
 		queryListAfter(ret.getList());
+		return ret;
 	}
 
 	/**
@@ -75,7 +82,7 @@ public class UserConsoleService extends CoreBaseService<CoreUser> {
 		user.setState(GeneralStateEnum.ENABLE.getValue());
 		user.setPassword(passwordEncryptService.password(user.getPassword()));
 		user.setDelFlag(DelFlagEnum.NORMAL.getValue());
-		userDao.insert(user, true);
+		userDao.insert(user);
 		if(StringUtils.isNotEmpty(user.getAttachmentId())){
 		    //更新附件详细信息,关联到这个用户
 		    fileService.updateFile(user.getAttachmentId(), User.class.getSimpleName(), String.valueOf(user.getId()));
@@ -152,7 +159,7 @@ public class UserConsoleService extends CoreBaseService<CoreUser> {
 	/**
 	 * 重置用户密码
 	 *
-	 * @param uId
+	 * @param id
 	 * @param password
 	 */
 	public int resetPassword(Long id, String password) {
@@ -185,8 +192,10 @@ public class UserConsoleService extends CoreBaseService<CoreUser> {
 		sqlManager.insert(userRole);
 	}
 	
-	public List<UserExcelExportData> queryExcel(PageQuery<CoreUser> query) {
-		PageQuery<CoreUser> ret = userDao.queryByCondtion(query);
+	public List<UserExcelExportData> queryExcel(UserQuery condition) {
+		PageRequest pageRequest = condition.getPageRequest();
+		Map params = condition.getPageParam();
+		PageResult<CoreUser> ret = userDao.queryByCondition(pageRequest,params);
 		List<CoreUser> list = ret.getList();
 		OrgItem orgRoot = platformService.buildOrg();
 		List<UserExcelExportData> items = new ArrayList<>();

admin-console/src/main/java/com/ibeetl/admin/console/web/AuditConsoleController.java

 package com.ibeetl.admin.console.web;
 
-
+
 import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.beetl.sql.core.engine.PageQuery;
+import org.beetl.sql.core.page.PageResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -24,7 +25,7 @@ import com.ibeetl.admin.core.entity.CoreAudit;
 import com.ibeetl.admin.core.util.AnnotationUtil;
 import com.ibeetl.admin.core.web.JsonResult;
 /**
- * 用户管理接口
+ * 用户审计接口
  * @author xiandafu
  *
  */
@@ -38,7 +39,6 @@ public class AuditConsoleController {
     
   
    /*页面*/
-    
     @GetMapping(MODEL + "/index.do")
     @Function("trace")
     public ModelAndView index() {
@@ -49,7 +49,6 @@ public class AuditConsoleController {
     
     
     /*Json*/
-
     @PostMapping(MODEL + "/view.json")
     @ResponseBody
     @Function("trace")
@@ -63,11 +62,9 @@ public class AuditConsoleController {
     @RequestMapping(MODEL + "/list.json")
     @Function("trace")
     @ResponseBody
-    public JsonResult<PageQuery<CoreAudit>> list(AuditQuery condtion) {
-       
-        PageQuery<CoreAudit> page = condtion.getPageQuery();
-        auditConsoleService.queryByCondtion(page);
-        return JsonResult.success(page);
+    public JsonResult<PageResult<CoreAudit>> list(AuditQuery condition) {
+        PageResult<CoreAudit> pageResult = auditConsoleService.queryByCondtion(condition);
+        return JsonResult.success(pageResult);
     }
     
     

admin-console/src/main/java/com/ibeetl/admin/console/web/DictConsoleController.java

@@ -14,6 +14,9 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.beetl.sql.core.engine.PageQuery;
+import org.beetl.sql.core.page.DefaultPageRequest;
+import org.beetl.sql.core.page.PageRequest;
+import org.beetl.sql.core.page.PageResult;
 import org.jxls.common.Context;
 import org.jxls.reader.ReaderBuilder;
 import org.jxls.reader.ReaderConfig;
@@ -92,11 +95,10 @@ public class DictConsoleController{
     @PostMapping(MODEL + "/list.json")
     @Function("dict.query")
     @ResponseBody
-    public JsonResult<PageQuery> list(CoreDictQuery condtion)
+    public JsonResult<PageResult<CoreDict>> list(CoreDictQuery condition)
     {
-        PageQuery page = condtion.getPageQuery();
-        dictService.queryByCondition(page);
-        return JsonResult.success(page);
+        PageResult<CoreDict> pageResult = dictService.queryByCondition(condition);
+        return JsonResult.success(pageResult);
     }
 
     @PostMapping(MODEL + "/add.json")
@@ -147,13 +149,10 @@ public class DictConsoleController{
     @PostMapping(MODEL + "/excel/export.json")
     @Function("dict.export")
     @ResponseBody
-    public JsonResult<String> export(HttpServletResponse response,CoreDictQuery condtion) {
+    public JsonResult<String> export(HttpServletResponse response,CoreDictQuery condition) {
         String excelTemplate ="excelTemplates/admin/dict/dict_collection_template.xls";
-        PageQuery<CoreUser> page = condtion.getPageQuery();
-        //取出全部符合条件的
-        page.setPageSize(Integer.MAX_VALUE);
-        page.setPageNumber(1);
-        page.setTotalRow(Integer.MAX_VALUE);
+       	PageRequest page = DefaultPageRequest.of(1,Integer.MAX_VALUE);
+
         List<CoreDict> dicts =dictService.queryExcel(page);
         try(InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(excelTemplate)) {
             if(is==null) {

admin-console/src/main/java/com/ibeetl/admin/console/web/FunctionController.java

@@ -9,6 +9,7 @@ import java.util.Map;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.beetl.sql.core.engine.PageQuery;
+import org.beetl.sql.core.page.PageResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.annotation.Validated;
@@ -153,11 +154,10 @@ public class FunctionController {
     @RequestMapping(MODEL + "/list.json")
     @Function("function.query")
     @ResponseBody
-    public JsonResult<PageQuery<CoreFunction>> list(FunctionQuery condtion) {
-     
-        PageQuery page = condtion.getPageQuery();
-        functionConsoleService.queryByCondtion(page);
-        return JsonResult.success(page);
+    public JsonResult<PageResult<CoreFunction>> list(FunctionQuery condtion) {
+
+		PageResult<CoreFunction>  pageResult = functionConsoleService.queryByCondtion(condtion);
+        return JsonResult.success(pageResult);
      
     }
     

admin-console/src/main/java/com/ibeetl/admin/console/web/MenuController.java

@@ -7,6 +7,8 @@ import java.util.Map;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.beetl.sql.core.engine.PageQuery;
+import org.beetl.sql.core.page.PageRequest;
+import org.beetl.sql.core.page.PageResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.annotation.Validated;
@@ -74,7 +76,6 @@ public class MenuController {
     
     /**
      * 查询
-     * @param menu
      * @return
      */
     @PostMapping(MODEL + "/list/condition.json")
@@ -89,10 +90,9 @@ public class MenuController {
     @PostMapping(MODEL + "/list.json")
     @Function("menu.query")
     @ResponseBody
-    public JsonResult<PageQuery> list(MenuQuery condtion) {
-        PageQuery page = condtion.getPageQuery();
-        menuService.queryByCondtion(page);
-        return JsonResult.success(page);
+    public JsonResult<PageResult<CoreMenu>> list(MenuQuery condition) {
+		PageResult<CoreMenu> pageResult = menuService.queryByCondition(condition);
+        return JsonResult.success(pageResult);
     }
     
 

admin-console/src/main/java/com/ibeetl/admin/console/web/OrgConsoleController.java

@@ -8,6 +8,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.beetl.sql.core.engine.PageQuery;
+import org.beetl.sql.core.page.PageRequest;
+import org.beetl.sql.core.page.PageResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.BindingResult;
@@ -92,16 +94,16 @@ public class OrgConsoleController {
     
     /**
      * 组织机构列表  分页
-     * @param condtion 查询条件
+     * @param condition 查询条件
      * @return
      */
     @PostMapping(MODEL + "/list.json")
     @Function("org.query")
     @ResponseBody
-    public JsonResult<PageQuery<CoreOrg>> list(OrgQuery condtion) {
-        PageQuery page = condtion.getPageQuery();
-        orgConsoleService.queryByCondtion(page);
-        return JsonResult.success(page);
+    public JsonResult<PageResult<CoreOrg>> list(OrgQuery condition) {
+
+		PageResult<CoreOrg> pageResult =  orgConsoleService.queryByCondition(condition);
+        return JsonResult.success(pageResult);
     }
 
     /**
@@ -111,7 +113,7 @@ public class OrgConsoleController {
     @PostMapping(MODEL + "/list/condition.json")
     @Function("org.query")
     @ResponseBody
-    public JsonResult<List<Map<String, Object>>> listCondtion() {
+    public JsonResult<List<Map<String, Object>>> listCondition() {
         List<Map<String, Object>> list = AnnotationUtil.getInstance().getAnnotations(Query.class, OrgQuery.class);
         return JsonResult.success(list);
     }
@@ -181,10 +183,9 @@ public class OrgConsoleController {
     @PostMapping(MODEL + "/user/list.json")
     @Function("org.query")
     @ResponseBody
-    public JsonResult<PageQuery<CoreUser>> getUsers(OrgUserQuery userQuery) {
-    	 PageQuery<CoreUser> page = userQuery.getPageQuery();
-         orgConsoleService.queryUserByCondition(page);
-         return JsonResult.success(page);
+    public JsonResult<PageResult<CoreUser>> getUsers(OrgUserQuery userQuery) {
+		PageResult<CoreUser>  pageResult = orgConsoleService.queryUserByCondition(userQuery);
+         return JsonResult.success(pageResult);
     }
    
 }