合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpAnnouncementMapper.java

 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 @Mapper
 public interface TpAnnouncementMapper {
     int deleteByPrimaryKey(Integer id);
     int updateByPrimaryKeySelective(@Param("id")Integer id, @Param("viewCount")Integer viewCount);
 
     int updateByPrimaryKey(TpAnnouncement record);
+	
+	List<TpAnnouncement> getAnnouncements(@Param("communityId") Integer communityId,@Param("title") String title);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpSocialViewMapper.java

 package com.community.huiju.dao;
 
-
 import com.community.huiju.model.TpSocialView;
 import org.apache.ibatis.annotations.Mapper;
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/SocialServiceI.java

 package com.community.huiju.service;
 
+import com.community.huiju.model.TpActivity;
 import com.community.huiju.model.TpAnnouncement;
 import com.community.huiju.model.TpSocialView;
 
+import java.util.List;
+
 /**
  * @author weichaochao
  * @Title: SocialServiceI
  */
 public interface SocialServiceI {
     TpAnnouncement findAnnouncementDetail(Integer id, Integer communityId);
-    void insertSocialView(TpSocialView tpSocialView);
+
+	/**
+	 * 分页获取公告列表
+	 * @param communityId
+	 * @param title
+	 * @param pageNum
+	 * @param pageSize
+	 * @return
+	 */
+	List<TpAnnouncement> getAnnouncements(Integer communityId, String title, Integer pageNum, Integer pageSize);
+	
+	/**
+	 * 分页获取活动列表
+	 * @param communityId
+	 * @param title
+	 * @param pageNum
+	 * @param pageSize
+	 * @return
+	 */
+	List<TpActivity> getActivitys(Integer communityId, String title, Integer pageNum, Integer pageSize);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java

 import com.community.huiju.model.TpAnnouncement;
 import com.community.huiju.model.TpSocialView;
 import com.community.huiju.service.SocialServiceI;
-import io.swagger.models.auth.In;
+import com.community.huiju.dao.TpActivityMapper;
+import com.community.huiju.dao.TpAnnouncementMapper;
+import com.community.huiju.model.TpActivity;
+import com.community.huiju.model.TpAnnouncement;
+import com.community.huiju.model.TpMessage;
+import com.community.huiju.service.SocialServiceI;
+import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
 
+import java.util.List;
+
 /**
  * @author weichaochao
  * @Title: SocialServiceImpl
 
     @Autowired
     private TpAnnouncementMapper tpAnnouncementMapper;
+
     @Autowired
     private TpSocialViewMapper tpSocialViewMapper;
 
+    @Autowired
+    private TpActivityMapper tpActivityMapper;
+    
     @Override
     @Transactional
     public TpAnnouncement findAnnouncementDetail(Integer id, Integer communityId) {
         return tpAnnouncementMapper.selectByPrimaryKey(id, communityId);
     }
 
+    /**
+     * 分页获取公告列表
+     * @param communityId
+     * @param title
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
     @Override
-    public void insertSocialView(TpSocialView tpSocialView) {
-
+    public List<TpAnnouncement> getAnnouncements(Integer communityId,String title, Integer pageNum, Integer pageSize) {
+        pageNum = null == pageNum ? 1 : pageNum;
+        pageSize = null == pageSize ? 10 : pageSize;
+        //使用分页插件
+        PageHelper.startPage(pageNum, pageSize);
+        // 获取数据
+        List<TpAnnouncement> announcementList = tpAnnouncementMapper.getAnnouncements(communityId,title);
+        return announcementList;
+    }
+    
+    /**
+     * 分页获取活动列表
+     * @param communityId
+     * @param title
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @Override
+    public List<TpActivity> getActivitys(Integer communityId, String title, Integer pageNum, Integer pageSize) {
+        pageNum = null == pageNum ? 1 : pageNum;
+        pageSize = null == pageSize ? 10 : pageSize;
+        //使用分页插件
+        PageHelper.startPage(pageNum, pageSize);
+        // 获取数据
+        List<TpActivity> activityList = tpActivityMapper.getActivitys(communityId,title);
+        return activityList;
     }
 }

CODE/smart-community/app-api/src/main/resources/mapper/TpAnnouncementMapper.xml

     <result column="announcement_title" property="announcementTitle" jdbcType="VARCHAR" />
     <result column="announcement_carousel_img" property="announcementCarouselImg" jdbcType="VARCHAR" />
     <result column="announcement_content" property="announcementContent" jdbcType="VARCHAR" />
+    <result column="user_name" property="userName" jdbcType="VARCHAR" />
     <result column="sort" property="sort" jdbcType="INTEGER" />
     <result column="view_count" property="viewCount" jdbcType="INTEGER" />
     <result column="set_up_carousel" property="setUpCarousel" jdbcType="CHAR" />
       update_date = #{updateDate,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
+
+  <select id="getAnnouncements" resultMap="BaseResultMap">
+    SELECT
+      a.id,
+      a.announcement_title,
+      a.announcement_content,
+      a.create_date,
+      u.user_name as user_name,
+      a.sort,
+      a.view_count
+  FROM
+      tp_announcement a
+      LEFT JOIN tp_user u ON a.create_user = u.id
+      AND u.community_id = #{communityId,jdbcType=INTEGER}
+  WHERE
+      a.community_id = #{communityId,jdbcType=INTEGER}
+      AND ( a.STATUS = 1 OR a.STATUS = 3 )
+      and a.announcement_title like concat('%',#{title,jdbcType=VARCHAR},'%')
+  ORDER BY
+      a.sort,
+      a.create_date DESC
+  </select>
 </mapper>