wks 2 лет назад
Родитель
Сommit
efde2ec953

+ 3 - 3
src/main/java/com/ydtech/modules/customer/controller/CustomerController.java

@@ -4,6 +4,7 @@ package com.ydtech.modules.customer.controller;
 import com.ydtech.aop.request.RequestSingleParam;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.customer.entity.po.CusChatMessages;
+import com.ydtech.modules.customer.entity.vo.ReturnMessageVo;
 import com.ydtech.modules.customer.service.CustomerService;
 import io.swagger.annotations.Api;
 import lombok.RequiredArgsConstructor;
@@ -22,12 +23,11 @@ public class CustomerController {
     private final CustomerService customerService;
 
     @PostMapping("/ai/sendMessage")
-    public HttpResult<String> sendMessage(@RequestSingleParam(value = "message") String message) {
-        String resultMessage = customerService.sendMessage(message);
+    public HttpResult<ReturnMessageVo> sendMessage(@RequestSingleParam(value = "message") String message) {
+        ReturnMessageVo resultMessage = customerService.sendMessage(message);
         return HttpResult.ok(resultMessage);
     }
 
-
     @PostMapping("/ai/queryMessage")
     public HttpResult<List<CusChatMessages>> queryMessage() {
         List<CusChatMessages> list = customerService.queryMessage();

+ 32 - 0
src/main/java/com/ydtech/modules/customer/entity/vo/ReturnMessageVo.java

@@ -0,0 +1,32 @@
+package com.ydtech.modules.customer.entity.vo;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ReturnMessageVo implements Serializable {
+
+    private static final long serialVersionUID = -2521321774624902217L;
+
+    @ApiModelProperty(value = "消息")
+    private String message;
+
+    @ApiModelProperty(value = "时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date date;
+
+    public ReturnMessageVo(String message) {
+        this.message = message;
+        this.date = new Date();
+    }
+}

+ 3 - 2
src/main/java/com/ydtech/modules/customer/service/CustomerService.java

@@ -1,6 +1,7 @@
 package com.ydtech.modules.customer.service;
 
 import com.ydtech.modules.customer.entity.po.CusChatMessages;
+import com.ydtech.modules.customer.entity.vo.ReturnMessageVo;
 
 import java.util.List;
 
@@ -12,10 +13,10 @@ public interface CustomerService {
      * @param message 消息
      * @return
      */
-    String sendMessage(String message);
+    ReturnMessageVo sendMessage(String message);
 
     /**
-     * 获取
+     * 获取消息
      * @return
      */
     List<CusChatMessages> queryMessage();

+ 6 - 8
src/main/java/com/ydtech/modules/customer/service/impl/CustomerServiceImpl.java

@@ -1,12 +1,14 @@
 package com.ydtech.modules.customer.service.impl;
 
-import cn.hutool.core.util.ArrayUtil;
+
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.constants.GroupType;
 import com.ydtech.modules.customer.components.CustomerComponents;
 import com.ydtech.modules.customer.entity.po.CusChatMessages;
 import com.ydtech.modules.customer.service.CusChatMessagesService;
 import com.ydtech.modules.customer.service.CustomerService;
+import com.ydtech.modules.customer.entity.vo.ReturnMessageVo;
+
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -25,7 +27,7 @@ public class CustomerServiceImpl implements CustomerService {
 
     @Override
     @Transactional
-    public String sendMessage(String message) {
+    public ReturnMessageVo sendMessage(String message) {
         String userId = BaseController.getUserId();
         List<CusChatMessages> list = new ArrayList<>();
         CusChatMessages toMessage = CusChatMessages.toAiMessage(userId, message);
@@ -33,18 +35,14 @@ public class CustomerServiceImpl implements CustomerService {
         CusChatMessages receptionMessages = CusChatMessages.receptionAiMessage(userId, message);
         Collections.addAll(list, toMessage, receptionMessages);
         cusChatMessagesService.saveBatch(list);
-        return s;
+        return new ReturnMessageVo(s);
     }
 
 
     @Override
     public List<CusChatMessages> queryMessage() {
         String userId = BaseController.getUserId();
-        cusChatMessagesService
-                .lambdaQuery()
-                .eq(CusChatMessages::getGroupType, GroupType.GT_1.getCode())
-                .and(x -> x.eq(CusChatMessages::getToUserId, userId).or().eq(CusChatMessages::getFromUserId, userId))
-                .orderByDesc(CusChatMessages::getCreatedAt);
+        cusChatMessagesService.lambdaQuery().eq(CusChatMessages::getGroupType, GroupType.GT_1.getCode()).and(x -> x.eq(CusChatMessages::getToUserId, userId).or().eq(CusChatMessages::getFromUserId, userId)).orderByDesc(CusChatMessages::getCreatedAt);
         return Collections.emptyList();
     }
 }