更换至beetlsql3最新版本

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreDict.java

 package com.ibeetl.admin.core.entity;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonView;
+import com.ibeetl.admin.core.util.ValidateConfig;
 import java.util.Date;
-
 import java.util.List;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
-
 import lombok.Data;
-import org.beetl.sql.core.annotatoin.AssignID;
-import org.beetl.sql.core.annotatoin.AutoID;
-import org.beetl.sql.core.annotatoin.SeqID;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonView;
-import com.ibeetl.admin.core.util.ValidateConfig;
+import org.beetl.sql.annotation.entity.AutoID;
+import org.beetl.sql.annotation.entity.SeqID;
 
 /**
  * 描述: 字典

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreFile.java

 package com.ibeetl.admin.core.entity;
 
+import com.ibeetl.admin.core.util.ValidateConfig;
 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.*;
-import com.ibeetl.admin.core.entity.BaseEntity;
+import org.beetl.sql.annotation.entity.AutoID;
+import org.beetl.sql.annotation.entity.SeqID;
 
 /*
  *
  * gen by Spring Boot2 Admin 2018-03-08
  */
 public class CoreFile extends BaseEntity {
+
   @NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class)
   @SeqID(name = ORACLE_FILE_SEQ_NAME)
   @AutoID
   private Long id;
+
   // 文件名称
   private String name;
+
   // 路径
   private String path;
+
   // 业务ID
   private String bizId;
+
   // 上传人id
   private Long userId;
+
   // 创建时间
   private Date createTime;
+
   private Long orgId;
+
   private String bizType;
 
   /*文件批次id，用于其它业务表记录*/
   private String fileBatchId;
 
-  public CoreFile() {}
+  public CoreFile() {
+
+  }
 
   public Long getId() {
+
     return id;
   }
 
   public void setId(Long id) {
+
     this.id = id;
   }
 
   /**
    * 文件名称
-   *
-   * @return
    */
   public String getName() {
+
     return name;
   }
 
   /**
    * 文件名称
-   *
-   * @param name
    */
   public void setName(String name) {
+
     this.name = name;
   }
 
   /**
    * 路径
-   *
-   * @return
    */
   public String getPath() {
+
     return path;
   }
 
   /**
    * 路径
-   *
-   * @param path
    */
   public void setPath(String path) {
+
     this.path = path;
   }
 
   /**
    * 业务ID
-   *
-   * @return
    */
   public String getBizId() {
+
     return bizId;
   }
 
   /**
    * 业务ID
-   *
-   * @param bizId
    */
   public void setBizId(String bizId) {
+
     this.bizId = bizId;
   }
 
   /**
    * 上传人id
-   *
-   * @return
    */
   public Long getUserId() {
+
     return userId;
   }
 
   /**
    * 上传人id
-   *
-   * @param userId
    */
   public void setUserId(Long userId) {
+
     this.userId = userId;
   }
 
   /**
    * 创建时间
-   *
-   * @return
    */
   public Date getCreateTime() {
+
     return createTime;
   }
 
   /**
    * 创建时间
-   *
-   * @param createTime
    */
   public void setCreateTime(Date createTime) {
+
     this.createTime = createTime;
   }
 
   public Long getOrgId() {
+
     return orgId;
   }
 
   public void setOrgId(Long orgId) {
+
     this.orgId = orgId;
   }
 
   public String getBizType() {
+
     return bizType;
   }
 
   public void setBizType(String bizType) {
+
     this.bizType = bizType;
   }
 
   public String getFileBatchId() {
+
     return fileBatchId;
   }
 
   public void setFileBatchId(String fileBatchId) {
+
     this.fileBatchId = fileBatchId;
   }
+
 }

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreFunction.java

 package com.ibeetl.admin.core.entity;
 
+import com.ibeetl.admin.core.annotation.Dict;
+import com.ibeetl.admin.core.util.ValidateConfig;
+import com.ibeetl.admin.core.util.enums.CoreDictType;
 import java.util.Date;
-
 import java.util.List;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
-
 import lombok.Data;
