更换至beetlsql3最新版本

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/web/query/PageParam.java

@@ -2,9 +2,10 @@ package com.ibeetl.admin.core.web.query;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.ibeetl.admin.core.annotation.Query;
-import org.beetl.sql.core.engine.PageQuery;
-
 import java.lang.reflect.Field;
+import java.util.Objects;
+import org.beetl.sql.core.page.DefaultPageRequest;
+import org.beetl.sql.core.page.PageRequest;
 
 /**
  * 子类继承此类获得翻页功能
@@ -12,32 +13,40 @@ import java.lang.reflect.Field;
  * @author lijiazhi
  */
 public class PageParam {
+
   private Integer page = null;
+
   private Integer limit = null;
 
   public Integer getPage() {
+
     return page;
   }
 
   public void setPage(Integer page) {
+
     this.page = page;
   }
 
   public Integer getLimit() {
+
     return limit;
   }
 
   public void setLimit(Integer limit) {
+
     this.limit = limit;
   }
 
   /**
    * 以当前类中被{@link Query} 注解的字段为SQL参数
+   *
    * @author 一日看尽长安花
    * Created on  2020/3/26
    */
   @JsonIgnore
-  public PageQuery getPageQuery() {
+  public <T> PageRequest<T> getPageRequest() {
+
     Field[] fs = this.getClass().getDeclaredFields();
     for (Field f : fs) {
       Query query = f.getAnnotation(Query.class);
@@ -58,13 +67,14 @@ public class PageParam {
         }
       }
     }
-    PageQuery query = new PageQuery();
-    query.setParas(this);
-    if (page != null) {
-      query.setPageNumber(page);
-      query.setPageSize(limit);
+    PageRequest pageRequest;
+
+    if (Objects.nonNull(this.page)) {
+      pageRequest = DefaultPageRequest.of(page, limit);
+    } else {
+      pageRequest = new DefaultPageRequest();
     }
-    return query;
+    return pageRequest;
   }
 
   /**
@@ -73,13 +83,16 @@ public class PageParam {
    * @author 一日看尽长安花
    */
   @JsonIgnore
-  public PageQuery createPageQuery() {
-    PageQuery query = new PageQuery();
-    query.setParas(this);
-    if (page != null) {
-      query.setPageNumber(page);
-      query.setPageSize(limit);
+  public PageRequest createPageRequest() {
+
+    PageRequest pageRequest;
+
+    if (Objects.nonNull(this.page)) {
+      pageRequest = DefaultPageRequest.of(page, limit);
+    } else {
+      pageRequest = new DefaultPageRequest();
     }
-    return query;
+    return pageRequest;
   }
+
 }

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/web/query/QueryParser.java

 package com.ibeetl.admin.core.web.query;
 
-import java.lang.reflect.Field;
-import java.util.concurrent.ConcurrentHashMap;
-
 import com.ibeetl.admin.core.annotation.Query;
 import com.ibeetl.admin.core.util.ClassLoaderUtil;
+import java.lang.reflect.Field;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * 页面查询条件

plus-admin/admin-core/src/main/resources/codeTemplate/java/controller.java

-package ${package};
+package $
 
+import $;
+import com.ibeetl.admin.core.annotation.Function;
+import com.ibeetl.admin.core.annotation.Query;
+import com.ibeetl.admin.core.file.FileItem;
+import com.ibeetl.admin.core.file.FileService;
+import com.ibeetl.admin.core.util.ConvertUtil;
+import com.ibeetl.admin.core.util.DateUtil;
+import com.ibeetl.admin.core.util.PlatformException;
+import com.ibeetl.admin.core.util.ValidateConfig;
+import com.ibeetl.admin.core.web.JsonResult;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-
 import javax.servlet.http.HttpServletResponse;
-
 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.jxls.common.Context;
-import org.jxls.reader.ReaderBuilder;
-import org.jxls.reader.ReaderConfig;
-import org.jxls.reader.XLSReadMessage;
-import org.jxls.reader.XLSReadStatus;
-import org.jxls.reader.XLSReader;
 import org.jxls.util.JxlsHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -33,19 +31,9 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.ModelAndView;
 
-import com.ibeetl.admin.console.web.dto.DictExcelImportData;
-import com.ibeetl.admin.console.web.query.UserQuery;
-import com.ibeetl.admin.core.annotation.Function;
-import com.ibeetl.admin.core.annotation.Query;
-import com.ibeetl.admin.core.entity.CoreDict;
-import com.ibeetl.admin.core.entity.CoreUser;
-import com.ibeetl.admin.core.file.FileItem;
-import com.ibeetl.admin.core.file.FileService;
-import com.ibeetl.admin.core.web.JsonResult;
-import com.ibeetl.admin.core.util.*;
-import ${basePackage}.entity.*;
-import ${basePackage}.service.*;
-import ${basePackage}.web.query.*;
+{package};
+    {basePackage}.entity.*;
+    {basePackage}.service.*;{basePackage}.web.query.*;
 
 /**
  * ${entity.displayName} 接口

plus-admin/admin-core/src/main/resources/codeTemplate/java/dao.java

-package ${package};
-
-import java.util.List;
+package $
 
 import org.beetl.sql.core.annotatoin.SqlResource;
-import org.beetl.sql.core.mapper.BaseMapper;
-import org.beetl.sql.core.engine.PageQuery;
 
-import  ${basePackage}.entity.*;
+{package};{basePackage}.entity.*;
 
 /**
  * ${entity.displayName} Dao

plus-admin/admin-core/src/main/resources/codeTemplate/java/pojo.java

-package ${package};
-
-import java.util.Date;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Null;
-
-import org.beetl.sql.core.annotatoin.AutoID;
-import org.beetl.sql.core.annotatoin.SeqID;
-
-import com.ibeetl.admin.core.util.ValidateConfig;
-
-import org.beetl.sql.core.TailBean;
-import java.math.*;
+package $
 
 import com.ibeetl.admin.core.annotation.Dict;
-import com.ibeetl.admin.core.entity.BaseEntity;
+import com.ibeetl.admin.core.util.ValidateConfig;
+import javax.validation.constraints.NotNull;
 
-import org.beetl.sql.core.annotatoin.InsertIgnore;
-import org.beetl.sql.core.annotatoin.Version;
-import org.beetl.sql.core.annotatoin.LogicDelete;
+{package};
 
 
 /* 

plus-admin/admin-core/src/main/resources/codeTemplate/java/query.java

-package ${package};
+package $
 
-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;
+
+{package};
 /**
  *${entity.displayName}查询
  */

plus-admin/admin-core/src/main/resources/codeTemplate/java/service.java

-package ${package};
+package $
 
-
-import ${basePackage}.dao.${entity.name}Dao;
-import ${basePackage}.entity.${entity.name};
-
-
-
-import com.ibeetl.admin.core.service.CoreBaseService;
-import com.ibeetl.admin.core.util.PlatformException;
-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 java.util.List;
+
+{package};
+    {basePackage}.dao.${entity.name}Dao;
+    {basePackage}.entity.${entity.name};
 
 
 

plus-admin/admin-core/src/main/resources/codeTemplate/maven/main.java

-package ${basePackage};
+package $
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -7,6 +7,8 @@ import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.web.WebApplicationInitializer;
 
+{basePackage};
+
 @SpringBootApplication
 @EnableCaching
 @ComponentScan(basePackages= {"${basePackage}","com.ibeetl.admin"})

plus-admin/admin-core/src/main/resources/sql/core/coreFunction.md

@@ -10,40 +10,33 @@ select menu.id,
        menu.ICON,
        ifnull(menu.SEQ, 999999) seq,
        func.ACCESS_URL          path,
-       func.COMPONENT           component,
-       role_menu.ROLE_ID
+       func.COMPONENT           component
 from core_menu menu
        left join core_function func on func.ID = menu.FUNCTION_ID 
-       left join core_role_menu role_menu on role_menu.MENU_ID = menu.id
-       where menu.DEL_FLAG = 0
+       where menu.DEL_FLAG = 0 
+        and menu.id in 
+            (select crm.menu_id from core_role_menu crm 
+                 where crm.role_id in (#join(roleIds)#)) 
 ```
-@ mapping("RouteMapping");
 
 RouteMapping
 ===
-```javascript
-    var route_mapping_var={
-                      "id": "core_route_map",
-                      "mapping": {
-                          "resultType": "com.ibeetl.admin.core.entity.CoreRoute",
-                          "path": "path",
-                          "name": "name",
-                          "component": "component",
-                          "id": "id",
-                          "parentId": "parent_id",
-                          "seq": "seq",
-                          "meta": {
-                              "resultType": "com.ibeetl.admin.core.entity.CoreRouteMeta",
-                              "icon": "icon",
-                              "title": "title",
-                              "roles": [
-                                  {
-                                      "id": "role_id"
-                                  }
-                              ]
-                          }
-                      }
-                  };
+```json
+    {
+        "path": "path",
+        "name": "name",
+        "component": "component",
+        "id": "id",
+        "parentId": "parent_id",
+        "seq": "seq",
+        "meta": {
+            "icon": "icon",
+            "title": "title",
+            "roles": {
+                "id": "role_id"
+            }
+        }
+    }
 ```
 
 

plus-admin/admin-core/src/main/resources/sql/core/coreRole.md

+geRoles
+===
+```sql
+select cr.* 
+from core_role cr join core_user_role cur on cur.role_id = cr.id 
+where cur.user_id = #userId# 
+```
\ No newline at end of file