Compare commits

..

No commits in common. "89637eed97cc993df2653c11c08b2679b0ee0c26" and "374d079e334b7c1b6aab764233c0d497799cd701" have entirely different histories.

4 changed files with 15 additions and 19 deletions

View File

@ -337,6 +337,7 @@ public class WebController extends BaseController {
* @param busiChatMain {@link BusiChatMain}
* @return com.ruoyi.common.core.domain.AjaxResult
**/
@Log(title = "在线聊天", businessType = BusinessType.INSERT)
@PostMapping("/chatMain")
public AjaxResult saveChatMain(@RequestBody BusiChatMain busiChatMain, HttpServletRequest request) {
String ip = "";

View File

@ -7,16 +7,8 @@ import java.util.Date;
@Data
public class Message {
private Integer id;
// private String username;
// private String userface;
// private String text;
// private Date date;
/**发送方*/
private String dataFrom;
/**聊天内容*/
private String content;
/**创建时间*/
private Date createTime;
private String username;
private String userface;
private String text;
private Date date;
}

View File

@ -10,14 +10,17 @@ public class MessageUtil {
public Message toMessage(String content){
Message message = new Message();
String[] contents=content.split(",");
String name=contents[0];
String text=contents[1];
int id = atomicInteger.incrementAndGet();
message.setId(id);
message.setDataFrom(name);
message.setContent(text);
message.setCreateTime(new Date());
String[] contents=content.split(",");
String name=contents[0];
String userface=contents[1];
String text=contents[2];
message.setUsername(name);
message.setUserface(userface);
message.setText(text);
message.setDate(new Date());
return message;
}
}

View File

@ -3,7 +3,7 @@
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<div class="dl-chat-box" v-infinite-scroll="nextPage" >
<template v-for="(item,index) in chatItemList">
<div v-if="item.dataFrom==' '" class="dl-customer-dom">
<div v-if="item.dataFrom=='customer'" class="dl-customer-dom">
<div class="dl-customer-photo">
<img src="@/assets/images/customer.jpg" >
</div>