Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
map-parent
Overview
Overview
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
常超
map-parent
Commits
5727cfe3
Commit
5727cfe3
authored
Jan 09, 2023
by
宋珺琪
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
意见反馈添加姓名和警号
parent
5b8d9d20
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
64 additions
and
8 deletions
+64
-8
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/suggestionEntity/CommentEntity.java
+8
-1
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/suggestionEntity/PaperEntity.java
+5
-1
service/publicapi/src/main/java/com/founder/publicapi/controller/SuggestionService/CommentController.java
+30
-6
service/publicapi/src/main/java/com/founder/publicapi/controller/SuggestionService/PaperController.java
+21
-0
No files found.
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/suggestionEntity/CommentEntity.java
View file @
5727cfe3
...
@@ -22,7 +22,12 @@ public class CommentEntity implements Serializable {
...
@@ -22,7 +22,12 @@ public class CommentEntity implements Serializable {
@TableId
(
type
=
IdType
.
INPUT
)
@TableId
(
type
=
IdType
.
INPUT
)
private
String
plId
;
// 评论ID
private
String
plId
;
// 评论ID
private
String
content
;
// 评论内容
private
String
content
;
// 评论内容
private
String
userName
;
// 评论作者姓名
private
String
userName
;
// 评论作者身份证
@TableField
(
exist
=
false
)
private
String
name
;
// 评论作者姓名
@TableField
(
exist
=
false
)
private
String
policemanId
;
//评论者警号
private
String
createTime
;
// 评论时间
private
String
createTime
;
// 评论时间
private
String
isDelete
;
// 是否删除(0:未删除;1:已删除)
private
String
isDelete
;
// 是否删除(0:未删除;1:已删除)
...
@@ -36,6 +41,8 @@ public class CommentEntity implements Serializable {
...
@@ -36,6 +41,8 @@ public class CommentEntity implements Serializable {
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
String
parentName
;
// 父评论名字(被回复的评论)
private
String
parentName
;
// 父评论名字(被回复的评论)
@TableField
(
exist
=
false
)
private
String
parentPolicemanId
;
// 父评论警号(被回复的评论)
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
List
<
CommentEntity
>
child
;
// 本评论下的子评论
private
List
<
CommentEntity
>
child
;
// 本评论下的子评论
...
...
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/suggestionEntity/PaperEntity.java
View file @
5727cfe3
...
@@ -22,7 +22,11 @@ import java.util.List;
...
@@ -22,7 +22,11 @@ import java.util.List;
public
class
PaperEntity
implements
Serializable
{
public
class
PaperEntity
implements
Serializable
{
@TableId
(
type
=
IdType
.
INPUT
)
@TableId
(
type
=
IdType
.
INPUT
)
private
String
id
;
// 文章id
private
String
id
;
// 文章id
private
String
userName
;
// 文章作者姓名
private
String
userName
;
// 文章作者身份证
@TableField
(
exist
=
false
)
private
String
name
;
// 文章作者姓名
@TableField
(
exist
=
false
)
private
String
policemanId
;
//文章作者警号
private
String
content
;
// 文章内容
private
String
content
;
// 文章内容
private
String
title
;
// 文章标题
private
String
title
;
// 文章标题
private
Integer
count
;
// 文章评论次数
private
Integer
count
;
// 文章评论次数
...
...
service/publicapi/src/main/java/com/founder/publicapi/controller/SuggestionService/CommentController.java
View file @
5727cfe3
...
@@ -3,13 +3,13 @@ package com.founder.publicapi.controller.SuggestionService;
...
@@ -3,13 +3,13 @@ package com.founder.publicapi.controller.SuggestionService;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper
;
import
com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper
;
import
com.founder.commonutils.model.newPublicEntity.MapRestResult
;
import
com.founder.commonutils.model.newPublicEntity.MapRestResult
;
import
com.founder.commonutils.model.newPublicEntity.S
kypDesktopEntity.SkMenu
;
import
com.founder.commonutils.model.newPublicEntity.S
ysUser
;
import
com.founder.commonutils.model.newPublicEntity.suggestionEntity.CommentEntity
;
import
com.founder.commonutils.model.newPublicEntity.suggestionEntity.CommentEntity
;
import
com.founder.commonutils.model.newPublicEntity.suggestionEntity.PaperEntity
;
import
com.founder.commonutils.util.KeyUtilNaotu
;
import
com.founder.commonutils.util.KeyUtilNaotu
;
import
com.founder.publicapi.mapper.mysqlMapper.CommentMapper
;
import
com.founder.publicapi.mapper.mysqlMapper.CommentMapper
;
import
com.founder.servicebase.logs.OperLog
;
import
com.founder.servicebase.logs.OperLog
;
import
com.founder.servicebase.logs.OperationType
;
import
com.founder.servicebase.logs.OperationType
;
import
com.founder.servicebase.mapper.mysqlMapper.SysUserMapper
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
@@ -26,6 +26,9 @@ public class CommentController {
...
@@ -26,6 +26,9 @@ public class CommentController {
@Autowired
@Autowired
CommentMapper
commentMapper
;
CommentMapper
commentMapper
;
@Autowired
SysUserMapper
sysUserMapper
;
/**
/**
* 评论发表、评论回复
* 评论发表、评论回复
...
@@ -117,6 +120,10 @@ public class CommentController {
...
@@ -117,6 +120,10 @@ public class CommentController {
// 将所有根评论加入 map
// 将所有根评论加入 map
for
(
CommentEntity
comment
:
list
)
{
for
(
CommentEntity
comment
:
list
)
{
if
(
comment
.
getParentId
()
==
null
){
if
(
comment
.
getParentId
()
==
null
){
//获取姓名和警号
SysUser
sysUser
=
jbxxBysfz
(
comment
.
getUserName
());
comment
.
setName
(
sysUser
.
getTrueName
());
comment
.
setPolicemanId
(
sysUser
.
getPolicemanid
());
result
.
add
(
comment
);
result
.
add
(
comment
);
}
}
map
.
put
(
comment
.
getPlId
(),
comment
);
map
.
put
(
comment
.
getPlId
(),
comment
);
...
@@ -124,17 +131,24 @@ public class CommentController {
...
@@ -124,17 +131,24 @@ public class CommentController {
// 子评论加入到父评论的 child 中
// 子评论加入到父评论的 child 中
for
(
CommentEntity
comment
:
list
)
{
for
(
CommentEntity
comment
:
list
)
{
String
id
=
comment
.
getParentId
();
String
id
=
comment
.
getParentId
();
System
.
out
.
println
(
id
);
if
(
id
!=
null
)
{
// 当前评论为子评论
if
(
id
!=
null
)
{
// 当前评论为子评论
//父的名称
CommentEntity
name
=
commentMapper
.
selectById
(
id
);
CommentEntity
name
=
commentMapper
.
selectById
(
id
);
comment
.
setParentName
(
name
.
getUserName
());
SysUser
sysUser1
=
jbxxBysfz
(
name
.
getUserName
());
comment
.
setParentName
(
sysUser1
.
getTrueName
());
comment
.
setParentPolicemanId
(
sysUser1
.
getPolicemanid
());
//根的名称
SysUser
sysUser
=
jbxxBysfz
(
comment
.
getUserName
());
comment
.
setName
(
sysUser
.
getTrueName
());
comment
.
setPolicemanId
(
sysUser
.
getPolicemanid
());
CommentEntity
p
=
map
.
get
(
id
);
CommentEntity
p
=
map
.
get
(
id
);
if
(
p
.
getChild
()
==
null
)
{
// child 为空,则
创建
if
(
p
.
getChild
()
==
null
)
{
// child 为空,则
先创建list
p
.
setChild
(
new
ArrayList
<>());
p
.
setChild
(
new
ArrayList
<>());
}
else
{
}
p
.
getChild
().
add
(
comment
);
p
.
getChild
().
add
(
comment
);
}
}
}
}
}
...
@@ -153,6 +167,9 @@ public class CommentController {
...
@@ -153,6 +167,9 @@ public class CommentController {
public
MapRestResult
commentDetails
(
@RequestBody
CommentEntity
commentEntity
){
public
MapRestResult
commentDetails
(
@RequestBody
CommentEntity
commentEntity
){
CommentEntity
commentEntity1
=
commentMapper
.
selectById
(
commentEntity
.
getPlId
());
CommentEntity
commentEntity1
=
commentMapper
.
selectById
(
commentEntity
.
getPlId
());
SysUser
sysUser
=
jbxxBysfz
(
commentEntity1
.
getUserName
());
commentEntity1
.
setName
(
sysUser
.
getTrueName
());
commentEntity1
.
setPolicemanId
(
sysUser
.
getPolicemanid
());
return
new
MapRestResult
(
200
,
"ok"
,
commentEntity1
);
return
new
MapRestResult
(
200
,
"ok"
,
commentEntity1
);
}
}
...
@@ -167,4 +184,11 @@ public class CommentController {
...
@@ -167,4 +184,11 @@ public class CommentController {
return
formatter
.
format
(
date
);
return
formatter
.
format
(
date
);
}
}
public
SysUser
jbxxBysfz
(
String
sfz
){
QueryWrapper
wrapper
=
new
QueryWrapper
<>();
wrapper
.
eq
(
"IDENTITYCARD"
,
sfz
);
SysUser
sysUser
=
sysUserMapper
.
selectOne
(
wrapper
);
return
sysUser
;
}
}
}
service/publicapi/src/main/java/com/founder/publicapi/controller/SuggestionService/PaperController.java
View file @
5727cfe3
...
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
...
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.founder.commonutils.model.newPublicEntity.MapRestResult
;
import
com.founder.commonutils.model.newPublicEntity.MapRestResult
;
import
com.founder.commonutils.model.newPublicEntity.SysUser
;
import
com.founder.commonutils.model.newPublicEntity.suggestionEntity.CommentEntity
;
import
com.founder.commonutils.model.newPublicEntity.suggestionEntity.CommentEntity
;
import
com.founder.commonutils.model.newPublicEntity.suggestionEntity.PaperEntity
;
import
com.founder.commonutils.model.newPublicEntity.suggestionEntity.PaperEntity
;
import
com.founder.commonutils.util.KeyUtil
;
import
com.founder.commonutils.util.KeyUtil
;
...
@@ -15,6 +16,7 @@ import com.founder.publicapi.mapper.mysqlMapper.CommentMapper;
...
@@ -15,6 +16,7 @@ import com.founder.publicapi.mapper.mysqlMapper.CommentMapper;
import
com.founder.publicapi.mapper.mysqlMapper.PaperMapper
;
import
com.founder.publicapi.mapper.mysqlMapper.PaperMapper
;
import
com.founder.servicebase.logs.OperLog
;
import
com.founder.servicebase.logs.OperLog
;
import
com.founder.servicebase.logs.OperationType
;
import
com.founder.servicebase.logs.OperationType
;
import
com.founder.servicebase.mapper.mysqlMapper.SysUserMapper
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
@@ -51,6 +53,9 @@ public class PaperController {
...
@@ -51,6 +53,9 @@ public class PaperController {
@Autowired
@Autowired
CommentMapper
commentMapper
;
CommentMapper
commentMapper
;
@Autowired
SysUserMapper
sysUserMapper
;
/**
/**
* 文章新增
* 文章新增
* @return
* @return
...
@@ -229,6 +234,10 @@ public class PaperController {
...
@@ -229,6 +234,10 @@ public class PaperController {
List
<
PaperEntity
>
list
=
iPage
.
getRecords
();
List
<
PaperEntity
>
list
=
iPage
.
getRecords
();
//遍历每一个文章 获取他的评论次数
//遍历每一个文章 获取他的评论次数
for
(
PaperEntity
pap
:
list
)
{
for
(
PaperEntity
pap
:
list
)
{
SysUser
sysUser
=
jbxxBysfz
(
pap
.
getUserName
());
pap
.
setName
(
sysUser
.
getTrueName
());
pap
.
setPolicemanId
(
sysUser
.
getPolicemanid
());
QueryWrapper
<
CommentEntity
>
wrapper1
=
new
QueryWrapper
<>();
QueryWrapper
<
CommentEntity
>
wrapper1
=
new
QueryWrapper
<>();
wrapper1
.
eq
(
"blog_id"
,
pap
.
getId
());
wrapper1
.
eq
(
"blog_id"
,
pap
.
getId
());
wrapper1
.
eq
(
"is_delete"
,
"0"
);
wrapper1
.
eq
(
"is_delete"
,
"0"
);
...
@@ -249,6 +258,10 @@ public class PaperController {
...
@@ -249,6 +258,10 @@ public class PaperController {
public
MapRestResult
articleDetails
(
@RequestBody
PaperEntity
paperEntity
)
{
public
MapRestResult
articleDetails
(
@RequestBody
PaperEntity
paperEntity
)
{
PaperEntity
paperEntity1
=
paperMapper
.
selectById
(
paperEntity
.
getId
());
PaperEntity
paperEntity1
=
paperMapper
.
selectById
(
paperEntity
.
getId
());
SysUser
sysUser
=
jbxxBysfz
(
paperEntity1
.
getUserName
());
paperEntity1
.
setName
(
sysUser
.
getTrueName
());
paperEntity1
.
setPolicemanId
(
sysUser
.
getPolicemanid
());
return
new
MapRestResult
(
200
,
"ok"
,
paperEntity1
);
return
new
MapRestResult
(
200
,
"ok"
,
paperEntity1
);
}
}
...
@@ -264,4 +277,12 @@ public class PaperController {
...
@@ -264,4 +277,12 @@ public class PaperController {
}
}
public
SysUser
jbxxBysfz
(
String
sfz
){
QueryWrapper
wrapper
=
new
QueryWrapper
<>();
wrapper
.
eq
(
"IDENTITYCARD"
,
sfz
);
SysUser
sysUser
=
sysUserMapper
.
selectOne
(
wrapper
);
return
sysUser
;
}
}
}
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