更换至beetlsql3最新版本

plus-admin/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.SqlResource;
 
 @SqlResource("console.audit")
 public interface AuditConsoleDao extends BaseMapper<CoreAudit> {
 
-  PageQuery<CoreAudit> queryByCondtion(PageQuery<CoreAudit> query);
+  PageResult<CoreAudit> queryByCondtion(PageRequest<CoreAudit> query);
 }

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

 package com.ibeetl.admin.console.dao;
 
-import java.util.List;
-
-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 java.util.List;
+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.SqlResource;
 
 /** CoreDict Dao */
 @SqlResource("console.dict")
 public interface DictConsoleDao extends BaseMapper<CoreDict> {
-  public PageQuery<CoreDict> queryByCondition(PageQuery query);
 
-  public void batchDelCoreDictByIds(List<Long> ids);
+  PageResult<CoreDict> queryByCondition(PageRequest query);
+
+  void batchDelCoreDictByIds(List<Long> ids);
+
 }

plus-admin/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.SqlResource;
 
 @SqlResource("console.function")
 public interface FunctionConsoleDao extends BaseMapper<CoreFunction> {
 
   /**
    * 根据条件查询
-   *
-   * @param query
    */
-  public void queryByCondtion(PageQuery query);
+  PageResult<CoreFunction> queryByCondtion(PageRequest<CoreFunction> query);
+
 }

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

 package com.ibeetl.admin.console.dao;
 
