DynamicMapper.xml(update)

csf-common/csf-common-model/src/main/java/com/mmc/csf/release/gambit/qo/UserTopicDynamicsQO.java

@@ -32,6 +32,9 @@ public class UserTopicDynamicsQO {
     @ApiModelProperty(value = "用户id",example = "1")
     private Integer userAccountId;
 
+    @ApiModelProperty(value = "token用户id",hidden = true)
+    private Integer userId;
+
 
     /**
      * 初始化起始查询行并返回当前页

release-service/src/main/java/com/mmc/csf/release/controller/GambitController.java

@@ -135,12 +135,16 @@ public class GambitController extends BaseController{
     @ApiOperation(value = "我的关注")
     @PostMapping("/myInterestList")
     public ResultBody<MyAttentionDO> myInterestList(HttpServletRequest request, @RequestBody UserTopicDynamicsQO userTopicDynamicsQO){
+        Integer userId = this.getUserLoginInfoFromRedis(request).getUserAccountId();
+        userTopicDynamicsQO.setUserId(userId);
         return ResultBody.success(gambitService.myInterestList(userTopicDynamicsQO));
     }
 
     @ApiOperation(value = "我的粉丝")
     @PostMapping("/myFansList")
     public ResultBody<MyFansDO> myFansList(HttpServletRequest request, @RequestBody UserTopicDynamicsQO userTopicDynamicsQO){
+        Integer userId = this.getUserLoginInfoFromRedis(request).getUserAccountId();
+        userTopicDynamicsQO.setUserId(userId);
         return ResultBody.success(gambitService.myFansList(userTopicDynamicsQO));
     }
 

release-service/src/main/java/com/mmc/csf/release/dao/DynamicDao.java

@@ -183,6 +183,8 @@ public interface DynamicDao {
 
     List<ForumGambitDO> selectGambit(Integer id);
 
+    List<ForumGambitDO> selectGambitBack(Integer id);
+
     void insertforumFirstLevelReview(ForumFirstLevelReviewDO forumFirstLevelReviewDO);
 
 

release-service/src/main/java/com/mmc/csf/release/dao/gambit/GambitDao.java

@@ -84,6 +84,8 @@ public interface GambitDao {
 
     void updateAttentionExchange(Integer userAccountId, Integer attentionUserAccountId);
 
+  void  updateAttentionExchanges(Integer userAccountId, Integer attentionUserAccountId,Integer userAccountId1, Integer attentionUserAccountId1);
+
     ForumAttentionDO selectAttentionMessage(Integer userAccountId, Integer attentionUserAccountId);
 
     List<ForumDynamicGambitDO> appGambitList(TopicDynamicsQO topicDynamicsQO);
@@ -108,11 +110,19 @@ public interface GambitDao {
 
     List<ForumDynamicGambitDO> likedList(UserTopicDynamicsQO userTopicDynamicsQO);
 
-    int myInterestListCount(UserTopicDynamicsQO userTopicDynamicsQO);
+    List<MyAttentionDO> myInterestListCount(UserTopicDynamicsQO userTopicDynamicsQO);
+
+    List<MyAttentionDO> myInterestListCounts(UserTopicDynamicsQO userTopicDynamicsQO);
 
     List<MyAttentionDO> myInterestList(UserTopicDynamicsQO userTopicDynamicsQO);
 
-    int myFansListCount(UserTopicDynamicsQO userTopicDynamicsQO);
+    List<MyAttentionDO> myInterestLists(UserTopicDynamicsQO userTopicDynamicsQO);
+
+    ForumCountDO selectUserCount(Integer userAccountId);
+
+    List<MyFansDO> myFansListCount(UserTopicDynamicsQO userTopicDynamicsQO);
+
+    List<MyFansDO> myFansListCounts(UserTopicDynamicsQO userTopicDynamicsQO);
 
     List<MyFansDO> myFansList(UserTopicDynamicsQO userTopicDynamicsQO);
 
@@ -137,4 +147,6 @@ public interface GambitDao {
     List<DynamicGambitDO> selectDynamicGambit(Integer dynamicId);
 
     void updateGambits(Integer gambitId);
+
+    List<MyFansDO> myFansLists(UserTopicDynamicsQO userTopicDynamicsQO);
 }

release-service/src/main/java/com/mmc/csf/release/entity/forum/MyAttentionDO.java

@@ -34,6 +34,9 @@ public class MyAttentionDO implements Serializable {
 
     private UserAccountVO userAccountVO;
 
+    @ApiModelProperty(value = "前端忽略此字段",hidden = true)
+    private Integer attentionUserAccountId;
+
 
 
 

release-service/src/main/java/com/mmc/csf/release/entity/forum/MyFansDO.java

@@ -34,6 +34,8 @@ public class MyFansDO implements Serializable {
 
     private UserAccountVO userAccountVO;
 
+    @ApiModelProperty(value = "前端忽略此字段",hidden = true)
+    private Integer attentionUserAccountId;
 
 
 

release-service/src/main/java/com/mmc/csf/release/service/gambit/impl/GambitServiceImpl.java

@@ -30,9 +30,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -177,7 +175,9 @@ public class GambitServiceImpl implements GambitService {
                     gambitDao.forumCountFansNO(userAccountId);
                     gambitDao.forumCountAttentionNO(attentionUserAccountId);
                 }else{
-                    gambitDao.updateAttentionExchange(attentionUserAccountId,userAccountId);
+                    Integer userAccountId1=attentionUserAccountId;
+                    Integer attentionUserAccountId1=userAccountId;
+                    gambitDao.updateAttentionExchanges(userAccountId,attentionUserAccountId,userAccountId1,attentionUserAccountId1);
                     gambitDao.forumCountFansNO(userAccountId);
                     gambitDao.forumCountAttentionNO(attentionUserAccountId);
                 }
@@ -284,9 +284,53 @@ public class GambitServiceImpl implements GambitService {
 
         Integer pageNo = userTopicDynamicsQO.getPageNo();
         userTopicDynamicsQO.buildCurrentPage();
-       int count = gambitDao.myInterestListCount(userTopicDynamicsQO);
-       List<MyAttentionDO> myAttentionDOS = gambitDao.myInterestList(userTopicDynamicsQO);
+        Integer userId = userTopicDynamicsQO.getUserId();
+        Integer userAccountId1 = userTopicDynamicsQO.getUserAccountId();
+        if (userAccountId1==null){
+            userTopicDynamicsQO.setUserAccountId(userId);
+        }
+        ArrayList<MyAttentionDO> listCount = new ArrayList<>();
+        List<MyAttentionDO> myAttentionDOSCount=null;
+        int count =0;
+
+        myAttentionDOSCount=gambitDao.myInterestListCount(userTopicDynamicsQO);
+        if (myAttentionDOSCount.size()!=0){
+            for (MyAttentionDO myAttentionDO : myAttentionDOSCount) {
+                listCount.add(myAttentionDO);
+            }
+        }
+        myAttentionDOSCount=gambitDao.myInterestListCounts(userTopicDynamicsQO);
+        if (myAttentionDOSCount.size()!=0){
+            for (MyAttentionDO myAttentionDO : myAttentionDOSCount) {
+                listCount.add(myAttentionDO);
+            }
+        }
+        ArrayList<MyAttentionDO> collectCount = listCount.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(MyAttentionDO::getId))), ArrayList::new));
+        count=collectCount.size();
+        ArrayList<MyAttentionDO> list = new ArrayList<>();
+        List<MyAttentionDO> myAttentionDOS =null;
+        myAttentionDOS= gambitDao.myInterestList(userTopicDynamicsQO);
+        if (myAttentionDOS.size()!=0){
+            for (MyAttentionDO myAttentionDO : myAttentionDOS) {
+                list.add(myAttentionDO);
+            }
+        }
+         myAttentionDOS= gambitDao.myInterestLists(userTopicDynamicsQO);
+        if (myAttentionDOS.size()!=0){
+            for (MyAttentionDO myAttentionDO : myAttentionDOS) {
+                list.add(myAttentionDO);
+            }
+        }
+        ArrayList<MyAttentionDO> collect = list.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(MyAttentionDO::getId))), ArrayList::new));
+        myAttentionDOS=collect;
         for (MyAttentionDO myAttentionDO : myAttentionDOS) {
+            if (userTopicDynamicsQO.getUserAccountId().equals(myAttentionDO.getUserAccountId())){
+                myAttentionDO.setUserAccountId(myAttentionDO.getAttentionUserAccountId());
+                ForumCountDO forumCountDO = gambitDao.selectUserCount(myAttentionDO.getUserAccountId());
+                myAttentionDO.setCountDO(forumCountDO);
+            }
             Integer userAccountId = myAttentionDO.getUserAccountId();
             UserAccountVO info = info(userAccountId);
             myAttentionDO.setUserAccountVO(info);
@@ -298,14 +342,59 @@ public class GambitServiceImpl implements GambitService {
     public PageResult myFansList(UserTopicDynamicsQO userTopicDynamicsQO) {
         Integer pageNo = userTopicDynamicsQO.getPageNo();
         userTopicDynamicsQO.buildCurrentPage();
-        int count = gambitDao.myFansListCount(userTopicDynamicsQO);
-        List<MyFansDO> myAttentionDOS = gambitDao.myFansList(userTopicDynamicsQO);
-        for (MyFansDO myAttentionDO : myAttentionDOS) {
+        Integer userId = userTopicDynamicsQO.getUserId();
+        Integer userAccountId1 = userTopicDynamicsQO.getUserAccountId();
+        if (userAccountId1==null){
+            userTopicDynamicsQO.setUserAccountId(userId);
+        }
+        List<MyFansDO> listCount =new ArrayList<>();
+        List<MyFansDO> myFansDOSCount=null;
+        int allCount =0;
+         myFansDOSCount = gambitDao.myFansListCount(userTopicDynamicsQO);
+        if (myFansDOSCount.size()!=0){
+            for (MyFansDO myFansDO : myFansDOSCount) {
+                listCount.add(myFansDO);
+            }
+        }
+        myFansDOSCount = gambitDao.myFansListCounts(userTopicDynamicsQO);
+        if (myFansDOSCount.size()!=0){
+            for (MyFansDO myFansDO : myFansDOSCount) {
+                listCount.add(myFansDO);
+            }
+        }
+        ArrayList<MyFansDO> collectCount = listCount.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(MyFansDO::getId))), ArrayList::new));
+
+        int count =collectCount.size();
+        List<MyFansDO> list =new ArrayList<>();
+        List<MyFansDO> myFansDOS=null;
+        myFansDOS=gambitDao.myFansList(userTopicDynamicsQO);
+        if (myFansDOS.size()!=0){
+            for (MyFansDO myFansDO : myFansDOS) {
+                list.add(myFansDO);
+            }
+        }
+        myFansDOS=gambitDao.myFansLists(userTopicDynamicsQO);
+        if (myFansDOS.size()!=0){
+            for (MyFansDO myFansDO : myFansDOS) {
+                list.add(myFansDO);
+            }
+        }
+        ArrayList<MyFansDO> collect = list.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(MyFansDO::getId))), ArrayList::new));
+
+        myFansDOS=collect;
+        for (MyFansDO myAttentionDO : myFansDOS) {
+            if (userTopicDynamicsQO.getUserAccountId().equals(myAttentionDO.getUserAccountId())){
+                myAttentionDO.setUserAccountId(myAttentionDO.getAttentionUserAccountId());
+                ForumCountDO forumCountDO = gambitDao.selectUserCount(myAttentionDO.getUserAccountId());
+                myAttentionDO.setCountDO(forumCountDO);
+            }
             Integer userAccountId = myAttentionDO.getUserAccountId();
             UserAccountVO info = info(userAccountId);
             myAttentionDO.setUserAccountVO(info);
         }
-        return  PageResult.buildPage(pageNo, userTopicDynamicsQO.getPageSize(),count,myAttentionDOS);
+        return  PageResult.buildPage(pageNo, userTopicDynamicsQO.getPageSize(),count,myFansDOS);
 
     }
 

release-service/src/main/java/com/mmc/csf/release/service/impl/BackstageForumServiceImpl.java

@@ -79,7 +79,7 @@ public class BackstageForumServiceImpl implements BackstageForumService {
         for (ForumDynamicDO forumDynamicDO : dynamicList) {
             Integer id = forumDynamicDO.getDynamicId();
             ArrayList<String> list = new ArrayList<>();
-            List<ForumGambitDO> gambitDOS = dynamicDao.selectGambit(id);
+            List<ForumGambitDO> gambitDOS = dynamicDao.selectGambitBack(id);
             for (ForumGambitDO gambitDO : gambitDOS) {
                 list.add(gambitDO.getGambitName());
             }

release-service/src/main/resources/mapper/forum/DynamicMapper.xml

@@ -248,6 +248,24 @@
           AND fdg.dynamic_id = #{id}
     </select>
 
+    <select id="selectGambitBack" resultType="com.mmc.csf.release.entity.gambit.ForumGambitDO">
+        SELECT DISTINCT
+            gf.id,
+            gf.gambit_name,
+            gf.gambit_icon,
+            gf.gambit_cover,
+            gf.post_count,
+            gf.gambit_property,
+            gf.user_account_id,
+            gf.discussion_count
+        FROM
+            forum_dynamic_gambit fdg
+                INNER JOIN forum_gambit gf
+        WHERE
+            fdg.gambit_id = gf.id
+          AND fdg.dynamic_id = #{id}
+    </select>
+
 
     <select id="selectGambitDTO" resultType="com.mmc.csf.release.gambit.dto.ForumGambitDTO">
         SELECT DISTINCT

release-service/src/main/resources/mapper/gambit/GambitDao.xml

@@ -72,6 +72,7 @@
         <result property="id" column="id"/>
         <result property="userAccountId" column="user_account_id" />
         <result property="mutualAttention" column="mutual_attention"/>
+        <result property="attentionUserAccountId" column="attention_user_account_id"/>
         <collection property="dynamicCount" ofType="java.lang.Integer"
             select="selectCountUser" column="{userAccountId=user_account_id}">
         </collection>
@@ -80,10 +81,12 @@
         </collection>
     </resultMap>
 
+
     <resultMap id="myFansListMap" type="com.mmc.csf.release.entity.forum.MyFansDO">
         <result property="id" column="id"/>
-        <result property="userAccountId" column="attention_user_account_id" />
+        <result property="userAccountId" column="user_account_id" />
         <result property="mutualAttention" column="mutual_attention"/>
+        <result property="attentionUserAccountId" column="attention_user_account_id"/>
         <collection property="dynamicCount" ofType="java.lang.Integer"
                     select="selectCountUser" column="{userAccountId=user_account_id}">
         </collection>
@@ -560,6 +563,14 @@
         where user_account_id=#{userAccountId} and attention_user_account_id=#{attentionUserAccountId}
     </update>
 
+    <update id="updateAttentionExchanges">
+        update forum_attention set user_account_id=#{userAccountId1} ,
+                                   attention_user_account_id=#{attentionUserAccountId1},
+                                   mutual_attention=false,
+                                   update_time=NOW()
+        where user_account_id=#{attentionUserAccountId} and attention_user_account_id=#{userAccountId}
+    </update>
+
     <select id="appGambitList" resultMap="appGambitListMap">
         SELECT DISTINCT
             fd.id,
@@ -651,10 +662,16 @@
             limit #{pageNo}, #{pageSize}
     </select>
 
-    <select id="myInterestListCount" resultType="java.lang.Integer">
-        select count(*) from forum_attention where attention_user_account_id=#{userAccountId}
+    <select id="myInterestListCount" resultMap="myInterestListMap">
+        select attention_user_account_id,mutual_attention,id,user_account_id from forum_attention where attention_user_account_id=#{userAccountId}
+    </select>
+
+    <select id="myInterestListCounts" resultMap="myInterestListMap">
+        select attention_user_account_id,mutual_attention,id,user_account_id from forum_attention where attention_user_account_id=#{userAccountId} or user_account_id=#{userAccountId} and mutual_attention=1
+
     </select>
 
+
     <select id="myInterestList" resultMap="myInterestListMap">
         select attention_user_account_id,mutual_attention,id,user_account_id from forum_attention where attention_user_account_id=#{userAccountId}
         ORDER BY
@@ -662,8 +679,20 @@
             limit #{pageNo}, #{pageSize}
     </select>
 
-    <select id="myFansListCount" resultType="java.lang.Integer">
-        select count(*) from forum_attention where attention_user_account_id=#{userAccountId}
+    <select id="myInterestLists" resultMap="myInterestListMap">
+        select attention_user_account_id,mutual_attention,id,user_account_id from forum_attention where attention_user_account_id=#{userAccountId} or user_account_id=#{userAccountId} and mutual_attention=1
+        ORDER BY
+            create_time DESC
+            limit #{pageNo}, #{pageSize}
+    </select>
+
+    <select id="myFansListCount"  resultMap="myFansListMap">
+        select user_account_id,mutual_attention,id,attention_user_account_id from forum_attention where user_account_id=#{userAccountId}
+    </select>
+
+    <select id="myFansListCounts"  resultMap="myFansListMap">
+        select user_account_id,mutual_attention,id,attention_user_account_id from forum_attention where
+            user_account_id=#{userAccountId} or attention_user_account_id=#{userAccountId} and mutual_attention=1
     </select>
 
     <select id="myFansList" resultMap="myFansListMap">
@@ -673,6 +702,14 @@
             limit #{pageNo}, #{pageSize}
     </select>
 
+    <select id="myFansLists" resultMap="myFansListMap">
+        select user_account_id,mutual_attention,id,attention_user_account_id from forum_attention where
+         user_account_id=#{userAccountId} or attention_user_account_id=#{userAccountId} and mutual_attention=1
+        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}