Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
X
xylt
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
svn
xylt
Commits
590a40ff
提交
590a40ff
authored
1月 21, 2019
作者:
liupengfei
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
--no commit message
上级
b3152a09
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
120 行增加
和
21 行删除
+120
-21
FgTalkController.java
...in/java/com/zrqx/talk/fg/controller/FgTalkController.java
+25
-16
AttentionMapper.java
...rc/main/java/com/zrqx/talk/fg/mapper/AttentionMapper.java
+25
-0
AttentionService.java
.../main/java/com/zrqx/talk/fg/service/AttentionService.java
+8
-0
AttentionServiceImpl.java
...n/java/com/zrqx/talk/fg/service/AttentionServiceImpl.java
+27
-0
FgTalkService.java
...src/main/java/com/zrqx/talk/fg/service/FgTalkService.java
+11
-0
FgTalkServiceImpl.java
...main/java/com/zrqx/talk/fg/service/FgTalkServiceImpl.java
+24
-5
没有找到文件。
com.zrqx.talk/src/main/java/com/zrqx/talk/fg/controller/FgTalkController.java
浏览文件 @
590a40ff
package
com
.
zrqx
.
talk
.
fg
.
controller
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiParam
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.List
;
...
...
@@ -14,16 +18,15 @@ import org.springframework.web.bind.annotation.RequestBody;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONObject
;
import
tk.mybatis.mapper.entity.Example
;
import
tk.mybatis.mapper.entity.Example.Criteria
;
import
com.zrqx.core.constant.talk.TalkRequestPath
;
import
com.zrqx.core.enums.ResponseCodeEnum
;
import
com.zrqx.core.exception.BaseException
;
import
com.zrqx.core.form.member.fg.permissions.LoginMemberInfo
;
import
com.zrqx.core.form.talk.fg.AddAskForm
;
import
com.zrqx.core.form.talk.fg.AddFgHotForm
;
import
com.zrqx.core.form.talk.fg.QueryAskForm
;
import
com.zrqx.core.model.member.Member
;
import
com.zrqx.core.model.talk.Attention
;
import
com.zrqx.core.model.talk.Collections
;
import
com.zrqx.core.model.talk.Imgs
;
import
com.zrqx.core.model.talk.Plate
;
...
...
@@ -36,6 +39,7 @@ import com.zrqx.core.util.page.PageParam;
import
com.zrqx.core.util.response.CallBack
;
import
com.zrqx.core.vo.talk.StatisticVO
;
import
com.zrqx.talk.commons.Redis
;
import
com.zrqx.talk.fg.service.AttentionService
;
import
com.zrqx.talk.fg.service.CollectionService
;
import
com.zrqx.talk.fg.service.FgImgsService
;
import
com.zrqx.talk.fg.service.FgReplyService
;
...
...
@@ -43,12 +47,6 @@ import com.zrqx.talk.fg.service.FgTalkService;
import
com.zrqx.talk.fg.service.RecordService
;
import
com.zrqx.talk.fg.service.ThumbsUpService
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiParam
;
import
tk.mybatis.mapper.entity.Example
;
import
tk.mybatis.mapper.entity.Example.Criteria
;
@RestController
@Api
(
description
=
"前台帖子相关"
)
@RequestMapping
(
TalkRequestPath
.
FG
+
TalkRequestPath
.
TALK
)
...
...
@@ -68,6 +66,8 @@ public class FgTalkController {
private
CollectionService
collectionService
;
@Autowired
private
RecordService
recordService
;
@Autowired
private
AttentionService
attentionService
;
@ApiOperation
(
value
=
"获取帖子列表"
,
notes
=
"根据类型获取帖子列表"
)
@GetMapping
(
value
=
TalkRequestPath
.
LIST
)
...
...
@@ -175,6 +175,7 @@ public class FgTalkController {
//保存浏览记录
LoginMemberInfo
member
=
redis
.
getMember
();
saveOrUpdateRecord
(
oid
,
member
.
getId
());
return
CallBack
.
success
(
entity
);
}
...
...
@@ -366,12 +367,20 @@ public class FgTalkController {
@ApiOperation
(
value
=
"添加关注"
,
notes
=
"添加关注"
)
@PostMapping
(
value
=
TalkRequestPath
.
ATTENTION
+
TalkRequestPath
.
SAVE
)
public
CallBack
<
Boolean
>
addAttention
(
Integer
talkId
)
{
Collections
collections
=
new
Collections
();
collections
.
setTalkId
(
talk
Id
);
public
CallBack
<
Boolean
>
addAttention
(
Integer
talkId
,
Integer
attentionId
)
{
Attention
attention
=
new
Attention
();
attention
.
setAttentionId
(
attention
Id
);
// redis.getMember().getId()
collections
.
setMemberId
(
20
);
return
CallBack
.
success
(
collectionService
.
insertSelective
(
collections
));
attention
.
setMemberId
(
20
);
attention
.
setCreateTime
(
new
Date
());
return
CallBack
.
success
(
attentionService
.
insertSelective
(
attention
));
}
@ApiOperation
(
value
=
"浏览记录"
,
notes
=
"浏览记录"
)
@GetMapping
(
value
=
TalkRequestPath
.
ATTENTION
)
public
CallBack
<
PageInfo
<
Attention
>>
selectAttion
(
PageParam
pageParam
)
{
//Member member = redis.getMember();
return
CallBack
.
success
(
talkService
.
selectAttion
(
pageParam
,
20
));
}
}
com.zrqx.talk/src/main/java/com/zrqx/talk/fg/mapper/AttentionMapper.java
0 → 100644
浏览文件 @
590a40ff
package
com
.
zrqx
.
talk
.
fg
.
mapper
;
import
java.util.List
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Select
;
import
com.zrqx.core.mapper.BaseMapper
;
import
com.zrqx.core.model.talk.Attention
;
public
interface
AttentionMapper
extends
BaseMapper
<
Attention
>
{
/**
* 查询当前用户的关注列表
* @param memberId
* @return
* @author xjg
* @date 2019年1月21日 上午10:24:26
*/
@Select
(
"select * from attention order by createTime desc where memberId = #{memberId} "
)
List
<
Attention
>
selectAttion
(
@Param
(
"memberId"
)
Integer
memberId
);
}
com.zrqx.talk/src/main/java/com/zrqx/talk/fg/service/AttentionService.java
0 → 100644
浏览文件 @
590a40ff
package
com
.
zrqx
.
talk
.
fg
.
service
;
import
com.zrqx.core.model.talk.Attention
;
import
com.zrqx.core.service.BaseService
;
public
interface
AttentionService
extends
BaseService
<
Attention
,
Integer
>
{
}
com.zrqx.talk/src/main/java/com/zrqx/talk/fg/service/AttentionServiceImpl.java
0 → 100644
浏览文件 @
590a40ff
package
com
.
zrqx
.
talk
.
fg
.
service
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
com.zrqx.core.mapper.BaseMapper
;
import
com.zrqx.core.model.talk.Attention
;
import
com.zrqx.core.service.BaseServiceImpl
;
import
com.zrqx.talk.fg.mapper.AttentionMapper
;
/**
* 论坛
* @author Administrator
*
*/
@Service
public
class
AttentionServiceImpl
extends
BaseServiceImpl
<
Attention
,
Integer
>
implements
AttentionService
{
@Autowired
private
AttentionMapper
attentionMapper
;
@Override
public
BaseMapper
<
Attention
>
getMapper
()
{
return
attentionMapper
;
}
}
com.zrqx.talk/src/main/java/com/zrqx/talk/fg/service/FgTalkService.java
浏览文件 @
590a40ff
...
...
@@ -2,6 +2,7 @@ package com.zrqx.talk.fg.service;
import
java.util.List
;
import
com.zrqx.core.model.talk.Attention
;
import
com.zrqx.core.model.talk.Plate
;
import
com.zrqx.core.model.talk.Talk
;
import
com.zrqx.core.service.BaseService
;
...
...
@@ -46,4 +47,14 @@ public interface FgTalkService extends BaseService<Talk, Integer> {
* @date 2019年1月18日 上午10:54:01
*/
PageInfo
<
Talk
>
selectRecord
(
PageParam
pageParam
,
Integer
memberId
);
/**
* 查询当前用户的关注列表
* @param pageParam
* @param i
* @return
* @author xjg
* @date 2019年1月21日 上午10:16:18
*/
PageInfo
<
Attention
>
selectAttion
(
PageParam
pageParam
,
Integer
memberId
);
}
com.zrqx.talk/src/main/java/com/zrqx/talk/fg/service/FgTalkServiceImpl.java
浏览文件 @
590a40ff
...
...
@@ -2,13 +2,14 @@ package com.zrqx.talk.fg.service;
import
java.util.List
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
tk.mybatis.mapper.entity.Example.Criteria
;
import
com.github.pagehelper.PageHelper
;
import
com.zrqx.core.mapper.BaseMapper
;
import
com.zrqx.core.model.
member.Member
;
import
com.zrqx.core.model.
talk.Attention
;
import
com.zrqx.core.model.talk.Imgs
;
import
com.zrqx.core.model.talk.Plate
;
import
com.zrqx.core.model.talk.Talk
;
...
...
@@ -17,10 +18,9 @@ import com.zrqx.core.util.page.PageInfo;
import
com.zrqx.core.util.page.PageParam
;
import
com.zrqx.talk.bg.mapper.PlateMapper
;
import
com.zrqx.talk.bg.mapper.TalkMapper
;
import
com.zrqx.talk.fg.mapper.AttentionMapper
;
import
com.zrqx.talk.fg.mapper.FgImgsMapper
;
import
tk.mybatis.mapper.entity.Example.Criteria
;
/**
* 论坛
*
...
...
@@ -36,7 +36,9 @@ public class FgTalkServiceImpl extends BaseServiceImpl<Talk, Integer> implements
private
PlateMapper
plateMapper
;
@Autowired
private
FgImgsMapper
fgImgsMapper
;
@Autowired
private
AttentionMapper
attentionMapper
;
@Override
public
BaseMapper
<
Talk
>
getMapper
()
{
return
talkMapper
;
...
...
@@ -103,4 +105,21 @@ public class FgTalkServiceImpl extends BaseServiceImpl<Talk, Integer> implements
pageInfo
.
setList
(
talkList
);
return
pageInfo
;
}
/**
* 查询当前用户的关注列表
* @param pageParam
* @param memberId
* @return
* @author xjg
* @date 2019年1月21日 上午10:18:24
*/
@Override
public
PageInfo
<
Attention
>
selectAttion
(
PageParam
pageParam
,
Integer
memberId
)
{
PageInfo
<
Attention
>
pageInfo
=
new
PageInfo
<
Attention
>();
startPage
(
pageParam
);
List
<
Attention
>
attentionList
=
attentionMapper
.
selectAttion
(
memberId
);
pageInfo
.
setList
(
attentionList
);
return
pageInfo
;
}
}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论