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

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

@@ -208,8 +208,6 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> implements ITaskS
         BeanUtils.copyProperties(taskAddNewDTO, projectImportPatentVO);
         String pramJson = JSONObject.toJSONString(projectImportPatentVO);
         task.setPramJson(pramJson);
-        //任务名称
-        task.setTaskName(taskAddNewDTO.getTaskName());
         //任务类型1（0普通任务 1定时任务）
         task.setTaskType(taskAddNewDTO.getTaskType());
 
@@ -314,7 +312,7 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> implements ITaskS
             String res = outInterfaceService.getPersonnelByIdsFromPCS(createPersonIds);
             com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(res);
             List<Personnel> personnels = com.alibaba.fastjson.JSONObject.parseArray(jsonObject.getString("data"), Personnel.class);
-            //遍历任务列表和人员列表，根据创建人id和人员id匹配，装载人员名称
+            //遍历装载创建人名称
             for (QueryTaskVO task : tasks) {
                 for (Personnel personnel : personnels) {
                     if (personnel.getId().equals(task.getCreateBy())) {
@@ -323,6 +321,15 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> implements ITaskS
                     }
                 }
             }
+            //遍历装载任务名称（检索式+创建时间+创建人名称）
+            for (QueryTaskVO task : tasks) {
+                if (task.getType().equals(3) || task.getType().equals(4)) {
+                    String createTimeStr = (task.getCreateTime() + "").replace("-", "");
+                    String createTime = createTimeStr.substring(0, createTimeStr.lastIndexOf(" "));
+                    String taskName = task.getConditions() + " " + createTime + " " + task.getCreateName();
+                    task.setTaskName(taskName);
+                }
+            }
         }
 
         //手动创建分页信息返回对象

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

@@ -180,17 +180,17 @@ public class ExcutePatentDataStar implements IExcutePatentData {
             if (successNum > 0 && successNum > startToEndNum) {
                 fromIndex = successNum - startToEndNum;
             }
-            //下载isAdd中的专利 ↓
+            //下载isAdd中的专利 / 下载多个专利号导入接口的专利 ↓
             if (isAddPatentNos != null && isAddPatentNos.size() > 0) {
-                //fromIndex > 0 表示上一次执行已经下载了isAdd中的部分专利，则此次需要把已完成的专利号截取掉
+                //fromIndex > 0 表示上一次执行的下载已经下载了isAdd中的部分专利，此次需要下载剩余专利
                 if (fromIndex > 0) {
                     isAddPatentNos = isAddPatentNos.subList(fromIndex, isAddPatentNos.size() - 1);
                 }
-                //若是检索页面网站导入，则isAddPatentNos里是前台传的多个申请号
+                //若是检索页面网站导入，则isAddPatentNos是前台传的多个申请号，即包含"."
                 if (isAddPatentNos.get(0).contains(".")) {
                     downLoadIsAddPatentNos(isAddPatentNos, task, orderBy, orderByType, dbType, cells, null);
                 } else {
-                    //若是多个专利号导入，则isAddPatentNos里是多个专利号
+                    //若是多个专利号导入的下载，则isAddPatentNos是多个专利号，不包含"."
                     downLoadIsAddPatentNos(isAddPatentNos, task, orderBy, orderByType, dbType, cells, conditions);
                 }
             }
@@ -588,7 +588,6 @@ public class ExcutePatentDataStar implements IExcutePatentData {
         int pageNum = 1;
         for (int i = 0; i < isAddPatentNos.size(); i += 50) {
             PatentStarListDto patentStarListDto = new PatentStarListDto()
-                    .setRetrieveRecordId(1)
                     .setCurrentQuery(conditions)
                     .setOrderBy(orderBy)
                     .setOrderByType(orderByType)

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

@@ -165,9 +165,11 @@ public class PantentQueueService {
                     queueData.setUploadParamsVO(pQueueData.getUploadParamsVO());
                     //装载完成，将其丢入著录消费者队列，并唤醒著录消费者线程
                     patentZhuluQueueList.add(queueData);
-                    patentZhuluLock.lock();
-                    patentZhuluCondition.signalAll();
-                    patentZhuluLock.unlock();
+                    if (patentZhuluLock.tryLock()) {
+                        //patentZhuluLock.lock();
+                        patentZhuluCondition.signalAll();
+                        patentZhuluLock.unlock();
+                    }
 
                 } else {
                     setPatentZhuluLock.lock();
@@ -208,9 +210,11 @@ public class PantentQueueService {
 
                     //装载完成，将其丢入权要消费者队列，并唤醒权要消费者线程
                     patentRightQueueList.add(queueData);
-                    patentRightLock.lock();
-                    patentRightCondition.signalAll();
-                    patentRightLock.unlock();
+                    if (patentRightLock.tryLock()) {
+                        //patentRightLock.lock();
+                        patentRightCondition.signalAll();
+                        patentRightLock.unlock();
+                    }
 
                 } else {
                     setPatentRightLock.lock();
@@ -251,9 +255,11 @@ public class PantentQueueService {
 
                     //装载完成，将其丢入说明书文本消费者队列，并唤醒说明书文本消费者线程
                     patentInstructionTextQueueList.add(queueData);
-                    patentInstructionTextLock.lock();
-                    patentInstructionTextCondition.signalAll();
-                    patentInstructionTextLock.unlock();
+                    if (patentInstructionTextLock.tryLock()) {
+                        //patentInstructionTextLock.lock();
+                        patentInstructionTextCondition.signalAll();
+                        patentInstructionTextLock.unlock();
+                    }
 
                 } else {
                     setPatentInstructionTextLock.lock();
@@ -294,9 +300,11 @@ public class PantentQueueService {
 
                     //装载完成，将其丢入说明书pdf消费者队列，并唤醒说明书pdf消费者线程
                     patentInstructionPDFQueueList.add(queueData);
-                    patentInstructionPDFLock.lock();
-                    patentInstructionPDFCondition.signalAll();
-                    patentInstructionPDFLock.unlock();
+                    if (patentInstructionPDFLock.tryLock()) {
+                        //patentInstructionPDFLock.lock();
+                        patentInstructionPDFCondition.signalAll();
+                        patentInstructionPDFLock.unlock();
+                    }
 
                 } else {
                     setPatentInstructionPDFLock.lock();
@@ -337,9 +345,11 @@ public class PantentQueueService {
 
                     //装载完成，将其丢入摘要附图消费者队列，并唤醒摘要附图消费者线程
                     patentImageQueueList.add(queueData);
-                    patentImageLock.lock();
-                    patentImageCondition.signalAll();
-                    patentImageLock.unlock();
+                    if (patentImageLock.tryLock()) {
+                        //patentImageLock.lock();
+                        patentImageCondition.signalAll();
+                        patentImageLock.unlock();
+                    }
 
                 } else {
                     setPatentImageLock.lock();
@@ -543,9 +553,9 @@ public class PantentQueueService {
             if (task.getType().equals(3) || task.getType().equals(4)) {  //若是网站导入任务，则临界默认设为下载字段类型数量 - 1
                 needNum = task.getConfigCellsNum() - 1;
             }
-            if (num == null) {
+            if (num == null && needNum > 0) {
                 patentIdMap.put(currentPatent, 1);
-            } else if (num < needNum) {
+            } else if (num != null && num < needNum) {
                 patentIdMap.put(currentPatent, ++num);
             } else {  //表示当前这个任务这个专利的消费者全都消费结束
 

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

@@ -39,7 +39,6 @@ public class TaskAddJob extends QuartzJobBean {
             task.setCreateBy(tasks.get(0).getCreateBy());
             task.setPramJson(tasks.get(0).getPramJson());
         }
-        task.setTaskName(taskCondition.getTaskName());
         task.setType(taskCondition.getTaskType2());
         task.setTaskType(taskCondition.getTaskType());
         task.setTaskConditionId(taskCondition.getId());

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

@@ -45,7 +45,6 @@ public class UploadTaskService {
     private final PatentStarApiService patentStarApiService;
     private final ProjectService projectService;
     private final PatentService patentService;
-    private final ReportService reportService;
 
     /**
      * 新增Excel导入任务