ForumReview(update)

csf-common/csf-common-model/src/main/java/com/mmc/csf/release/forum/vo/ForumReviewVO.java

@@ -48,6 +48,9 @@ public class ForumReviewVO implements Serializable {
     @ApiModelProperty(value = "pid")
     private Integer pid;
 
+    @ApiModelProperty(value = "status")
+    private Boolean status;
+
     @ApiModelProperty(value = "用户信息")
     private UserAccountVO userAccountVO;
 

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

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 /**
  * @Author LW
@@ -82,11 +83,13 @@ public class DynamicController extends BaseController {
     @GetMapping("/dynamicList")
     public ResultBody<DynamicVO> dynamicList(
             @RequestParam Integer pageNo, @RequestParam Integer pageSize, HttpServletRequest request,
-            @RequestParam(required = false) Integer gambitId,@RequestParam(required = false) Integer id,
-            @RequestParam(required = false) Integer userAccountId) {
+            @RequestParam(required = false) Integer gambitId, @RequestParam(required = false) Integer id,
+            @RequestParam(required = false) Integer userAccountId,
+            @RequestParam(required = false) String description,
+            @RequestParam(required = false) List<String> gambitName) {
         return ResultBody.success(
                 dynamicService.dynamicList(
-                        pageNo, pageSize, this.getUserLoginInfoFromRedis(request).getUserAccountId(), request,gambitId,id,userAccountId));
+                        pageNo, pageSize, this.getUserLoginInfoFromRedis(request).getUserAccountId(), request,gambitId,id,userAccountId,description,gambitName));
     }
 
 

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

@@ -80,7 +80,7 @@ public interface DynamicDao {
      *
      * @return int
      */
-    int countDynamicList(Integer id,Integer userAccountIds);
+    int countDynamicList(Integer id,Integer userAccountIds,String description);
 
     /**
      * 动态列表
@@ -89,7 +89,7 @@ public interface DynamicDao {
      * @param pageSize  页面大小
      * @return {@link List}<{@link ForumDynamicDO}>
      */
-    List<ForumDynamicDO> dynamicList(int itemIndex, Integer pageSize,Integer id,Integer userAccountIds);
+    List<ForumDynamicDO> dynamicList(int itemIndex, Integer pageSize,Integer id,Integer userAccountIds,String description);
 
     List<ForumDynamicDO> dynamicListGambit(int itemIndex, Integer pageSize,Integer id,Integer userAccountIds,Integer gambitId);
 
@@ -200,4 +200,6 @@ public interface DynamicDao {
     List<ForumGambitDTO> selectGambitDTO(Integer id);
 
     void updateDiscussionCounts(Integer id);
+
+    Integer gambitName(String gambitName);
 }

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

@@ -129,4 +129,6 @@ public interface GambitDao {
     int selectCountAttentions(Integer userAccountId,Integer userId);
 
     int selectGambitAndDynamic(Integer id);
+
+    Integer selectStatus(Integer id, Integer userId);
 }

release-service/src/main/java/com/mmc/csf/release/service/DynamicService.java

@@ -11,6 +11,7 @@ import com.mmc.csf.release.gambit.vo.ForumGambitVO;
 import io.swagger.models.auth.In;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 /**
  * @Author LW 测试合并
@@ -60,7 +61,7 @@ public interface DynamicService {
     ResultBody dynamicDetails(Integer dynamicId, Integer userId, HttpServletRequest request);
 
     PageResult dynamicList(
-            Integer pageNo, Integer pageSize, Integer userAccountId, HttpServletRequest request, Integer gambitId,Integer id,Integer userId);
+            Integer pageNo, Integer pageSize, Integer userAccountId, HttpServletRequest request, Integer gambitId, Integer id, Integer userId, String description, List<String> gambitName);
 
     ResultBody recentNewsList(Integer userAccountId);
 

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

@@ -296,21 +296,37 @@ public class DynamicServiceImpl implements DynamicService {
 
     @Override
     public PageResult dynamicList(
-            Integer pageNo, Integer pageSize, Integer userId, HttpServletRequest request, Integer gambitId,Integer dynId,Integer userAccountIds) {
-        int count = dynamicDao.countDynamicList(dynId,userAccountIds);
+            Integer pageNo, Integer pageSize, Integer userId, HttpServletRequest request, Integer gambitId,Integer dynId,Integer userAccountIds,
+            String description,List<String> gambitName) {
+        int count = dynamicDao.countDynamicList(dynId,userAccountIds,description);
         if (count == 0) {
             return PageResult.buildPage(pageNo, pageSize, 0);
         }
         int itemIndex = (pageNo - 1) * pageSize;
-        List<ForumDynamicDO> forumDynamicList = dynamicDao.dynamicList(itemIndex, pageSize,dynId,userAccountIds);
+        List<ForumDynamicDO> forumDynamicList = dynamicDao.dynamicList(itemIndex, pageSize,dynId,userAccountIds,description);
+
+       if (gambitName!=null){
+           for (String s : gambitName) {
+               Integer integer = dynamicDao.gambitName(s);
+               forumDynamicList = dynamicDao.dynamicListGambit(itemIndex, pageSize,dynId,userAccountIds,integer);
+           }
+       }
+       // List<Integer> integers = dynamicDao.gambitName(gambitName);
         if (gambitId!=null){
          forumDynamicList = dynamicDao.dynamicListGambit(itemIndex, pageSize,dynId,userAccountIds,gambitId);
         }
-
        for (ForumDynamicDO forumDynamicDO : forumDynamicList) {
             Integer dynamicId = forumDynamicDO.getDynamicId();
            ForumReviewVO forumReviewVO = gambitDao.selectForumReviewMessage(dynamicId);
-            forumDynamicDO.setForumReviewVO(forumReviewVO);
+           if (forumReviewVO!=null){
+               Integer i = gambitDao.selectStatus(forumReviewVO.getId(), userId);
+               if (i==null){
+                   forumReviewVO.setStatus(null);
+               }else if (i==1){
+                   forumReviewVO.setStatus(true);
+               }
+           }
+           forumDynamicDO.setForumReviewVO(forumReviewVO);
             if (forumReviewVO!=null){
                 Integer userAccountId = forumReviewVO.getUserAccountId();
                 UserAccountVO info = info(userAccountId);

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

@@ -97,6 +97,12 @@
         where id=#{gambitId}
     </update>
 
+    <select id="gambitName" resultType="java.lang.Integer">
+        select id from forum_gambit where
+        <if test="gambitName!='' and gambitName!=null">
+            gambit_name=#{gambitName}
+        </if>
+    </select>
 
     <update id="updateDiscussionCount">
         update forum_gambit
@@ -348,8 +354,9 @@
         <if test="userAccountIds">
             and user_account_id=#{userAccountIds}
         </if>
-
-
+        <if test="description!=null and  description!=''">
+            and description like concat('%',#{description},'%')
+        </if>
     </select>
     <select id="dynamicList" resultType="com.mmc.csf.release.entity.forum.ForumDynamicDO">
         select id,
@@ -373,6 +380,9 @@
         <if test="userAccountIds!=null">
             and user_account_id=#{userAccountIds}
         </if>
+        <if test="description!=null and description!='' ">
+            and description like concat('%',#{description},'%')
+        </if>
         order by create_time desc
             LIMIT #{itemIndex}, #{pageSize}
     </select>

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

@@ -199,6 +199,10 @@
         select count(*) from forum_dynamic_gambit where gambit_id=#{id}
     </select>
 
+    <select id="selectStatus" resultType="java.lang.Integer">
+        select `status` from forum_review_likes where user_account_id=#{userId} and review_id=#{id}
+    </select>
+
     <select id="selectResourceList" resultType="com.mmc.csf.release.entity.forum.ForumResourceDO">
         select dynamic_id,resource_url,create_time,update_time,`type` from  forum_resource where  dynamic_id=#{dynamicId}
     </select>