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
Eladmin
Commits
83dc7f8a
Commit
83dc7f8a
authored
Jun 10, 2019
by
zhengjie
Browse files
优化user列表中的岗位DTO,修改@author信息,新增验证码登录
parent
c01435a0
Changes
172
Hide whitespace changes
Inline
Side-by-side
eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/MenuDTO.java
View file @
83dc7f8a
...
...
@@ -7,7 +7,7 @@ import java.util.List;
import
java.util.Set
;
/**
* @author
j
ie
* @author
Zheng J
ie
* @date 2018-12-17
*/
@Data
...
...
eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/PermissionDTO.java
View file @
83dc7f8a
...
...
@@ -7,7 +7,7 @@ import java.sql.Timestamp;
import
java.util.List
;
/**
* @author
j
ie
* @author
Zheng J
ie
* @date 2018-12-03
*/
@Data
...
...
eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleDTO.java
View file @
83dc7f8a
...
...
@@ -6,7 +6,7 @@ import java.sql.Timestamp;
import
java.util.Set
;
/**
* @author
j
ie
* @author
Zheng J
ie
* @date 2018-11-23
*/
@Data
...
...
eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/RoleSmallDTO.java
View file @
83dc7f8a
...
...
@@ -7,7 +7,7 @@ import java.sql.Timestamp;
import
java.util.Set
;
/**
* @author
j
ie
* @author
Zheng J
ie
* @date 2018-11-23
*/
@Data
...
...
eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserDTO.java
View file @
83dc7f8a
...
...
@@ -9,7 +9,7 @@ import java.util.Date;
import
java.util.Set
;
/**
* @author
j
ie
* @author
Zheng J
ie
* @date 2018-11-23
*/
@Data
...
...
@@ -39,9 +39,9 @@ public class UserDTO implements Serializable {
private
Set
<
RoleSmallDTO
>
roles
;
@ApiModelProperty
(
hidden
=
true
)
private
JobDTO
job
;
private
Job
Small
DTO
job
;
private
DeptDTO
dept
;
private
Dept
Small
DTO
dept
;
private
Long
deptId
;
}
eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserQueryCriteria.java
View file @
83dc7f8a
...
...
@@ -6,7 +6,7 @@ import java.io.Serializable;
import
java.util.Set
;
/**
* @author
j
ie
* @author
Zheng J
ie
* @date 2018-11-23
*/
@Data
...
...
eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java
View file @
83dc7f8a
...
...
@@ -18,7 +18,7 @@ import java.util.*;
import
java.util.stream.Collectors
;
/**
* @author
j
ie
* @author
Zheng J
ie
* @date 2019-03-25
*/
@Service
...
...
eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictDetailServiceImpl.java
View file @
83dc7f8a
...
...
@@ -18,7 +18,7 @@ import org.springframework.transaction.annotation.Transactional;
import
java.util.Optional
;
/**
* @author
j
ie
* @author
Zheng J
ie
* @date 2019-04-10
*/
@Service
...
...
eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java
View file @
83dc7f8a
...
...
@@ -17,7 +17,7 @@ import org.springframework.transaction.annotation.Transactional;
import
java.util.Optional
;
/**
* @author
j
ie
* @author
Zheng J
ie
* @date 2019-04-10
*/
@Service
...
...
eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/JobServiceImpl.java
View file @
83dc7f8a
...
...
@@ -21,7 +21,7 @@ import java.util.List;
import
java.util.Optional
;
/**
* @author
j
ie
* @author
Zheng J
ie
* @date 2019-03-29
*/
@Service
...
...
eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/PermissionServiceImpl.java
View file @
83dc7f8a
...
...
@@ -17,7 +17,7 @@ import org.springframework.transaction.annotation.Transactional;
import
java.util.*
;
/**
* @author
j
ie
* @author
Zheng J
ie
* @date 2018-12-03
*/
@Service
...
...
eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java
View file @
83dc7f8a
...
...
@@ -23,7 +23,7 @@ import java.util.*;
import
java.util.stream.Collectors
;
/**
* @author
j
ie
* @author
Zheng J
ie
* @date 2018-12-03
*/
@Service
...
...
eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java
View file @
83dc7f8a
...
...
@@ -22,7 +22,7 @@ import java.util.Date;
import
java.util.Optional
;
/**
* @author
j
ie
* @author
Zheng J
ie
* @date 2018-11-23
*/
@Service
...
...
eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DeptMapper.java
View file @
83dc7f8a
...
...
@@ -7,7 +7,7 @@ import org.mapstruct.Mapper;
import
org.mapstruct.ReportingPolicy
;
/**
* @author
j
ie
* @author
Zheng J
ie
* @date 2019-03-25
*/
@Mapper
(
componentModel
=
"spring"
,
uses
=
{},
unmappedTargetPolicy
=
ReportingPolicy
.
IGNORE
)
...
...
eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DeptSmallMapper.java
0 → 100644
View file @
83dc7f8a
package
me.zhengjie.modules.system.service.mapper
;
import
me.zhengjie.mapper.EntityMapper
;
import
me.zhengjie.modules.system.domain.Dept
;
import
me.zhengjie.modules.system.service.dto.DeptSmallDTO
;
import
org.mapstruct.Mapper
;
import
org.mapstruct.ReportingPolicy
;
/**
* @author Zheng Jie
* @date 2019-03-25
*/
@Mapper
(
componentModel
=
"spring"
,
uses
=
{},
unmappedTargetPolicy
=
ReportingPolicy
.
IGNORE
)
public
interface
DeptSmallMapper
extends
EntityMapper
<
DeptSmallDTO
,
Dept
>
{
}
\ No newline at end of file
eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DictDetailMapper.java
View file @
83dc7f8a
...
...
@@ -7,7 +7,7 @@ import org.mapstruct.Mapper;
import
org.mapstruct.ReportingPolicy
;
/**
* @author
j
ie
* @author
Zheng J
ie
* @date 2019-04-10
*/
@Mapper
(
componentModel
=
"spring"
,
uses
=
{},
unmappedTargetPolicy
=
ReportingPolicy
.
IGNORE
)
...
...
eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/DictMapper.java
View file @
83dc7f8a
...
...
@@ -7,7 +7,7 @@ import org.mapstruct.Mapper;
import
org.mapstruct.ReportingPolicy
;
/**
* @author
j
ie
* @author
Zheng J
ie
* @date 2019-04-10
*/
@Mapper
(
componentModel
=
"spring"
,
uses
=
{},
unmappedTargetPolicy
=
ReportingPolicy
.
IGNORE
)
...
...
eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/JobMapper.java
View file @
83dc7f8a
...
...
@@ -8,7 +8,7 @@ import org.mapstruct.Mapping;
import
org.mapstruct.ReportingPolicy
;
/**
* @author
j
ie
* @author
Zheng J
ie
* @date 2019-03-29
*/
@Mapper
(
componentModel
=
"spring"
,
uses
=
{
DeptMapper
.
class
},
unmappedTargetPolicy
=
ReportingPolicy
.
IGNORE
)
...
...
eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/JobSmallMapper.java
0 → 100644
View file @
83dc7f8a
package
me.zhengjie.modules.system.service.mapper
;
import
me.zhengjie.mapper.EntityMapper
;
import
me.zhengjie.modules.system.domain.Job
;
import
me.zhengjie.modules.system.service.dto.JobSmallDTO
;
import
org.mapstruct.Mapper
;
import
org.mapstruct.ReportingPolicy
;
/**
* @author Zheng Jie
* @date 2019-03-29
*/
@Mapper
(
componentModel
=
"spring"
,
uses
=
{},
unmappedTargetPolicy
=
ReportingPolicy
.
IGNORE
)
public
interface
JobSmallMapper
extends
EntityMapper
<
JobSmallDTO
,
Job
>
{
}
\ No newline at end of file
eladmin-system/src/main/java/me/zhengjie/modules/system/service/mapper/MenuMapper.java
View file @
83dc7f8a
...
...
@@ -7,7 +7,7 @@ import org.mapstruct.Mapper;
import
org.mapstruct.ReportingPolicy
;
/**
* @author
j
ie
* @author
Zheng J
ie
* @date 2018-12-17
*/
@Mapper
(
componentModel
=
"spring"
,
uses
=
{},
unmappedTargetPolicy
=
ReportingPolicy
.
IGNORE
)
...
...
Prev
1
…
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