Просмотр исходного кода

[task-1451] 新首页开发 / 首页消息接口调整

Li Yuan 2 лет назад
Родитель
Сommit
90649fa577

+ 2 - 1
ibps-comp-base-root/modules/comp-message-server-api/src/main/java/com/lc/ibps/message/server/api/IInnerMessageService.java

@@ -69,7 +69,8 @@ public interface IInnerMessageService {
 	 * @return
 	 */
 	@RequestMapping(value = "/msgList", method = RequestMethod.GET)
-	public APIResult<APIPageList<InnerMessagePo>> msgList();
+	public APIResult<APIPageList<InnerMessagePo>> msgList(
+			@RequestParam(name = "status", required = false , defaultValue = "0") int status );
 
 
 	// 系统首页消息提示查询修改

+ 7 - 4
ibps-comp-root/modules/comp-message-server/src/main/java/com/lc/ibps/cloud/message/provider/InnerMessageProvider.java

@@ -196,9 +196,11 @@ public class InnerMessageProvider  extends GenericProvider implements IInnerMess
 		return result;
 	}
 
-	@ApiOperation(value = "获取未读消息列表", notes = "获取未读消息列表")
+	@ApiOperation(value = "获取指定类型消息列表", notes = "获取指定类型消息列表")
 	@Override
-	public APIResult<APIPageList<InnerMessagePo>> msgList() {
+	public APIResult<APIPageList<InnerMessagePo>> msgList(
+			@ApiParam(name = "status", value = "获取消息列表,status: 0=未读,1=已读,2=所有", required = false, defaultValue = "0")
+			@RequestParam(name = "status", required = false , defaultValue = "0") int status ) {
 		APIResult<APIPageList<InnerMessagePo>> result = new APIResult<>();
 		logger.debug("com.lc.ibps.message.provider.InnerMessageProvider.msgList()--->");
 		try {
@@ -206,7 +208,8 @@ public class InnerMessageProvider  extends GenericProvider implements IInnerMess
 			page.setPage(1);
 			page.setLimit(10);
 			Map<String,Object> params =  new HashMap<String,Object>();		
-			params.put("isRead", InnerMessagePo.IS_NOT_READ);
+//			params.put("isRead", InnerMessagePo.IS_NOT_READ);
+			params.put("isRead", status);
 			List<InnerMessagePo> messageList = innerMessageRepository.queryMsgByUserId(ContextUtil.getCurrentUserId(), params, page);
 			List<InnerMessagePo> mess =innerMessageRepository.findByPosition(ContextUtil.getCurrentUserId());
 			messageList.addAll(mess);
@@ -215,7 +218,7 @@ public class InnerMessageProvider  extends GenericProvider implements IInnerMess
 			}
 			APIPageList<InnerMessagePo> resultData = getAPIPageList(messageList);
 			result.setData(resultData);
-			result.setMessage("获取未读消息列表成功!");
+			result.setMessage("获取消息列表成功!");
 		} catch (Exception e) {
 			setExceptionResult(result, StateEnum.ERROR_INNER_MESSAGE.getCode(), StateEnum.ERROR_INNER_MESSAGE.getText(), e);
 		}