dcs hace 1 día
padre
commit
f23e16e6c9

+ 2 - 4
virgo.api/src/main/java/com/bosshand/virgo/api/workark/controller/DifyController.java

@@ -214,13 +214,12 @@ public class DifyController {
     @RequestMapping(value = "/dataset", method = RequestMethod.POST)
     public Response createDataset(@RequestBody DifyDataset difyDataset) {
         try {
-            difyDatasetService.createDataset(difyDataset);
+            return Response.ok(difyDatasetService.createDataset(difyDataset));
         } catch (IOException e) {
             return Response.fail(Constant.CODE_BAD_REQUEST, e.getMessage());
         } catch (DifyApiException e) {
             return Response.fail(Constant.CODE_BAD_REQUEST, e.getMessage());
         }
-        return Response.ok();
     }
 
     @ApiOperation("删除知识库")
@@ -292,8 +291,7 @@ public class DifyController {
             return Response.fail(Constant.CODE_BAD_REQUEST, "文件大小不能超过15MB");
         }
         try {
-            difyDatasetService.uploadFileToDataset(datasetId, file);
-            return Response.ok();
+            return Response.ok(difyDatasetService.uploadFileToDataset(datasetId, file));
         } catch (IOException e) {
             return Response.fail(Constant.CODE_BAD_REQUEST, Constant.RET_INPUT_ERROR);
         }

+ 4 - 2
virgo.api/src/main/java/com/bosshand/virgo/api/workark/service/DifyDatasetService.java

@@ -58,7 +58,7 @@ public class DifyDatasetService {
     /**
      * 创建知识库
      */
-    public void createDataset(DifyDataset difyDataset) throws IOException, DifyApiException {
+    public String createDataset(DifyDataset difyDataset) throws IOException, DifyApiException {
         // 创建知识库请求
         CreateDatasetRequest request = CreateDatasetRequest.builder()
                 .name(difyDataset.getName())
@@ -70,6 +70,7 @@ public class DifyDatasetService {
         DatasetResponse response = getClient().createDataset(request);
         difyDataset.setDatasetId(response.getId());
         difyDatasetDao.save(difyDataset);
+        return response.getId();
     }
 
     /**
@@ -270,7 +271,7 @@ public class DifyDatasetService {
         }
     }
 
-    public void uploadFileToDataset(String datasetId, MultipartFile multipartFile) throws IOException {
+    public String uploadFileToDataset(String datasetId, MultipartFile multipartFile) throws IOException {
         String apiUrl = "http://203.110.233.149:80/v1/datasets/{dataset_id}/document/create-by-file";
         String response = uploadFile(apiUrl, "dataset-SWjJp6FOFqT85n7KxxyCFPSS", datasetId, multipartFile);
         DocumentResponse documentResponse = JSONObject.parseObject(response, DocumentResponse.class);
@@ -281,6 +282,7 @@ public class DifyDatasetService {
         difyDatasetDocument.setDocumentId(documentId);
         difyDatasetDocument.setName(multipartFile.getOriginalFilename());
         difyDatasetDocumentDao.save(difyDatasetDocument);
+        return documentId;
     }
 
     public String retrieve(String apiUrl, String apiKey, String datasetId, String json) throws IOException {