更换至beetlsql3最新版本

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

@@ -31,7 +31,8 @@ import java.util.Map;
 import java.util.stream.Collectors;
 import javax.validation.constraints.NotNull;
 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.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -68,11 +69,11 @@ public class RoleConsoleElController {
    */
   @GetMapping("/list")
   @Function("role.query")
-  public JsonResult<PageQuery> list(RoleQuery condtion) {
+  public JsonResult<PageResult> list(RoleQuery condtion) {
 
-    PageQuery page = condtion.getPageQuery();
-    roleConsoleService.queryByCondtion(page);
-    return JsonResult.success(page);
+    PageRequest page = condtion.getPageRequest();
+    PageResult pageResult = roleConsoleService.queryByCondtion(page);
+    return JsonResult.success(pageResult);
   }
 
   @GetMapping("/all")
@@ -161,11 +162,11 @@ public class RoleConsoleElController {
    */
   @PostMapping("/user/list")
   @Function("role.user.query")
-  public JsonResult<PageQuery<CoreUser>> userList(RoleUserQuery query) {
+  public JsonResult<PageResult<CoreUser>> userList(RoleUserQuery query) {
 
-    PageQuery page = query.getPageQuery();
-    PageQuery<CoreUser> pageQuery = roleConsoleService.queryRoleUser(page);
-    return JsonResult.success(page);
+    PageRequest page = query.getPageRequest();
+    PageResult<CoreUser> pageResult = roleConsoleService.queryRoleUser(page);
+    return JsonResult.success(pageResult);
   }
 
   @GetMapping("/function/ids")

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

@@ -24,7 +24,7 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import org.beetl.sql.core.engine.PageQuery;
+import org.beetl.sql.core.page.PageResult;
 import org.jxls.common.Context;
 import org.jxls.util.JxlsHelper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -62,9 +62,9 @@ public class UserConsoleElController {
 
   @Function("user.query")
   @GetMapping
-  public JsonResult<PageQuery<CoreUser>> users(CoreUserParam coreUserParam) {
+  public JsonResult<PageResult<CoreUser>> users(CoreUserParam coreUserParam) {
 
-    PageQuery<CoreUser> allUsers = userConsoleService.getUsersByComplexSelect(coreUserParam);
+    PageResult<CoreUser> allUsers = userConsoleService.getUsersByComplexSelect(coreUserParam);
     return JsonResult.success(allUsers);
   }
 

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

 package com.ibeetl.admin.console.web.dto;
 
-import javax.validation.constraints.NotBlank;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.ibeetl.admin.core.annotation.Dict;
-
 /**
  * excel导出需要的模板数据
  *

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

 package com.ibeetl.admin.console.web.query;
 
-import java.util.Date;
-
-import org.apache.commons.lang3.StringUtils;
-
 import com.ibeetl.admin.core.annotation.Query;
 import com.ibeetl.admin.core.util.Tool;
 import com.ibeetl.admin.core.web.query.PageParam;
+import java.util.Date;
+import org.apache.commons.lang3.StringUtils;
 
 /** 审计查询条件 */
 public class AuditQuery extends PageParam {

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

 package com.ibeetl.admin.console.web.query;
 
 import com.ibeetl.admin.core.annotation.Query;
-import com.ibeetl.admin.core.util.enums.CoreDictType;
 import com.ibeetl.admin.core.web.query.PageParam;
-import java.util.Date;
 /** CmsBlog查询 */
 public class CmsBlogQuery extends PageParam {
   @Query(name = "id", display = true)

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

 package com.ibeetl.admin.console.web.query;
 
 import com.ibeetl.admin.core.annotation.Query;
-import com.ibeetl.admin.core.util.enums.CoreDictType;
 import com.ibeetl.admin.core.web.query.PageParam;
-import java.util.Date;
 /** CoreDict查询 */
 public class CoreDictQuery extends PageParam {
   @Query(name = "字典值", display = true)

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

 package com.ibeetl.admin.console.web.query;
 
 import com.ibeetl.admin.core.annotation.Query;
-import com.ibeetl.admin.core.util.enums.CoreDictType;
 import com.ibeetl.admin.core.web.query.PageParam;
 /** 功能查询 */
 public class CoreFunctionQuery extends PageParam {

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

 package com.ibeetl.admin.console.web.query;
 
-import java.util.List;
-
 import com.ibeetl.admin.core.annotation.Query;
 import com.ibeetl.admin.core.web.query.PageParam;
+import java.util.List;
 
 /** 功能表单查询条件 */
 public class FunctionQuery extends PageParam {

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

 package com.ibeetl.admin.console.web.query;
 
-import java.util.List;
-
 import com.ibeetl.admin.core.web.query.PageParam;
+import java.util.List;
 
 /** 描述: 带有组织树相关的查询 */
 public class OrgTreeQuery extends PageParam {

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

 package com.ibeetl.admin.console.web.query;
 
-import java.util.Date;
-
 import com.ibeetl.admin.core.annotation.Query;
-import com.ibeetl.admin.core.util.Tool;
 import com.ibeetl.admin.core.util.enums.CoreDictType;
 import com.ibeetl.admin.core.web.query.PageParam;
 

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

 package com.ibeetl.admin.console.web.query;
 
 import com.ibeetl.admin.core.annotation.Query;
-import com.ibeetl.admin.core.util.enums.CoreDictType;
 import com.ibeetl.admin.core.web.query.PageParam;
 
 /** 描述: 角色李的用户列表 */

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

 package com.ibeetl.admin.console.web.query;
 
-import java.util.Date;
-
-import org.apache.commons.lang3.StringUtils;
-
 import com.ibeetl.admin.core.annotation.Query;
 import com.ibeetl.admin.core.util.Tool;
 import com.ibeetl.admin.core.util.enums.CoreDictType;
 import com.ibeetl.admin.core.web.query.PageParam;
+import java.util.Date;
+import org.apache.commons.lang3.StringUtils;
 
 public class UserQuery extends PageParam {
 

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

 package com.ibeetl.admin.console.web.query;
 
-import java.util.Date;
-
 import com.ibeetl.admin.core.annotation.Query;
 import com.ibeetl.admin.core.web.query.PageParam;
 

plus-admin/admin-console/src/main/resources/application.yml

@@ -19,8 +19,9 @@ beetl:
   suffix: html
 # -------beetlsql配置
 beetlsql:
-  ds:
-    baseDataSource:
+  sqlManagers: baseSqlManager
+  baseSqlManager:
+    ds: baseDataSource
     basePackage: com.ibeetl.admin
     daoSuffix: Dao
     dbStyle: org.beetl.sql.core.db.MySqlStyle

plus-admin/admin-console/src/main/resources/btsql-ext.properties

@@ -5,4 +5,4 @@ DELIMITER_STATEMENT_END=
 #\u51FD\u6570\u6CE8\u518C
 FN.isEmpty=org.beetl.ext.fn.EmptyExpressionFunction
 FN.isNotEmpty=org.beetl.ext.fn.IsNotEmptyExpressionFunction
-FN.mapping=com.ibeetl.admin.core.conf.beetl.handler.MappingFunction
+#FN.mapping=com.ibeetl.admin.core.conf.beetl.handler.MappingFunction

plus-admin/admin-console/src/main/resources/sql/console/menu.md

@@ -45,17 +45,12 @@ from core_menu cm
         and cm.del_flag = 0
         and cf.del_flag = 0
 ```
-@ mapping("MenuFunctionMapping");
-
 
 MenuFunctionMapping
 ===
 * 菜单功能点结果集映射
-```javascript
-    var menu_func_mapping={
-                      "id": "menu_func_map",
-                      "mapping": {
-                          "resultType": "com.ibeetl.admin.core.entity.CoreMenu",
+```json
+    {
         "id": "id",
         "name": "name",
         "code": "code",
@@ -65,12 +60,10 @@ MenuFunctionMapping
         "seq": "seq",
         "type": "type",
         "relationFunction": {
-                              "resultType": "com.ibeetl.admin.core.entity.CoreFunction",
             "id": "func_id",
             "name": "func_name",
             "accessUrl": "func_access_url",
             "type": "func_type"
         }
     }
-                  };
 ```
\ No newline at end of file

plus-admin/admin-console/src/main/resources/sql/console/org.md

@@ -4,30 +4,32 @@ batchDelByIds
 
 queryByCondtion
 ===
-	select 
-	@pageTag(){
-	o.*
-	@}
-	from core_org o where 1=1 and del_flag = 0
-	@ //数据权限，组织机构对应的对应的字段
-	and #function("org.query",{org:"id"})# 
-    @if(!isEmpty(code)){
+```sql
+select 
+@pageTag(){
+o.*
+@}
+from core_org o where 1=1 and del_flag = 0
+@ //数据权限，组织机构对应的对应的字段
+@and #function("org.query",{org:"id"})# 
+@if(!isEmpty(code)){
     and  o.code like #"%"+code+"%"#
-    @}
-    @if(!isEmpty(name)){
+@}
+@if(!isEmpty(name)){
     and  o.name like #"%"+name+"%"#
-    @}
-    @if(!isEmpty(type)){
+@}
+@if(!isEmpty(type)){
     and  o.type = #type#
-    @}
-    @if(!isEmpty(parentOrgId)){
+@}
+@if(!isEmpty(parentOrgId)){
     and  o.parent_org_id = #parentOrgId#
-    @}
+@}
 
-    @pageIgnoreTag(){
+@pageIgnoreTag(){
        order by o.id
-    @}
+@}
 
+```
   
 queryUserByCondtion
 ===

plus-admin/admin-console/src/main/resources/sql/console/user.md

@@ -34,7 +34,6 @@ and #function("user.query")#
     and  u.create_time< #nextDay(createTimeEnd)#
 @}
 ```
-@ mapping("UsersMapping");
 
 batchDelUserByIds
 ===
@@ -69,11 +68,8 @@ where u.id=#id#
 
 UsersMapping
 ===
-```
-    var user_mapping_var={
-                      "id": "core_user_map",
-                      "mapping": {
-                          "resultType": "com.ibeetl.admin.core.entity.CoreUser",
+```json
+    {
       "id": "id",
       "createTime": "create_time",
       "code": "code",
@@ -84,10 +80,8 @@ UsersMapping
       "updateTime": "update_time",
       "attachmentId": "attachment_id",
       "org": {
-                              "resultType": "com.ibeetl.admin.core.entity.CoreOrg",
           "id": "org_id",
           "name": "org_name"
       }
     }
-                  };
 ```
\ No newline at end of file

plus-admin/admin-console/src/test/java/CustomBeanProcessorTest.java

+import cn.hutool.core.collection.CollUtil;
 import com.ibeetl.admin.ConsoleApplication;
 import com.ibeetl.admin.core.dao.CoreFunctionDao;
 import com.ibeetl.admin.core.entity.CoreRoute;
@@ -15,16 +16,19 @@ import org.springframework.test.context.junit4.SpringRunner;
 @SpringBootTest(classes = ConsoleApplication.class)
 public class CustomBeanProcessorTest {
 
-  @Autowired CoreFunctionDao coreFunctionDao;
+  @Autowired
+  CoreFunctionDao coreFunctionDao;
 
   @Test
   public void maptest() {
-    List<CoreRoute> routesList = coreFunctionDao.getAllRoutes();
+
+    List<CoreRoute> routesList = coreFunctionDao.getAllRoutes(CollUtil.<Long>newArrayList(1L, 3L));
     System.out.println(routesList);
   }
 
   @Test
   public void test() {
+
     SQLManager sqlManager = coreFunctionDao.getSQLManager();
     List<CmsBlog> cmsBlogList = sqlManager.lambdaQuery(CmsBlog.class).select();
     System.out.println(cmsBlogList);

plus-admin/admin-console/src/test/java/SimpleTest.java

 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONUtil;
+import java.awt.AWTException;
+import java.awt.Robot;
+import java.awt.event.InputEvent;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.EnumSet;
@@ -9,6 +11,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.BiConsumer;
 import java.util.function.BinaryOperator;
 import java.util.function.Function;
@@ -19,6 +22,21 @@ import org.junit.Test;
 
 public class SimpleTest {
 
+  @Test
+  public void RobotTest() throws AWTException {
+
+    AtomicInteger  count = new AtomicInteger(3600*3);
+    Robot robot = new Robot();
+    robot.delay(1000);
+    while (count.decrementAndGet()>0){
+      robot.mousePress(InputEvent.BUTTON3_DOWN_MASK);
+      robot.delay(20);
+      robot.mouseRelease(InputEvent.BUTTON3_DOWN_MASK);
+      robot.delay(3000);
+    }
+
+  }
+
   @Test
   public void testStream() {
     GetLastProductByJobsBean b1 = new GetLastProductByJobsBean();