|
|
@@ -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();
|
|
|
}
|
|
|
}
|