Merge remote-tracking branch 'origin/dev2' into dev2

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

@@ -409,23 +409,24 @@ public class PatentInstructionService extends ServiceImpl<PatentInstructionMappe
                     task.setSuccessNum(task.getSuccessNum() + 1);
                     task.setTrueSuccessNum(task.getTrueSuccessNum() + 1);
                     sendMessage(total, task);
-                    continue;
+                    //continue;
+                } else {
+                    PDDocument doc = PDDocument.load(pdfFile);
+                    Splitter splitter = new Splitter();
+                    splitter.setStartPage(1);
+                    splitter.setEndPage(1);
+                    PDDocument needDoc = splitter.split(doc).get(0);
+                    String newFilePath = StringUtils.getUUID() + ".pdf";
+                    needDoc.save(newFilePath);
+                    filePaths.add(newFilePath);
+                    pdfMerger.addSource(newFilePath);
+                    needDoc.close();
+                    doc.close();
+                    //更新任务表（完成数量+1）并发送进度
+                    task.setSuccessNum(task.getSuccessNum() + 1);
+                    task.setTrueSuccessNum(task.getTrueSuccessNum() + 1);
+                    sendMessage(total, task);
                 }
-                PDDocument doc = PDDocument.load(pdfFile);
-                Splitter splitter = new Splitter();
-                splitter.setStartPage(1);
-                splitter.setEndPage(1);
-                PDDocument needDoc = splitter.split(doc).get(0);
-                String newFilePath = StringUtils.getUUID() + ".pdf";
-                needDoc.save(newFilePath);
-                filePaths.add(newFilePath);
-                pdfMerger.addSource(newFilePath);
-                needDoc.close();
-                doc.close();
-                //更新任务表（完成数量+1）并发送进度
-                task.setSuccessNum(task.getSuccessNum() + 1);
-                task.setTrueSuccessNum(task.getTrueSuccessNum() + 1);
-                sendMessage(total, task);
             }
 
         }

PAS/src/main/java/cn/cslg/pas/service/upLoadPatent/ExcutePatentDataPatentNo.java

@@ -119,10 +119,8 @@ public class ExcutePatentDataPatentNo implements IExcutePatentData {
             e.printStackTrace();
             //生产消费到一半时，发生错误异常，将任务状态置为完成
             task = taskService.getById(task.getId());
-            if (task.getStatus().equals(1)) {
-                task.setStatus(2);
-                taskService.updateById(task);
-            }
+            task.setStatus(2);
+            taskService.updateById(task);
         }
 
 

PAS/src/main/java/cn/cslg/pas/service/upLoadPatent/ExcutePatentDataStar.java

@@ -79,7 +79,6 @@ public class ExcutePatentDataStar implements IExcutePatentData {
                 }
 
                 //获得返回的的多个检索式 patentStarListDtos
-
                 List<PatentStarListDto> patentStarListDtos = patentStarApiService.getSplitedConditions(new PatentStarListDto()
                         .setCurrentQuery(task.getConditions())
                         .setOrderBy(orderBy)
@@ -184,10 +183,8 @@ public class ExcutePatentDataStar implements IExcutePatentData {
                 e.printStackTrace();
                 //生产消费到一半时，发生错误异常，将任务状态置为完成
                 task = taskService.getById(task.getId());
-                if (task.getStatus().equals(1)) {
-                    task.setStatus(2);
-                    taskService.updateById(task);
-                }
+                task.setStatus(2);
+                taskService.updateById(task);
             }
         }
 
@@ -314,10 +311,8 @@ public class ExcutePatentDataStar implements IExcutePatentData {
             e.printStackTrace();
             //生产消费到一半时，发生错误异常，将任务状态置为完成
             task = taskService.getById(task.getId());
-            if (task.getStatus().equals(1)) {
-                task.setStatus(2);
-                taskService.updateById(task);
-            }
+            task.setStatus(2);
+            taskService.updateById(task);
         }
     }
 
@@ -931,46 +926,35 @@ public class ExcutePatentDataStar implements IExcutePatentData {
                     return;
                 }
 
-                try {
-                    UploadParamsVO uploadParamsVO = new UploadParamsVO();
-                    Patent patent = new Patent();
-                    uploadParamsVO.setPatent(patent);
-                    uploadParamsVO.getPatent().setPatentNo(starPatent.getPatentNo());
-                    uploadPatentBatchService.getOneOrInsertOne(uploadParamsVO);
-
-                    PQueueData pQueueData = new PQueueData()
-                            .setTask(task)
-                            .setStarPatent(starPatent)
-                            .setUploadParamsVO(uploadParamsVO);
-                    //装载专利著录
-                    if (cells.contains("1")) {
-                        pantentQueueService.zhuluToPQueue(pQueueData);
-                    }
-                    //装载权要
-                    if (cells.contains("2")) {
-                        pantentQueueService.rightToPQueue(pQueueData);
-                    }
-                    //装载说明书文本
-                    if (cells.contains("3")) {
-                        pantentQueueService.instructionTextToPQueue(pQueueData);
-                    }
-                    //装载说明书pdf
-                    if (cells.contains("4")) {
-                        pantentQueueService.instructionPDFToPQueue(pQueueData);
-                    }
-                    //装载摘要附图
-                    if (cells.contains("6")) {
-                        pantentQueueService.imageToPQueue(pQueueData);
-                    }
-
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    //生产消费到一半时，发生错误异常，将任务状态置为完成
-                    task = taskService.getById(task.getId());
-                    if (task.getStatus().equals(1)) {
-                        task.setStatus(2);
-                        taskService.updateById(task);
-                    }
+                UploadParamsVO uploadParamsVO = new UploadParamsVO();
+                Patent patent = new Patent();
+                uploadParamsVO.setPatent(patent);
+                uploadParamsVO.getPatent().setPatentNo(starPatent.getPatentNo());
+                uploadPatentBatchService.getOneOrInsertOne(uploadParamsVO);
+
+                PQueueData pQueueData = new PQueueData()
+                        .setTask(task)
+                        .setStarPatent(starPatent)
+                        .setUploadParamsVO(uploadParamsVO);
+                //装载专利著录
+                if (cells.contains("1")) {
+                    pantentQueueService.zhuluToPQueue(pQueueData);
+                }
+                //装载权要
+                if (cells.contains("2")) {
+                    pantentQueueService.rightToPQueue(pQueueData);
+                }
+                //装载说明书文本
+                if (cells.contains("3")) {
+                    pantentQueueService.instructionTextToPQueue(pQueueData);
+                }
+                //装载说明书pdf
+                if (cells.contains("4")) {
+                    pantentQueueService.instructionPDFToPQueue(pQueueData);
+                }
+                //装载摘要附图
+                if (cells.contains("6")) {
+                    pantentQueueService.imageToPQueue(pQueueData);
                 }
 
             }

PAS/src/main/java/cn/cslg/pas/service/upLoadPatent/UploadTaskService.java

@@ -263,9 +263,10 @@ public class UploadTaskService {
                 .setOrderByType(taskAddNewDTO.getOrderByType())
                 .setPageNum(1)
                 .setRowCount(10);
-        //中国专利检索中国库
         List<String> cNPatentNos = taskAddNewDTO.getIsAddPatentNos().stream().filter(patentNo -> patentNo.contains("CN")).collect(Collectors.toList());
         List<String> wDPatentNos = taskAddNewDTO.getIsAddPatentNos().stream().filter(patentNo -> !patentNo.contains("CN")).collect(Collectors.toList());
+
+        //中国专利检索中国库
         if (cNPatentNos.size() > 0) {
             List<String> cNPatentNos0;
             try {