From 5e6d8a91baa8e09505c1caffa50a5052e2e7b904 Mon Sep 17 00:00:00 2001
From: PQZ <pangqingzhou@gmail.com>
Date: Mon, 21 Jul 2025 10:23:36 +0800
Subject: [PATCH] 1

---
 .../com/ruoyi/base/controller/WebController.java |  1 -
 .../main/java/com/ruoyi/webSocket/Message.java   | 16 ++++++++++++----
 .../java/com/ruoyi/webSocket/MessageUtil.java    | 15 ++++++---------
 dl_vue/src/views/busi/chatMain/chatForm.vue      |  2 +-
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/WebController.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/WebController.java
index a9a05ef..abe3e71 100644
--- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/WebController.java
+++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/controller/WebController.java
@@ -329,7 +329,6 @@ 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 = "";
diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/webSocket/Message.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/webSocket/Message.java
index c0dcd25..1e99637 100644
--- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/webSocket/Message.java
+++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/webSocket/Message.java
@@ -7,8 +7,16 @@ 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 username;
+//    private String userface;
+//    private String text;
+//    private Date date;
+
+    /**发送方*/
+    private String dataFrom;
+    /**聊天内容*/
+    private String content;
+    /**创建时间*/
+    private Date createTime;
+
 }
diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/webSocket/MessageUtil.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/webSocket/MessageUtil.java
index 036e7a5..d911050 100644
--- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/webSocket/MessageUtil.java
+++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/webSocket/MessageUtil.java
@@ -10,17 +10,14 @@ public class MessageUtil {
 
     public Message toMessage(String content){
         Message message = new Message();
-        int id = atomicInteger.incrementAndGet();
-        message.setId(id);
         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());
-
+        String text=contents[1];
+        int id = atomicInteger.incrementAndGet();
+        message.setId(id);
+        message.setDataFrom(name);
+        message.setContent(text);
+        message.setCreateTime(new Date());
         return message;
     }
 }
diff --git a/dl_vue/src/views/busi/chatMain/chatForm.vue b/dl_vue/src/views/busi/chatMain/chatForm.vue
index e154551..126a107 100644
--- a/dl_vue/src/views/busi/chatMain/chatForm.vue
+++ b/dl_vue/src/views/busi/chatMain/chatForm.vue
@@ -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=='customer'" class="dl-customer-dom">
+        <div v-if="item.dataFrom==' '" class="dl-customer-dom">
           <div class="dl-customer-photo">
             <img src="@/assets/images/customer.jpg" >
           </div>