标注库功能的代码

PAS/src/main/java/cn/cslg/pas/common/model/dto/FMSDeleteFileDTO.java

@@ -1,23 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * 调用FMS系统删除文件接口
- * @Author xiexiang
- * @Date 2023/8/14
- */
-@Data
-public class FMSDeleteFileDTO {
-    /**
-     * 需删除的ids
-     */
-    private List<Integer> ids;
-
-    /**
-     * 删除类型
-     */
-    private Integer type;
-}

PAS/src/main/java/cn/cslg/pas/controller/ScratchWordsController.java

@@ -1,9 +1,8 @@
 package cn.cslg.pas.controller;
 
 import cn.cslg.pas.common.core.base.Constants;
-import cn.cslg.pas.common.model.dto.SWQueryDTO;
-import cn.cslg.pas.common.model.dto.ScratchWordsDTO;
-import cn.cslg.pas.common.model.dto.ScratchWordsUpdateDTO;
+import cn.cslg.pas.common.model.dto.*;
+import cn.cslg.pas.common.model.vo.PageVO;
 import cn.cslg.pas.common.model.vo.ScratchWordsVO;
 import cn.cslg.pas.common.utils.*;
 import cn.cslg.pas.common.utils.auth.checkAuth;
@@ -13,9 +12,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.*;
 
@@ -26,7 +23,6 @@ import java.util.*;
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class ScratchWordsController {
     private final ScratchWordsService scratchWordsService;
-    private final FileManagerService fileManagerService;
 
     @checkAuth(FunId = "/workspace/scratchWords/add")
     @Operation(summary = "新增划词高亮")
@@ -51,6 +47,18 @@ public class ScratchWordsController {
         }
     }
 
+    @Operation(summary = "分页查询标注清单")
+    @PostMapping("/queryScratchs")
+    public String queryScratchs(@RequestBody QueryScratchsDTO queryScratchsDTO) throws IOException {
+        return Response.success(scratchWordsService.queryScratchs(queryScratchsDTO));
+    }
+
+    @Operation(summary = "分页分组查询标注清单")
+    @PostMapping("/queryGroupScratchs")
+    public String queryGroupScratchs(@RequestBody QueryGroupScratchsDTO queryGroupScratchsDTO) throws IOException {
+        return Response.success(scratchWordsService.queryGroupScratchs(queryGroupScratchsDTO));
+    }
+
     @checkAuth(FunId = "/workspace/scratchWords/query")
     @Operation(summary = "更新划词高亮")
     @PostMapping("/update")
@@ -75,4 +83,5 @@ public class ScratchWordsController {
         }
     }
 
+
 }

PAS/src/main/java/cn/cslg/pas/service/FileManagerService.java

