|
@@ -4,7 +4,7 @@ import com.alibaba.fastjson2.JSON;
|
|
|
import com.alibaba.fastjson2.JSONArray;
|
|
import com.alibaba.fastjson2.JSONArray;
|
|
|
import com.alibaba.fastjson2.JSONObject;
|
|
import com.alibaba.fastjson2.JSONObject;
|
|
|
import com.takai.ai.domain.TakaiSysOss;
|
|
import com.takai.ai.domain.TakaiSysOss;
|
|
|
-import com.takai.ai.domain.dto.TakaiDialogDetailReqDTO;
|
|
|
|
|
|
|
+import com.takai.ai.domain.dto.*;
|
|
|
import com.takai.ai.domain.entity.*;
|
|
import com.takai.ai.domain.entity.*;
|
|
|
import com.takai.ai.mapper.*;
|
|
import com.takai.ai.mapper.*;
|
|
|
import com.takai.ai.service.ITakaiAiService;
|
|
import com.takai.ai.service.ITakaiAiService;
|
|
@@ -14,9 +14,6 @@ import com.takai.common.annotation.DataSource;
|
|
|
import com.takai.common.config.DeepseekConfig;
|
|
import com.takai.common.config.DeepseekConfig;
|
|
|
import com.takai.common.core.redis.RedisCache;
|
|
import com.takai.common.core.redis.RedisCache;
|
|
|
import com.takai.common.enums.DataSourceType;
|
|
import com.takai.common.enums.DataSourceType;
|
|
|
-import com.takai.ai.domain.dto.TakaiDialogReqDTO;
|
|
|
|
|
-import com.takai.ai.domain.dto.TakaiDialogRespDTO;
|
|
|
|
|
-import com.takai.ai.domain.dto.TakaiQuestionDTO;
|
|
|
|
|
import com.takai.common.utils.StringUtils;
|
|
import com.takai.common.utils.StringUtils;
|
|
|
import com.takai.common.utils.uuid.IdUtils;
|
|
import com.takai.common.utils.uuid.IdUtils;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
@@ -26,6 +23,7 @@ import okhttp3.sse.EventSourceListener;
|
|
|
import okhttp3.sse.EventSources;
|
|
import okhttp3.sse.EventSources;
|
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
import org.slf4j.LoggerFactory;
|
|
|
|
|
+import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.data.redis.core.RedisTemplate;
|
|
import org.springframework.data.redis.core.RedisTemplate;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
@@ -345,6 +343,13 @@ public class TakaiAiServiceImpl implements ITakaiAiService {
|
|
|
@Override
|
|
@Override
|
|
|
public List<TakaiDialogRespDTO> getDialogDetail(String dialogId) {
|
|
public List<TakaiDialogRespDTO> getDialogDetail(String dialogId) {
|
|
|
List<TakaiDialogRespDTO> detail = takaiDialogMapper.selectDialogDetail(dialogId);
|
|
List<TakaiDialogRespDTO> detail = takaiDialogMapper.selectDialogDetail(dialogId);
|
|
|
|
|
+ if(detail != null && detail.size() != 0){
|
|
|
|
|
+ for(TakaiDialogRespDTO dto : detail){
|
|
|
|
|
+ if(StringUtils.isNotEmpty(dto.getSliceJson())){
|
|
|
|
|
+ dto.setSliceInfo(JSON.parseObject(dto.getSliceJson(), TakaiSliceInfoDTO.class));
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
return detail;
|
|
return detail;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -367,6 +372,7 @@ public class TakaiAiServiceImpl implements ITakaiAiService {
|
|
|
dto.setDialogId(dialogId);
|
|
dto.setDialogId(dialogId);
|
|
|
TakaiDialogRespDTO detail = takaiDialogMapper.selectDialogDetailById(dto.getId());
|
|
TakaiDialogRespDTO detail = takaiDialogMapper.selectDialogDetailById(dto.getId());
|
|
|
if (detail == null) {
|
|
if (detail == null) {
|
|
|
|
|
+ if (dto.getSliceInfo() != null) dto.setSliceJson(JSON.toJSONString(dto.getSliceInfo()));
|
|
|
takaiDialogMapper.insertDialogDetail(dto);
|
|
takaiDialogMapper.insertDialogDetail(dto);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|