1

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

@@ -444,6 +444,16 @@ public class PatentRightService extends ServiceImpl<PatentRightMapper, PatentRig
                 this.saveOrUpdateBatch(patentRights);
             }
 
+            //不进行拆分，原文直接保存入库
+//            PatentRight patentRight = new PatentRight()
+//                    .setPatentId(params.getPatentId())
+//                    .setContent(params.getContent())
+//                    .setContentOut(params.getContentOut());
+//            if (patentRight.getContent() != null && !patentRight.getContent().equals("")) {
+//                this.deleteByPatentId(patentRight.getPatentId());
+//                this.saveOrUpdate(patentRight);
+//            }
+
         } catch (Exception e) {
             e.printStackTrace();
         }

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

@@ -503,7 +503,7 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> implements ITaskS
 
         //检查任务是否处于进行中状态，若不是则提示用户 "暂停失败，当前任务不处于进行中状态，请尝试刷新页面"
         if (!task.getStatus().equals(1)) {
-            ThrowException.throwXiaoShiException("暂停失败，当前任务未进行，请尝试刷新页面");
+            ThrowException.throwXiaoShiException("暂停失败，当前任务不在进行中，请尝试刷新页面");
         }
 
         //任务表将任务状态修改为4暂停
@@ -517,23 +517,23 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> implements ITaskS
         }
 
         //将生产者生产专利中的公共任务状态改为暂停
-        if (task.getType() == 1) {
+        if (task.getType() == 1) {  //Excel导入
             excutePatentDataExcel.setTaskStatus(taskId, 4);
-        } else if (task.getType() == 3) {
+        } else if (task.getType() == 3) {  //欧专局
             excutePatentDataEpo.setTaskStatus(taskId, 4);
-        } else if (task.getType() == 4) {
+        } else if (task.getType() == 4) {  //专利之星
             excutePatentDataStar.setTaskStatus(taskId, 4);
         }
 
         //若是网站导入任务，则还要将专利各部分装载线程队列中该任务的专利清空
         if (task.getType().equals(3) || task.getType().equals(4)) {
             //等上半秒（上述代码虽然使得生产暂停，但是生产暂停前正在存入生产队列的过程中，等2秒使得这些放入消费者队列后再清空消费者）
-            Thread.sleep(500);
+            //Thread.sleep(500);
             pantentQueueService.setQueueRemoveTasks(taskId);
         }
 
         //等上一秒（上述代码虽然使得生产暂停，但是生产暂停前已生产的专利正在存入消费者队列的过程中，等2秒使得这些放入消费者队列后再清空消费者）
-        Thread.sleep(1000);
+        //Thread.sleep(1000);
         //将消费者的专利队列中所有该任务的专利剔除
         pantentQueueService.consumerQueueRemoveTasks(taskId);
 

PAS/src/main/java/cn/cslg/pas/service/getPatentStarPart/GetPatentStarPartService.java

@@ -196,13 +196,8 @@ public class GetPatentStarPartService {
         }
 
         patentDTO.setPdf(patentInstructions);
+
         return patentDTO;
-        //        HttpServletResponse response = new HttpServletResponse();
-//        response.setHeader("Content-Disposition", "attachment;filename=" + patentInstruction.getFileName());
-//        ServletOutputStream out = response.getOutputStream();
-//        String fil = fileUtils.getSystemPath() + patentInstruction.getUrl();
-//        out.write(FileUtil.readBytes(fil));
-//        IoUtil.close(out);
     }
 
     /**

PAS/src/main/java/cn/cslg/pas/service/outApi/PatentStarApiService.java

@@ -507,7 +507,6 @@ public class PatentStarApiService {
             Response response = okHttpClient.newCall(request).execute();
             // 判断请求是否成功
             if (response.isSuccessful()) {
-                response.body().toString();
                 // 打印服务端返回结果
                 return Objects.requireNonNull(response.body()).string();
             }

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

@@ -500,7 +500,7 @@ public class ExcutePatentDataStar implements IExcutePatentData {
             //以下 ↓装载的是调用"获得中国专利著录"接口返回的专利相关数据
             if (appNo.contains("CN")) {
                 String chinaPatentZhuLuStr = patentStarApiService.getCnBibApi(appNo);
-                if (chinaPatentZhuLuStr != null && !chinaPatentZhuLuStr.trim().equals("") && !chinaPatentZhuLuStr.equals("{}")) {
+                if (chinaPatentZhuLuStr != null && !chinaPatentZhuLuStr.trim().equals("") && !chinaPatentZhuLuStr.equals("{}") && !chinaPatentZhuLuStr.contains("请求不合法")) {
                     List<ChinaPatentZhuLu> chinaPatentZhuLus = JSON.parseArray(chinaPatentZhuLuStr, ChinaPatentZhuLu.class);
                     ChinaPatentZhuLu chinaPatentZhuLu = chinaPatentZhuLus.get(0);
                     //装载申请人地址
@@ -639,7 +639,7 @@ public class ExcutePatentDataStar implements IExcutePatentData {
         try {
             if (starPatent.getPatentNo() != null && !starPatent.getPatentNo().equals("")) {
                 String familyPatentNoStr = patentStarApiService.getFamilyByPubNoApi(starPatent.getPatentNo());
-                if (!familyPatentNoStr.equals("no data")) {
+                if (!familyPatentNoStr.equals("no data") && !familyPatentNoStr.equals("{}")) {
                     FamilyPatentNo familyPatentNo = JSON.parseObject(familyPatentNoStr, FamilyPatentNo.class);
                     List<String> familyPatentNos = Arrays.asList(familyPatentNo.getFamilyinfo().split(";"));
                     uploadParamsVO.setSimpleFamily(familyPatentNos);
@@ -737,6 +737,8 @@ public class ExcutePatentDataStar implements IExcutePatentData {
                     String macherGroup = matcher.group();
                     String right = macherGroup.replaceAll("<!--.*?-->", "").trim();
                     right = right.replaceAll("<.*?>", "").trim();
+                    right = right.replaceAll(" +", "");
+                    right = right.replace("\r\n", "").replace("\n", "");
                     builder.append(right).append("\r\n");
                 }