-import org.beetl.sql.core.annotatoin.AutoID;
-import org.beetl.sql.core.annotatoin.SeqID;
-import org.beetl.sql.core.annotatoin.UpdateIgnore;
-
-import com.ibeetl.admin.core.annotation.Dict;
-import com.ibeetl.admin.core.util.ValidateConfig;
-import com.ibeetl.admin.core.util.enums.CoreDictType;
+import lombok.EqualsAndHashCode;
+import org.beetl.sql.annotation.entity.AutoID;
+import org.beetl.sql.annotation.entity.SeqID;
+import org.beetl.sql.annotation.entity.UpdateIgnore;
 
 @Data
+@EqualsAndHashCode(callSuper = true)
 public class CoreFunction extends BaseEntity {
 
   @NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class)

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreMenu.java

@@ -9,15 +9,17 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.beetl.sql.core.annotatoin.AutoID;
-import org.beetl.sql.core.annotatoin.SeqID;
-import org.beetl.sql.core.annotatoin.UpdateIgnore;
+import org.beetl.sql.annotation.entity.AutoID;
+import org.beetl.sql.annotation.entity.JsonMapper;
+import org.beetl.sql.annotation.entity.SeqID;
+import org.beetl.sql.annotation.entity.UpdateIgnore;
 
 /**
  * 系统菜单
  */
 @NoArgsConstructor
 @Data
