diff --git a/chat-server/src/main/java/com/bjtds/brichat/mapper/postgresql/DifyDatasetsMapper.java b/chat-server/src/main/java/com/bjtds/brichat/mapper/postgresql/DifyDatasetsMapper.java index 693c3f2..66a90f4 100644 --- a/chat-server/src/main/java/com/bjtds/brichat/mapper/postgresql/DifyDatasetsMapper.java +++ b/chat-server/src/main/java/com/bjtds/brichat/mapper/postgresql/DifyDatasetsMapper.java @@ -20,4 +20,5 @@ public interface DifyDatasetsMapper { void updateDataset(DatasetUpdateReq datasetUpdateReq); + String getDatasetNameById(String name); } diff --git a/chat-server/src/main/java/com/bjtds/brichat/service/dify/impl/DifyDatasetApiServiceImpl.java b/chat-server/src/main/java/com/bjtds/brichat/service/dify/impl/DifyDatasetApiServiceImpl.java index 86666b1..3905010 100644 --- a/chat-server/src/main/java/com/bjtds/brichat/service/dify/impl/DifyDatasetApiServiceImpl.java +++ b/chat-server/src/main/java/com/bjtds/brichat/service/dify/impl/DifyDatasetApiServiceImpl.java @@ -6,6 +6,7 @@ import com.bjtds.brichat.entity.dify.DatasetDto; import com.bjtds.brichat.entity.dify.DifyDatasetResponse; import com.bjtds.brichat.entity.dto.PdfConversionResponse; import com.bjtds.brichat.entity.dto.PdfTaskDto; +import com.bjtds.brichat.mapper.postgresql.DifyDatasetsMapper; import com.bjtds.brichat.service.dify.DifyDatasetApiService; import com.bjtds.brichat.util.Constants; import com.fasterxml.jackson.core.JsonProcessingException; @@ -74,6 +75,9 @@ public class DifyDatasetApiServiceImpl implements DifyDatasetApiService { @Value("${pdf.conversion.service.max-workers}") private Integer pdfConversionMaxWorkers; + @Resource + private DifyDatasetsMapper difyDatasetsMapper; + @Override public ResponseEntity createDataset(String name, String description) { // 1. 设置请求URL @@ -192,11 +196,10 @@ public class DifyDatasetApiServiceImpl implements DifyDatasetApiService { // 0.0, // 初始化进度为0% // request.getDatasetId() // ); - DatasetInfoRequest datasetInfoRequest = new DatasetInfoRequest(); - datasetInfoRequest.setDatasetId(request.getDatasetId()); - DatasetInfoResponse datasetInfo = difyDatasetService.info(datasetInfoRequest); - String datasetName = datasetInfo.getName(); + + + String datasetName = difyDatasetsMapper.getDatasetNameById(request.getDatasetId()); request.setDeepAnalysis(false); diff --git a/chat-server/src/main/java/com/bjtds/brichat/service/impl/MarkdownServiceImpl.java b/chat-server/src/main/java/com/bjtds/brichat/service/impl/MarkdownServiceImpl.java index 9eedbf0..49bfbd1 100644 --- a/chat-server/src/main/java/com/bjtds/brichat/service/impl/MarkdownServiceImpl.java +++ b/chat-server/src/main/java/com/bjtds/brichat/service/impl/MarkdownServiceImpl.java @@ -2,8 +2,7 @@ package com.bjtds.brichat.service.impl; import com.bjtds.brichat.service.MarkdownService; import com.bjtds.brichat.util.FuzzyMatcher; -import com.itextpdf.text.pdf.parser.clipper.Path; -import com.sun.xml.internal.ws.policy.privateutil.PolicyUtils; + import java.io.File; import org.springframework.stereotype.Service; @@ -11,7 +10,7 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Paths; -import java.nio.file.StandardCopyOption; + import java.nio.file.StandardOpenOption; import java.util.ArrayList; import java.util.List; diff --git a/chat-server/src/main/resources/com/bjtds/brichat/mapper/postgresql/DifyDatasetMapper.xml b/chat-server/src/main/resources/com/bjtds/brichat/mapper/postgresql/DifyDatasetMapper.xml index 5975c64..97a5040 100644 --- a/chat-server/src/main/resources/com/bjtds/brichat/mapper/postgresql/DifyDatasetMapper.xml +++ b/chat-server/src/main/resources/com/bjtds/brichat/mapper/postgresql/DifyDatasetMapper.xml @@ -43,4 +43,8 @@ select id,tenant_id,name,description,created_by,created_at, updated_at from datasets ORDER BY created_at DESC + + \ No newline at end of file