dianliang/dl_site_system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: dianliang:89637eed97cc993df2653c11c08b2679b0ee0c26
Branches Tags
dianliang:master
dianliang:dev
..
compare: dianliang:374d079e334b7c1b6aab764233c0d497799cd701
Branches Tags
dianliang:master
dianliang:dev

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

4 changed files with 15 additions and 19 deletions
Show Stats Expand all files Collapse all files

1
dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/WebController.java
View File

@ -337,6 +337,7 @@ 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 = "";

16
dl_admin/ruoyi-admin/src/main/java/com/ruoyi/webSocket/Message.java
View File

@ -7,16 +7,8 @@ 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;
} }

15
dl_admin/ruoyi-admin/src/main/java/com/ruoyi/webSocket/MessageUtil.java
View File

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

2
dl_vue/src/views/busi/chatMain/chatForm.vue
View File

@ -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==' '" class="dl-customer-dom"> <div v-if="item.dataFrom=='customer'" 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>