getpage 2022/11/22

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

@@ -59,8 +59,8 @@ public class ProjectImportController {
     @PostMapping("sysPatent")
     @Operation(summary = "导入专利")
     public String importSysPatent(@RequestBody TaskParams taskParams) {
-        uploadPatentBatchService.uploadPatentBatchBro(taskParams);
-        return Response.success(true);
+        return uploadPatentBatchService.uploadPatentBatchBro(taskParams);
+
     }
 
     @GetMapping("list")

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

@@ -1331,19 +1331,29 @@ public String getComPantentNos(PatentVO params){
         if(location>totalNumber){
             location=totalNumber;
         }
-        int n=location-2;
-        if(n<0){
-            n=0;
+        int p;
+        int n;
+        if(location==1){
+            p=2;
+            n=0;}
+        else {
+            p=3;
+            n=location-2;
         }
-        int p=3;
+
         List<Patent> patent = patentMapper.getPatent(list, n, p);
+       String str1= patent.get(0).getPatentNo();
+        String str2=patent.get(1).getPatentNo();
+        String str3=patent.get(2).getPatentNo();
         int front=location-1;
         int behind=totalNumber-location;
         Map map=new HashMap();
         map.put("frontNumber",front);
         map.put("behindNumber",behind);
         map.put("totalNumber",totalNumber);
-        map.put("Patent",patent);
+        map.put("frontPatent",str1);
+        map.put("currentPatent",str2);
+        map.put("behindPatent",str3);
         return  Response.success(map);
 
 

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

@@ -133,7 +133,7 @@ public class UploadPatentBatchService {
      * @description  uploadPatentBatch的兄弟方法
      */
     @Async("singleThreadAsyncTaskExecutor")
-    public void uploadPatentBatchBro(TaskParams params) {
+    public String  uploadPatentBatchBro(TaskParams params) {
         Integer total = params.getTotal();
         Integer index =params.getIndex();
         try {
@@ -183,7 +183,7 @@ public class UploadPatentBatchService {
                         .setUrl("")
                         .setTotal(total), ResponseEnum.PATENT_IMPORT_TASK_SUCCESS), params.getUserId());
 
-
+            return Response.success();
         } catch (Exception e) {
 
             SpringUtil.getBean(ProjectService.class).setImportPatentTaskStatus(2, params.getTaskId());
@@ -204,6 +204,7 @@ public class UploadPatentBatchService {
                 WebSocketServer.sendInfo(Response.error("部分数据上传成功" + "\n" + "成功条数:" + successCount + "失败条数:" + FLAG), params.getUserId());
             }
             FLAG = 0;
+            return Response.error();
         }
     }