Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
xyqb-user2
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
head_group
xyqb-user2
Commits
87c73958
Commit
87c73958
authored
Jul 21, 2023
by
王亮
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add createdAt at User query.
parent
b1843bd9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
0 deletions
+7
-0
UserBean.java
src/main/java/cn/quantgroup/xyqb/model/UserBean.java
+7
-0
No files found.
src/main/java/cn/quantgroup/xyqb/model/UserBean.java
View file @
87c73958
...
...
@@ -2,9 +2,11 @@ package cn.quantgroup.xyqb.model;
import
cn.quantgroup.xyqb.entity.User
;
import
cn.quantgroup.xyqb.entity.WechatUserInfo
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
lombok.Data
;
import
org.apache.commons.collections.CollectionUtils
;
import
java.time.LocalDateTime
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Optional
;
...
...
@@ -24,6 +26,9 @@ public class UserBean {
private
Boolean
enable
;
private
Integer
tenantId
;
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
private
LocalDateTime
createdAt
;
public
static
UserBean
from
(
User
user
,
WechatUserInfo
wechatUserInfo
)
{
UserBean
userBean
=
new
UserBean
();
...
...
@@ -33,6 +38,7 @@ public class UserBean {
userBean
.
setUuid
(
user
.
getUuid
());
userBean
.
setEnable
(
user
.
getEnable
());
userBean
.
setTenantId
(
user
.
getTenantId
());
userBean
.
setCreatedAt
(
user
.
getCreatedAt
());
if
(
wechatUserInfo
!=
null
)
{
userBean
.
setOpenId
(
wechatUserInfo
.
getOpenId
());
userBean
.
setUnionId
(
wechatUserInfo
.
getUnionId
());
...
...
@@ -52,6 +58,7 @@ public class UserBean {
userBean
.
setUuid
(
user
.
getUuid
());
userBean
.
setEnable
(
user
.
getEnable
());
userBean
.
setTenantId
(
user
.
getTenantId
());
userBean
.
setCreatedAt
(
user
.
getCreatedAt
());
if
(
CollectionUtils
.
isNotEmpty
(
wechatUserInfoList
))
{
Optional
<
WechatUserInfo
>
optionalWechatUserInfo
=
wechatUserInfoList
.
stream
().
filter
(
i
->
i
.
getUserId
().
equals
(
user
.
getId
())).
findFirst
();
...
...
Write
Preview
Markdown
is supported
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