@@ -1,111 +0,0 @@
-package cn.cslg.pas.service;
-
-import cn.cslg.pas.common.model.dto.FMSDeleteFileDTO;
-import com.google.gson.Gson;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import okhttp3.*;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.util.FileCopyUtils;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.TimeUnit;
-
-import static cn.hutool.core.io.FileUtil.getMimeType;
-
-/**
- * Okhttp调用FMS上传文件接口
- * @Author xiexiang
- * @Date 2023/8/10
- */
-@RequiredArgsConstructor
-@Slf4j
-@Service
-public class FileManagerService {
-    @Value("${authorUrl}")
-    private String PCSUrl;
-    @Value("${OPSUrl}")
-    private String OPSUrl;
-    @Value("${PASUrl}")
-    private String PASUrl;
-    @Value("${RMSUrl}")
-    private String RMSUrl;
-    @Value("${FMSUrl}")
-    private String FMSUrl;
-
-    public String uploadFile(List<MultipartFile> multipartFiles, Integer sourceId) throws IOException {
-        List<File> files = new ArrayList<>();
-        for(MultipartFile multipartFile:multipartFiles){
-            File file = new File(multipartFile.getOriginalFilename());
-            FileCopyUtils.copy(multipartFile.getBytes(),file);
-            files.add(file);
-        }
-        MultipartBody.Builder multipartBodyBuilder = new MultipartBody.Builder()
-                .setType(MultipartBody.FORM);
-        for(File file:files){
-            //根据文件名获取文件的MIME类型
-            String mimeType = getMimeType(file.getPath());
-            multipartBodyBuilder.addFormDataPart("files",file.getName(),RequestBody.create(MediaType.parse(mimeType), file));
-        }
-        RequestBody requestBody =multipartBodyBuilder
-                .addFormDataPart("sourceId", String.valueOf(sourceId))
-                .build();
-        OkHttpClient okHttpClient = new OkHttpClient.Builder()
-                .connectTimeout(60, TimeUnit.SECONDS)
-                .writeTimeout(60, TimeUnit.SECONDS)
-                .readTimeout(60, TimeUnit.SECONDS)
-                .build();
-        Request request = new Request.Builder()
-                .url(FMSUrl + "/fileManager/uploadSystemFile")
-                .post(requestBody)
-                .build();
-        return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
-    }
-
-    /**
-     * 调用文件系统查询接口
-     * @return
-     * @throws IOException
-     */
-    public String getSystemFileFromFMS(List<Integer> tenantIds) throws IOException {
-        String param = new Gson().toJson(tenantIds);
-        RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), param);
-        OkHttpClient okHttpClient = new OkHttpClient.Builder()
-                .connectTimeout(60, TimeUnit.SECONDS)
-                .writeTimeout(60, TimeUnit.SECONDS)
-                .readTimeout(60, TimeUnit.SECONDS)
-                .build();
-        Request request = new Request.Builder()
-                .url(FMSUrl + "/fileManager/getFileData")
-                .post(requestBody)
-                .build();
-        return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
-    }
-
-    /**
-     * 调用文件系统删除接口
-     * @return
-     * @throws IOException
-     */
-    public String deleteFileFromFMS(FMSDeleteFileDTO fmsDeleteFileDTO) throws IOException {
-        String param = new Gson().toJson(fmsDeleteFileDTO);
-        RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), param);
-        OkHttpClient okHttpClient = new OkHttpClient.Builder()
-                .connectTimeout(60, TimeUnit.SECONDS)
-                .writeTimeout(60, TimeUnit.SECONDS)
-                .readTimeout(60, TimeUnit.SECONDS)
-                .build();
-        Request request = new Request.Builder()
-                .url(FMSUrl + "/fileManager/deleteSystemFile")
-                .post(requestBody)
-                .build();
-        return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
-    }
-
-}

PAS/src/main/java/cn/cslg/pas/service/OutInterfaceService.java

@@ -199,9 +199,9 @@ public class OutInterfaceService {
         return Objects.requireNonNull(httpClient.newCall(request).execute().body()).string();
     }
 
-    public String importAssoReportPatentNo(Integer reportId, String patentNo,String name,Integer asCompare) throws IOException {
-        if(asCompare==null){
-            asCompare=0;
+    public String importAssoReportPatentNo(Integer reportId, String patentNo, String name, Integer asCompare) throws IOException {
+        if (asCompare == null) {
+            asCompare = 0;
         }
         OkHttpClient httpClient = new OkHttpClient.Builder()
                 .pingInterval(400, TimeUnit.SECONDS) // 设置 PING 帧发送间隔
@@ -209,7 +209,7 @@ public class OutInterfaceService {
                 .readTimeout(300, TimeUnit.SECONDS)//设置读取超时时间
                 .build();
         Request request = new Request.Builder()
-                .url(RMSUrl + "/api/report/api/compare/addSingle?reportId=" + reportId + "&patentNo=" + patentNo+"&name="+name+"&asCompare="+asCompare)
+                .url(RMSUrl + "/api/report/api/compare/addSingle?reportId=" + reportId + "&patentNo=" + patentNo + "&name=" + name + "&asCompare=" + asCompare)
                 .get()
                 .build();
         return Objects.requireNonNull(httpClient.newCall(request).execute().body()).string();
@@ -230,4 +230,18 @@ public class OutInterfaceService {
         return Objects.requireNonNull(httpClient.newCall(request).execute().body()).string();
     }
 
+    public String getReportsFromRMS(String token) throws IOException {
+        OkHttpClient httpClient = new OkHttpClient.Builder()
+                .pingInterval(400, TimeUnit.SECONDS) // 设置 PING 帧发送间隔
+                .connectTimeout(300, TimeUnit.SECONDS)//设置连接超时时间
+                .readTimeout(300, TimeUnit.SECONDS)//设置读取超时时间
+                .build();
+        Request request = new Request.Builder()
+                .url(RMSUrl + "/api/report/api/report/queryReportByPAS")
+                .get()
+                .addHeader("Cookie", token)
+                .build();
+        return Objects.requireNonNull(httpClient.newCall(request).execute().body()).string();
+    }
+
 }