公告轮播图

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java

@@ -2,6 +2,7 @@ package com.community.huiju.controller;
 
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
+import com.community.huiju.model.TpActivity;
 import com.community.huiju.model.TpAnnouncement;
 import com.community.huiju.model.TpMessage;
 import com.community.huiju.service.SocialServiceI;
@@ -73,4 +74,17 @@ public class SocialController {
         return responseBean;
     }
 
+    
+    @ApiOperation(value = "按小区获取分页活动列表", notes = "按小区获取分页活动列表,公告标题模糊查询")
+    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "title", value = "活动标题"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
+    @RequestMapping(value = "/activitys/{communityId}",method = RequestMethod.GET)
+    public ResponseBean getActivitys(@PathVariable Integer communityId,@RequestParam String title,@RequestParam Integer pageNum,@RequestParam Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        List<TpActivity> activityList = socialServiceI.getActivitys(communityId,title,pageNum,pageSize);
+        responseBean.addSuccess(activityList);
+        return responseBean;
+    }
 }

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

@@ -3,6 +3,9 @@ package com.community.huiju.dao;
 
 import com.community.huiju.model.TpActivity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 @Mapper
 public interface TpActivityMapper {
@@ -17,4 +20,6 @@ public interface TpActivityMapper {
     int updateByPrimaryKeySelective(TpActivity record);
 
     int updateByPrimaryKey(TpActivity record);
+    
+    List<TpActivity> getActivitys(@Param("communityId")Integer communityId,@Param("title") String title);
 }

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

@@ -1,7 +1,9 @@
 package com.community.huiju.dao;
 
 import com.community.huiju.model.TpSocialView;
+import org.apache.ibatis.annotations.Mapper;
 
+@Mapper
 public interface TpSocialViewMapper {
     int deleteByPrimaryKey(Integer id);
 

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

@@ -1,7 +1,9 @@
 package com.community.huiju.dao;
 
 import com.community.huiju.model.TpTransaction;
+import org.apache.ibatis.annotations.Mapper;
 
+@Mapper
 public interface TpTransactionMapper {
     int deleteByPrimaryKey(Integer id);
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpActivity.java

@@ -38,6 +38,8 @@ public class TpActivity {
     private Integer updateUser;
 
     private Date updateDate;
+    
+    private String userName;
 
     public Integer getId() {
         return id;
@@ -182,4 +184,12 @@ public class TpActivity {
     public void setUpdateDate(Date updateDate) {
         this.updateDate = updateDate;
     }
+    
+    public String getUserName() {
+        return userName;
+    }
+    
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.community.huiju.service;
 
+import com.community.huiju.model.TpActivity;
 import com.community.huiju.model.TpAnnouncement;
 import com.community.huiju.model.TpMessage;
 
@@ -16,6 +17,7 @@ public interface SocialServiceI {
 	/**
 	 * 分页获取公告列表
 	 * @param communityId
+	 * @param title
 	 * @param pageNum
 	 * @param pageSize
 	 * @return
@@ -29,4 +31,14 @@ public interface SocialServiceI {
 	 * @return
 	 */
 	List<TpAnnouncement> getAnnouncement(Integer communityId, Integer sum);
+	
+	/**
+	 * 分页获取活动列表
+	 * @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/MessageServiceImpl.java

@@ -27,6 +27,7 @@ public class MessageServiceImpl implements MessageServiceI {
 	 */
 	@Override
 	public Map<String, Object> getMessageTotal(Integer communityId) {
+		//todo
 		Integer userId = 1;
 		return tpMessageMapper.getMessageTotal(userId,communityId);
 	}
@@ -41,6 +42,7 @@ public class MessageServiceImpl implements MessageServiceI {
 	 */
 	@Override
 	public List<TpMessage> getMessages(Integer communityId, Integer pageNum, Integer pageSize,Integer modelType) {
+		//todo
 		Integer userId = 1;
 		pageNum = null == pageNum ? 1 : pageNum;
 		pageSize = null == pageSize ? 10 : pageSize;

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

@@ -1,6 +1,8 @@
 package com.community.huiju.service.impl;
 
+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;
@@ -20,6 +22,10 @@ import java.util.List;
 public class SocialServiceImpl implements SocialServiceI {
     @Autowired
     private TpAnnouncementMapper tpAnnouncementMapper;
+    
+    @Autowired
+    private TpActivityMapper tpActivityMapper;
+    
     @Override
     public TpAnnouncement findAnnouncementDetail(Integer id, Integer communityId) {
         return tpAnnouncementMapper.selectByPrimaryKey(id, communityId);
@@ -28,6 +34,7 @@ public class SocialServiceImpl implements SocialServiceI {
     /**
      * 分页获取公告列表
      * @param communityId
+     * @param title
      * @param pageNum
      * @param pageSize
      * @return
@@ -54,4 +61,23 @@ public class SocialServiceImpl implements SocialServiceI {
         return listAnnouncement;
     }
 
+    
+    /**
+     * 分页获取活动列表
+     * @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/TpActivityMapper.xml

@@ -7,6 +7,7 @@
     <result column="activity_title" property="activityTitle" jdbcType="VARCHAR" />
     <result column="activity_carousel_img" property="activityCarouselImg" jdbcType="VARCHAR" />
     <result column="activity_content" property="activityContent" jdbcType="VARCHAR" />
+    <result column="user_name" property="userName" jdbcType="VARCHAR" />
     <result column="sort" property="sort" jdbcType="INTEGER" />
     <result column="sign_up_count" property="signUpCount" jdbcType="INTEGER" />
     <result column="sign_up_max" property="signUpMax" jdbcType="INTEGER" />
@@ -246,4 +247,27 @@
       update_date = #{updateDate,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
+
+  <select id="getActivitys" resultMap="BaseResultMap">
+    SELECT
+      a.id,
+      a.activity_title,
+      a.activity_content,
+      a.create_date,
+      u.user_name AS user_name,
+      a.sort,
+      a.view_count,
+      a.sign_up_count
+  FROM
+      tp_activity 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.activity_title LIKE concat('%',#{title,jdbcType=VARCHAR},'%')
+  ORDER BY
+      a.sort,
+      a.create_date DESC
+  </select>
 </mapper>

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

@@ -204,7 +204,7 @@
   WHERE
       a.community_id = #{communityId,jdbcType=INTEGER}
       AND ( a.STATUS = 1 OR a.STATUS = 3 )
-      and announcement_title like concat('%',#{title,jdbcType=VARCHAR},'%')
+      and a.announcement_title like concat('%',#{title,jdbcType=VARCHAR},'%')
   ORDER BY
       a.sort,
       a.create_date DESC