-import java.util.List;
-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 java.util.List;
+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.SqlResource;
 
 @SqlResource("console.menu")
 public interface MenuConsoleDao extends BaseMapper<CoreMenu> {
@@ -15,7 +15,7 @@ public interface MenuConsoleDao extends BaseMapper<CoreMenu> {
    *
    * @param query 查询条件
    */
-  void queryByCondtion(PageQuery query);
+  PageResult queryByCondtion(PageRequest<CoreMenu> query);
 
   List<CoreMenu> selectMenuAndRelationFunction();
 }

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

 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.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 java.util.List;
+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.Param;
+import org.beetl.sql.mapper.annotation.Select;
+import org.beetl.sql.mapper.annotation.SqlResource;
 
 @SqlResource("console.org")
 public interface OrgConsoleDao extends BaseMapper<CoreOrg> {
 
-  void queryByCondtion(PageQuery<CoreOrg> query);
+  PageResult<CoreOrg> queryByCondtion(PageRequest<CoreOrg> query);
 
-  @SqlStatement(type = SqlStatementType.SELECT)
-  void queryUserByCondtion(PageQuery<CoreUser> query);
+  @Select
+  PageResult queryUserByCondtion(PageRequest<CoreUser> query);
 
   void batchDelByIds(@Param(value = "ids") List<Long> ids);
 }

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

 package com.ibeetl.admin.console.dao;
 
-import java.util.List;
-
-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 java.util.List;
+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.SqlResource;
 
 @SqlResource("console.role")
 public interface RoleConsoleDao extends BaseMapper<CoreRole> {
@@ -16,14 +14,16 @@ public interface RoleConsoleDao extends BaseMapper<CoreRole> {
   /**
    * 根据条件分页查询
    *
-   * @param query 查询条件
+   * @param query
+   *     查询条件
    */
-  void queryByCondtion(PageQuery query);
+  PageResult queryByCondtion(PageRequest query);
 
   /**
    * 批量删除角色
    *
-   * @param ids 角色id
+   * @param ids
+   *     角色id
    */
   void batchDelByIds(List<Long> ids);
 
@@ -33,5 +33,6 @@ public interface RoleConsoleDao extends BaseMapper<CoreRole> {
 
   void batchDeleteUserRole(List<Long> ids);
 
-  PageQuery<CoreUser> queryUser(PageQuery query);
+  PageResult<CoreUser> queryUser(PageRequest query);
+
 }

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

 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 java.util.List;
+import org.beetl.sql.mapper.BaseMapper;
+import org.beetl.sql.mapper.annotation.SqlResource;
 
 @SqlResource("console.roleFunction")
 public interface RoleFunctionConsoleDao extends BaseMapper<CoreRoleFunction> {
@@ -17,4 +14,5 @@ public interface RoleFunctionConsoleDao extends BaseMapper<CoreRoleFunction> {
   List<Long> getFunctionIdByRole(Long roleId);
 
   List<RoleDataAccessFunction> getQueryFunctionAndRoleData(Long roleId);
+
 }

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

 package com.ibeetl.admin.console.dao;
 
-import com.ibeetl.admin.core.service.param.CoreUserParam;
-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.service.param.CoreUserParam;
 import com.ibeetl.admin.core.util.enums.GeneralStateEnum;
-
 import java.util.List;
+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.SqlResource;
 
 @SqlResource("console.user")
 public interface UserConsoleDao extends BaseMapper<CoreUser> {
 
-  PageQuery<CoreUser> queryByCondtion(PageQuery<CoreUser> query);
+  PageResult<CoreUser> queryByCondtion(CoreUserParam param, PageRequest<CoreUser> query);
 
   void batchDelUserByIds(List<Long> ids);
 
   void batchUpdateUserState(List<Long> ids, GeneralStateEnum state);
 
   List<CoreUserRole> queryUserRole(Long id, Long orgId, Long roleId);
+
 }

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

 package com.ibeetl.admin.console.service;
 
-import org.beetl.sql.core.engine.PageQuery;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.ibeetl.admin.console.dao.AuditConsoleDao;
 import com.ibeetl.admin.core.entity.CoreAudit;
 import com.ibeetl.admin.core.service.CoreBaseService;
+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;
 
 @Service
 @Transactional
 public class AuditConsoleService extends CoreBaseService<CoreAudit> {
 
-  @Autowired AuditConsoleDao auditConsoleDao;
+  @Autowired
+  AuditConsoleDao auditConsoleDao;
 
   /**
    * 根据条件查询
-   *
-   * @param query
    */
-  public void queryByCondtion(PageQuery<CoreAudit> query) {
-    PageQuery<CoreAudit> ret = auditConsoleDao.queryByCondtion(query);
+  public void queryByCondtion(PageRequest<CoreAudit> query) {
+
+    PageResult<CoreAudit> ret = auditConsoleDao.queryByCondtion(query);
     handleStrDictValueFields(ret.getList());
   }
+
 }

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

 package com.ibeetl.admin.console.service;
 
+import com.ibeetl.admin.console.dao.DictConsoleDao;
+import com.ibeetl.admin.console.web.dto.DictExcelImportData;
+import com.ibeetl.admin.core.entity.CoreDict;
+import com.ibeetl.admin.core.entity.CoreUser;
+import com.ibeetl.admin.core.service.CoreBaseService;
+import com.ibeetl.admin.core.util.ExcelError;
+import com.ibeetl.admin.core.util.PlatformException;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import javax.validation.constraints.NotEmpty;
 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;
-
-import com.ibeetl.admin.console.dao.DictConsoleDao;
-import com.ibeetl.admin.console.web.dto.DictExcelImportData;
-import com.ibeetl.admin.core.entity.CoreDict;
-import com.ibeetl.admin.core.entity.CoreUser;
-import com.ibeetl.admin.core.service.CoreBaseService;
-import com.ibeetl.admin.core.util.ExcelError;
-import com.ibeetl.admin.core.util.PlatformException;
 import org.springframework.validation.annotation.Validated;
 
 /** CoreDict Service */
@@ -26,16 +25,19 @@ import org.springframework.validation.annotation.Validated;
 @Transactional
 public class DictConsoleService extends CoreBaseService<CoreDict> {
 
-  @Autowired private DictConsoleDao dictDao;
+  @Autowired
+  private DictConsoleDao dictDao;
+
+  public PageResult<CoreDict> queryByCondition(PageRequest query) {
 
-  public PageQuery<CoreDict> queryByCondition(PageQuery query) {
-    PageQuery ret = dictDao.queryByCondition(query);
+    PageResult ret = dictDao.queryByCondition(query);
     handleStrDictValueFields(ret.getList());
     return ret;
   }
 
   @Validated
   public void batchDelCoreDict(@NotEmpty List<Long> ids) {
+
     try {
       // TODO,找到数据字典所有子类，设置删除标记、可以从缓存中遍历字典树得到id
       dictDao.batchDelCoreDictByIds(ids);
@@ -44,19 +46,18 @@ public class DictConsoleService extends CoreBaseService<CoreDict> {
     }
   }
 
-  public List<CoreDict> queryExcel(PageQuery<CoreUser> query) {
+  public List<CoreDict> queryExcel(PageRequest<CoreUser> query) {
     // 同查询，不需要额外数据
-    PageQuery ret = dictDao.queryByCondition(query);
+    PageResult ret = dictDao.queryByCondition(query);
     handleStrDictValueFields(ret.getList());
     return ret.getList();
   }
+
   /**
    * 参考：dict_mapping.xml
-   *
-   * @param list
-   * @return
    */
   public void batchInsert(List<DictExcelImportData> list) {
+
     int dataStartRow = 2;
     final Map<Integer, DictExcelImportData> map = new HashMap<>();
     list.forEach((item) -> map.put(item.getExcelId(), item));
@@ -101,10 +102,12 @@ public class DictConsoleService extends CoreBaseService<CoreDict> {
   }
 
   private void throwImporError(int row, int col, String msg) {
+
     ExcelError error = new ExcelError();
     CellReference cr = new CellReference(row, col, false, false);
     error.setCell(cr.formatAsString());
     error.setMsg(msg);
     throw new PlatformException("导入错误在:" + error.getCell() + "," + msg);
   }
+
 }

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

@@ -24,7 +24,8 @@ import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 import javax.validation.constraints.NotNull;
-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.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
@@ -89,10 +90,10 @@ public class FunctionConsoleService extends CoreBaseService<CoreFunction> {
     }
   }
 
-  public void queryByCondtion(PageQuery<CoreFunction> query) {
+  public void queryByCondtion(PageRequest<CoreFunction> query) {
 
-    functionConsoleDao.queryByCondtion(query);
-    List<CoreFunction> list = query.getList();
+    PageResult<CoreFunction> pageResult = functionConsoleDao.queryByCondtion(query);
+    List<CoreFunction> list = pageResult.getList();
     this.handleStrDictValueFields(list);
     // 处理父功能名称显示
     FunctionItem root = corePlatformService.buildFunction();
@@ -117,7 +118,7 @@ public class FunctionConsoleService extends CoreBaseService<CoreFunction> {
     Long parentId = Optional.ofNullable(function.getParent()).map(CoreFunction::getId).orElse(-1L);
     function.setParentId(parentId);
     function.setCreateTime(new Date());
-    functionConsoleDao.insert(function, true);
+    functionConsoleDao.insert(function);
     corePlatformService.clearFunctionCache();
     return function.getId();
   }

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

@@ -16,7 +16,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.validation.constraints.NotNull;
-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.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
@@ -35,10 +36,10 @@ public class MenuConsoleService extends CoreBaseService<CoreMenu> {
   @Autowired
   CorePlatformService platformService;
 
-  public void queryByCondtion(PageQuery<CoreMenu> query) {
+  public void queryByCondtion(PageRequest<CoreMenu> query) {
 
-    menuDao.queryByCondtion(query);
-    handleStrDictValueFields(query.getList());
+    PageResult pageResult = menuDao.queryByCondtion(query);
+    handleStrDictValueFields(pageResult.getList());
   }
 
   public Long saveMenu(CoreMenu menu) {
@@ -52,7 +53,7 @@ public class MenuConsoleService extends CoreBaseService<CoreMenu> {
     menu.setCreateTime(new Date());
     menu.setParentMenuId(menu.getParent().getId());
     menu.setFunctionId(menu.getRelationFunction().getId());
-    menuDao.insert(menu, true);
+    menuDao.insert(menu);
     platformService.clearMenuCache();
     return menu.getId();
   }

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

 package com.ibeetl.admin.console.service;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.beetl.sql.core.engine.PageQuery;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.ibeetl.admin.console.dao.OrgConsoleDao;
 import com.ibeetl.admin.core.entity.CoreOrg;
 import com.ibeetl.admin.core.entity.CoreUser;
@@ -15,24 +7,32 @@ import com.ibeetl.admin.core.rbac.tree.OrgItem;
 import com.ibeetl.admin.core.service.CoreBaseService;
 import com.ibeetl.admin.core.service.CorePlatformService;
 import com.ibeetl.admin.core.util.PlatformException;
+import java.util.ArrayList;
+import java.util.List;
+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;
 
 /** @author : xiandafu */
 @Service
 @Transactional
 public class OrgConsoleService extends CoreBaseService<CoreOrg> {
 
-  @Autowired private OrgConsoleDao orgDao;
+  @Autowired
+  private OrgConsoleDao orgDao;
 
-  @Autowired private CorePlatformService platformService;
+  @Autowired
+  private CorePlatformService platformService;
 
   /**
    * 根据条件查询
-   *
-   * @param query
    */
-  public void queryByCondtion(PageQuery<CoreOrg> query) {
-    orgDao.queryByCondtion(query);
-    List<CoreOrg> list = query.getList();
+  public PageResult<CoreOrg> queryByCondtion(PageRequest<CoreOrg> query) {
+
+    PageResult<CoreOrg> pageResult = orgDao.queryByCondtion(query);
+    List<CoreOrg> list = pageResult.getList();
     handleStrDictValueFields(list);
     OrgItem root = platformService.buildOrg();
     // 处理父机构名称显示，没有用sql查询是考虑到跨数据库
@@ -42,20 +42,27 @@ 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);
-    handleStrDictValueFields(query.getList());
+  public PageResult queryUserByCondition(PageRequest<CoreUser> query) {
+
+    PageResult pageResult = orgDao.queryUserByCondtion(query);
+    handleStrDictValueFields(pageResult.getList());
+    return pageResult;
   }
 
   /**
    * 获取机构下面的所以机构
    *
-   * @param orgId 机构id
+   * @param orgId
+   *     机构id
    */
   public List<Long> getAllChildIdsByOrgId(Long orgId) {
-    if (orgId == null) return null;
+
+    if (orgId == null) {
+      return null;
+    }
 
     OrgItem orgItem = platformService.buildOrg().findChild(orgId);
     if (orgItem == null) {
@@ -72,6 +79,7 @@ public class OrgConsoleService extends CoreBaseService<CoreOrg> {
 
   @Override
   public boolean deleteById(List<Long> ids) {
+
     OrgItem root = platformService.buildOrg();
     // 检查子节点
 
@@ -83,4 +91,5 @@ public class OrgConsoleService extends CoreBaseService<CoreOrg> {
     }
     return super.deleteById(ids);
   }
+
 }

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

 package com.ibeetl.admin.console.service;
 
-import java.util.List;
-
-import org.beetl.sql.core.SQLManager;
-import org.beetl.sql.core.engine.PageQuery;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.ibeetl.admin.console.dao.RoleConsoleDao;
 import com.ibeetl.admin.core.entity.CoreRole;
 import com.ibeetl.admin.core.entity.CoreUser;
@@ -18,24 +8,36 @@ import com.ibeetl.admin.core.service.CoreBaseService;
 import com.ibeetl.admin.core.service.CorePlatformService;
 import com.ibeetl.admin.core.util.PlatformException;
 import com.ibeetl.admin.core.util.enums.RoleTypeEnum;
+import java.util.List;
+import org.beetl.sql.core.SQLManager;
+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;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 @Transactional
 public class RoleConsoleService extends CoreBaseService<CoreRole> {
+
   private static final Logger LOGGER = LoggerFactory.getLogger(RoleConsoleService.class);
 
-  @Autowired private RoleConsoleDao roleDao;
+  @Autowired
+  private RoleConsoleDao roleDao;
 
-  @Autowired private SQLManager sqlManager;
+  @Autowired
+  private SQLManager sqlManager;
 
-  @Autowired CorePlatformService platformService;
+  @Autowired
+  CorePlatformService platformService;
 
   /**
    * 获取全部操作角色集合
-   *
-   * @return
    */
   public List<CoreRole> queryAllPermissionList() {
+
     CoreRole template = new CoreRole();
     template.setType(RoleTypeEnum.ACCESS.getValue());
     return roleDao.template(template);
@@ -43,26 +45,26 @@ public class RoleConsoleService extends CoreBaseService<CoreRole> {
 
   /**
    * 根据删标记获取全部角色集合
-   *
-   * @return
    */
   public List<CoreRole> queryAllList() {
+
     return roleDao.all();
   }
 
   /**
    * 根据条件查询
-   *
-   * @param query
    */
-  public void queryByCondtion(PageQuery query) {
-    roleDao.queryByCondtion(query);
-    super.handleStrDictValueFields(query.getList());
+  public PageResult queryByCondtion(PageRequest query) {
+
+    PageResult pageResult = roleDao.queryByCondtion(query);
+    super.handleStrDictValueFields(pageResult.getList());
+    return pageResult;
   }
 
-  public PageQuery<CoreUser> queryRoleUser(PageQuery query) {
+  public PageResult<CoreUser> queryRoleUser(PageRequest query) {
+
     OrgItem root = platformService.buildOrg();
-    PageQuery<CoreUser> ret = roleDao.queryUser(query);
+    PageResult<CoreUser> ret = roleDao.queryUser(query);
     List<CoreUser> list = ret.getList();
     // 从缓存里取出组织机构名称
     for (CoreUser user : list) {
@@ -79,10 +81,11 @@ public class RoleConsoleService extends CoreBaseService<CoreRole> {
   /**
    * 根据编号查询
    *
-   * @param code 角色编号
-   * @return
+   * @param code
+   *     角色编号
    */
   public CoreRole queryByCode(String code) {
+
     CoreRole queryRole = new CoreRole();
     queryRole.setCode(code);
     CoreRole role = roleDao.templateOne(queryRole);
@@ -91,6 +94,7 @@ public class RoleConsoleService extends CoreBaseService<CoreRole> {
 
   @Override
   public boolean deleteById(List<Long> ids) {
+
     if (ids == null || ids.isEmpty()) {
       throw new PlatformException("删除数据ID不能为空");
     }
@@ -101,4 +105,5 @@ public class RoleConsoleService extends CoreBaseService<CoreRole> {
     roleDao.batchDeleteUserRole(ids);
     return true;
   }
+
 }

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

@@ -27,7 +27,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 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;
@@ -36,42 +37,45 @@ import org.springframework.transaction.annotation.Transactional;
 @Transactional
 public class UserConsoleService extends CoreBaseService<CoreUser> {
 
-  @Autowired UserConsoleDao userConsoleDao;
+  @Autowired
+  UserConsoleDao userConsoleDao;
 
-  @Autowired FileService fileService;
+  @Autowired
+  FileService fileService;
 
-  @Autowired PasswordEncryptService passwordEncryptService;
+  @Autowired
+  PasswordEncryptService passwordEncryptService;
 
-  @Autowired CoreDictService dictService;
+  @Autowired
+  CoreDictService dictService;
+
+  @Autowired
+  CorePlatformService platformService;
 
-  @Autowired CorePlatformService platformService;
   /**
    * 根据条件查询
-   *
-   * @param query
    */
-  public void queryByCondtion(PageQuery<CoreUser> query) {
-    PageQuery<CoreUser> ret = userConsoleDao.queryByCondtion(query);
+  public void queryByCondtion(PageRequest<CoreUser> query) {
+
+    PageResult<CoreUser> ret = userConsoleDao.queryByCondtion(null, query);
     handleStrDictValueFields(ret.getList());
   }
 
   /**
    * 提供用户管理列表页数据
-   *
-   * @param coreUserParam
    */
-  public PageQuery<CoreUser> getUsersByComplexSelect(CoreUserParam coreUserParam) {
-    PageQuery<CoreUser> resultList =
-        userConsoleDao.queryByCondtion(coreUserParam.createPageQuery());
+  public PageResult<CoreUser> getUsersByComplexSelect(CoreUserParam coreUserParam) {
+
+    PageResult<CoreUser> resultList =
+        userConsoleDao.queryByCondtion(coreUserParam, coreUserParam.createPageRequest());
     return resultList;
   }
 
   /**
    * 插入一条用户数据
-   *
-   * @param user
    */
   public void saveUser(CoreUser user) {
+
     CoreUser query = new CoreUser();
     query.setCode(user.getCode());
     CoreUser dbUser = userConsoleDao.templateOne(query);
@@ -81,7 +85,7 @@ public class UserConsoleService extends CoreBaseService<CoreUser> {
     user.setCreateTime(new Date());
     user.setPassword(passwordEncryptService.password(user.getPassword()));
     user.setDelFlag(DelFlagEnum.NORMAL.getValue());
-    userConsoleDao.insert(user, true);
+    userConsoleDao.insert(user);
     if (StringUtils.isNotEmpty(user.getAttachmentId())) {
       // 更新附件详细信息,关联到这个用户
       fileService.updateFile(user.getAttachmentId(), user.getName(), String.valueOf(user.getId()));
@@ -90,29 +94,28 @@ public class UserConsoleService extends CoreBaseService<CoreUser> {
 
   /**
    * 根据用户id查询一条数据
-   *
-   * @param userId
    */
   public CoreUser queryUserById(Long userId) {
+
     return userConsoleDao.unique(userId);
   }
 
   /**
    * 更新用户 只更新不为空的字段
-   *
-   * @param user
-   * @return
    */
   public int updateSysUser(CoreUser user) {
+
     return userConsoleDao.updateTemplateById(user);
   }
 
   /**
    * 删除用户
    *
-   * @param userId 用户id
+   * @param userId
+   *     用户id
    */
   public void delSysUser(Long userId) {
+
     CoreUser user = queryUserById(userId);
     if (user == null) {
       throw new NoResourceException("用户不存在!");
@@ -130,9 +133,11 @@ public class UserConsoleService extends CoreBaseService<CoreUser> {
    * 批量删除用户 <br>
    * 软删除 标记用户删除状态
    *
-   * @param userIds 用户id
+   * @param userIds
+   *     用户id
    */
   public void batchDelSysUser(List<Long> userIds) {
+
     try {
       userConsoleDao.batchDelUserByIds(userIds);
     } catch (Exception e) {
@@ -144,19 +149,19 @@ public class UserConsoleService extends CoreBaseService<CoreUser> {
    * 批量停用用户 <br>
    * 标记用户状态 停用
    *
-   * @param userIds 用户id
+   * @param userIds
+   *     用户id
    */
   public void batchUpdateUserState(List<Long> userIds, GeneralStateEnum stateEnum) {
+
     userConsoleDao.batchUpdateUserState(userIds, stateEnum);
   }
 
   /**
    * 重置用户密码
-   *
-   * @param id
-   * @param password
    */
   public int resetPassword(Long id, String password) {
+
     CoreUser user = new CoreUser();
     user.setId(id);
     user.setPassword(passwordEncryptService.password(password));
@@ -165,11 +170,13 @@ public class UserConsoleService extends CoreBaseService<CoreUser> {
   }
 
   public List<CoreUserRole> getUserRoles(UserRoleQuery roleQuery) {
+
     return userConsoleDao.queryUserRole(
         roleQuery.getUserId(), roleQuery.getOrgId(), roleQuery.getRoleId());
   }
 
   public JsonResult deleteUserRoles(List<Long> ids) {
+
     int delete =
         sqlManager.lambdaQuery(CoreUserRole.class).andIn(CoreUserRole::getId, ids).delete();
     if (delete > 0) {
@@ -179,6 +186,7 @@ public class UserConsoleService extends CoreBaseService<CoreUser> {
   }
 
   public void saveUserRole(CoreUserRole userRole) {
+
     long queryCount = sqlManager.templateCount(userRole);
     if (queryCount > 0) {
       throw new PlatformException("已存在用户角色关系");
@@ -187,12 +195,13 @@ public class UserConsoleService extends CoreBaseService<CoreUser> {
   }
 
   public List<UserExcelExportData> queryExcel(CoreUserParam coreUserParam) {
-    PageQuery<CoreUser> query = coreUserParam.createPageQuery();
+
+    PageRequest<CoreUser> query = coreUserParam.createPageRequest();
     // 取出全部符合条件的
     //    page.setPageSize(Integer.MAX_VALUE);
     //    page.setPageNumber(1);
     //    page.setTotalRow(Integer.MAX_VALUE);
-    PageQuery<CoreUser> ret = userConsoleDao.queryByCondtion(query);
+    PageResult<CoreUser> ret = userConsoleDao.queryByCondtion(coreUserParam, query);
     List<CoreUser> list = ret.getList();
     OrgItem orgRoot = platformService.buildOrg();
     List<UserExcelExportData> items = new ArrayList<>();
@@ -217,4 +226,5 @@ public class UserConsoleService extends CoreBaseService<CoreUser> {
     }
     return items;
   }
+
 }

plus-admin/admin-console/src/main/java/com/ibeetl/admin/console/web/DictConsoleElController.java

@@ -25,7 +25,9 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import lombok.extern.slf4j.Slf4j;
-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;
@@ -65,11 +67,12 @@ public class DictConsoleElController {
 
   @GetMapping("/list")
   @Function("dict.query")
-  public JsonResult<PageQuery> list(CoreDictQuery condtion) {
+  public JsonResult<PageResult> list(CoreDictQuery condtion) {
 
-    PageQuery page = condtion.getPageQuery();
-    dictService.queryByCondition(page);
-    return JsonResult.success(page);
+    PageRequest page = condtion.getPageRequest();
+    PageResult<CoreDict> pageResult = dictService
+        .queryByCondition(page);
+    return JsonResult.success(pageResult);
   }
 
   @PostMapping("/add")
@@ -119,11 +122,8 @@ public class DictConsoleElController {
       HttpServletResponse response) {
 
     String excelTemplate = "excelTemplates/admin/dict/dict_collection_template.xls";
-    PageQuery<CoreUser> page = condtion.getPageQuery();
+    PageRequest<CoreUser> page = DefaultPageRequest.of(1,Integer.MAX_VALUE);
     // 取出全部符合条件的
-    page.setPageSize(Integer.MAX_VALUE);
-    page.setPageNumber(1);
-    page.setTotalRow(Integer.MAX_VALUE);
     List<CoreDict> dicts = dictService.queryExcel(page);
     try (InputStream is =
         Thread.currentThread().getContextClassLoader().getResourceAsStream(excelTemplate)) {

plus-admin/admin-console/src/main/java/com/ibeetl/admin/console/web/FunctionElController.java

@@ -7,7 +7,6 @@ import com.ibeetl.admin.core.entity.CoreFunction;
 import com.ibeetl.admin.core.service.CorePlatformService;
 import com.ibeetl.admin.core.util.ValidateConfig;
 import com.ibeetl.admin.core.web.JsonResult;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;

plus-admin/admin-console/src/main/java/com/ibeetl/admin/console/web/MenuElController.java

@@ -3,16 +3,11 @@ package com.ibeetl.admin.console.web;
 import com.ibeetl.admin.console.service.MenuConsoleService;
 import com.ibeetl.admin.core.annotation.Function;
 import com.ibeetl.admin.core.annotation.RequestBodyPlus;
-import com.ibeetl.admin.core.entity.CoreFunction;
 import com.ibeetl.admin.core.entity.CoreMenu;
-import com.ibeetl.admin.core.rbac.tree.MenuItem;
 import com.ibeetl.admin.core.service.CorePlatformService;
-import com.ibeetl.admin.core.util.ConvertUtil;
 import com.ibeetl.admin.core.web.JsonResult;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
-import org.beetl.sql.core.engine.PageQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;

plus-admin/admin-console/src/main/java/com/ibeetl/admin/console/web/OrgCascaderElController.java

 package com.ibeetl.admin.console.web;
 
+import com.ibeetl.admin.console.service.CoreOrgConsoleElService;
 import com.ibeetl.admin.core.entity.CoreOrg;
 import com.ibeetl.admin.core.model.ElCascaderData;
-import com.ibeetl.admin.console.service.CoreOrgConsoleElService;
 import com.ibeetl.admin.core.service.CoreOrgService;
 import com.ibeetl.admin.core.service.CorePlatformService;
 import com.ibeetl.admin.core.web.JsonResult;

plus-admin/admin-console/src/main/java/com/ibeetl/admin/console/web/OrgConsoleElController.java

@@ -17,7 +17,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import lombok.extern.slf4j.Slf4j;
-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;
@@ -59,11 +60,11 @@ public class OrgConsoleElController {
   @GetMapping("/list")
   @Function("org.query")
   @ResponseBody
-  public JsonResult<PageQuery<CoreOrg>> list(OrgQuery condtion) {
+  public JsonResult<PageResult<CoreOrg>> list(OrgQuery condtion) {
 
-    PageQuery page = condtion.getPageQuery();
-    orgConsoleService.queryByCondtion(page);
-    return JsonResult.success(page);
+    PageRequest<CoreOrg> page = condtion.getPageRequest();
+    PageResult<CoreOrg> pageResult = orgConsoleService.queryByCondtion(page);
+    return JsonResult.success(pageResult);
   }
 
   /**
@@ -139,11 +140,11 @@ public class OrgConsoleElController {
   @GetMapping("/user/list")
   @Function("org.query")
   @ResponseBody
-  public JsonResult<PageQuery<CoreUser>> getUsers(OrgUserQuery userQuery) {
+  public JsonResult<PageResult<CoreUser>> getUsers(OrgUserQuery userQuery) {
 
-    PageQuery<CoreUser> page = userQuery.getPageQuery();
-    orgConsoleService.queryUserByCondition(page);
-    return JsonResult.success(page);
+    PageRequest<CoreUser> page = userQuery.getPageRequest();
+    PageResult pageResult = orgConsoleService.queryUserByCondition(page);
+    return JsonResult.success(pageResult);
   }
 
 }