@@ -44,4 +44,6 @@ public class QuanNewsReq extends QuanNews {
* 点赞的用户id
*/
private Long userId;
+
+ private String title;
}
@@ -15,6 +15,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.AllArgsConstructor;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.client.RestTemplate;
@@ -60,12 +61,13 @@ public class QuanNewsServiceImpl extends ServiceImpl<QuanNewsMapper, QuanNews> i
/**
* 获取更多新闻
- * @param request
+ * @param quanNews
* @return
public RestResponse getMoreNewsList(QuanNewsReq quanNews) {
Page<QuanNews> page = new Page<>(quanNews.getPageNum(), quanNews.getPageSize());
IPage<QuanNews> news = this.page(page, Wrappers.<QuanNews>query()
+ .like(!StringUtils.isEmpty(quanNews.getTitle()),"title", quanNews.getTitle())
.orderByDesc("is_top")
.orderByAsc("top_serial")
.orderByDesc("release_date"));
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import cn.com.ty.lift.ud.redis.RedisUtils;
+import com.alibaba.fastjson.JSONObject;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -52,10 +53,9 @@ public class ChatMsgServiceImpl extends ServiceImpl<ChatMsgMapper, ChatMsgEntity
// List list2 = redis.get("ALLCHATS:" + req.getSessionid(), List.class);
List<String> list2 = redis.lRange("ALLCHATS:" + req.getSessionid(), 0, -1);
if (list2 != null) {
- for (Object i : list2) {
- ObjectMapper objectMapper = new ObjectMapper();
- IMMessage convertValue = objectMapper.convertValue(i, IMMessage.class);
- data.add(convertValue);
+ for (Object msgStr : list2) {
+ IMMessage imMessage = JSONObject.parseObject(msgStr.toString(), IMMessage.class);
+ data.add(imMessage);
@@ -66,4 +66,20 @@ public class IMMessage {
this.type = StringUtils.isNotBlank(type) == true ? Integer.parseInt(type) : 1;
+ public IMMessage(String addr, String cmd, long time, int online, String name, String avatarUrl, String userId, String receiver, String msg, Integer type, Integer dura, String fromUser, String sessionid, int dataTable) {
+ this.addr = addr;
+ this.cmd = cmd;
+ this.time = time;
+ this.online = online;
+ this.name = name;
+ this.avatarUrl = avatarUrl;
+ this.userId = userId;
+ this.receiver = receiver;
+ this.msg = msg;
+ this.type = null == type ? type : 1;
+ this.dura = dura;
+ this.fromUser = fromUser;
+ this.sessionid = sessionid;
+ this.dataTable = dataTable;
+ }