1
This commit is contained in:
parent
26d4bef142
commit
5e6d8a91ba
@ -329,7 +329,6 @@ public class WebController extends BaseController {
|
|||||||
* @param busiChatMain {@link BusiChatMain}
|
* @param busiChatMain {@link BusiChatMain}
|
||||||
* @return com.ruoyi.common.core.domain.AjaxResult
|
* @return com.ruoyi.common.core.domain.AjaxResult
|
||||||
**/
|
**/
|
||||||
@Log(title = "在线聊天", businessType = BusinessType.INSERT)
|
|
||||||
@PostMapping("/chatMain")
|
@PostMapping("/chatMain")
|
||||||
public AjaxResult saveChatMain(@RequestBody BusiChatMain busiChatMain, HttpServletRequest request) {
|
public AjaxResult saveChatMain(@RequestBody BusiChatMain busiChatMain, HttpServletRequest request) {
|
||||||
String ip = "";
|
String ip = "";
|
||||||
|
@ -7,8 +7,16 @@ import java.util.Date;
|
|||||||
@Data
|
@Data
|
||||||
public class Message {
|
public class Message {
|
||||||
private Integer id;
|
private Integer id;
|
||||||
private String username;
|
// private String username;
|
||||||
private String userface;
|
// private String userface;
|
||||||
private String text;
|
// private String text;
|
||||||
private Date date;
|
// private Date date;
|
||||||
|
|
||||||
|
/**发送方*/
|
||||||
|
private String dataFrom;
|
||||||
|
/**聊天内容*/
|
||||||
|
private String content;
|
||||||
|
/**创建时间*/
|
||||||
|
private Date createTime;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -10,17 +10,14 @@ public class MessageUtil {
|
|||||||
|
|
||||||
public Message toMessage(String content){
|
public Message toMessage(String content){
|
||||||
Message message = new Message();
|
Message message = new Message();
|
||||||
int id = atomicInteger.incrementAndGet();
|
|
||||||
message.setId(id);
|
|
||||||
String[] contents=content.split(",");
|
String[] contents=content.split(",");
|
||||||
String name=contents[0];
|
String name=contents[0];
|
||||||
String userface=contents[1];
|
String text=contents[1];
|
||||||
String text=contents[2];
|
int id = atomicInteger.incrementAndGet();
|
||||||
message.setUsername(name);
|
message.setId(id);
|
||||||
message.setUserface(userface);
|
message.setDataFrom(name);
|
||||||
message.setText(text);
|
message.setContent(text);
|
||||||
message.setDate(new Date());
|
message.setCreateTime(new Date());
|
||||||
|
|
||||||
return message;
|
return message;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
|
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
|
||||||
<div class="dl-chat-box" v-infinite-scroll="nextPage" >
|
<div class="dl-chat-box" v-infinite-scroll="nextPage" >
|
||||||
<template v-for="(item,index) in chatItemList">
|
<template v-for="(item,index) in chatItemList">
|
||||||
<div v-if="item.dataFrom=='customer'" class="dl-customer-dom">
|
<div v-if="item.dataFrom==' '" class="dl-customer-dom">
|
||||||
<div class="dl-customer-photo">
|
<div class="dl-customer-photo">
|
||||||
<img src="@/assets/images/customer.jpg" >
|
<img src="@/assets/images/customer.jpg" >
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
Reference in New Issue
Block a user