合并本地分支

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

@@ -3,8 +3,6 @@ package com.community.huiju.controller;
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
-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;
@@ -19,7 +17,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpSession;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -66,14 +63,12 @@ public class MessageController extends BaseController {
 		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
 		Integer userId = userElement.getId();
 		ResponseBean responseBean = new ResponseBean();
-
 		if (!check(communityId)) {
 			responseBean.addError("小区不存在");
 			return responseBean;
 		}
-
-		List<TpMessage> newsList = messageService.getMessages(communityId,pageNum,pageSize, Constant.MODEL_TYPE_NEWS, userId);
-		responseBean.addSuccess(newsList);
+		Map<String,Object> map = messageService.getMessages(communityId,pageNum,pageSize, Constant.MODEL_TYPE_NEWS, userId);
+		responseBean.addSuccess(map);
 		return responseBean;
 	}
 	
@@ -89,14 +84,13 @@ public class MessageController extends BaseController {
 		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
 		Integer userId = userElement.getId();
 		ResponseBean responseBean = new ResponseBean();
-
+		
 		if (!check(communityId)) {
 			responseBean.addError("小区不存在");
 			return responseBean;
 		}
-
-		List<TpMessage> upcomingList = messageService.getMessages(communityId,pageNum,pageSize,Constant.MODEL_TYPE_UPCOMING, userId);
-		responseBean.addSuccess(upcomingList);
+		Map<String,Object> map = messageService.getMessages(communityId,pageNum,pageSize,Constant.MODEL_TYPE_UPCOMING, userId);
+		responseBean.addSuccess(map);
 		return responseBean;
 	}
 

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

@@ -1,8 +1,5 @@
 package com.community.huiju.service;
 
-import com.community.huiju.model.TpMessage;
-
-import java.util.List;
 import java.util.Map;
 
 public interface MessageServiceI {
@@ -21,7 +18,7 @@ public interface MessageServiceI {
 	 * @param modelType
 	 * @return
 	 */
-	List<TpMessage> getMessages(Integer communityId, Integer pageNum, Integer pageSize,Integer modelType, Integer userId);
+	Map<String,Object> getMessages(Integer communityId, Integer pageNum, Integer pageSize,Integer modelType, Integer userId);
 
 	/**
 	 * 全部已读

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

@@ -3,11 +3,12 @@ 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.Page;
 import com.github.pagehelper.PageHelper;
-import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -40,12 +41,15 @@ public class MessageServiceImpl implements MessageServiceI {
 	 * @return
 	 */
 	@Override
-	public List<TpMessage> getMessages(Integer communityId, Integer pageNum, Integer pageSize,Integer modelType, Integer userId) {
+	public Map<String,Object> getMessages(Integer communityId, Integer pageNum, Integer pageSize,Integer modelType, Integer userId) {
 		//使用分页插件
-		PageHelper.startPage(pageNum, pageSize);
+		Page page = PageHelper.startPage(pageNum, pageSize);
 		// 获取数据
 		List<TpMessage> messageList = tpMessageMapper.getMessages(userId,communityId, modelType);
-		return messageList;
+		Map<String,Object> map = new HashMap<>();
+		map.put("list",messageList);
+		map.put("total",page.getTotal());
+		return map;
 	}
 
 	/**