message list 分页

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,17 +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.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/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/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/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/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/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/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

@@ -23,6 +23,10 @@ public class Constant {
 
     /** 请求发送验证码的远程服务器地址 **/
     public static final String REQUEST_URL = "http://micservice.ycjcjy.com/sms";
-
-
+    
+    /** 住户APP端消息 **/
+    public static final Integer MODEL_TYPE_NEWS = 1;
+    
+    /** 住户APP端待办 **/
+    public static final Integer MODEL_TYPE_UPCOMING = 2;
 }