|
@@ -50,6 +50,56 @@ public class TimeMessageController {
|
|
return RestResponse.success(messageBO);
|
|
return RestResponse.success(messageBO);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 系统消息列表
|
|
|
|
+ *
|
|
|
|
+ * @param messageVo 分页数据的请求对象
|
|
|
|
+ * @return 带已读,未读条数的分页列表
|
|
|
|
+ */
|
|
|
|
+ @PostMapping("systemList")
|
|
|
|
+ public RestResponse<MessageBO> systemList(@RequestBody MessageVo messageVo) {
|
|
|
|
+ IPage<TimeMessage> page = new Page<>(messageVo.getPageNum(), messageVo.getPageSize());
|
|
|
|
+ IPage<TimeMessage> result = timeMessageService.page(page, Wrappers.<TimeMessage>query()
|
|
|
|
+ .eq(messageVo.getUserId() != null, "user_id", messageVo.getUserId())
|
|
|
|
+ .eq( "type", 0)
|
|
|
|
+ .notIn("device_model", ApiConstants.DeviceModel.PC)
|
|
|
|
+ .orderByAsc("view_flag")
|
|
|
|
+ .orderByDesc("create_time"));
|
|
|
|
+ MessageBO messageBO = MessageBO.pageCastMessageBo(result);
|
|
|
|
+ messageBO.setReadCount((long) timeMessageService.count(Wrappers.<TimeMessage>query()
|
|
|
|
+ .eq(messageVo.getUserId() != null, "user_id", messageVo.getUserId())
|
|
|
|
+ .eq("view_flag", 1)
|
|
|
|
+ .eq("type", 0)
|
|
|
|
+ .notIn("device_model", ApiConstants.DeviceModel.PC)));
|
|
|
|
+ messageBO.setUnreadCount(messageBO.getTotal() - messageBO.getReadCount());
|
|
|
|
+ return RestResponse.success(messageBO);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * 通知消息列表
|
|
|
|
+ *
|
|
|
|
+ * @param messageVo 分页数据的请求对象
|
|
|
|
+ * @return 带已读,未读条数的分页列表
|
|
|
|
+ */
|
|
|
|
+ @PostMapping("noticeList")
|
|
|
|
+ public RestResponse<MessageBO> noticeList(@RequestBody MessageVo messageVo) {
|
|
|
|
+ IPage<TimeMessage> page = new Page<>(messageVo.getPageNum(), messageVo.getPageSize());
|
|
|
|
+ IPage<TimeMessage> result = timeMessageService.page(page, Wrappers.<TimeMessage>query()
|
|
|
|
+ .eq(messageVo.getUserId() != null, "user_id", messageVo.getUserId())
|
|
|
|
+ .notIn("type", 0)
|
|
|
|
+ .notIn("device_model", ApiConstants.DeviceModel.PC)
|
|
|
|
+ .orderByAsc("view_flag")
|
|
|
|
+ .orderByDesc("create_time"));
|
|
|
|
+ MessageBO messageBO = MessageBO.pageCastMessageBo(result);
|
|
|
|
+ messageBO.setReadCount((long) timeMessageService.count(Wrappers.<TimeMessage>query()
|
|
|
|
+ .eq(messageVo.getUserId() != null, "user_id", messageVo.getUserId())
|
|
|
|
+ .eq("view_flag", 1)
|
|
|
|
+ .notIn("type", 0)
|
|
|
|
+ .notIn("device_model", ApiConstants.DeviceModel.PC)));
|
|
|
|
+ messageBO.setUnreadCount(messageBO.getTotal() - messageBO.getReadCount());
|
|
|
|
+ return RestResponse.success(messageBO);
|
|
|
|
+ }
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* @param messageVo 分页功能的请求对象
|
|
* @param messageVo 分页功能的请求对象
|
|
* @return 一条消息详情
|
|
* @return 一条消息详情
|