Skip to content

I
ims-ci-test
提交 40de3d3a 作者: 张小凤
操作

Gamb(add)

上级 b0c129da
正在显示 包含 52 行增加 和 18 行删除
release-service/src/main/java/com/mmc/csf/release/controller/DynamicController.java
......@@ -70,7 +70,7 @@ public class DynamicController extends BaseController {
@ApiOperation(value = "动态详情")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = DynamicVO.class)})
@GetMapping("/dynamicDetails")
public ResultBody dynamicDetails(@RequestParam Integer dynamicId, HttpServletRequest request) {
public ResultBody<DynamicVO> dynamicDetails(@RequestParam Integer dynamicId, HttpServletRequest request) {
return dynamicService.dynamicDetails(
dynamicId, this.getUserLoginInfoFromRedis(request).getUserAccountId(), request);
}
......@@ -78,7 +78,7 @@ public class DynamicController extends BaseController {
@ApiOperation(value = "动态列表")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = DynamicVO.class)})
@GetMapping("/dynamicList")
public ResultBody dynamicList(
public ResultBody<DynamicVO> dynamicList(
@RequestParam Integer pageNo, @RequestParam Integer pageSize, HttpServletRequest request) {
return ResultBody.success(
dynamicService.dynamicList(
......
release-service/src/main/java/com/mmc/csf/release/controller/GambitController.java
package com.mmc.csf.release.controller;
import com.mmc.csf.common.util.web.ResultBody;
import com.mmc.csf.release.entity.forum.ForumDynamicGambitDO;
import com.mmc.csf.release.entity.forum.ForumReviewDO;
import com.mmc.csf.release.entity.forum.*;
import com.mmc.csf.release.gambit.dto.ForumGambitDTO;
import com.mmc.csf.release.gambit.qo.*;
import com.mmc.csf.release.gambit.vo.ForumGambitVO;
......@@ -109,7 +108,7 @@ public class GambitController extends BaseController{
return ResultBody.success(gambitService.allCommentList(allReviewQO));
}
@ApiOperation(value = "某一条动态下面的所有回复")
@ApiOperation(value = "动态下某一条评论下面所有回复")
@PostMapping("/replyList")
public ResultBody<ForumReviewDO> replyList(HttpServletRequest request, @RequestBody AppReplyQO replyQO){
return ResultBody.success(gambitService.replyList(replyQO));
......@@ -127,21 +126,25 @@ public class GambitController extends BaseController{
return ResultBody.success(gambitService.liked(userTopicDynamicsQO));
}
@ApiOperation(value = "我的关注")
@PostMapping("/myInterestList")
public ResultBody myInterestList(HttpServletRequest request, @RequestBody UserTopicDynamicsQO userTopicDynamicsQO){
public ResultBody<MyAttentionDO> myInterestList(HttpServletRequest request, @RequestBody UserTopicDynamicsQO userTopicDynamicsQO){
return ResultBody.success(gambitService.myInterestList(userTopicDynamicsQO));
}
@ApiOperation(value = "我的粉丝")
@PostMapping("/myFansList")
public ResultBody myFansList(HttpServletRequest request, @RequestBody UserTopicDynamicsQO userTopicDynamicsQO){
public ResultBody<MyFansDO> myFansList(HttpServletRequest request, @RequestBody UserTopicDynamicsQO userTopicDynamicsQO){
return ResultBody.success(gambitService.myFansList(userTopicDynamicsQO));
}
@ApiOperation(value = "单个用户信息")
@GetMapping("/userMessage")
public ResultBody<ForumCountDO> userMessage(HttpServletRequest request, @ApiParam(value = "userAccountId") @RequestParam Integer userAccountId){
return gambitService.userMessage(userAccountId);
}
......
release-service/src/main/java/com/mmc/csf/release/dao/gambit/GambitDao.java
......@@ -114,4 +114,8 @@ public interface GambitDao {
int myFansListCount(UserTopicDynamicsQO userTopicDynamicsQO);
List<MyFansDO> myFansList(UserTopicDynamicsQO userTopicDynamicsQO);
ForumAttentionDO selectAttentionM(Integer userAccountId, Integer attentionUserAccountId);
ForumCountDO userMessage(Integer userAccountId);
}
release-service/src/main/java/com/mmc/csf/release/service/gambit/GambitService.java
......@@ -40,4 +40,6 @@ public interface GambitService {
PageResult myInterestList(UserTopicDynamicsQO userTopicDynamicsQO);
PageResult myFansList(UserTopicDynamicsQO userTopicDynamicsQO);
ResultBody userMessage(Integer userAccountId);
}
release-service/src/main/java/com/mmc/csf/release/service/gambit/impl/GambitServiceImpl.java
......@@ -4,10 +4,7 @@ import com.mmc.csf.common.util.page.PageResult;
import com.mmc.csf.common.util.web.ResultBody;
import com.mmc.csf.release.dao.DynamicDao;
import com.mmc.csf.release.dao.gambit.GambitDao;
import com.mmc.csf.release.entity.forum.ForumDynamicGambitDO;
import com.mmc.csf.release.entity.forum.ForumReviewDO;
import com.mmc.csf.release.entity.forum.MyAttentionDO;
import com.mmc.csf.release.entity.forum.MyFansDO;
import com.mmc.csf.release.entity.forum.*;
import com.mmc.csf.release.entity.gambit.ForumAttentionDO;
import com.mmc.csf.release.entity.gambit.ForumGambitDO;
import com.mmc.csf.release.gambit.dto.ForumGambitDTO;
......@@ -118,7 +115,8 @@ public class GambitServiceImpl implements GambitService {
dynamicDao.insertForumCount(attentionUserAccountId);
}
ForumAttentionDO forumAttentionDO = gambitDao.selectAttentionMessage(userAccountId, attentionUserAccountId);
if (!forumAttentionDO.equals(null)){
ForumAttentionDO forumAttentionDOs = gambitDao.selectAttentionM(userAccountId,attentionUserAccountId);
if (forumAttentionDO!=null ||forumAttentionDOs!=null){
gambitDao.updateAttention(userAccountId,attentionUserAccountId,true);
gambitDao.forumCountFansYes(userAccountId);
gambitDao.forumCountAttentionYes(attentionUserAccountId);
......@@ -217,6 +215,12 @@ public class GambitServiceImpl implements GambitService {
}
@Override
public ResultBody userMessage(Integer userAccountId) {
ForumCountDO forumCountDO= gambitDao.userMessage(userAccountId);
return ResultBody.success(forumCountDO);
}
@Override
public PageResult allCommentList(AllReviewQO allReviewQO) {
Integer pageNo = allReviewQO.getPageNo();
allReviewQO.buildCurrentPage();
......@@ -238,4 +242,9 @@ public class GambitServiceImpl implements GambitService {
}
release-service/src/main/resources/mapper/gambit/GambitDao.xml
......@@ -429,6 +429,12 @@
where attention_user_account_id=#{attentionUserAccountId} and user_account_id=#{userAccountId}
</select>
<select id="selectAttentionM" resultType="com.mmc.csf.release.entity.gambit.ForumAttentionDO">
select id,user_account_id,create_time,update_time,attention_user_account_id,status,mutual_attention from forum_attention
where attention_user_account_id=#{userAccountId} and user_account_id=#{attentionUserAccountId}
</select>
<select id="updateAttention">
update forum_attention
set mutual_attention=#{status},
......@@ -456,8 +462,10 @@
FROM
forum_dynamic fd
INNER JOIN forum_dynamic_gambit fdg ON fd.id = fdg.dynamic_id
WHERE
fdg.gambit_id = #{gambitId}
WHERE 1=1
<if test="gambitId!=null ">
and fdg.gambit_id = #{gambitId}
</if>
AND fdg.check_status = 1
AND fd.check_status = 1
ORDER BY
......@@ -541,10 +549,18 @@
</select>
<select id="myFansListCount" resultType="java.lang.Integer">
select count(*) from forum_attention where user_account_id=#{userAccountId}
select count(*) from forum_attention where attention_user_account_id=#{userAccountId}
</select>
<select id="myFansList" resultMap="myFansListMap">
select user_account_id,mutual_attention,id from forum_attention where attention_user_account_id=#{userAccountId}
select user_account_id,mutual_attention,id,attention_user_account_id from forum_attention where attention_user_account_id=#{userAccountId}
ORDER BY
create_time DESC
limit #{pageNo}, #{pageSize}
</select>
<select id="userMessage" resultType="com.mmc.csf.release.entity.forum.ForumCountDO">
select id,user_account_id,like_count,fans_count,attention_count,create_time,update_time
from forum_count where user_account_id=#{userAccountId}
</select>
</mapper>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论