合并本地分支

CODE/smart-community/app-api/pom.xml

@@ -71,6 +71,12 @@
 			<version>1.3.2</version>
 		</dependency>
 
+		<dependency>
+			<groupId>com.github.pagehelper</groupId>
+			<artifactId>pagehelper-spring-boot-starter</artifactId>
+			<version>1.2.3</version>
+		</dependency>
+
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/code/impl/PhoneCodeImpl.java

@@ -1,18 +1,11 @@
 package com.community.huiju.common.code.impl;
 
-import com.alibaba.fastjson.JSONObject;
 import com.community.commom.constant.Constant;
-import com.community.commom.utils.HttpClientUtils;
 import com.community.huiju.common.code.ICode;
-import com.community.huiju.common.code.cache.AppkeyCache;
-import com.community.huiju.common.code.entity.CodeEntity;
-import lombok.extern.log4j.Log4j;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;
 
 import java.io.IOException;

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

@@ -4,10 +4,13 @@ import com.community.commom.mode.ResponseBean;
 import com.community.huiju.model.ToBanner;
 import com.community.huiju.service.BannerServiceI;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -30,10 +33,11 @@ public class BannerController {
     private BannerServiceI bannerService;
 
     @ApiOperation(value = "首页运营banner接口", notes = "获取首页运营banner")
-    @RequestMapping(value = "/banners", method = RequestMethod.GET)
-    public ResponseBean selectToBannerImg(){
+    @RequestMapping(value = "/banner/{bannerId}", method = RequestMethod.GET)
+    @ApiImplicitParams({ @ApiImplicitParam(paramType = "query", dataType = "Long", name = "bannerId", value = "运营banner图Id") })
+    public ResponseBean selectToBannerImg(@PathVariable("bannerId")Integer bannerId){
         ResponseBean responseBean = new ResponseBean();
-        List<ToBanner> toBannerList = bannerService.viewBannerImg();
+        ToBanner toBannerList = bannerService.viewBannerImg(bannerId);
         responseBean.addSuccess(toBannerList);
         return responseBean;
     }

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

@@ -1,7 +1,9 @@
 package com.community.huiju.controller;
 
+import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.huiju.model.ToCommunities;
+import com.community.huiju.model.TpMessage;
 import com.community.huiju.service.MessageServiceI;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -9,6 +11,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,12 +33,37 @@ public class MessageController {
 	@Autowired
 	private MessageServiceI messageService;
 	
-	@ApiOperation(value = "根据小区名获取小区列表", notes = "根据小区名获取小区列表")
-	@RequestMapping(value = "/message/total",method = RequestMethod.GET)
-	public ResponseBean getMessageTotal(){
+	@ApiOperation(value = "按小区获取消息总数", notes = "按小区获取个人消息总数")
+	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id") })
+	@RequestMapping(value = "/message/{communityId}/total",method = RequestMethod.GET)
+	public ResponseBean getMessageTotal(@PathVariable Integer communityId){
 		ResponseBean responseBean = new ResponseBean();
-		Map<String,Object> totalMap = messageService.getMessageTotal();
+		Map<String,Object> totalMap = messageService.getMessageTotal(communityId);
 		responseBean.addSuccess(totalMap);
 		return responseBean;
 	}
+	
+	@ApiOperation(value = "按小区获取分页消息", notes = "按小区获取分页消息")
+	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
+	@RequestMapping(value = "/message/{communityId}/news",method = RequestMethod.GET)
+	public ResponseBean getNews(@PathVariable Integer communityId,@RequestParam Integer pageNum,@RequestParam Integer pageSize){
+		ResponseBean responseBean = new ResponseBean();
+		List<TpMessage> newsList = messageService.getMessages(communityId,pageNum,pageSize, Constant.MODEL_TYPE_NEWS);
+		responseBean.addSuccess(newsList);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "按小区获取分页待办", notes = "按小区获取分页待办")
+	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
+	@RequestMapping(value = "/message/{communityId}/upcoming",method = RequestMethod.GET)
+	public ResponseBean getUpcoming(@PathVariable Integer communityId,@RequestParam Integer pageNum,@RequestParam Integer pageSize){
+		ResponseBean responseBean = new ResponseBean();
+		List<TpMessage> upcomingList = messageService.getMessages(communityId,pageNum,pageSize,Constant.MODEL_TYPE_UPCOMING);
+		responseBean.addSuccess(upcomingList);
+		return responseBean;
+	}
 }

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

@@ -0,0 +1,61 @@
+package com.community.huiju.controller;
+
+import com.community.commom.constant.Constant;
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.model.TpAnnouncement;
+import com.community.huiju.model.TpMessage;
+import com.community.huiju.service.SocialServiceI;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author weichaochao
+ * @Title: SocialController
+ * @date 2018/10/23
+ */
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api("app端论坛相关的API")
+public class SocialController {
+
+    @Autowired
+    private SocialServiceI socialServiceI;
+
+    @RequestMapping(value = "/announcement/{communityId}", method = RequestMethod.GET)
+    @ApiOperation(value = "论坛公告帖子详情", notes = "获取论坛公告帖子详情")
+    @ApiImplicitParams({ @ApiImplicitParam(paramType = "query", dataType = "Long", name = "communityId", value = "小区Id") })
+    public ResponseBean findAnnouncementDetail(@PathVariable(value = "communityId")Integer communityId, @RequestParam("id") Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        TpAnnouncement tpAnnouncement = socialServiceI.findAnnouncementDetail(id, communityId);
+        responseBean.addSuccess(tpAnnouncement);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/sign", method = RequestMethod.GET)
+    @ApiOperation(value = "活动报名接口", notes = "活动报名接口")
+    @ApiImplicitParams({ @ApiImplicitParam(paramType = "query", dataType = "Long", name = "communityId", value = "小区Id") })
+    public ResponseBean SignActivity(@PathVariable(value = "communityId")Integer communityId){
+        ResponseBean responseBean = new ResponseBean();
+        return responseBean;
+    }
+    
+    @ApiOperation(value = "按小区获取分页活动列表", notes = "按小区获取分页活动列表")
+    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
+    @RequestMapping(value = "/announcements/{communityId}",method = RequestMethod.GET)
+    public ResponseBean getAnnouncements(@PathVariable Integer communityId,@RequestParam Integer pageNum,@RequestParam Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        List<TpMessage> upcomingList = socialServiceI.getAnnouncements(communityId,pageNum,pageSize);
+        responseBean.addSuccess(upcomingList);
+        return responseBean;
+    }
+}

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

@@ -2,12 +2,13 @@ package com.community.huiju.dao;
 
 import com.community.huiju.model.ToBanner;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 @Mapper
 public interface ToBannerMapper {
 
-    List<ToBanner> selectByCommunityId(String nowTime);
+    ToBanner selectByCommunityId(@Param("bannerId") Integer bannerId, @Param("nowTime") String nowTime);
 
 }

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

@@ -0,0 +1,20 @@
+package com.community.huiju.dao;
+
+
+import com.community.huiju.model.TpActivity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TpActivityMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpActivity record);
+
+    int insertSelective(TpActivity record);
+
+    TpActivity selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpActivity record);
+
+    int updateByPrimaryKey(TpActivity record);
+}

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

@@ -0,0 +1,21 @@
+package com.community.huiju.dao;
+
+
+import com.community.huiju.model.TpAnnouncement;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface TpAnnouncementMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpAnnouncement record);
+
+    int insertSelective(TpAnnouncement record);
+
+    TpAnnouncement selectByPrimaryKey(@Param("id") Integer id, @Param("communityId") Integer communityId);
+
+    int updateByPrimaryKeySelective(TpAnnouncement record);
+
+    int updateByPrimaryKey(TpAnnouncement record);
+}

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

