Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
C
chnmuseum-party
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
liqin
chnmuseum-party
Commits
641ae44d
Commit
641ae44d
authored
Apr 10, 2021
by
liqin
💬
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://111.203.232.171:8888/lee/chnmuseum-party
into master
parents
8df66851
45f3fe25
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
4 deletions
+13
-4
TInteraction.java
...java/cn/wisenergy/chnmuseum/party/model/TInteraction.java
+3
-2
TInteractionController.java
...hnmuseum/party/web/controller/TInteractionController.java
+6
-1
TInteractionMapper.xml
src/main/resources/mapper/TInteractionMapper.xml
+4
-1
No files found.
src/main/java/cn/wisenergy/chnmuseum/party/model/TInteraction.java
View file @
641ae44d
...
@@ -86,15 +86,16 @@ public class TInteraction implements Serializable {
...
@@ -86,15 +86,16 @@ public class TInteraction implements Serializable {
@NotNull
(
message
=
"创建时间不能为空"
,
groups
=
{
Add
.
class
,
Update
.
class
})
@NotNull
(
message
=
"创建时间不能为空"
,
groups
=
{
Add
.
class
,
Update
.
class
})
private
LocalDateTime
createTime
;
private
LocalDateTime
createTime
;
@ApiModelProperty
(
"管理员账号"
)
@TableField
(
"user_id"
)
private
String
userId
;
@ApiModelProperty
(
"管理员账号"
)
@ApiModelProperty
(
"管理员账号"
)
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
@NotNull
(
message
=
"管理员账号不能为空"
,
groups
=
{
Add
.
class
})
private
String
name
;
private
String
name
;
@ApiModelProperty
(
"密码"
)
@ApiModelProperty
(
"密码"
)
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
@NotNull
(
message
=
"密码不能为空"
,
groups
=
{
Add
.
class
})
private
String
password
;
private
String
password
;
...
...
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TInteractionController.java
View file @
641ae44d
...
@@ -89,6 +89,11 @@ public class TInteractionController extends BaseController {
...
@@ -89,6 +89,11 @@ public class TInteractionController extends BaseController {
resultMap
.
put
(
"message"
,
"用户不是单位管理员"
);
resultMap
.
put
(
"message"
,
"用户不是单位管理员"
);
return
resultMap
;
return
resultMap
;
}
}
if
(
user
.
getOrgId
()!=
null
&&
user
.
getOrgId
()!=
tInteraction
.
getOrganId
()){
resultMap
.
put
(
"resultCode"
,
"500"
);
resultMap
.
put
(
"message"
,
"管理员账号不是本机构的单位管理员"
);
return
resultMap
;
}
byte
[]
salt
=
user
.
getPasswordSalt
();
byte
[]
salt
=
user
.
getPasswordSalt
();
if
(!
new
String
(
SHA256PasswordEncryptionService
.
createPasswordHash
(
tInteraction
.
getPassword
(),
salt
))
if
(!
new
String
(
SHA256PasswordEncryptionService
.
createPasswordHash
(
tInteraction
.
getPassword
(),
salt
))
.
equals
(
new
String
(
user
.
getPasswordHash
())))
{
.
equals
(
new
String
(
user
.
getPasswordHash
())))
{
...
@@ -96,7 +101,7 @@ public class TInteractionController extends BaseController {
...
@@ -96,7 +101,7 @@ public class TInteractionController extends BaseController {
resultMap
.
put
(
"message"
,
"密码错误"
);
resultMap
.
put
(
"message"
,
"密码错误"
);
return
resultMap
;
return
resultMap
;
}
}
tInteraction
.
setUser
name
(
user
.
getUserName
());
tInteraction
.
setUser
Id
(
user
.
getId
());
tInteraction
.
setCreateTime
(
LocalDateTime
.
now
());
tInteraction
.
setCreateTime
(
LocalDateTime
.
now
());
result
=
tInteractionService
.
save
(
tInteraction
);
result
=
tInteractionService
.
save
(
tInteraction
);
// 返回操作结果
// 返回操作结果
...
...
src/main/resources/mapper/TInteractionMapper.xml
View file @
641ae44d
...
@@ -14,6 +14,8 @@
...
@@ -14,6 +14,8 @@
<result
column=
"content"
property=
"content"
/>
<result
column=
"content"
property=
"content"
/>
<result
column=
"images"
property=
"images"
/>
<result
column=
"images"
property=
"images"
/>
<result
column=
"create_time"
property=
"createTime"
/>
<result
column=
"create_time"
property=
"createTime"
/>
<result
column=
"user_id"
property=
"userId"
/>
<result
column=
"name"
property=
"name"
/>
</resultMap>
</resultMap>
<!-- 通用查询结果列 -->
<!-- 通用查询结果列 -->
...
@@ -22,9 +24,10 @@
...
@@ -22,9 +24,10 @@
</sql>
</sql>
<select
id=
"selectPageList"
resultMap=
"BaseResultMap"
>
<select
id=
"selectPageList"
resultMap=
"BaseResultMap"
>
SELECT i.*,e.`name` board_name
SELECT i.*,e.`name` board_name
,u.user_name name
FROM t_interaction i
FROM t_interaction i
left join exhibition_board e on e.id = i.board_id
left join exhibition_board e on e.id = i.board_id
left join t_user u on u.id = i.user_id
where i.organ_id =#{orgId}
where i.organ_id =#{orgId}
order by i.create_time desc
order by i.create_time desc
</select>
</select>
...
...
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