+@JsonMapper(resource = "console.menu.MenuFunctionMapping")
 public class CoreMenu extends BaseEntity implements Comparable {
 
   public static final String TYPE_SYSTEM = "MENU_S";

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreOrg.java

 package com.ibeetl.admin.core.entity;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.ibeetl.admin.core.annotation.Dict;
+import com.ibeetl.admin.core.util.ValidateConfig;
+import com.ibeetl.admin.core.util.enums.CoreDictType;
 import java.util.Date;
-
 import java.util.List;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
-
 import lombok.Data;
-import org.beetl.sql.core.annotatoin.AutoID;
-import org.beetl.sql.core.annotatoin.SeqID;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.ibeetl.admin.core.annotation.Dict;
-import com.ibeetl.admin.core.util.ValidateConfig;
-import com.ibeetl.admin.core.util.enums.CoreDictType;
+import lombok.EqualsAndHashCode;
+import org.beetl.sql.annotation.entity.AutoID;
+import org.beetl.sql.annotation.entity.SeqID;
 
 /**
  * 机构对象， 有母公司，一个系统只有一个母公司，多个集团，集团下可以有多个公司，子公司，部门。如果系统不符合这个设定，需要修改· <br>
  * 映射了上级机构，可以通过org.parentOrg.xxx取上级机构的属性
  */
-@Data
+@Data@EqualsAndHashCode(callSuper = true)
 public class CoreOrg extends BaseEntity {
 
   // 自增id

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRole.java

 package com.ibeetl.admin.core.entity;
 
-import java.util.Date;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
-import org.beetl.sql.core.annotatoin.AutoID;
-import org.beetl.sql.core.annotatoin.SeqID;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.ibeetl.admin.core.annotation.Dict;
 import com.ibeetl.admin.core.util.ValidateConfig;
 import com.ibeetl.admin.core.util.enums.CoreDictType;
+import java.util.Date;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import org.beetl.sql.annotation.entity.AutoID;
+import org.beetl.sql.annotation.entity.SeqID;
 
 /** 角色 */
 public class CoreRole extends BaseEntity {
@@ -39,42 +35,53 @@ public class CoreRole extends BaseEntity {
   private String type;
 
   public String getCode() {
+
     return code;
   }
 
   public void setCode(String code) {
+
     this.code = code;
   }
 
   public String getName() {
+
     return name;
   }
 
   public void setName(String name) {
+
     this.name = name;
   }
 
   public String getType() {
+
     return type;
   }
 
   public void setType(String type) {
+
     this.type = type;
   }
 
   public Long getId() {
+
     return id;
   }
 
   public void setId(Long id) {
+
     this.id = id;
   }
 
   public Date getCreateTime() {
+
     return createTime;
   }
 
   public void setCreateTime(Date createTime) {
+
     this.createTime = createTime;
   }
+
 }

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRoleFunction.java

 package com.ibeetl.admin.core.entity;
 
-import java.util.Date;
-
-import javax.validation.constraints.NotNull;
-
-import org.beetl.sql.core.annotatoin.AutoID;
-import org.beetl.sql.core.annotatoin.SeqID;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.ibeetl.admin.core.util.ValidateConfig;
+import java.util.Date;
+import javax.validation.constraints.NotNull;
+import org.beetl.sql.annotation.entity.AutoID;
+import org.beetl.sql.annotation.entity.SeqID;
 
 /*
  *
  * gen by beetlsql 2016-11-22
  */
 public class CoreRoleFunction extends BaseEntity {
+
   @NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class)
   @SeqID(name = ORACLE_CORE_SEQ_NAME)
   @AutoID
   protected Long id;
+
   // 删除标识
-  @JsonIgnore protected Integer delFlag = 0;
+  @JsonIgnore
+  protected Integer delFlag = 0;
   // 创建时间
 
   protected Date createTime;
 
   private String dataAccessPolicy;
+
   // 数据访问类型，1 只看自己的，2 看部门的，3 看公司的 4 自定义，参考policy字段
   private Integer dataAccessType;
+
   private Long functionId;
+
   private Long roleId;
 
-  public CoreRoleFunction() {}
+  public CoreRoleFunction() {
+
+  }
 
   public Long getId() {
+
     return id;
   }
 
   public void setId(Long id) {
+
     this.id = id;
   }
 
   public String getDataAccessPolicy() {
+
     return dataAccessPolicy;
   }
 
   public void setDataAccessPolicy(String dataAccessPolicy) {
+
     this.dataAccessPolicy = dataAccessPolicy;
   }
 
   public Integer getDataAccessType() {
+
     return dataAccessType;
   }
 
   public void setDataAccessType(Integer dataAccessType) {
+
     this.dataAccessType = dataAccessType;
   }
 
   public Long getFunctionId() {
+
     return functionId;
   }
 
   public void setFunctionId(Long functionId) {
+
     this.functionId = functionId;
   }
 
   public Long getRoleId() {
+
     return roleId;
   }
 
   public void setRoleId(Long roleId) {
+
     this.roleId = roleId;
   }
 
   public Integer getDelFlag() {
+
     return delFlag;
   }
 
   public void setDelFlag(Integer delFlag) {
+
     this.delFlag = delFlag;
   }
 
   public Date getCreateTime() {
+
     return createTime;
   }
 
   public void setCreateTime(Date createTime) {
+
     this.createTime = createTime;
   }
+
 }

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRoleMenu.java

 package com.ibeetl.admin.core.entity;
 
+import com.ibeetl.admin.core.util.ValidateConfig;
 import java.util.Date;
-
 import javax.validation.constraints.NotNull;
-
-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.annotation.entity.AutoID;
+import org.beetl.sql.annotation.entity.SeqID;
 
 /*
  *
  * gen by beetlsql 2016-11-22
  */
 public class CoreRoleMenu extends BaseEntity {
+
   @NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class)
   @SeqID(name = ORACLE_CORE_SEQ_NAME)
   @AutoID
   protected Long id;
 
   private Long menuId;
+
   private Long roleId;
+
   private Date createTime;
 
-  public CoreRoleMenu() {}
+  public CoreRoleMenu() {
+
+  }
 
   public Long getId() {
+
     return id;
   }
 
   public void setId(Long id) {
+
     this.id = id;
   }
 
   public Long getMenuId() {
+
     return menuId;
   }
 
   public void setMenuId(Long menuId) {
+
     this.menuId = menuId;
   }
 
   public Long getRoleId() {
+
     return roleId;
   }
 
   public void setRoleId(Long roleId) {
+
     this.roleId = roleId;
   }
 
   public Date getCreateTime() {
+
     return createTime;
   }
 
   public void setCreateTime(Date createTime) {
+
     this.createTime = createTime;
   }
+
 }

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRoute.java

@@ -5,11 +5,12 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import lombok.Data;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.beetl.sql.annotation.entity.JsonMapper;
 
 /**
  * 对应前端页面的routes路由表。具体格式如下： { "path": "/profile", "name": "router-name", "meta": { "title":
@@ -18,6 +19,8 @@ import java.util.Objects;
  * @author 一日看尽长安花
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
+@JsonMapper(resource = "core.coreFunction.RouteMapping")
 public class CoreRoute extends BaseEntity implements Comparable<CoreRoute> {
 
   private Long id;

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRouteMeta.java

 package com.ibeetl.admin.core.entity;
 
 import cn.hutool.core.collection.CollUtil;
-import lombok.Data;
-
 import java.util.List;
+import lombok.Data;
 
 @Data
 public class CoreRouteMeta {

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreUser.java

@@ -11,8 +11,9 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.beetl.sql.core.annotatoin.AutoID;
-import org.beetl.sql.core.annotatoin.SeqID;
+import org.beetl.sql.annotation.entity.AutoID;
+import org.beetl.sql.annotation.entity.JsonMapper;
+import org.beetl.sql.annotation.entity.SeqID;
 
 /*
  *   用户实体
@@ -21,14 +22,18 @@ import org.beetl.sql.core.annotatoin.SeqID;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
+@JsonMapper(resource = "console.user.UsersMapping")
 public class CoreUser extends BaseEntity {
 
   @NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class)
   @SeqID(name = ORACLE_CORE_SEQ_NAME)
   @AutoID
   protected Long id;
+
   // 删除标识
-  @JsonIgnore protected Integer delFlag = 0;
+  @JsonIgnore
+  protected Integer delFlag = 0;
+
   // 创建时间
   protected Date createTime;
 
@@ -51,7 +56,8 @@ public class CoreUser extends BaseEntity {
   private String orgName;
 
   // 密码
-  @JsonIgnore private String password;
+  @JsonIgnore
+  private String password;
 
   @Dict(type = CoreDictType.USER_STATE)
   private StateTypeEnum state;
@@ -67,4 +73,5 @@ public class CoreUser extends BaseEntity {
 
   /*用户的个人资料附件，保存到Core_File 表里*/
   private String attachmentId;
+
 }

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreUserRole.java

@@ -3,8 +3,8 @@ package com.ibeetl.admin.core.entity;
 import java.util.Date;
 import javax.validation.constraints.NotNull;
 import lombok.Data;
-import org.beetl.sql.core.annotatoin.AutoID;
-import org.beetl.sql.core.annotatoin.SeqID;
+import org.beetl.sql.annotation.entity.AutoID;
+import org.beetl.sql.annotation.entity.SeqID;
 
 /*
  *  用户角色关系

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/file/DBIndexHelper.java

 package com.ibeetl.admin.core.file;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.ibeetl.admin.core.dao.CoreFileDao;
 import com.ibeetl.admin.core.entity.CoreFile;
+import java.util.List;
 
 /**
  * 从数据库搜索文档信息，对应core_file,和core_file_tag,目前先忽略tag功能
@@ -35,7 +30,7 @@ public class DBIndexHelper {
   }
 
   public void createFileItem(CoreFile file, List<FileTag> tags) {
-    fileDao.insert(file, true);
+    fileDao.insert(file);
     if (tags == null || tags.isEmpty()) {
       return;
     }

plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/file/FileService.java

 package com.ibeetl.admin.core.file;
 
-import java.io.OutputStream;
 import java.util.List;
 /**
  * 文件持久化，默认为文件系统，可以扩展到fastfds等

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

 package com.ibeetl.admin.core.gen;
 
-import java.io.Writer;
-
 import com.ibeetl.admin.core.gen.model.Entity;
 
 public interface AutoGen {

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

 package com.ibeetl.admin.core.gen;
 
+import com.ibeetl.admin.core.util.beetl.VerifyForamtFunction;
 import java.io.IOException;
-
 import org.beetl.core.Configuration;
 import org.beetl.core.Context;
 import org.beetl.core.Function;
 import org.beetl.core.GroupTemplate;
 import org.beetl.core.resource.ClasspathResourceLoader;
 
-import com.ibeetl.admin.core.util.beetl.VerifyForamtFunction;
-
 public abstract class BaseTarget implements Target {
 
   protected GroupTemplate gt = null;

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

 package com.ibeetl.admin.core.gen;
 
+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.Entity;
-
 public class HtmlGen implements AutoGen {
 
   @Override

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

 package com.ibeetl.admin.core.gen;
 
+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.Entity;
-
 public class JSGen implements AutoGen {
 
   @Override

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

 package com.ibeetl.admin.core.gen;
 
+import com.ibeetl.admin.core.gen.model.Attribute;
+import com.ibeetl.admin.core.gen.model.Entity;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 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 JavaCodeGen implements AutoGen {
   String basePackage;
   Entity entity;

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

 package com.ibeetl.admin.core.gen;
 
+import com.ibeetl.admin.core.gen.model.Entity;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 
-import com.ibeetl.admin.core.gen.model.Entity;
-
 public class MavenProjectTarget extends BaseTarget {
   Entity entity;
   String basePackage;