@@ -4,6 +4,7 @@ import com.community.huiju.model.TpMessage;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Map;
 
 @Mapper
@@ -20,5 +21,7 @@ public interface TpMessageMapper {
 
     int updateByPrimaryKey(TpMessage record);
     
-    Map<String, Object> getMessageTotal(@Param(value="userId") Integer userId);
+    Map<String, Object> getMessageTotal(@Param(value = "userId") Integer userId,@Param(value = "communityId") Integer communityId);
+    
+    List<TpMessage> getMessages(@Param(value = "userId") Integer userId,@Param(value = "communityId") Integer communityId, @Param(value = "modelType") Integer modelType);
 }

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

@@ -0,0 +1,185 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TpActivity {
+    private Integer id;
+
+    private Integer communityId;
+
+    private String activityTitle;
+
+    private String activityCarouselImg;
+
+    private String activityContent;
+
+    private Integer sort;
+
+    private Integer signUpCount;
+
+    private Integer signUpMax;
+
+    private Integer viewCount;
+
+    private Date registrationStartTime;
+
+    private Date registrationEndTime;
+
+    private Date activityStartTime;
+
+    private Date activityEndTime;
+
+    private String status;
+
+    private Integer createUser;
+
+    private Date createDate;
+
+    private Integer updateUser;
+
+    private Date updateDate;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public String getActivityTitle() {
+        return activityTitle;
+    }
+
+    public void setActivityTitle(String activityTitle) {
+        this.activityTitle = activityTitle == null ? null : activityTitle.trim();
+    }
+
+    public String getActivityCarouselImg() {
+        return activityCarouselImg;
+    }
+
+    public void setActivityCarouselImg(String activityCarouselImg) {
+        this.activityCarouselImg = activityCarouselImg == null ? null : activityCarouselImg.trim();
+    }
+
+    public String getActivityContent() {
+        return activityContent;
+    }
+
+    public void setActivityContent(String activityContent) {
+        this.activityContent = activityContent == null ? null : activityContent.trim();
+    }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
+    public Integer getSignUpCount() {
+        return signUpCount;
+    }
+
+    public void setSignUpCount(Integer signUpCount) {
+        this.signUpCount = signUpCount;
+    }
+
+    public Integer getSignUpMax() {
+        return signUpMax;
+    }
+
+    public void setSignUpMax(Integer signUpMax) {
+        this.signUpMax = signUpMax;
+    }
+
+    public Integer getViewCount() {
+        return viewCount;
+    }
+
+    public void setViewCount(Integer viewCount) {
+        this.viewCount = viewCount;
+    }
+
+    public Date getRegistrationStartTime() {
+        return registrationStartTime;
+    }
+
+    public void setRegistrationStartTime(Date registrationStartTime) {
+        this.registrationStartTime = registrationStartTime;
+    }
+
+    public Date getRegistrationEndTime() {
+        return registrationEndTime;
+    }
+
+    public void setRegistrationEndTime(Date registrationEndTime) {
+        this.registrationEndTime = registrationEndTime;
+    }
+
+    public Date getActivityStartTime() {
+        return activityStartTime;
+    }
+
+    public void setActivityStartTime(Date activityStartTime) {
+        this.activityStartTime = activityStartTime;
+    }
+
+    public Date getActivityEndTime() {
+        return activityEndTime;
+    }
+
+    public void setActivityEndTime(Date activityEndTime) {
+        this.activityEndTime = activityEndTime;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status == null ? null : status.trim();
+    }
+
+    public Integer getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Integer createUser) {
+        this.createUser = createUser;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Integer getUpdateUser() {
+        return updateUser;
+    }
+
+    public void setUpdateUser(Integer updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+}

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

@@ -0,0 +1,135 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TpAnnouncement {
+    private Integer id;
+
+    private Integer communityId;
+
+    private String announcementTitle;
+
+    private String announcementCarouselImg;
+
+    private String announcementContent;
+
+    private Integer sort;
+
+    private Integer viewCount;
+
+    private String setUpCarousel;
+
+    private String status;
+
+    private Integer createUser;
+
+    private Date createDate;
+
+    private Integer updateUser;
+
+    private Date updateDate;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public String getAnnouncementTitle() {
+        return announcementTitle;
+    }
+
+    public void setAnnouncementTitle(String announcementTitle) {
+        this.announcementTitle = announcementTitle == null ? null : announcementTitle.trim();
+    }
+
+    public String getAnnouncementCarouselImg() {
+        return announcementCarouselImg;
+    }
+
+    public void setAnnouncementCarouselImg(String announcementCarouselImg) {
+        this.announcementCarouselImg = announcementCarouselImg == null ? null : announcementCarouselImg.trim();
+    }
+
+    public String getAnnouncementContent() {
+        return announcementContent;
+    }
+
+    public void setAnnouncementContent(String announcementContent) {
+        this.announcementContent = announcementContent == null ? null : announcementContent.trim();
+    }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
+    public Integer getViewCount() {
+        return viewCount;
+    }
+
+    public void setViewCount(Integer viewCount) {
+        this.viewCount = viewCount;
+    }
+
+    public String getSetUpCarousel() {
+        return setUpCarousel;
+    }
+
+    public void setSetUpCarousel(String setUpCarousel) {
+        this.setUpCarousel = setUpCarousel == null ? null : setUpCarousel.trim();
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status == null ? null : status.trim();
+    }
+
+    public Integer getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Integer createUser) {
+        this.createUser = createUser;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Integer getUpdateUser() {
+        return updateUser;
+    }
+
+    public void setUpdateUser(Integer updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+}

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

@@ -11,6 +11,6 @@ import java.util.List;
  */
 public interface BannerServiceI {
 
-    List<ToBanner> viewBannerImg();
+    ToBanner viewBannerImg(Integer bannerId);
 
 }

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

@@ -1,7 +1,25 @@
 package com.community.huiju.service;
 
+import com.community.huiju.model.TpMessage;
+
+import java.util.List;
 import java.util.Map;
 
 public interface MessageServiceI {
-	Map<String, Object> getMessageTotal();
+	/**
+	 * 获取消息数量
+	 * @param communityId
+	 * @return
+	 */
+	Map<String, Object> getMessageTotal(Integer communityId);
+	
+	/**
+	 * 分页获取消息或待办
+	 * @param communityId
+	 * @param pageNum
+	 * @param pageSize
+	 * @param modelType
+	 * @return
+	 */
+	List<TpMessage> getMessages(Integer communityId, Integer pageNum, Integer pageSize,Integer modelType);
 }

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

@@ -0,0 +1,24 @@
+package com.community.huiju.service;
+
+import com.community.huiju.model.TpAnnouncement;
+import com.community.huiju.model.TpMessage;
+
+import java.util.List;
+
+/**
+ * @author weichaochao
+ * @Title: SocialServiceI
+ * @date 2018/10/23
+ */
+public interface SocialServiceI {
+    TpAnnouncement findAnnouncementDetail(Integer id, Integer communityId);
+	
+	/**
+	 * 分页获取活动列表
+	 * @param communityId
+	 * @param pageNum
+	 * @param pageSize
+	 * @return
+	 */
+	List<TpMessage> getAnnouncements(Integer communityId, Integer pageNum, Integer pageSize);
+}

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

@@ -0,0 +1,10 @@
+package com.community.huiju.service;
+
+/**
+ * @author weichaochao
+ * @Title: TpActivityServiceI
+ * @date 2018/10/23
+ */
+public interface TpActivityServiceI {
+
+}

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

@@ -21,8 +21,8 @@ public class BannerServiceImpl implements BannerServiceI {
     private ToBannerMapper toBannerMapper;
 
     @Override
-    public List<ToBanner> viewBannerImg() {
+    public ToBanner viewBannerImg(Integer bannerId) {
         String nowTime = DateUtils.getDate("yyyy-MM-dd");
-        return toBannerMapper.selectByCommunityId(nowTime);
+        return toBannerMapper.selectByCommunityId(bannerId, nowTime);
     }
 }

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

@@ -1,10 +1,13 @@
 package com.community.huiju.service.impl;
 
 import com.community.huiju.dao.TpMessageMapper;
+import com.community.huiju.model.TpMessage;
 import com.community.huiju.service.MessageServiceI;
+import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -17,9 +20,34 @@ public class MessageServiceImpl implements MessageServiceI {
 	@Autowired
 	private TpMessageMapper tpMessageMapper;
 	
+	/**
+	 * 获取消息数量
+	 * @param communityId
+	 * @return
+	 */
 	@Override
-	public Map<String, Object> getMessageTotal() {
+	public Map<String, Object> getMessageTotal(Integer communityId) {
 		Integer userId = 1;
-		return tpMessageMapper.getMessageTotal(userId);
+		return tpMessageMapper.getMessageTotal(userId,communityId);
+	}
+	
+	/**
+	 * 分页获取消息或待办
+	 * @param communityId
+	 * @param pageNum
+	 * @param pageSize
+	 * @param modelType
+	 * @return
+	 */
+	@Override
+	public List<TpMessage> getMessages(Integer communityId, Integer pageNum, Integer pageSize,Integer modelType) {
+		Integer userId = 1;
+		pageNum = null == pageNum ? 1 : pageNum;
+		pageSize = null == pageSize ? 10 : pageSize;
+		//使用分页插件
+		PageHelper.startPage(pageNum, pageSize);
+		// 获取数据
+		List<TpMessage> messageList = tpMessageMapper.getMessages(userId,communityId, modelType);
+		return messageList;
 	}
 }

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

@@ -0,0 +1,39 @@
+package com.community.huiju.service.impl;
+
+import com.community.huiju.dao.TpAnnouncementMapper;
+import com.community.huiju.model.TpAnnouncement;
+import com.community.huiju.model.TpMessage;
+import com.community.huiju.service.SocialServiceI;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author admin
+ * @Title: SocialServiceImpl
+ * @Description: TODO
+ * @date 2018/10/23
+ */
+@Service("SocialService")
+public class SocialServiceImpl implements SocialServiceI {
+    @Autowired
+    private TpAnnouncementMapper tpAnnouncementMapper;
+    @Override
+    public TpAnnouncement findAnnouncementDetail(Integer id, Integer communityId) {
+        return tpAnnouncementMapper.selectByPrimaryKey(id, communityId);
+    }
+    
+    /**
+     * 分页获取活动列表
+     * @param communityId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @Override
+    public List<TpMessage> getAnnouncements(Integer communityId, Integer pageNum, Integer pageSize) {
+        Integer userId = 1;
+        return null;
+    }
+}

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

@@ -0,0 +1,15 @@
+package com.community.huiju.service.impl;
+
+import com.community.huiju.service.TpActivityServiceI;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author admin
+ * @Title: TpActivityServiceImpl
+ * @Description: TODO
+ * @date 2018/10/23
+ */
+@Service("TpActivityService")
+public class TpActivityServiceImpl implements TpActivityServiceI {
+
+}

CODE/smart-community/app-api/src/main/resources/application.yml

@@ -6,4 +6,14 @@ management:
 ## Mybatis
 mybatis:
   typeAliasesPackage: com.community.huiju.model
-  mapperLocations: classpath:mapper/*.xml
+  mapperLocations: classpath:mapper/*.xml
+# 分页配置
+pagehelper:
+  helper-dialect: mysql
+  reasonable: true
+  support-methods-arguments: true
+  params: count=countSql
+# 打印sql
+logging:
+  level:
+    com.community.huiju.dao: debug

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

@@ -21,9 +21,9 @@
     id, community_id, banner_description, sort, banner_cover, banner_position, eff_time, 
     exp_time, banner_type, external_link, banner_title, banner_content, create_user, create_date
   </sql>
-  <select id="selectByCommunityId" resultMap="BaseResultMap" parameterType="java.lang.String">
+  <select id="selectByCommunityId" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List"></include>
-    from to_banner t where t.eff_time &lt; #{nowTime} and t.exp_time &gt; #{nowTime} order by t.sort, t.eff_time
+    from to_banner t where id = #{bannerId} and t.eff_time &lt; #{nowTime} and t.exp_time &gt; #{nowTime} order by t.sort, t.eff_time
   </select>
 </mapper>

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

@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.community.huiju.dao.TpActivityMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TpActivity" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <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="sort" property="sort" jdbcType="INTEGER" />
+    <result column="sign_up_count" property="signUpCount" jdbcType="INTEGER" />
+    <result column="sign_up_max" property="signUpMax" jdbcType="INTEGER" />
+    <result column="view_count" property="viewCount" jdbcType="INTEGER" />
+    <result column="registration_start_time" property="registrationStartTime" jdbcType="TIMESTAMP" />
+    <result column="registration_end_time" property="registrationEndTime" jdbcType="TIMESTAMP" />
+    <result column="activity_start_time" property="activityStartTime" jdbcType="TIMESTAMP" />
+    <result column="activity_end_time" property="activityEndTime" jdbcType="TIMESTAMP" />
+    <result column="status" property="status" jdbcType="CHAR" />
+    <result column="create_user" property="createUser" jdbcType="INTEGER" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+    <result column="update_user" property="updateUser" jdbcType="INTEGER" />
+    <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, activity_title, activity_carousel_img, activity_content, sort, 
+    sign_up_count, sign_up_max, view_count, registration_start_time, registration_end_time, 
+    activity_start_time, activity_end_time, status, create_user, create_date, update_user, 
+    update_date
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from tp_activity
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from tp_activity
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TpActivity" >
+    insert into tp_activity (id, community_id, activity_title, 
+      activity_carousel_img, activity_content, sort, 
+      sign_up_count, sign_up_max, view_count, 
+      registration_start_time, registration_end_time, 
+      activity_start_time, activity_end_time, 
+      status, create_user, create_date, 
+      update_user, update_date)
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{activityTitle,jdbcType=VARCHAR}, 
+      #{activityCarouselImg,jdbcType=VARCHAR}, #{activityContent,jdbcType=VARCHAR}, #{sort,jdbcType=INTEGER}, 
+      #{signUpCount,jdbcType=INTEGER}, #{signUpMax,jdbcType=INTEGER}, #{viewCount,jdbcType=INTEGER}, 
+      #{registrationStartTime,jdbcType=TIMESTAMP}, #{registrationEndTime,jdbcType=TIMESTAMP}, 
+      #{activityStartTime,jdbcType=TIMESTAMP}, #{activityEndTime,jdbcType=TIMESTAMP}, 
+      #{status,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, 
+      #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpActivity" >
+    insert into tp_activity
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="activityTitle != null" >
+        activity_title,
+      </if>
+      <if test="activityCarouselImg != null" >
+        activity_carousel_img,
+      </if>
+      <if test="activityContent != null" >
+        activity_content,
+      </if>
+      <if test="sort != null" >
+        sort,
+      </if>
+      <if test="signUpCount != null" >
+        sign_up_count,
+      </if>
+      <if test="signUpMax != null" >
+        sign_up_max,
+      </if>
+      <if test="viewCount != null" >
+        view_count,
+      </if>
+      <if test="registrationStartTime != null" >
+        registration_start_time,
+      </if>
+      <if test="registrationEndTime != null" >
+        registration_end_time,
+      </if>
+      <if test="activityStartTime != null" >
+        activity_start_time,
+      </if>
+      <if test="activityEndTime != null" >
+        activity_end_time,
+      </if>
+      <if test="status != null" >
+        status,
+      </if>
+      <if test="createUser != null" >
+        create_user,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+      <if test="updateUser != null" >
+        update_user,
+      </if>
+      <if test="updateDate != null" >
+        update_date,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null" >
+        #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="activityTitle != null" >
+        #{activityTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="activityCarouselImg != null" >
+        #{activityCarouselImg,jdbcType=VARCHAR},
+      </if>
+      <if test="activityContent != null" >
+        #{activityContent,jdbcType=VARCHAR},
+      </if>
+      <if test="sort != null" >
+        #{sort,jdbcType=INTEGER},
+      </if>
+      <if test="signUpCount != null" >
+        #{signUpCount,jdbcType=INTEGER},
+      </if>
+      <if test="signUpMax != null" >
+        #{signUpMax,jdbcType=INTEGER},
+      </if>
+      <if test="viewCount != null" >
+        #{viewCount,jdbcType=INTEGER},
+      </if>
+      <if test="registrationStartTime != null" >
+        #{registrationStartTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="registrationEndTime != null" >
+        #{registrationEndTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="activityStartTime != null" >
+        #{activityStartTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="activityEndTime != null" >
+        #{activityEndTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="status != null" >
+        #{status,jdbcType=CHAR},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        #{updateUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpActivity" >
+    update tp_activity
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="activityTitle != null" >
+        activity_title = #{activityTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="activityCarouselImg != null" >
+        activity_carousel_img = #{activityCarouselImg,jdbcType=VARCHAR},
+      </if>
+      <if test="activityContent != null" >
+        activity_content = #{activityContent,jdbcType=VARCHAR},
+      </if>
+      <if test="sort != null" >
+        sort = #{sort,jdbcType=INTEGER},
+      </if>
+      <if test="signUpCount != null" >
+        sign_up_count = #{signUpCount,jdbcType=INTEGER},
+      </if>
+      <if test="signUpMax != null" >
+        sign_up_max = #{signUpMax,jdbcType=INTEGER},
+      </if>
+      <if test="viewCount != null" >
+        view_count = #{viewCount,jdbcType=INTEGER},
+      </if>
+      <if test="registrationStartTime != null" >
+        registration_start_time = #{registrationStartTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="registrationEndTime != null" >
+        registration_end_time = #{registrationEndTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="activityStartTime != null" >
+        activity_start_time = #{activityStartTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="activityEndTime != null" >
+        activity_end_time = #{activityEndTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="status != null" >
+        status = #{status,jdbcType=CHAR},
+      </if>
+      <if test="createUser != null" >
+        create_user = #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        update_user = #{updateUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateDate != null" >
+        update_date = #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpActivity" >
+    update tp_activity
+    set community_id = #{communityId,jdbcType=INTEGER},
+      activity_title = #{activityTitle,jdbcType=VARCHAR},
+      activity_carousel_img = #{activityCarouselImg,jdbcType=VARCHAR},
+      activity_content = #{activityContent,jdbcType=VARCHAR},
+      sort = #{sort,jdbcType=INTEGER},
+      sign_up_count = #{signUpCount,jdbcType=INTEGER},
+      sign_up_max = #{signUpMax,jdbcType=INTEGER},
+      view_count = #{viewCount,jdbcType=INTEGER},
+      registration_start_time = #{registrationStartTime,jdbcType=TIMESTAMP},
+      registration_end_time = #{registrationEndTime,jdbcType=TIMESTAMP},
+      activity_start_time = #{activityStartTime,jdbcType=TIMESTAMP},
+      activity_end_time = #{activityEndTime,jdbcType=TIMESTAMP},
+      status = #{status,jdbcType=CHAR},
+      create_user = #{createUser,jdbcType=INTEGER},
+      create_date = #{createDate,jdbcType=TIMESTAMP},
+      update_user = #{updateUser,jdbcType=INTEGER},
+      update_date = #{updateDate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

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

@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.community.huiju.dao.TpAnnouncementMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TpAnnouncement" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <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="sort" property="sort" jdbcType="INTEGER" />
+    <result column="view_count" property="viewCount" jdbcType="INTEGER" />
+    <result column="set_up_carousel" property="setUpCarousel" jdbcType="CHAR" />
+    <result column="status" property="status" jdbcType="CHAR" />
+    <result column="create_user" property="createUser" jdbcType="INTEGER" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+    <result column="update_user" property="updateUser" jdbcType="INTEGER" />
+    <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, announcement_title, announcement_carousel_img, announcement_content, 
+    sort, view_count, set_up_carousel, status, create_user, create_date, update_user, 
+    update_date
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from tp_announcement
+    where id = #{id,jdbcType=INTEGER} and community_id = #{communityId,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from tp_announcement
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TpAnnouncement" >
+    insert into tp_announcement (id, community_id, announcement_title, 
+      announcement_carousel_img, announcement_content, 
+      sort, view_count, set_up_carousel, 
+      status, create_user, create_date, 
+      update_user, update_date)
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{announcementTitle,jdbcType=VARCHAR}, 
+      #{announcementCarouselImg,jdbcType=VARCHAR}, #{announcementContent,jdbcType=VARCHAR}, 
+      #{sort,jdbcType=INTEGER}, #{viewCount,jdbcType=INTEGER}, #{setUpCarousel,jdbcType=CHAR}, 
+      #{status,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, 
+      #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpAnnouncement" >
+    insert into tp_announcement
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="announcementTitle != null" >
+        announcement_title,
+      </if>
+      <if test="announcementCarouselImg != null" >
+        announcement_carousel_img,
+      </if>
+      <if test="announcementContent != null" >
+        announcement_content,
+      </if>
+      <if test="sort != null" >
+        sort,
+      </if>
+      <if test="viewCount != null" >
+        view_count,
+      </if>
+      <if test="setUpCarousel != null" >
+        set_up_carousel,
+      </if>
+      <if test="status != null" >
+        status,
+      </if>
+      <if test="createUser != null" >
+        create_user,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+      <if test="updateUser != null" >
+        update_user,
+      </if>
+      <if test="updateDate != null" >
+        update_date,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null" >
+        #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="announcementTitle != null" >
+        #{announcementTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="announcementCarouselImg != null" >
+        #{announcementCarouselImg,jdbcType=VARCHAR},
+      </if>
+      <if test="announcementContent != null" >
+        #{announcementContent,jdbcType=VARCHAR},
+      </if>
+      <if test="sort != null" >
+        #{sort,jdbcType=INTEGER},
+      </if>
+      <if test="viewCount != null" >
+        #{viewCount,jdbcType=INTEGER},
+      </if>
+      <if test="setUpCarousel != null" >
+        #{setUpCarousel,jdbcType=CHAR},
+      </if>
+      <if test="status != null" >
+        #{status,jdbcType=CHAR},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        #{updateUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpAnnouncement" >
+    update tp_announcement
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="announcementTitle != null" >
+        announcement_title = #{announcementTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="announcementCarouselImg != null" >
+        announcement_carousel_img = #{announcementCarouselImg,jdbcType=VARCHAR},
+      </if>
+      <if test="announcementContent != null" >
+        announcement_content = #{announcementContent,jdbcType=VARCHAR},
+      </if>
+      <if test="sort != null" >
+        sort = #{sort,jdbcType=INTEGER},
+      </if>
+      <if test="viewCount != null" >
+        view_count = #{viewCount,jdbcType=INTEGER},
+      </if>
+      <if test="setUpCarousel != null" >
+        set_up_carousel = #{setUpCarousel,jdbcType=CHAR},
+      </if>
+      <if test="status != null" >
+        status = #{status,jdbcType=CHAR},
+      </if>
+      <if test="createUser != null" >
+        create_user = #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        update_user = #{updateUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateDate != null" >
+        update_date = #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpAnnouncement" >
+    update tp_announcement
+    set community_id = #{communityId,jdbcType=INTEGER},
+      announcement_title = #{announcementTitle,jdbcType=VARCHAR},
+      announcement_carousel_img = #{announcementCarouselImg,jdbcType=VARCHAR},
+      announcement_content = #{announcementContent,jdbcType=VARCHAR},
+      sort = #{sort,jdbcType=INTEGER},
+      view_count = #{viewCount,jdbcType=INTEGER},
+      set_up_carousel = #{setUpCarousel,jdbcType=CHAR},
+      status = #{status,jdbcType=CHAR},
+      create_user = #{createUser,jdbcType=INTEGER},
+      create_date = #{createDate,jdbcType=TIMESTAMP},
+      update_user = #{updateUser,jdbcType=INTEGER},
+      update_date = #{updateDate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

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

@@ -233,7 +233,7 @@
     where id = #{id,jdbcType=INTEGER}
   </update>
 
-  <select id="getMessageTotal" resultType="map" parameterType="java.lang.Integer" >
+  <select id="getMessageTotal" resultType="map">
     SELECT
         count( CASE WHEN model_type = 1 AND read_status = 0 THEN 1 ELSE NULL END ) AS messageTotal,
         count( CASE WHEN model_type = 2 THEN 1 ELSE NULL END ) AS toDoTotal
@@ -241,8 +241,23 @@
         tp_message
     WHERE
         uuid_type = 1
+        AND community_id = #{communityId,jdbcType=INTEGER}
         AND uuid = #{userId,jdbcType=INTEGER}
         AND STATUS = 1
         AND advice_type = 1
   </select>
+
+  <select id="getMessages" resultMap="BaseResultMap">
+    SELECT
+      <include refid="Base_Column_List" />
+    FROM
+        tp_message
+    WHERE
+        uuid_type = 1
+        AND community_id = #{communityId,jdbcType=INTEGER}
+        AND uuid = #{userId,jdbcType=INTEGER}
+        AND STATUS = 1
+        AND advice_type = 1
+        AND model_type = #{modelType,jdbcType=INTEGER}
+  </select>
 </mapper>

CODE/smart-community/community-common/src/main/java/com/community/commom/constant/Constant.java

@@ -30,5 +30,10 @@ public class Constant {
     /** 本地緩存最大个数 **/
     public static final Long CACHE_SIZE = 1000L;
 
+    /** 住户APP端消息 **/
+    public static final Integer MODEL_TYPE_NEWS = 1;
+    
+    /** 住户APP端待办 **/
+    public static final Integer MODEL_TYPE_UPCOMING = 2;
 
 }