Skip to content
GitLab
Commit 18144407 authored by trumansdo's avatar trumansdo
Browse files

应用codestyle 


千万千万要用vscode打开前端项目，或者关闭eslint，移除它
Signed-off-by: default avatartrumansdo <1012243881@qq.com>
parent 9b3d96a6
Hide whitespace changes
Inline Side-by-side
plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreOrgDao.java
View file @ 18144407
......@@ -11,13 +11,10 @@ import com.ibeetl.admin.core.entity.CoreOrg;
@SqlResource("core.coreOrg")
public interface CoreOrgDao extends BaseMapper<CoreOrg> {
List<CoreOrg> queryOrgByUser(Long userId);
List<CoreOrg> queryOrgByUser(Long userId);
List<String> queryAllOrgCode(List<Long> orgIds);
@Sql("select * from core_org where parent_org_id is null")
CoreOrg getRoot();
List<String> queryAllOrgCode(List<Long> orgIds);
@Sql("select * from core_org where parent_org_id is null")
CoreOrg getRoot();
}
plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreRoleDao.java
View file @ 18144407
......@@ -10,8 +10,4 @@ import com.ibeetl.admin.core.entity.CoreRole;
import java.util.List;
@SqlResource("core.coreRole")
public interface CoreRoleDao extends BaseMapper<CoreRole> {
}
public interface CoreRoleDao extends BaseMapper<CoreRole> {}
plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreRoleFunctionDao.java
View file @ 18144407
......@@ -12,12 +12,7 @@ import java.util.List;
@SqlResource("core.coreRoleFunction")
public interface CoreRoleFunctionDao extends BaseMapper<CoreRoleFunction> {
List<CoreRoleFunction> getRoleFunction(Long userId, Long orgId, String code);
List<CoreRoleFunction> getRoleFunction( Long userId, Long orgId,
String code);
List<String> getRoleChildrenFunction(Long userId, Long orgId,
Long parentId);
List<String> getRoleChildrenFunction(Long userId, Long orgId, Long parentId);
}
plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreRoleMenuDao.java
View file @ 18144407
......@@ -12,17 +12,19 @@ import java.util.List;
@SqlResource("core.coreRoleMenu")
public interface CoreRoleMenuDao extends BaseMapper<CoreRoleMenu> {
/**
* 根据用户ID，机构ID查询菜单
* @param userId 用户id
* @param orgId 机构id
* @return
*/
List<Long> queryMenuByUser( Long userId, Long orgId);
/**
* 根据用户ID，机构ID查询菜单
*
* @param userId 用户id
* @param orgId 机构id
* @return
*/
List<Long> queryMenuByUser(Long userId, Long orgId);
/**
* 根据菜单id删除角色和菜单关系
* @param ids
*/
void deleteRoleMenu(List<Long> ids);
/**
* 根据菜单id删除角色和菜单关系
*
* @param ids
*/
void deleteRoleMenu(List<Long> ids);
}
plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserDao.java
View file @ 18144407
......@@ -11,12 +11,11 @@ import java.util.List;
@SqlResource("core.coreUser")
public interface CoreUserDao extends BaseMapper<CoreUser> {
/**
* 根据角色编码查询用户集合
* @param roleCode 角色编码
* @return
*/
List<CoreUser> getUserByRole( String roleCode);
/**
* 根据角色编码查询用户集合
*
* @param roleCode 角色编码
* @return
*/
List<CoreUser> getUserByRole(String roleCode);
}
plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserRoleDao.java
View file @ 18144407
......@@ -7,7 +7,4 @@ import org.beetl.sql.core.mapper.BaseMapper;
import com.ibeetl.admin.core.entity.CoreUserRole;
@SqlResource("core.coresUserRole")
public interface CoreUserRoleDao extends BaseMapper<CoreUserRole> {
}
public interface CoreUserRoleDao extends BaseMapper<CoreUserRole> {}
plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreWorkflowDao.java
View file @ 18144407
......@@ -9,16 +9,18 @@ import java.util.List;
/**
* 业务侧工作流的基本功能，工作流的一些功能将在业务侧完成，比如选人操作
*
* @author lijiazhi
*/
@SqlResource("core.workflow")
public interface CoreWorkflowDao extends BaseMapper {
/**
* 根据角色id，机构id查询用户集合
* @param roleId 角色id
* @param orgs 机构id
* @return
*/
List<CoreUser> queryUsersByRole(Long roleId, List<Long> orgs);
/**
* 根据角色id，机构id查询用户集合
*
* @param roleId 角色id
* @param orgs 机构id
* @return
*/
List<CoreUser> queryUsersByRole(Long roleId, List<Long> orgs);
}
plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/entity/BaseEntity.java
View file @ 18144407
......@@ -9,20 +9,17 @@ import com.fasterxml.jackson.annotation.JsonAnySetter;
/**
* 描述:用于辅助序列化beetlsql 的TailBean
*
* @author : xiandafu
*/
public class BaseEntity extends TailBean implements java.io.Serializable {
protected final static String ORACLE_CORE_SEQ_NAME="core_seq";
protected final static String ORACLE_AUDIT_SEQ_NAME="audit_seq";
protected final static String ORACLE_FILE_SEQ_NAME="core_seq";
@JsonAnyGetter
public Map<String, Object> getTails(){
return super.getTails();
}
protected static final String ORACLE_CORE_SEQ_NAME = "core_seq";
protected static final String ORACLE_AUDIT_SEQ_NAME = "audit_seq";
protected static final String ORACLE_FILE_SEQ_NAME = "core_seq";
@JsonAnyGetter
public Map<String, Object> getTails() {
return super.getTails();
}
}
plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreAudit.java
View file @ 18144407
......@@ -14,109 +14,97 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.ibeetl.admin.core.util.ValidateConfig;
public class CoreAudit extends BaseEntity {
@SeqID(name = "ORACLE_AUDIT_SEQ_NAME")
@AutoID
@NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class)
protected Long id;
//删除标识
@JsonIgnore
protected Integer delFlag;
//创建时间
private Integer success ;
private String functionCode ;
private String functionName ;
private String ip ;
private String message ;
private String userName ;
private Long userId ;
protected Date createTime;
public CoreAudit() {
}
public Integer getSuccess(){
return success;
}
public void setSuccess(Integer success ){
this.success = success;
}
public String getFunctionCode(){
return functionCode;
}
public void setFunctionCode(String functionCode ){
this.functionCode = functionCode;
}
public String getFunctionName(){
return functionName;
}
public void setFunctionName(String functionName ){
this.functionName = functionName;
}
public String getIp(){
return ip;
}
public void setIp(String ip ){
this.ip = ip;
}
public String getMessage(){
return message;
}
public void setMessage(String message ){
this.message = message;
}
public String getUserName(){
return userName;
}
public void setUserName(String userName ){
this.userName = userName;
}
public Long getUserId(){
return userId;
}
public void setUserId(Long userId ){
this.userId = userId;
}
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;
}
}
\ No newline at end of file
public class CoreAudit extends BaseEntity {
@SeqID(name = "ORACLE_AUDIT_SEQ_NAME")
@AutoID
@NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class)
protected Long id;
// 删除标识
@JsonIgnore protected Integer delFlag;
// 创建时间
private Integer success;
private String functionCode;
private String functionName;
private String ip;
private String message;
private String userName;
private Long userId;
protected Date createTime;
public CoreAudit() {}
public Integer getSuccess() {
return success;
}
public void setSuccess(Integer success) {
this.success = success;
}
public String getFunctionCode() {
return functionCode;
}
public void setFunctionCode(String functionCode) {
this.functionCode = functionCode;
}
public String getFunctionName() {
return functionName;
}
public void setFunctionName(String functionName) {
this.functionName = functionName;
}
public String getIp() {
return ip;
}
public void setIp(String ip) {
this.ip = ip;
}
public String getMessage() {
return message;
}
public void setMessage(String message) {
this.message = message;
}
public String getUserName() {
return userName;
}
public void setUserName(String userName) {
this.userName = userName;
}
public Long getUserId() {
return userId;
}
public void setUserId(Long userId) {
this.userId = userId;
}
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/CoreDict.java
View file @ 18144407
......@@ -15,132 +15,122 @@ import com.ibeetl.admin.core.util.ValidateConfig;
/**
* 描述: 字典
*
* @author : xiandafu
*/
public class CoreDict extends BaseEntity {
@NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class)
@SeqID(name = ORACLE_CORE_SEQ_NAME)
@AutoID
private Long id;
private String value; // 数据值
//删除标识
@JsonIgnore
protected Integer delFlag = 0;
//创建时间
protected Date createTime;
@NotBlank(message = "字典类型不能为空", groups = ValidateConfig.ADD.class)
@JsonView(TypeListView.class)
private String type; //类型
@JsonView(TypeListView.class)
@NotBlank(message = "字典类型描述不能为空")
private String typeName; //类型描述
@NotBlank(message = "字典值不能为空", groups = ValidateConfig.ADD.class)
@NotBlank(message = "字典值名称不能为空")
private String name; // 标签名
private Integer sort; // 排序
private Long parent; //父Id
private String remark; //备注
@NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class)
@SeqID(name = ORACLE_CORE_SEQ_NAME)
@AutoID
private Long id;
private String value; // 数据值
// 删除标识
@JsonIgnore protected Integer delFlag = 0;
// 创建时间
protected Date createTime;
public Long getId() {
return id;
}
@NotBlank(message = "字典类型不能为空", groups = ValidateConfig.ADD.class)
@JsonView(TypeListView.class)
private String type; // 类型
public void setId(Long id) {
this.id = id;
}
@JsonView(TypeListView.class)
@NotBlank(message = "字典类型描述不能为空")
private String typeName; // 类型描述
public String getType() {
return type;
}
@NotBlank(message = "字典值不能为空", groups = ValidateConfig.ADD.class)
@NotBlank(message = "字典值名称不能为空")
private String name; // 标签名
public void setType(String type) {
this.type = type;
}
private Integer sort; // 排序
private Long parent; // 父Id
private String remark; // 备注
public String getTypeName() {
return typeName;
}
public Long getId() {
return id;
}
public void setTypeName(String typeName) {
this.typeName = typeName;
}
public void setId(Long id) {
this.id = id;
}
public String getValue() {
return value;
}
public String getType() {
return type;
}
public void setValue(String value) {
this.value = value;
}
public void setType(String type) {
this.type = type;
}
public String getName() {
return name;
}
public String getTypeName() {
return typeName;
}
public void setName(String name) {
this.name = name;
}
public void setTypeName(String typeName) {
this.typeName = typeName;
}
public Integer getSort() {
return sort;
}
public String getValue() {
return value;
}
public void setSort(Integer sort) {
this.sort = sort;
}
public void setValue(String value) {
this.value = value;
}
public Long getParent() {
return parent;
}
public String getName() {
return name;
}
public void setParent(Long parent) {
this.parent = parent;
}
public void setName(String name) {
this.name = name;
}
public String getRemark() {
return remark;
}
public Integer getSort() {
return sort;
}
public void setRemark(String remark) {
this.remark = remark;
}
public void setSort(Integer sort) {
this.sort = sort;
}
public Long getParent() {
return parent;
}
public void setParent(Long parent) {
this.parent = parent;
}
public Integer getDelFlag() {
return delFlag;
}
public String getRemark() {
return remark;
}
public void setDelFlag(Integer delFlag) {
this.delFlag = delFlag;
}
public Date getCreateTime() {
return createTime;
}
public void setRemark(String remark) {
this.remark = remark;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Integer getDelFlag() {
return delFlag;
}
public void setDelFlag(Integer delFlag) {
this.delFlag = delFlag;
}
public interface TypeListView{
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
@Override
public String toString() {
return "CoreDict [value=" + value + ", type=" + type + ", name=" + name + "]";
}
public interface TypeListView {}
@Override
public String toString() {
return "CoreDict [value=" + value + ", type=" + type + ", name=" + name + "]";
}
}
plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreFile.java
View file @ 18144407
......@@ -11,154 +11,151 @@ import org.beetl.sql.core.TailBean;
import java.math.*;
import com.ibeetl.admin.core.entity.BaseEntity;
/*
*
* gen by Spring Boot2 Admin 2018-03-08
*/
/*
*
* 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;
private String fileBatchId;
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;
}
@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;
private String fileBatchId;
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
View file @ 18144407
package com.ibeetl.admin.core.entity;
import java.util.Date;
import javax.validation.constraints.NotBlank;
......@@ -12,78 +13,81 @@ import com.ibeetl.admin.core.annotation.Dict;
import com.ibeetl.admin.core.util.ValidateConfig;
import com.ibeetl.admin.core.util.enums.CoreDictType;
public class CoreFunction extends BaseEntity {
@NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class)
@SeqID(name = ORACLE_CORE_SEQ_NAME)
@AutoID
protected Long id;
// 创建时间
@UpdateIgnore protected Date createTime;
private String accessUrl;
@NotBlank private String code;
@NotBlank private String name;
@NotBlank private Long parentId;
@Dict(type = CoreDictType.FUNCTION_TYPE)
@NotBlank
private String type = null; // "FN0" ;
public String getAccessUrl() {
return accessUrl;
}
public void setAccessUrl(String accessUrl) {
this.accessUrl = accessUrl;
}
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 Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Long getParentId() {
return parentId;
}
public void setParentId(Long parentId) {
this.parentId = parentId;
}
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getType() {
return type;
}
public class CoreFunction extends BaseEntity {
@NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class)
@SeqID(name = ORACLE_CORE_SEQ_NAME)
@AutoID
protected Long id;
//创建时间
@UpdateIgnore
protected Date createTime;
private String accessUrl ;
@NotBlank
private String code ;
@NotBlank
private String name ;
@NotBlank
private Long parentId ;
@Dict(type=CoreDictType.FUNCTION_TYPE)
@NotBlank
private String type = null;//"FN0" ;
public String getAccessUrl(){
return accessUrl;
}
public void setAccessUrl(String accessUrl ){
this.accessUrl = accessUrl;
}
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 Date getCreateTime(){
return createTime;
}
public void setCreateTime(Date createTime ){
this.createTime = createTime;
}
public Long getParentId() {
return parentId;
}
public void setParentId(Long parentId) {
this.parentId = parentId;
}
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public boolean hasParent(){
return this.parentId != null && this.parentId > 0;
}
public void setType(String type) {
this.type = type;
}
public boolean hasParent() {
return this.parentId != null && this.parentId > 0;
}
}
plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreMenu.java
View file @ 18144407
......@@ -13,125 +13,119 @@ import com.ibeetl.admin.core.annotation.Dict;
import com.ibeetl.admin.core.util.ValidateConfig;
import com.ibeetl.admin.core.util.enums.CoreDictType;
/**
* 系统菜单
*/
/** 系统菜单 */
public class CoreMenu extends BaseEntity {
public static final String TYPE_SYSTEM = "MENU_S";
public static final String TYPE_NAV = "MENU_N";
public static final String TYPE_MENUITEM = "MENU_M";
public static final String TYPE_SYSTEM = "MENU_S";
public static final String TYPE_NAV = "MENU_N";
public static final String TYPE_MENUITEM = "MENU_M";
@NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class)
@SeqID(name = ORACLE_CORE_SEQ_NAME)
@AutoID
protected Long id;
@NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class)
@SeqID(name = ORACLE_CORE_SEQ_NAME)
@AutoID
protected Long id;
//创建时间
@UpdateIgnore
protected Date createTime;
// 创建时间
@UpdateIgnore protected Date createTime;
//菜单代码
@NotBlank(message = "菜单代码不能为空", groups = ValidateConfig.ADD.class)
private String code;
// 菜单代码
@NotBlank(message = "菜单代码不能为空", groups = ValidateConfig.ADD.class)
private String code;
//功能id
private Long functionId;
// 功能id
private Long functionId;
//类型 /*1 系统 2 导航 3 菜单项(与功能点有关)*/
@NotNull(message = "菜单类型不能为空")
@Dict(type = CoreDictType.MENU_TYPE)
private String type;
// 类型 /*1 系统 2 导航 3 菜单项(与功能点有关)*/
@NotNull(message = "菜单类型不能为空")
@Dict(type = CoreDictType.MENU_TYPE)
private String type;
//菜单名称
@NotBlank(message = "菜单名称不能为空")
private String name;
// 菜单名称
@NotBlank(message = "菜单名称不能为空")
private String name;
//上层菜单id
@NotNull(message = "上层菜单不能为空")
private Long parentMenuId;
// 上层菜单id
@NotNull(message = "上层菜单不能为空")
private Long parentMenuId;
//排序
@NotNull(message = "排序不能为空")
private Integer seq;
// 排序
@NotNull(message = "排序不能为空")
private Integer seq;
//图标
private String icon;
// 图标
private String icon;
public CoreMenu() {
}
public CoreMenu() {}
public Long getId() {
return id;
}
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public void setId(Long id) {
this.id = id;
}
public String getCode() {
return code;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public void setCode(String code) {
this.code = code;
}
public Long getFunctionId() {
return functionId;
}
public Long getFunctionId() {
return functionId;
}
public void setFunctionId(Long functionId) {
this.functionId = functionId;
}
public void setFunctionId(Long functionId) {
this.functionId = functionId;
}
public String getType() {
return type;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public void setType(String type) {
this.type = type;
}
public String getName() {
return name;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public void setName(String name) {
this.name = name;
}
public Long getParentMenuId() {
return parentMenuId;
}
public Long getParentMenuId() {
return parentMenuId;
}
public void setParentMenuId(Long parentMenuId) {
this.parentMenuId = parentMenuId;
}
public void setParentMenuId(Long parentMenuId) {
this.parentMenuId = parentMenuId;
}
public Integer getSeq() {
return seq;
}
public Integer getSeq() {
return seq;
}
public void setSeq(Integer seq) {
this.seq = seq;
}
public void setSeq(Integer seq) {
this.seq = seq;
}
public String getIcon() {
return icon;
}
public String getIcon() {
return icon;
}
public void setIcon(String icon) {
this.icon = icon;
}
public void setIcon(String icon) {
this.icon = icon;
}
public Date getCreateTime() {
return createTime;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
}
plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreOrg.java
View file @ 18144407
......@@ -13,104 +13,94 @@ import com.ibeetl.admin.core.annotation.Dict;
import com.ibeetl.admin.core.util.ValidateConfig;
import com.ibeetl.admin.core.util.enums.CoreDictType;
/**
* 机构对象，
* 有母公司，一个系统只有一个母公司，多个集团，集团下可以有多个公司，子公司，部门。如果系统不符合这个设定，需要修改·
*
* <br/>
* 机构对象， 有母公司，一个系统只有一个母公司，多个集团，集团下可以有多个公司，子公司，部门。如果系统不符合这个设定，需要修改· <br>
* 映射了上级机构，可以通过org.parentOrg.xxx取上级机构的属性
*/
public class CoreOrg extends BaseEntity {
// 自增id
@NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class)
@SeqID(name = ORACLE_CORE_SEQ_NAME)
@AutoID
private Long id;
//删除标识
@JsonIgnore
protected Integer delFlag= 0;
//创建时间
protected Date createTime;
// 机构编号
@NotBlank(message = "组织编号不能为空", groups = ValidateConfig.ADD.class)
private String code;
// 机构名称
@NotBlank(message = "组织名称不能为空", groups = {ValidateConfig.ADD.class, ValidateConfig.UPDATE.class})
private String name;
// 上层机构id
private Long parentOrgId;
// 机构类型 1 集团 2 公司，3 部门，4 小组
@Dict(type = CoreDictType.ORG_TYPE)
@NotBlank(message = "组织类型不能为空", groups = ValidateConfig.class)
private String type;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
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 Long getParentOrgId() {
return parentOrgId;
}
public void setParentOrgId(Long parentOrgId) {
this.parentOrgId = parentOrgId;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
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;
}
// 自增id
@NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class)
@SeqID(name = ORACLE_CORE_SEQ_NAME)
@AutoID
private Long id;
// 删除标识
@JsonIgnore protected Integer delFlag = 0;
// 创建时间
protected Date createTime;
// 机构编号
@NotBlank(message = "组织编号不能为空", groups = ValidateConfig.ADD.class)
private String code;
// 机构名称
@NotBlank(
message = "组织名称不能为空",
groups = {ValidateConfig.ADD.class, ValidateConfig.UPDATE.class})
private String name;
// 上层机构id
private Long parentOrgId;
// 机构类型 1 集团 2 公司，3 部门，4 小组
@Dict(type = CoreDictType.ORG_TYPE)
@NotBlank(message = "组织类型不能为空", groups = ValidateConfig.class)
private String type;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
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 Long getParentOrgId() {
return parentOrgId;
}
public void setParentOrgId(Long parentOrgId) {
this.parentOrgId = parentOrgId;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
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/CoreRole.java
View file @ 18144407
......@@ -13,71 +13,68 @@ import com.ibeetl.admin.core.annotation.Dict;
import com.ibeetl.admin.core.util.ValidateConfig;
import com.ibeetl.admin.core.util.enums.CoreDictType;
/**
* 角色
*/
/** 角色 */
public class CoreRole extends BaseEntity {
@NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class)
@SeqID(name = ORACLE_CORE_SEQ_NAME)
@AutoID
protected Long id;
@NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class)
@SeqID(name = ORACLE_CORE_SEQ_NAME)
@AutoID
protected Long id;
protected Date createTime;
protected Date createTime;
// 角色code
@NotBlank(message = "角色编码不能为空", groups = ValidateConfig.ADD.class)
private String code;
// 角色code
@NotBlank(message = "角色编码不能为空", groups = ValidateConfig.ADD.class)
private String code;
// 角色名称
@NotBlank(
message = "角色名称不能为空",
groups = {ValidateConfig.ADD.class, ValidateConfig.UPDATE.class})
private String name;
// 角色名称
@NotBlank(message = "角色名称不能为空", groups = { ValidateConfig.ADD.class, ValidateConfig.UPDATE.class })
private String name;
// 角色类型,系统的角色，工作流角色
@NotBlank(message = "角色类型不能为空")
@Dict(type = CoreDictType.ROLE_TYPE)
private String type;
// 角色类型,系统的角色，工作流角色
@NotBlank(message = "角色类型不能为空")
@Dict(type = CoreDictType.ROLE_TYPE)
private String type;
public String getCode() {
return code;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public void setCode(String code) {
this.code = code;
}
public String getName() {
return name;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public void setName(String name) {
this.name = name;
}
public String getType() {
return type;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public void setType(String type) {
this.type = type;
}
public Long getId() {
return id;
}
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public void setId(Long id) {
this.id = id;
}
public Date getCreateTime() {
return createTime;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
}
\ No newline at end of file
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
}
plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRoleFunction.java
View file @ 18144407
......@@ -11,85 +11,81 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
import com.ibeetl.admin.core.util.ValidateConfig;
/*
*
* gen by beetlsql 2016-11-22
*/
*
* 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;
// 创建时间
protected Date createTime;
private String dataAccessPolicy;
// 数据访问类型，1 只看自己的，2 看部门的，3 看公司的 4 自定义，参考policy字段
private Integer dataAccessType;
private Long functionId;
private Long roleId;
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;
}
@NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class)
@SeqID(name = ORACLE_CORE_SEQ_NAME)
@AutoID
protected Long id;
// 删除标识
@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 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
View file @ 18144407
package com.ibeetl.admin.core.entity;
import java.util.Date;
import javax.validation.constraints.NotNull;
......@@ -9,49 +10,50 @@ import org.beetl.sql.core.annotatoin.SeqID;
import com.ibeetl.admin.core.util.ValidateConfig;
/*
*
* gen by beetlsql 2016-11-22
*/
*
* 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 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;
}
@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 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/CoreUser.java
View file @ 18144407
......@@ -15,158 +15,146 @@ import com.ibeetl.admin.core.util.ValidateConfig;
import com.ibeetl.admin.core.util.enums.CoreDictType;
/*
* 用户实体
*
*/
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;
// 创建时间
protected Date createTime;
// 登录名，编号
@NotBlank(message = "用户编号不能为空", groups = ValidateConfig.ADD.class)
@Null(message = "用户编号不能为空", groups = ValidateConfig.UPDATE.class)
private String code;
// 用户姓名
@NotBlank(message = "用户名不能为空")
private String name;
// 组织机构id
private Long orgId;
// 密码
@JsonIgnore
private String password;
@Dict(type=CoreDictType.USER_STATE)
private String state;
//扩展例子
@Dict(type="job_type")
private String jobType0;
@Dict(type="job_type")
private String jobType1;
private Date updateTime;
/*用户的个人资料附件，保存到Core_File 表里*/
private String attachmentId;
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 Long getOrgId() {
return orgId;
}
public void setOrgId(Long orgId) {
this.orgId = orgId;
}
public String getPassword() {
return password;
}
public void setPassword(String password) {
this.password = password;
}
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
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;
}
public String getJobType0() {
return jobType0;
}
public void setJobType0(String jobType0) {
this.jobType0 = jobType0;
}
public String getJobType1() {
return jobType1;
}
public void setJobType1(String jobType1) {
this.jobType1 = jobType1;
}
public String getState() {
return state;
}
public void setState(String state) {
this.state = state;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
* 用户实体
*
*/
public String getAttachmentId() {
return attachmentId;
}
public class CoreUser extends BaseEntity {
public void setAttachmentId(String attachmentId) {
this.attachmentId = attachmentId;
}
@NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class)
@SeqID(name = ORACLE_CORE_SEQ_NAME)
@AutoID
protected Long id;
// 删除标识
@JsonIgnore protected Integer delFlag = 0;
// 创建时间
protected Date createTime;
// 登录名，编号
@NotBlank(message = "用户编号不能为空", groups = ValidateConfig.ADD.class)
@Null(message = "用户编号不能为空", groups = ValidateConfig.UPDATE.class)
private String code;
// 用户姓名
@NotBlank(message = "用户名不能为空")
private String name;
// 组织机构id
private Long orgId;
// 密码
@JsonIgnore private String password;
@Dict(type = CoreDictType.USER_STATE)
private String state;
// 扩展例子
@Dict(type = "job_type")
private String jobType0;
@Dict(type = "job_type")
private String jobType1;
private Date updateTime;
/*用户的个人资料附件，保存到Core_File 表里*/
private String attachmentId;
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 Long getOrgId() {
return orgId;
}
public void setOrgId(Long orgId) {
this.orgId = orgId;
}
public String getPassword() {
return password;
}
public void setPassword(String password) {
this.password = password;
}
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
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;
}
public String getJobType0() {
return jobType0;
}
public void setJobType0(String jobType0) {
this.jobType0 = jobType0;
}
public String getJobType1() {
return jobType1;
}
public void setJobType1(String jobType1) {
this.jobType1 = jobType1;
}
public String getState() {
return state;
}
public void setState(String state) {
this.state = state;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public String getAttachmentId() {
return attachmentId;
}
public void setAttachmentId(String attachmentId) {
this.attachmentId = attachmentId;
}
}
plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreUserRole.java
View file @ 18144407
......@@ -8,66 +8,64 @@ import org.beetl.sql.core.annotatoin.AutoID;
import org.beetl.sql.core.annotatoin.SeqID;
/*
* 用户角色关系
* gen by beetlsql 2016-11-22
*/
* 用户角色关系
* gen by beetlsql 2016-11-22
*/
public class CoreUserRole extends BaseEntity {
// 自增id
@SeqID(name = "ORACLE_CORE_SEQ_NAME")
@AutoID
private Long id;
// 授权机构id
@NotNull(message = "授权机构不能为空")
private Long orgId;
// 授权角色id
@NotNull(message = "授权角色不能为空")
private Long roleId;
// 用户id
@NotNull(message = "授权用户不能为空")
private Long userId;
protected Date createTime;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Long getOrgId() {
return orgId;
}
public void setOrgId(Long orgId) {
this.orgId = orgId;
}
public Long getRoleId() {
return roleId;
}
public void setRoleId(Long roleId) {
this.roleId = roleId;
}
public Long getUserId() {
return userId;
}
public void setUserId(Long userId) {
this.userId = userId;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
// 自增id
@SeqID(name = "ORACLE_CORE_SEQ_NAME")
@AutoID
private Long id;
// 授权机构id
@NotNull(message = "授权机构不能为空")
private Long orgId;
// 授权角色id
@NotNull(message = "授权角色不能为空")
private Long roleId;
// 用户id
@NotNull(message = "授权用户不能为空")
private Long userId;
protected Date createTime;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Long getOrgId() {
return orgId;
}
public void setOrgId(Long orgId) {
this.orgId = orgId;
}
public Long getRoleId() {
return roleId;
}
public void setRoleId(Long roleId) {
this.roleId = roleId;
}
public Long getUserId() {
return userId;
}
public void setUserId(Long userId) {
this.userId = userId;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
}
plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/file/DBIndexHelper.java
View file @ 18144407
......@@ -11,62 +11,59 @@ import com.ibeetl.admin.core.entity.CoreFile;
/**
* 从数据库搜索文档信息，对应core_file,和core_file_tag,目前先忽略tag功能
* @author xiandafu
*
* @author xiandafu
*/
public class DBIndexHelper {
public class DBIndexHelper {
CoreFileDao fileDao;
public DBIndexHelper(CoreFileDao fileDao) {
this.fileDao = fileDao;
}
public CoreFile getFileItemByPath(String path) {
CoreFile t = new CoreFile();
t.setPath(path);
CoreFile dbData = fileDao.templateOne(t);
return dbData;
}
public CoreFile getFileItemById(Long id) {
CoreFile dbData = fileDao.unique(id);
return dbData;
}
public void createFileItem(CoreFile file,List<FileTag> tags) {
fileDao.insert(file,true);
if(tags==null||tags.isEmpty()) {
return ;
}
Long fileId = file.getId();
for(FileTag tag:tags) {
tag.setFileId(fileId);
}
fileDao.getSQLManager().insertBatch(FileTag.class, tags);
}
public List<CoreFile> queryByUserId(Long userId,List<FileTag> tags){
List<CoreFile> dbDatas = fileDao.createLambdaQuery().andEq(CoreFile::getUserId, userId).select();
return dbDatas;
}
public List<CoreFile> queryByBiz(String bizType,String bizId){
CoreFile template=new CoreFile();
template.setBizType(bizType);
template.setBizId(bizId);
List<CoreFile> dbDatas = fileDao.template(template);
return dbDatas;
CoreFileDao fileDao;
public DBIndexHelper(CoreFileDao fileDao) {
this.fileDao = fileDao;
}
public CoreFile getFileItemByPath(String path) {
CoreFile t = new CoreFile();
t.setPath(path);
CoreFile dbData = fileDao.templateOne(t);
return dbData;
}
public CoreFile getFileItemById(Long id) {
CoreFile dbData = fileDao.unique(id);
return dbData;
}
public void createFileItem(CoreFile file, List<FileTag> tags) {
fileDao.insert(file, true);
if (tags == null || tags.isEmpty()) {
return;
}
public List<CoreFile> queryByBatchId(String batchId){
CoreFile template=new CoreFile();
template.setFileBatchId(batchId);
List<CoreFile> dbDatas = fileDao.template(template);
return dbDatas;
Long fileId = file.getId();
for (FileTag tag : tags) {
tag.setFileId(fileId);
}
fileDao.getSQLManager().insertBatch(FileTag.class, tags);
}
public List<CoreFile> queryByUserId(Long userId, List<FileTag> tags) {
List<CoreFile> dbDatas =
fileDao.createLambdaQuery().andEq(CoreFile::getUserId, userId).select();
return dbDatas;
}
public List<CoreFile> queryByBiz(String bizType, String bizId) {
CoreFile template = new CoreFile();
template.setBizType(bizType);
template.setBizId(bizId);
List<CoreFile> dbDatas = fileDao.template(template);
return dbDatas;
}
public List<CoreFile> queryByBatchId(String batchId) {
CoreFile template = new CoreFile();
template.setFileBatchId(batchId);
List<CoreFile> dbDatas = fileDao.template(template);
return dbDatas;
}
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment