更换至beetlsql3最新版本

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/gen/MdGen.java

 package com.ibeetl.admin.core.gen;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
+import com.ibeetl.admin.core.gen.model.Entity;
 import org.beetl.core.GroupTemplate;
 import org.beetl.core.Template;
 
-import com.ibeetl.admin.core.gen.model.Attribute;
-import com.ibeetl.admin.core.gen.model.Entity;
-
 public class MdGen implements AutoGen {
 
   static String CR = System.getProperty("line.separator");

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/gen/WebTarget.java

 package com.ibeetl.admin.core.gen;
 
+import com.ibeetl.admin.core.gen.model.Entity;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.ibeetl.admin.core.gen.model.Entity;
-
 public class WebTarget extends MavenProjectTarget {
 
   public Map<Object, String> map = new HashMap<Object, String>();

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/rbac/DataAccess.java

 package com.ibeetl.admin.core.rbac;
 
-import com.ibeetl.admin.core.service.CorePlatformService;
-
 /**
  * 数据权限接口类
  *

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/rbac/DataAccessFactory.java

 package com.ibeetl.admin.core.rbac;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.ibeetl.admin.core.rbac.tree.OrgItem;
+import java.util.List;
 
 public interface DataAccessFactory {
   /**

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/rbac/UserLoginInfo.java

 package com.ibeetl.admin.core.rbac;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonView;
 import com.ibeetl.admin.core.entity.CoreOrg;
+import com.ibeetl.admin.core.entity.CoreRole;
 import com.ibeetl.admin.core.entity.CoreUser;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import org.apache.commons.collections4.CollectionUtils;
 
 public class UserLoginInfo {
+
   // 用户所在机构
-  List<CoreOrg> orgs = new ArrayList<CoreOrg>();
+  List<CoreOrg> orgs;
+
   // 用户信息
   CoreUser user;
+
   // 用户默认登录机构
-  CoreOrg currentOrg = null;
+  CoreOrg currentOrg;
+
+  List<CoreRole> roles;
 
   public List<CoreOrg> getOrgs() {
+
     return orgs;
   }
 
   public void setOrgs(List<CoreOrg> orgs) {
+
     this.orgs = orgs;
   }
 
   public CoreUser getUser() {
+
     return user;
   }
 
   public void setUser(CoreUser user) {
+
     this.user = user;
   }
 
   public CoreOrg getCurrentOrg() {
-    return currentOrg;
+
+    if (Objects.isNull(this.currentOrg)) {
+      Collection<CoreOrg> orgs = CollectionUtils.emptyIfNull(this.orgs);
+      this.currentOrg = orgs.stream().findFirst().orElse(null);
+      Long orgId = Optional.ofNullable(this.user).map(CoreUser::getOrgId).orElse(null);
+      for (CoreOrg org : orgs) {
+        if (Objects.equals(org.getId(), orgId)) {
+          this.currentOrg = org;
+          break;
+        }
+      }
+    }
+    return this.currentOrg;
   }
 
   public void setCurrentOrg(CoreOrg currentOrg) {
+
     this.currentOrg = currentOrg;
   }
+
+  public List<CoreRole> getRoles() {
+
+    return roles;
+  }
+
+  public void setRoles(List<CoreRole> roles) {
+
+    this.roles = roles;
+  }
+
 }

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/rbac/da/AllGroupAccess.java

 package com.ibeetl.admin.core.rbac.da;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import com.ibeetl.admin.core.entity.CoreOrg;
 import com.ibeetl.admin.core.rbac.AccessType;
 import com.ibeetl.admin.core.rbac.DataAccess;
 import com.ibeetl.admin.core.rbac.DataAccessResullt;
-import com.ibeetl.admin.core.rbac.tree.OrgItem;
 import com.ibeetl.admin.core.service.CorePlatformService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 /**
  * 所有机构
  *

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/rbac/da/DefaultDataAccessFactory.java

 package com.ibeetl.admin.core.rbac.da;
 
+import com.ibeetl.admin.core.rbac.DataAccess;
+import com.ibeetl.admin.core.rbac.DataAccessFactory;
+import com.ibeetl.admin.core.rbac.tree.OrgItem;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.springframework.context.ApplicationContext;
-
-import com.ibeetl.admin.core.rbac.DataAccess;
-import com.ibeetl.admin.core.rbac.DataAccessFactory;
-import com.ibeetl.admin.core.rbac.tree.OrgItem;
 /**
  * 系统提供的数据访问权限设置，适合大多数情况。如果只是小型公司，只需要配置数据字典组织机构类型和数据访问类型为系统默认的子集即可
  *

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/rbac/da/GroupDataAccess.java

 package com.ibeetl.admin.core.rbac.da;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import com.ibeetl.admin.core.entity.CoreOrg;
 import com.ibeetl.admin.core.rbac.AccessType;
 import com.ibeetl.admin.core.rbac.DataAccess;
 import com.ibeetl.admin.core.rbac.DataAccessResullt;
 import com.ibeetl.admin.core.rbac.tree.OrgItem;
 import com.ibeetl.admin.core.service.CorePlatformService;
+import java.util.ArrayList;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 /**
  * 集团公司所有
  *

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/rbac/da/GroupOnlyDataAccess.java

 package com.ibeetl.admin.core.rbac.da;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import com.ibeetl.admin.core.entity.CoreOrg;
 import com.ibeetl.admin.core.rbac.AccessType;
 import com.ibeetl.admin.core.rbac.DataAccess;
 import com.ibeetl.admin.core.rbac.DataAccessResullt;
 import com.ibeetl.admin.core.rbac.tree.OrgItem;
 import com.ibeetl.admin.core.service.CorePlatformService;
+import java.util.ArrayList;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 /**
  * 集团公司所有，但不包含集团下的公司,仅仅集团职能部门
  *

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/rbac/da/OwnerDataAccess.java

 package com.ibeetl.admin.core.rbac.da;
 
-import java.util.Arrays;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 import com.ibeetl.admin.core.rbac.AccessType;
 import com.ibeetl.admin.core.rbac.DataAccess;
 import com.ibeetl.admin.core.rbac.DataAccessResullt;
 import com.ibeetl.admin.core.service.CorePlatformService;
+import java.util.Arrays;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 /**
  * 只查看自己
  *

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/rbac/da/ParentCorpDataAccess.java

 package com.ibeetl.admin.core.rbac.da;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import com.ibeetl.admin.core.entity.CoreOrg;
 import com.ibeetl.admin.core.rbac.AccessType;
 import com.ibeetl.admin.core.rbac.DataAccess;
 import com.ibeetl.admin.core.rbac.DataAccessResullt;
 import com.ibeetl.admin.core.rbac.tree.OrgItem;
 import com.ibeetl.admin.core.service.CorePlatformService;
+import java.util.ArrayList;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 /**
  * 母公司所有
  *

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/rbac/da/SameCompanyAllDataAccess.java

 package com.ibeetl.admin.core.rbac.da;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import com.ibeetl.admin.core.entity.CoreOrg;
 import com.ibeetl.admin.core.rbac.AccessType;
 import com.ibeetl.admin.core.rbac.DataAccess;
 import com.ibeetl.admin.core.rbac.DataAccessResullt;
 import com.ibeetl.admin.core.rbac.tree.OrgItem;
 import com.ibeetl.admin.core.service.CorePlatformService;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 /**
  * 同公司下所有
  *

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/rbac/da/SameDeparmentAllDataAccess.java

 package com.ibeetl.admin.core.rbac.da;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import com.ibeetl.admin.core.entity.CoreOrg;
 import com.ibeetl.admin.core.rbac.AccessType;
 import com.ibeetl.admin.core.rbac.DataAccess;
 import com.ibeetl.admin.core.rbac.DataAccessResullt;
 import com.ibeetl.admin.core.rbac.tree.OrgItem;
 import com.ibeetl.admin.core.service.CorePlatformService;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 /**
  * 同部门下所有
  *

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/rbac/da/SameOrgDataAccess.java

 package com.ibeetl.admin.core.rbac.da;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import com.ibeetl.admin.core.entity.CoreOrg;
 import com.ibeetl.admin.core.rbac.AccessType;
 import com.ibeetl.admin.core.rbac.DataAccess;
 import com.ibeetl.admin.core.rbac.DataAccessResullt;
-import com.ibeetl.admin.core.rbac.tree.OrgItem;
 import com.ibeetl.admin.core.service.CorePlatformService;
+import java.util.Arrays;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 /**
  * 同机构
  *

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/rbac/tree/FunctionItem.java

 package com.ibeetl.admin.core.rbac.tree;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.ibeetl.admin.core.entity.CoreFunction;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.ibeetl.admin.core.entity.CoreFunction;
-
 public class FunctionItem implements TreeItem {
   CoreFunction sysFunction = null;
   List<FunctionItem> children = new ArrayList<>();

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/rbac/tree/MenuItem.java

 package com.ibeetl.admin.core.rbac.tree;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.ibeetl.admin.core.entity.CoreMenu;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.ibeetl.admin.core.entity.CoreMenu;
-
 public class MenuItem implements TreeItem {
   CoreMenu sysMenu = null;
   List<MenuItem> children = new ArrayList<MenuItem>();

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/rbac/tree/OrgItem.java

 package com.ibeetl.admin.core.rbac.tree;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.ibeetl.admin.core.entity.CoreOrg;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.ibeetl.admin.core.entity.CoreOrg;
-
 public class OrgItem implements TreeItem {
   private Long id;
   private CoreOrg org;

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreAuditService.java

 package com.ibeetl.admin.core.service;
 
+import com.ibeetl.admin.core.dao.CoreAuditDao;
+import com.ibeetl.admin.core.entity.CoreAudit;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.ibeetl.admin.core.dao.CoreAuditDao;
-import com.ibeetl.admin.core.entity.CoreAudit;
-
 @Service
 @Transactional
 public class CoreAuditService extends CoreBaseService<CoreAudit> {

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreBaseService.java

@@ -18,7 +18,6 @@ import java.util.List;
 import java.util.Map;
 import org.beetl.sql.core.SQLManager;
 import org.beetl.sql.core.TailBean;
-import org.beetl.sql.core.engine.PageQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
@@ -75,7 +74,7 @@ public class CoreBaseService<T> {
    */
   public boolean save(T model) {
 
-    return sqlManager.insert(model, true) > 0;
+    return sqlManager.insert(model) > 0;
   }
 
   /**
@@ -176,7 +175,6 @@ public class CoreBaseService<T> {
 
   /**
    * 处理字典字符值，将字典名存放在{@link TailBean}中。字典需要{@link Dict}注解
-   * @param bean
    */
   public void handleStrDictValueField(Object bean) {
 
@@ -214,11 +212,6 @@ public class CoreBaseService<T> {
     } while (c != TailBean.class);
   }
 
-  public void handleDictTypeFields(PageQuery pageQuery) {
-
-    this.handleDictTypeFields(pageQuery.getList());
-  }
-
   public void handleDictTypeFields(Collection<?> collection) {
 
     for (Object o : collection) {
@@ -228,7 +221,6 @@ public class CoreBaseService<T> {
 
   /**
    * 处理{@link DictType} 类型字段，将字典的name ,value,type存放在{@link TailBean}。字典需要{@link Dict}注解
-   * @param object
    */
   public void handleDictTypeField(Object object) {
 

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreCodeGenService.java

 package com.ibeetl.admin.core.service;
 
+import com.ibeetl.admin.core.entity.CoreFunction;
+import com.ibeetl.admin.core.entity.CoreMenu;
+import com.ibeetl.admin.core.gen.model.Attribute;
+import com.ibeetl.admin.core.gen.model.Entity;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
-
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.beetl.sql.core.JavaType;
-import org.beetl.sql.core.NameConversion;
+import org.beetl.sql.clazz.ColDesc;
+import org.beetl.sql.clazz.NameConversion;
+import org.beetl.sql.clazz.TableDesc;
+import org.beetl.sql.clazz.kit.JavaType;
 import org.beetl.sql.core.SQLManager;
-import org.beetl.sql.core.db.ClassDesc;
-import org.beetl.sql.core.db.ColDesc;
-import org.beetl.sql.core.db.MetadataManager;
-import org.beetl.sql.core.db.TableDesc;
+import org.beetl.sql.core.meta.MetadataManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.ibeetl.admin.core.entity.CoreFunction;
-import com.ibeetl.admin.core.entity.CoreMenu;
-import com.ibeetl.admin.core.gen.model.Attribute;
-import com.ibeetl.admin.core.gen.model.Entity;
-
 /**
  * 代码生成，用于根据表或者视图生成entity，mapper，service，conroller 未来可以生成swagger api，界面
  *
@@ -30,16 +27,21 @@ import com.ibeetl.admin.core.gen.model.Entity;
  */
 @Service
 public class CoreCodeGenService {
-  @Autowired SQLManager sqlManager;
-  @Autowired CorePlatformService platformService;
+
+  @Autowired
+  SQLManager sqlManager;
+
+  @Autowired
+  CorePlatformService platformService;
 
   Log log = LogFactory.getLog(CoreCodeGenService.class);
 
   public void refresh() {
-    sqlManager.refresh();
+//    sqlManager.refresh();
   }
 
   public List<Entity> getAllEntityInfo() {
+
     MetadataManager meta = sqlManager.getMetaDataManager();
     Set<String> set = meta.allTable();
     List<Entity> list = new ArrayList<Entity>();
@@ -50,13 +52,13 @@ public class CoreCodeGenService {
   }
 
   public Entity getEntitySimpleInfo(String table) {
+
     MetadataManager meta = sqlManager.getMetaDataManager();
     NameConversion nc = sqlManager.getNc();
     TableDesc tableDesc = meta.getTable(table);
     if (tableDesc == null) {
       return null;
     }
-    ClassDesc classDesc = tableDesc.getClassDesc(nc);
     Entity e = new Entity();
     e.setName(nc.getClassName(table));
     e.setComment(tableDesc.getRemark());
@@ -65,13 +67,13 @@ public class CoreCodeGenService {
   }
 
   public Entity getEntityInfo(String table) {
+
     MetadataManager meta = sqlManager.getMetaDataManager();
     NameConversion nc = sqlManager.getNc();
     TableDesc tableDesc = meta.getTable(table);
     if (tableDesc == null) {
       return null;
     }
-    ClassDesc classDesc = tableDesc.getClassDesc(nc);
     Entity e = new Entity();
     e.setName(nc.getClassName(table));
     e.setComment(tableDesc.getRemark());
@@ -91,8 +93,8 @@ public class CoreCodeGenService {
         attr.setId(true);
         e.setIdAttribute(attr);
       }
-      attr.setComment(desc.remark);
-      String type = JavaType.getType(desc.sqlType, desc.size, desc.digit);
+      attr.setComment(desc.getRemark());
+      String type = JavaType.getType(desc.getSqlType(), desc.getSize(), desc.getDigit());
       if (type.equals("Double")) {
         type = "BigDecimal";
       }
@@ -107,12 +109,12 @@ public class CoreCodeGenService {
 
     return e;
   }
+
   /**
-   * @param data
-   * @param urlBase
    * @return 增删改查中的查
    */
   public Long insertFunction(Entity data, String urlBase) {
+
     String preffix = urlBase.replace('/', '.');
     String functionCode = preffix + "." + data.getCode();
     String indexFunctonCode = functionCode + ".query";
@@ -120,7 +122,7 @@ public class CoreCodeGenService {
     query.setCode(indexFunctonCode);
     Object o = sqlManager.templateOne(query);
     if (o != null) {
-      return -1l;
+      return -1L;
     }
 
     // 设置父功能点
@@ -130,7 +132,7 @@ public class CoreCodeGenService {
     rootFunction.setCreateTime(new Date());
     rootFunction.setParentId(0L);
     rootFunction.setType("FN0");
-    sqlManager.insert(rootFunction, true);
+    sqlManager.insert(rootFunction);
     Long parentId = rootFunction.getId();
 
     // 设置曾删改查功能点
@@ -142,7 +144,7 @@ public class CoreCodeGenService {
     indexFunction.setAccessUrl("/" + urlBase + "/" + data.getCode() + "/index.do");
     // 设置为查询功能
     indexFunction.setType("FN1");
-    sqlManager.insert(indexFunction, true);
+    sqlManager.insert(indexFunction);
 
     CoreFunction upateFunction = new CoreFunction();
     String updateFunctonCode = functionCode + ".edit";
@@ -151,7 +153,7 @@ public class CoreCodeGenService {
     upateFunction.setCreateTime(new Date());
     upateFunction.setParentId(parentId);
     upateFunction.setType("FN0");
-    sqlManager.insert(upateFunction, true);
+    sqlManager.insert(upateFunction);
 
     CoreFunction addFunction = new CoreFunction();
     String addFunctionCode = functionCode + ".add";
@@ -160,7 +162,7 @@ public class CoreCodeGenService {
     addFunction.setCreateTime(new Date());
     addFunction.setParentId(parentId);
     addFunction.setType("FN0");
-    sqlManager.insert(addFunction, true);
+    sqlManager.insert(addFunction);
 
     CoreFunction delFunction = new CoreFunction();
     String delFunctionCode = functionCode + ".delete";
@@ -169,7 +171,7 @@ public class CoreCodeGenService {
     delFunction.setCreateTime(new Date());
     delFunction.setParentId(parentId);
     delFunction.setType("FN0");
-    sqlManager.insert(delFunction, true);
+    sqlManager.insert(delFunction);
 
     // 刷新缓存
     platformService.clearFunctionCache();
@@ -178,6 +180,7 @@ public class CoreCodeGenService {
   }
 
   public boolean insertMenu(Long functionId, Entity data, String urlBase) {
+
     CoreMenu query = new CoreMenu();
     query.setCode("代码生成导航");
     query.setType("MENU_N");
@@ -203,15 +206,19 @@ public class CoreCodeGenService {
   // 根据类名提供一个变量名
   private String getEntityCode(String s) {
     // 找到最后一个大写字母，以此为变量名
-    if (Character.isLowerCase(s.charAt(0))) return s;
-    else
+    if (Character.isLowerCase(s.charAt(0))) {
+      return s;
+    } else {
       return (new StringBuilder())
           .append(Character.toLowerCase(s.charAt(0)))
           .append(s.substring(1))
           .toString();
+    }
   }
+
   /*根据数据库注释来判断显示名称*/
   private void setGetDisplayName(Attribute attr) {
+
     String comment = attr.getComment();
     if (StringUtils.isEmpty(comment)) {
       attr.setDisplayName(attr.getName());
@@ -226,4 +233,5 @@ public class CoreCodeGenService {
       attr.setDisplayName(comment);
     }
   }
+
 }