Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
Springboot Plus
Commits
18144407
Commit
18144407
authored
Sep 04, 2019
by
trumansdo
Browse files
应用codestyle
千万千万要用vscode打开前端项目,或者关闭eslint,移除它 Signed-off-by:
trumansdo
<
1012243881@qq.com
>
parent
9b3d96a6
Changes
178
Show whitespace changes
Inline
Side-by-side
plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreOrgDao.java
View file @
18144407
...
@@ -13,11 +13,8 @@ public interface CoreOrgDao extends BaseMapper<CoreOrg> {
...
@@ -13,11 +13,8 @@ public interface CoreOrgDao extends BaseMapper<CoreOrg> {
List
<
CoreOrg
>
queryOrgByUser
(
Long
userId
);
List
<
CoreOrg
>
queryOrgByUser
(
Long
userId
);
List
<
String
>
queryAllOrgCode
(
List
<
Long
>
orgIds
);
List
<
String
>
queryAllOrgCode
(
List
<
Long
>
orgIds
);
@Sql
(
"select * from core_org where parent_org_id is null"
)
@Sql
(
"select * from core_org where parent_org_id is null"
)
CoreOrg
getRoot
();
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;
...
@@ -10,8 +10,4 @@ import com.ibeetl.admin.core.entity.CoreRole;
import
java.util.List
;
import
java.util.List
;
@SqlResource
(
"core.coreRole"
)
@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;
...
@@ -12,12 +12,7 @@ import java.util.List;
@SqlResource
(
"core.coreRoleFunction"
)
@SqlResource
(
"core.coreRoleFunction"
)
public
interface
CoreRoleFunctionDao
extends
BaseMapper
<
CoreRoleFunction
>
{
public
interface
CoreRoleFunctionDao
extends
BaseMapper
<
CoreRoleFunction
>
{
List
<
CoreRoleFunction
>
getRoleFunction
(
Long
userId
,
Long
orgId
,
String
code
);
List
<
CoreRoleFunction
>
getRoleFunction
(
Long
userId
,
Long
orgId
,
List
<
String
>
getRoleChildrenFunction
(
Long
userId
,
Long
orgId
,
Long
parentId
);
String
code
);
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
...
@@ -14,14 +14,16 @@ public interface CoreRoleMenuDao extends BaseMapper<CoreRoleMenu> {
...
@@ -14,14 +14,16 @@ public interface CoreRoleMenuDao extends BaseMapper<CoreRoleMenu> {
/**
/**
* 根据用户ID,机构ID查询菜单
* 根据用户ID,机构ID查询菜单
*
* @param userId 用户id
* @param userId 用户id
* @param orgId 机构id
* @param orgId 机构id
* @return
* @return
*/
*/
List
<
Long
>
queryMenuByUser
(
Long
userId
,
Long
orgId
);
List
<
Long
>
queryMenuByUser
(
Long
userId
,
Long
orgId
);
/**
/**
* 根据菜单id删除角色和菜单关系
* 根据菜单id删除角色和菜单关系
*
* @param ids
* @param ids
*/
*/
void
deleteRoleMenu
(
List
<
Long
>
ids
);
void
deleteRoleMenu
(
List
<
Long
>
ids
);
...
...
plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserDao.java
View file @
18144407
...
@@ -13,10 +13,9 @@ public interface CoreUserDao extends BaseMapper<CoreUser> {
...
@@ -13,10 +13,9 @@ public interface CoreUserDao extends BaseMapper<CoreUser> {
/**
/**
* 根据角色编码查询用户集合
* 根据角色编码查询用户集合
*
* @param roleCode 角色编码
* @param roleCode 角色编码
* @return
* @return
*/
*/
List
<
CoreUser
>
getUserByRole
(
String
roleCode
);
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;
...
@@ -7,7 +7,4 @@ import org.beetl.sql.core.mapper.BaseMapper;
import
com.ibeetl.admin.core.entity.CoreUserRole
;
import
com.ibeetl.admin.core.entity.CoreUserRole
;
@SqlResource
(
"core.coresUserRole"
)
@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,6 +9,7 @@ import java.util.List;
...
@@ -9,6 +9,7 @@ import java.util.List;
/**
/**
* 业务侧工作流的基本功能,工作流的一些功能将在业务侧完成,比如选人操作
* 业务侧工作流的基本功能,工作流的一些功能将在业务侧完成,比如选人操作
*
* @author lijiazhi
* @author lijiazhi
*/
*/
@SqlResource
(
"core.workflow"
)
@SqlResource
(
"core.workflow"
)
...
@@ -16,6 +17,7 @@ public interface CoreWorkflowDao extends BaseMapper {
...
@@ -16,6 +17,7 @@ public interface CoreWorkflowDao extends BaseMapper {
/**
/**
* 根据角色id,机构id查询用户集合
* 根据角色id,机构id查询用户集合
*
* @param roleId 角色id
* @param roleId 角色id
* @param orgs 机构id
* @param orgs 机构id
* @return
* @return
...
...
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;
...
@@ -9,20 +9,17 @@ import com.fasterxml.jackson.annotation.JsonAnySetter;
/**
/**
* 描述:用于辅助序列化beetlsql 的TailBean
* 描述:用于辅助序列化beetlsql 的TailBean
*
* @author : xiandafu
* @author : xiandafu
*/
*/
public
class
BaseEntity
extends
TailBean
implements
java
.
io
.
Serializable
{
public
class
BaseEntity
extends
TailBean
implements
java
.
io
.
Serializable
{
protected
final
static
String
ORACLE_CORE_SEQ_NAME
=
"core_seq"
;
protected
static
final
String
ORACLE_CORE_SEQ_NAME
=
"core_seq"
;
protected
final
static
String
ORACLE_AUDIT_SEQ_NAME
=
"audit_seq"
;
protected
static
final
String
ORACLE_AUDIT_SEQ_NAME
=
"audit_seq"
;
protected
final
static
String
ORACLE_FILE_SEQ_NAME
=
"core_seq"
;
protected
static
final
String
ORACLE_FILE_SEQ_NAME
=
"core_seq"
;
@JsonAnyGetter
@JsonAnyGetter
public
Map
<
String
,
Object
>
getTails
(){
public
Map
<
String
,
Object
>
getTails
()
{
return
super
.
getTails
();
return
super
.
getTails
();
}
}
}
}
plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreAudit.java
View file @
18144407
...
@@ -14,7 +14,6 @@ import com.fasterxml.jackson.core.JsonProcessingException;
...
@@ -14,7 +14,6 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.ibeetl.admin.core.util.ValidateConfig
;
import
com.ibeetl.admin.core.util.ValidateConfig
;
public
class
CoreAudit
extends
BaseEntity
{
public
class
CoreAudit
extends
BaseEntity
{
@SeqID
(
name
=
"ORACLE_AUDIT_SEQ_NAME"
)
@SeqID
(
name
=
"ORACLE_AUDIT_SEQ_NAME"
)
...
@@ -22,101 +21,90 @@ public class CoreAudit extends BaseEntity {
...
@@ -22,101 +21,90 @@ public class CoreAudit extends BaseEntity {
@NotNull
(
message
=
"ID不能为空"
,
groups
=
ValidateConfig
.
UPDATE
.
class
)
@NotNull
(
message
=
"ID不能为空"
,
groups
=
ValidateConfig
.
UPDATE
.
class
)
protected
Long
id
;
protected
Long
id
;
//删除标识
// 删除标识
@JsonIgnore
@JsonIgnore
protected
Integer
delFlag
;
protected
Integer
delFlag
;
// 创建时间
//创建时间
private
Integer
success
;
private
Integer
success
;
private
String
functionCode
;
private
String
functionCode
;
private
String
functionName
;
private
String
functionName
;
private
String
ip
;
private
String
ip
;
private
String
message
;
private
String
message
;
private
String
userName
;
private
String
userName
;
private
Long
userId
;
private
Long
userId
;
protected
Date
createTime
;
protected
Date
createTime
;
public
CoreAudit
()
{
public
CoreAudit
()
{}
}
public
Integer
getSuccess
(){
public
Integer
getSuccess
()
{
return
success
;
return
success
;
}
}
public
void
setSuccess
(
Integer
success
){
public
void
setSuccess
(
Integer
success
)
{
this
.
success
=
success
;
this
.
success
=
success
;
}
}
public
String
getFunctionCode
()
{
public
String
getFunctionCode
(){
return
functionCode
;
return
functionCode
;
}
}
public
void
setFunctionCode
(
String
functionCode
){
public
void
setFunctionCode
(
String
functionCode
)
{
this
.
functionCode
=
functionCode
;
this
.
functionCode
=
functionCode
;
}
}
public
String
getFunctionName
(){
public
String
getFunctionName
()
{
return
functionName
;
return
functionName
;
}
}
public
void
setFunctionName
(
String
functionName
){
public
void
setFunctionName
(
String
functionName
)
{
this
.
functionName
=
functionName
;
this
.
functionName
=
functionName
;
}
}
public
String
getIp
(){
public
String
getIp
()
{
return
ip
;
return
ip
;
}
}
public
void
setIp
(
String
ip
){
public
void
setIp
(
String
ip
)
{
this
.
ip
=
ip
;
this
.
ip
=
ip
;
}
}
public
String
getMessage
(){
public
String
getMessage
()
{
return
message
;
return
message
;
}
}
public
void
setMessage
(
String
message
){
public
void
setMessage
(
String
message
)
{
this
.
message
=
message
;
this
.
message
=
message
;
}
}
public
String
getUserName
(){
public
String
getUserName
()
{
return
userName
;
return
userName
;
}
}
public
void
setUserName
(
String
userName
){
public
void
setUserName
(
String
userName
)
{
this
.
userName
=
userName
;
this
.
userName
=
userName
;
}
}
public
Long
getUserId
(){
public
Long
getUserId
()
{
return
userId
;
return
userId
;
}
}
public
void
setUserId
(
Long
userId
){
public
void
setUserId
(
Long
userId
)
{
this
.
userId
=
userId
;
this
.
userId
=
userId
;
}
}
public
Long
getId
()
{
public
Long
getId
()
{
return
id
;
return
id
;
}
}
public
void
setId
(
Long
id
)
{
public
void
setId
(
Long
id
)
{
this
.
id
=
id
;
this
.
id
=
id
;
}
}
public
Date
getCreateTime
()
{
public
Date
getCreateTime
()
{
return
createTime
;
return
createTime
;
}
}
public
void
setCreateTime
(
Date
createTime
)
{
public
void
setCreateTime
(
Date
createTime
)
{
this
.
createTime
=
createTime
;
this
.
createTime
=
createTime
;
}
}
}
}
plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreDict.java
View file @
18144407
...
@@ -15,6 +15,7 @@ import com.ibeetl.admin.core.util.ValidateConfig;
...
@@ -15,6 +15,7 @@ import com.ibeetl.admin.core.util.ValidateConfig;
/**
/**
* 描述: 字典
* 描述: 字典
*
* @author : xiandafu
* @author : xiandafu
*/
*/
public
class
CoreDict
extends
BaseEntity
{
public
class
CoreDict
extends
BaseEntity
{
...
@@ -25,26 +26,26 @@ public class CoreDict extends BaseEntity {
...
@@ -25,26 +26,26 @@ public class CoreDict extends BaseEntity {
private
Long
id
;
private
Long
id
;
private
String
value
;
// 数据值
private
String
value
;
// 数据值
//删除标识
// 删除标识
@JsonIgnore
@JsonIgnore
protected
Integer
delFlag
=
0
;
protected
Integer
delFlag
=
0
;
// 创建时间
//创建时间
protected
Date
createTime
;
protected
Date
createTime
;
@NotBlank
(
message
=
"字典类型不能为空"
,
groups
=
ValidateConfig
.
ADD
.
class
)
@NotBlank
(
message
=
"字典类型不能为空"
,
groups
=
ValidateConfig
.
ADD
.
class
)
@JsonView
(
TypeListView
.
class
)
@JsonView
(
TypeListView
.
class
)
private
String
type
;
//类型
private
String
type
;
// 类型
@JsonView
(
TypeListView
.
class
)
@JsonView
(
TypeListView
.
class
)
@NotBlank
(
message
=
"字典类型描述不能为空"
)
@NotBlank
(
message
=
"字典类型描述不能为空"
)
private
String
typeName
;
//类型描述
private
String
typeName
;
// 类型描述
@NotBlank
(
message
=
"字典值不能为空"
,
groups
=
ValidateConfig
.
ADD
.
class
)
@NotBlank
(
message
=
"字典值不能为空"
,
groups
=
ValidateConfig
.
ADD
.
class
)
@NotBlank
(
message
=
"字典值名称不能为空"
)
@NotBlank
(
message
=
"字典值名称不能为空"
)
private
String
name
;
// 标签名
private
String
name
;
// 标签名
private
Integer
sort
;
// 排序
private
Long
parent
;
//父Id
private
String
remark
;
//备注
private
Integer
sort
;
// 排序
private
Long
parent
;
// 父Id
private
String
remark
;
// 备注
public
Long
getId
()
{
public
Long
getId
()
{
return
id
;
return
id
;
...
@@ -110,8 +111,6 @@ public class CoreDict extends BaseEntity {
...
@@ -110,8 +111,6 @@ public class CoreDict extends BaseEntity {
this
.
remark
=
remark
;
this
.
remark
=
remark
;
}
}
public
Integer
getDelFlag
()
{
public
Integer
getDelFlag
()
{
return
delFlag
;
return
delFlag
;
}
}
...
@@ -128,19 +127,10 @@ public class CoreDict extends BaseEntity {
...
@@ -128,19 +127,10 @@ public class CoreDict extends BaseEntity {
this
.
createTime
=
createTime
;
this
.
createTime
=
createTime
;
}
}
public
interface
TypeListView
{}
public
interface
TypeListView
{
}
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
return
"CoreDict [value="
+
value
+
", type="
+
type
+
", name="
+
name
+
"]"
;
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
...
@@ -12,9 +12,9 @@ import java.math.*;
...
@@ -12,9 +12,9 @@ import java.math.*;
import
com.ibeetl.admin.core.entity.BaseEntity
;
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
{
public
class
CoreFile
extends
BaseEntity
{
@NotNull
(
message
=
"ID不能为空"
,
groups
=
ValidateConfig
.
UPDATE
.
class
)
@NotNull
(
message
=
"ID不能为空"
,
groups
=
ValidateConfig
.
UPDATE
.
class
)
@SeqID
(
name
=
ORACLE_FILE_SEQ_NAME
)
@SeqID
(
name
=
ORACLE_FILE_SEQ_NAME
)
...
@@ -35,8 +35,7 @@ public class CoreFile extends BaseEntity {
...
@@ -35,8 +35,7 @@ public class CoreFile extends BaseEntity {
private
String
fileBatchId
;
private
String
fileBatchId
;
public
CoreFile
()
{
public
CoreFile
()
{}
}
public
Long
getId
()
{
public
Long
getId
()
{
return
id
;
return
id
;
...
@@ -159,6 +158,4 @@ public class CoreFile extends BaseEntity {
...
@@ -159,6 +158,4 @@ public class CoreFile extends BaseEntity {
public
void
setFileBatchId
(
String
fileBatchId
)
{
public
void
setFileBatchId
(
String
fileBatchId
)
{
this
.
fileBatchId
=
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
;
package
com.ibeetl.admin.core.entity
;
import
java.util.Date
;
import
java.util.Date
;
import
javax.validation.constraints.NotBlank
;
import
javax.validation.constraints.NotBlank
;
...
@@ -12,7 +13,6 @@ import com.ibeetl.admin.core.annotation.Dict;
...
@@ -12,7 +13,6 @@ import com.ibeetl.admin.core.annotation.Dict;
import
com.ibeetl.admin.core.util.ValidateConfig
;
import
com.ibeetl.admin.core.util.ValidateConfig
;
import
com.ibeetl.admin.core.util.enums.CoreDictType
;
import
com.ibeetl.admin.core.util.enums.CoreDictType
;
public
class
CoreFunction
extends
BaseEntity
{
public
class
CoreFunction
extends
BaseEntity
{
@NotNull
(
message
=
"ID不能为空"
,
groups
=
ValidateConfig
.
UPDATE
.
class
)
@NotNull
(
message
=
"ID不能为空"
,
groups
=
ValidateConfig
.
UPDATE
.
class
)
...
@@ -20,46 +20,46 @@ public class CoreFunction extends BaseEntity {
...
@@ -20,46 +20,46 @@ public class CoreFunction extends BaseEntity {
@AutoID
@AutoID
protected
Long
id
;
protected
Long
id
;
//创建时间
// 创建时间
@UpdateIgnore
@UpdateIgnore
protected
Date
createTime
;
protected
Date
createTime
;
private
String
accessUrl
;
private
String
accessUrl
;
@NotBlank
private
String
code
;
@NotBlank
@NotBlank
private
String
name
;
private
String
code
;
@NotBlank
private
Long
parentId
;
@NotBlank
private
String
name
;
@NotBlank
private
Long
parentId
;
@Dict
(
type
=
CoreDictType
.
FUNCTION_TYPE
)
@NotBlank
private
String
type
=
null
;
//"FN0" ;
@Dict
(
type
=
CoreDictType
.
FUNCTION_TYPE
)
@NotBlank
private
String
type
=
null
;
// "FN0" ;
public
String
getAccessUrl
(){
public
String
getAccessUrl
()
{
return
accessUrl
;
return
accessUrl
;
}
}
public
void
setAccessUrl
(
String
accessUrl
){
public
void
setAccessUrl
(
String
accessUrl
)
{
this
.
accessUrl
=
accessUrl
;
this
.
accessUrl
=
accessUrl
;
}
}
public
String
getCode
(){
public
String
getCode
()
{
return
code
;
return
code
;
}
}
public
void
setCode
(
String
code
){
public
void
setCode
(
String
code
)
{
this
.
code
=
code
;
this
.
code
=
code
;
}
}
public
String
getName
(){
public
String
getName
()
{
return
name
;
return
name
;
}
}
public
void
setName
(
String
name
){
public
void
setName
(
String
name
)
{
this
.
name
=
name
;
this
.
name
=
name
;
}
}
public
Date
getCreateTime
(){
public
Date
getCreateTime
()
{
return
createTime
;
return
createTime
;
}
}
public
void
setCreateTime
(
Date
createTime
){
public
void
setCreateTime
(
Date
createTime
)
{
this
.
createTime
=
createTime
;
this
.
createTime
=
createTime
;
}
}
...
@@ -70,20 +70,24 @@ public class CoreFunction extends BaseEntity {
...
@@ -70,20 +70,24 @@ public class CoreFunction extends BaseEntity {
public
void
setParentId
(
Long
parentId
)
{
public
void
setParentId
(
Long
parentId
)
{
this
.
parentId
=
parentId
;
this
.
parentId
=
parentId
;
}
}
public
Long
getId
()
{
public
Long
getId
()
{
return
id
;
return
id
;
}
}
public
void
setId
(
Long
id
)
{
public
void
setId
(
Long
id
)
{
this
.
id
=
id
;
this
.
id
=
id
;
}
}
public
String
getType
()
{
public
String
getType
()
{
return
type
;
return
type
;
}
}
public
void
setType
(
String
type
)
{
public
void
setType
(
String
type
)
{
this
.
type
=
type
;
this
.
type
=
type
;
}
}
public
boolean
hasParent
(){
public
boolean
hasParent
()
{
return
this
.
parentId
!=
null
&&
this
.
parentId
>
0
;
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,9 +13,7 @@ import com.ibeetl.admin.core.annotation.Dict;
...
@@ -13,9 +13,7 @@ import com.ibeetl.admin.core.annotation.Dict;
import
com.ibeetl.admin.core.util.ValidateConfig
;
import
com.ibeetl.admin.core.util.ValidateConfig
;
import
com.ibeetl.admin.core.util.enums.CoreDictType
;
import
com.ibeetl.admin.core.util.enums.CoreDictType
;
/**
/** 系统菜单 */
* 系统菜单
*/
public
class
CoreMenu
extends
BaseEntity
{
public
class
CoreMenu
extends
BaseEntity
{
public
static
final
String
TYPE_SYSTEM
=
"MENU_S"
;
public
static
final
String
TYPE_SYSTEM
=
"MENU_S"
;
...
@@ -27,39 +25,37 @@ public class CoreMenu extends BaseEntity {
...
@@ -27,39 +25,37 @@ public class CoreMenu extends BaseEntity {
@AutoID
@AutoID
protected
Long
id
;
protected
Long
id
;
//创建时间
// 创建时间
@UpdateIgnore
@UpdateIgnore
protected
Date
createTime
;
protected
Date
createTime
;
//菜单代码
//
菜单代码
@NotBlank
(
message
=
"菜单代码不能为空"
,
groups
=
ValidateConfig
.
ADD
.
class
)
@NotBlank
(
message
=
"菜单代码不能为空"
,
groups
=
ValidateConfig
.
ADD
.
class
)
private
String
code
;
private
String
code
;
//功能id
//
功能id
private
Long
functionId
;
private
Long
functionId
;
//类型 /*1 系统 2 导航 3 菜单项(与功能点有关)*/
//
类型 /*1 系统 2 导航 3 菜单项(与功能点有关)*/
@NotNull
(
message
=
"菜单类型不能为空"
)
@NotNull
(
message
=
"菜单类型不能为空"
)
@Dict
(
type
=
CoreDictType
.
MENU_TYPE
)
@Dict
(
type
=
CoreDictType
.
MENU_TYPE
)
private
String
type
;
private
String
type
;
//菜单名称
//
菜单名称
@NotBlank
(
message
=
"菜单名称不能为空"
)
@NotBlank
(
message
=
"菜单名称不能为空"
)
private
String
name
;
private
String
name
;
//上层菜单id
//
上层菜单id
@NotNull
(
message
=
"上层菜单不能为空"
)
@NotNull
(
message
=
"上层菜单不能为空"
)
private
Long
parentMenuId
;
private
Long
parentMenuId
;
//排序
//
排序
@NotNull
(
message
=
"排序不能为空"
)
@NotNull
(
message
=
"排序不能为空"
)
private
Integer
seq
;
private
Integer
seq
;
//图标
//
图标
private
String
icon
;
private
String
icon
;
public
CoreMenu
()
{
public
CoreMenu
()
{}
}
public
Long
getId
()
{
public
Long
getId
()
{
return
id
;
return
id
;
...
@@ -132,6 +128,4 @@ public class CoreMenu extends BaseEntity {
...
@@ -132,6 +128,4 @@ public class CoreMenu extends BaseEntity {
public
void
setCreateTime
(
Date
createTime
)
{
public
void
setCreateTime
(
Date
createTime
)
{
this
.
createTime
=
createTime
;
this
.
createTime
=
createTime
;
}
}
}
}
plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreOrg.java
View file @
18144407
...
@@ -13,15 +13,10 @@ import com.ibeetl.admin.core.annotation.Dict;
...
@@ -13,15 +13,10 @@ import com.ibeetl.admin.core.annotation.Dict;
import
com.ibeetl.admin.core.util.ValidateConfig
;
import
com.ibeetl.admin.core.util.ValidateConfig
;
import
com.ibeetl.admin.core.util.enums.CoreDictType
;
import
com.ibeetl.admin.core.util.enums.CoreDictType
;
/**
/**
* 机构对象,
* 机构对象, 有母公司,一个系统只有一个母公司,多个集团,集团下可以有多个公司,子公司,部门。如果系统不符合这个设定,需要修改· <br>
* 有母公司,一个系统只有一个母公司,多个集团,集团下可以有多个公司,子公司,部门。如果系统不符合这个设定,需要修改·
*
* <br/>
* 映射了上级机构,可以通过org.parentOrg.xxx取上级机构的属性
* 映射了上级机构,可以通过org.parentOrg.xxx取上级机构的属性
*/
*/
public
class
CoreOrg
extends
BaseEntity
{
public
class
CoreOrg
extends
BaseEntity
{
// 自增id
// 自增id
...
@@ -30,10 +25,9 @@ public class CoreOrg extends BaseEntity {
...
@@ -30,10 +25,9 @@ public class CoreOrg extends BaseEntity {
@AutoID
@AutoID
private
Long
id
;
private
Long
id
;
//删除标识
// 删除标识
@JsonIgnore
@JsonIgnore
protected
Integer
delFlag
=
0
;
protected
Integer
delFlag
=
0
;
// 创建时间
//创建时间
protected
Date
createTime
;
protected
Date
createTime
;
// 机构编号
// 机构编号
...
@@ -41,7 +35,9 @@ public class CoreOrg extends BaseEntity {
...
@@ -41,7 +35,9 @@ public class CoreOrg extends BaseEntity {
private
String
code
;
private
String
code
;
// 机构名称
// 机构名称
@NotBlank
(
message
=
"组织名称不能为空"
,
groups
=
{
ValidateConfig
.
ADD
.
class
,
ValidateConfig
.
UPDATE
.
class
})
@NotBlank
(
message
=
"组织名称不能为空"
,
groups
=
{
ValidateConfig
.
ADD
.
class
,
ValidateConfig
.
UPDATE
.
class
})
private
String
name
;
private
String
name
;
// 上层机构id
// 上层机构id
...
@@ -52,8 +48,6 @@ public class CoreOrg extends BaseEntity {
...
@@ -52,8 +48,6 @@ public class CoreOrg extends BaseEntity {
@NotBlank
(
message
=
"组织类型不能为空"
,
groups
=
ValidateConfig
.
class
)
@NotBlank
(
message
=
"组织类型不能为空"
,
groups
=
ValidateConfig
.
class
)
private
String
type
;
private
String
type
;
public
Long
getId
()
{
public
Long
getId
()
{
return
id
;
return
id
;
}
}
...
@@ -86,8 +80,6 @@ public class CoreOrg extends BaseEntity {
...
@@ -86,8 +80,6 @@ public class CoreOrg extends BaseEntity {
this
.
parentOrgId
=
parentOrgId
;
this
.
parentOrgId
=
parentOrgId
;
}
}
public
String
getType
()
{
public
String
getType
()
{
return
type
;
return
type
;
}
}
...
@@ -111,6 +103,4 @@ public class CoreOrg extends BaseEntity {
...
@@ -111,6 +103,4 @@ public class CoreOrg extends BaseEntity {
public
void
setCreateTime
(
Date
createTime
)
{
public
void
setCreateTime
(
Date
createTime
)
{
this
.
createTime
=
createTime
;
this
.
createTime
=
createTime
;
}
}
}
}
plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRole.java
View file @
18144407
...
@@ -13,9 +13,7 @@ import com.ibeetl.admin.core.annotation.Dict;
...
@@ -13,9 +13,7 @@ import com.ibeetl.admin.core.annotation.Dict;
import
com.ibeetl.admin.core.util.ValidateConfig
;
import
com.ibeetl.admin.core.util.ValidateConfig
;
import
com.ibeetl.admin.core.util.enums.CoreDictType
;
import
com.ibeetl.admin.core.util.enums.CoreDictType
;
/**
/** 角色 */
* 角色
*/
public
class
CoreRole
extends
BaseEntity
{
public
class
CoreRole
extends
BaseEntity
{
@NotNull
(
message
=
"ID不能为空"
,
groups
=
ValidateConfig
.
UPDATE
.
class
)
@NotNull
(
message
=
"ID不能为空"
,
groups
=
ValidateConfig
.
UPDATE
.
class
)
...
@@ -23,7 +21,6 @@ public class CoreRole extends BaseEntity {
...
@@ -23,7 +21,6 @@ public class CoreRole extends BaseEntity {
@AutoID
@AutoID
protected
Long
id
;
protected
Long
id
;
protected
Date
createTime
;
protected
Date
createTime
;
// 角色code
// 角色code
...
@@ -31,7 +28,9 @@ public class CoreRole extends BaseEntity {
...
@@ -31,7 +28,9 @@ public class CoreRole extends BaseEntity {
private
String
code
;
private
String
code
;
// 角色名称
// 角色名称
@NotBlank
(
message
=
"角色名称不能为空"
,
groups
=
{
ValidateConfig
.
ADD
.
class
,
ValidateConfig
.
UPDATE
.
class
})
@NotBlank
(
message
=
"角色名称不能为空"
,
groups
=
{
ValidateConfig
.
ADD
.
class
,
ValidateConfig
.
UPDATE
.
class
})
private
String
name
;
private
String
name
;
// 角色类型,系统的角色,工作流角色
// 角色类型,系统的角色,工作流角色
...
@@ -71,7 +70,6 @@ public class CoreRole extends BaseEntity {
...
@@ -71,7 +70,6 @@ public class CoreRole extends BaseEntity {
this
.
id
=
id
;
this
.
id
=
id
;
}
}
public
Date
getCreateTime
()
{
public
Date
getCreateTime
()
{
return
createTime
;
return
createTime
;
}
}
...
@@ -79,5 +77,4 @@ public class CoreRole extends BaseEntity {
...
@@ -79,5 +77,4 @@ public class CoreRole extends BaseEntity {
public
void
setCreateTime
(
Date
createTime
)
{
public
void
setCreateTime
(
Date
createTime
)
{
this
.
createTime
=
createTime
;
this
.
createTime
=
createTime
;
}
}
}
}
plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRoleFunction.java
View file @
18144407
...
@@ -11,17 +11,16 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
...
@@ -11,17 +11,16 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
import
com.ibeetl.admin.core.util.ValidateConfig
;
import
com.ibeetl.admin.core.util.ValidateConfig
;
/*
/*
*
*
* gen by beetlsql 2016-11-22
* gen by beetlsql 2016-11-22
*/
*/
public
class
CoreRoleFunction
extends
BaseEntity
{
public
class
CoreRoleFunction
extends
BaseEntity
{
@NotNull
(
message
=
"ID不能为空"
,
groups
=
ValidateConfig
.
UPDATE
.
class
)
@NotNull
(
message
=
"ID不能为空"
,
groups
=
ValidateConfig
.
UPDATE
.
class
)
@SeqID
(
name
=
ORACLE_CORE_SEQ_NAME
)
@SeqID
(
name
=
ORACLE_CORE_SEQ_NAME
)
@AutoID
@AutoID
protected
Long
id
;
protected
Long
id
;
// 删除标识
// 删除标识
@JsonIgnore
@JsonIgnore
protected
Integer
delFlag
=
0
;
protected
Integer
delFlag
=
0
;
// 创建时间
// 创建时间
protected
Date
createTime
;
protected
Date
createTime
;
...
@@ -32,8 +31,7 @@ public class CoreRoleFunction extends BaseEntity {
...
@@ -32,8 +31,7 @@ public class CoreRoleFunction extends BaseEntity {
private
Long
functionId
;
private
Long
functionId
;
private
Long
roleId
;
private
Long
roleId
;
public
CoreRoleFunction
()
{
public
CoreRoleFunction
()
{}
}
public
Long
getId
()
{
public
Long
getId
()
{
return
id
;
return
id
;
...
@@ -51,7 +49,6 @@ public class CoreRoleFunction extends BaseEntity {
...
@@ -51,7 +49,6 @@ public class CoreRoleFunction extends BaseEntity {
this
.
dataAccessPolicy
=
dataAccessPolicy
;
this
.
dataAccessPolicy
=
dataAccessPolicy
;
}
}
public
Integer
getDataAccessType
()
{
public
Integer
getDataAccessType
()
{
return
dataAccessType
;
return
dataAccessType
;
}
}
...
@@ -91,5 +88,4 @@ public class CoreRoleFunction extends BaseEntity {
...
@@ -91,5 +88,4 @@ public class CoreRoleFunction extends BaseEntity {
public
void
setCreateTime
(
Date
createTime
)
{
public
void
setCreateTime
(
Date
createTime
)
{
this
.
createTime
=
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
;
package
com.ibeetl.admin.core.entity
;
import
java.util.Date
;
import
java.util.Date
;
import
javax.validation.constraints.NotNull
;
import
javax.validation.constraints.NotNull
;
...
@@ -9,49 +10,50 @@ import org.beetl.sql.core.annotatoin.SeqID;
...
@@ -9,49 +10,50 @@ import org.beetl.sql.core.annotatoin.SeqID;
import
com.ibeetl.admin.core.util.ValidateConfig
;
import
com.ibeetl.admin.core.util.ValidateConfig
;
/*
/*
*
*
* gen by beetlsql 2016-11-22
* gen by beetlsql 2016-11-22
*/
*/
public
class
CoreRoleMenu
extends
BaseEntity
{
public
class
CoreRoleMenu
extends
BaseEntity
{
@NotNull
(
message
=
"ID不能为空"
,
groups
=
ValidateConfig
.
UPDATE
.
class
)
@NotNull
(
message
=
"ID不能为空"
,
groups
=
ValidateConfig
.
UPDATE
.
class
)
@SeqID
(
name
=
ORACLE_CORE_SEQ_NAME
)
@SeqID
(
name
=
ORACLE_CORE_SEQ_NAME
)
@AutoID
@AutoID
protected
Long
id
;
protected
Long
id
;
private
Long
menuId
;
private
Long
menuId
;
private
Long
roleId
;
private
Long
roleId
;
private
Date
createTime
;
private
Date
createTime
;
public
CoreRoleMenu
()
{
public
CoreRoleMenu
()
{}
}
public
Long
getId
(){
public
Long
getId
()
{
return
id
;
return
id
;
}
}
public
void
setId
(
Long
id
){
public
void
setId
(
Long
id
)
{
this
.
id
=
id
;
this
.
id
=
id
;
}
}
public
Long
getMenuId
(){
public
Long
getMenuId
()
{
return
menuId
;
return
menuId
;
}
}
public
void
setMenuId
(
Long
menuId
){
public
void
setMenuId
(
Long
menuId
)
{
this
.
menuId
=
menuId
;
this
.
menuId
=
menuId
;
}
}
public
Long
getRoleId
(){
public
Long
getRoleId
()
{
return
roleId
;
return
roleId
;
}
}
public
void
setRoleId
(
Long
roleId
){
public
void
setRoleId
(
Long
roleId
)
{
this
.
roleId
=
roleId
;
this
.
roleId
=
roleId
;
}
}
public
Date
getCreateTime
(){
public
Date
getCreateTime
()
{
return
createTime
;
return
createTime
;
}
}
public
void
setCreateTime
(
Date
createTime
){
public
void
setCreateTime
(
Date
createTime
)
{
this
.
createTime
=
createTime
;
this
.
createTime
=
createTime
;
}
}
}
}
plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreUser.java
View file @
18144407
...
@@ -15,26 +15,22 @@ import com.ibeetl.admin.core.util.ValidateConfig;
...
@@ -15,26 +15,22 @@ import com.ibeetl.admin.core.util.ValidateConfig;
import
com.ibeetl.admin.core.util.enums.CoreDictType
;
import
com.ibeetl.admin.core.util.enums.CoreDictType
;
/*
/*
* 用户实体
* 用户实体
*
*
*/
*/
public
class
CoreUser
extends
BaseEntity
{
public
class
CoreUser
extends
BaseEntity
{
@NotNull
(
message
=
"ID不能为空"
,
groups
=
ValidateConfig
.
UPDATE
.
class
)
@NotNull
(
message
=
"ID不能为空"
,
groups
=
ValidateConfig
.
UPDATE
.
class
)
@SeqID
(
name
=
ORACLE_CORE_SEQ_NAME
)
@SeqID
(
name
=
ORACLE_CORE_SEQ_NAME
)
@AutoID
@AutoID
protected
Long
id
;
protected
Long
id
;
// 删除标识
// 删除标识
@JsonIgnore
@JsonIgnore
protected
Integer
delFlag
=
0
;
protected
Integer
delFlag
=
0
;
// 创建时间
// 创建时间
protected
Date
createTime
;
protected
Date
createTime
;
// 登录名,编号
// 登录名,编号
@NotBlank
(
message
=
"用户编号不能为空"
,
groups
=
ValidateConfig
.
ADD
.
class
)
@NotBlank
(
message
=
"用户编号不能为空"
,
groups
=
ValidateConfig
.
ADD
.
class
)
@Null
(
message
=
"用户编号不能为空"
,
groups
=
ValidateConfig
.
UPDATE
.
class
)
@Null
(
message
=
"用户编号不能为空"
,
groups
=
ValidateConfig
.
UPDATE
.
class
)
...
@@ -49,20 +45,18 @@ public class CoreUser extends BaseEntity {
...
@@ -49,20 +45,18 @@ public class CoreUser extends BaseEntity {
private
Long
orgId
;
private
Long
orgId
;
// 密码
// 密码
@JsonIgnore
@JsonIgnore
private
String
password
;
private
String
password
;
@Dict
(
type
=
CoreDictType
.
USER_STATE
)
@Dict
(
type
=
CoreDictType
.
USER_STATE
)
private
String
state
;
private
String
state
;
//扩展例子
//
扩展例子
@Dict
(
type
=
"job_type"
)
@Dict
(
type
=
"job_type"
)
private
String
jobType0
;
private
String
jobType0
;
@Dict
(
type
=
"job_type"
)
@Dict
(
type
=
"job_type"
)
private
String
jobType1
;
private
String
jobType1
;
private
Date
updateTime
;
private
Date
updateTime
;
/*用户的个人资料附件,保存到Core_File 表里*/
/*用户的个人资料附件,保存到Core_File 表里*/
...
@@ -100,7 +94,6 @@ public class CoreUser extends BaseEntity {
...
@@ -100,7 +94,6 @@ public class CoreUser extends BaseEntity {
this
.
password
=
password
;
this
.
password
=
password
;
}
}
public
Long
getId
()
{
public
Long
getId
()
{
return
id
;
return
id
;
}
}
...
@@ -125,8 +118,6 @@ public class CoreUser extends BaseEntity {
...
@@ -125,8 +118,6 @@ public class CoreUser extends BaseEntity {
this
.
createTime
=
createTime
;
this
.
createTime
=
createTime
;
}
}
public
String
getJobType0
()
{
public
String
getJobType0
()
{
return
jobType0
;
return
jobType0
;
}
}
...
@@ -166,7 +157,4 @@ public class CoreUser extends BaseEntity {
...
@@ -166,7 +157,4 @@ public class CoreUser extends BaseEntity {
public
void
setAttachmentId
(
String
attachmentId
)
{
public
void
setAttachmentId
(
String
attachmentId
)
{
this
.
attachmentId
=
attachmentId
;
this
.
attachmentId
=
attachmentId
;
}
}
}
}
plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreUserRole.java
View file @
18144407
...
@@ -8,9 +8,9 @@ import org.beetl.sql.core.annotatoin.AutoID;
...
@@ -8,9 +8,9 @@ import org.beetl.sql.core.annotatoin.AutoID;
import
org.beetl.sql.core.annotatoin.SeqID
;
import
org.beetl.sql.core.annotatoin.SeqID
;
/*
/*
* 用户角色关系
* 用户角色关系
* gen by beetlsql 2016-11-22
* gen by beetlsql 2016-11-22
*/
*/
public
class
CoreUserRole
extends
BaseEntity
{
public
class
CoreUserRole
extends
BaseEntity
{
// 自增id
// 自增id
...
@@ -68,6 +68,4 @@ public class CoreUserRole extends BaseEntity {
...
@@ -68,6 +68,4 @@ public class CoreUserRole extends BaseEntity {
public
void
setCreateTime
(
Date
createTime
)
{
public
void
setCreateTime
(
Date
createTime
)
{
this
.
createTime
=
createTime
;
this
.
createTime
=
createTime
;
}
}
}
}
plus-admin/admin-core/src/main/java/com/ibeetl/admin/core/file/DBIndexHelper.java
View file @
18144407
...
@@ -11,10 +11,9 @@ import com.ibeetl.admin.core.entity.CoreFile;
...
@@ -11,10 +11,9 @@ import com.ibeetl.admin.core.entity.CoreFile;
/**
/**
* 从数据库搜索文档信息,对应core_file,和core_file_tag,目前先忽略tag功能
* 从数据库搜索文档信息,对应core_file,和core_file_tag,目前先忽略tag功能
* @author xiandafu
*
*
* @author xiandafu
*/
*/
public
class
DBIndexHelper
{
public
class
DBIndexHelper
{
CoreFileDao
fileDao
;
CoreFileDao
fileDao
;
...
@@ -35,38 +34,36 @@ public class DBIndexHelper {
...
@@ -35,38 +34,36 @@ public class DBIndexHelper {
return
dbData
;
return
dbData
;
}
}
public
void
createFileItem
(
CoreFile
file
,
List
<
FileTag
>
tags
)
{
public
void
createFileItem
(
CoreFile
file
,
List
<
FileTag
>
tags
)
{
fileDao
.
insert
(
file
,
true
);
fileDao
.
insert
(
file
,
true
);
if
(
tags
==
null
||
tags
.
isEmpty
())
{
if
(
tags
==
null
||
tags
.
isEmpty
())
{
return
;
return
;
}
}
Long
fileId
=
file
.
getId
();
Long
fileId
=
file
.
getId
();
for
(
FileTag
tag
:
tags
)
{
for
(
FileTag
tag
:
tags
)
{
tag
.
setFileId
(
fileId
);
tag
.
setFileId
(
fileId
);
}
}
fileDao
.
getSQLManager
().
insertBatch
(
FileTag
.
class
,
tags
);
fileDao
.
getSQLManager
().
insertBatch
(
FileTag
.
class
,
tags
);
}
}
public
List
<
CoreFile
>
queryByUserId
(
Long
userId
,
List
<
FileTag
>
tags
)
{
public
List
<
CoreFile
>
queryByUserId
(
Long
userId
,
List
<
FileTag
>
tags
){
List
<
CoreFile
>
dbDatas
=
List
<
CoreFile
>
dbDatas
=
fileDao
.
createLambdaQuery
().
andEq
(
CoreFile:
:
getUserId
,
userId
).
select
();
fileDao
.
createLambdaQuery
().
andEq
(
CoreFile:
:
getUserId
,
userId
).
select
();
return
dbDatas
;
return
dbDatas
;
}
}
public
List
<
CoreFile
>
queryByBiz
(
String
bizType
,
String
bizId
){
public
List
<
CoreFile
>
queryByBiz
(
String
bizType
,
String
bizId
)
{
CoreFile
template
=
new
CoreFile
();
CoreFile
template
=
new
CoreFile
();
template
.
setBizType
(
bizType
);
template
.
setBizType
(
bizType
);
template
.
setBizId
(
bizId
);
template
.
setBizId
(
bizId
);
List
<
CoreFile
>
dbDatas
=
fileDao
.
template
(
template
);
List
<
CoreFile
>
dbDatas
=
fileDao
.
template
(
template
);
return
dbDatas
;
return
dbDatas
;
}
}
public
List
<
CoreFile
>
queryByBatchId
(
String
batchId
){
public
List
<
CoreFile
>
queryByBatchId
(
String
batchId
)
{
CoreFile
template
=
new
CoreFile
();
CoreFile
template
=
new
CoreFile
();
template
.
setFileBatchId
(
batchId
);
template
.
setFileBatchId
(
batchId
);
List
<
CoreFile
>
dbDatas
=
fileDao
.
template
(
template
);
List
<
CoreFile
>
dbDatas
=
fileDao
.
template
(
template
);
return
dbDatas
;
return
dbDatas
;
}
}
}
}
Prev
1
2
3
4
5
6
7
8
9
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment