将欧专局导入的类注释掉

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

@@ -48,7 +48,7 @@ public class TaskController {
         TaskCondition taskCondition = new TaskCondition();
         //新增欧专局网站导入任务
         if (taskAddNewDTO.getTaskType2().equals(3)) {
-            taskCondition = uploadTaskService.addEpoTask(taskAddNewDTO);
+            //taskCondition = uploadTaskService.addEpoTask(taskAddNewDTO);
             //新增专利之星网站导入任务
         } else if (taskAddNewDTO.getTaskType2().equals(4)) {
             taskCondition = uploadTaskService.addPatentStarTask(taskAddNewDTO);

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

@@ -61,7 +61,7 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> implements ITaskS
     private final OutInterfaceService outInterfaceService;
     private final PantentQueueService pantentQueueService;
     private final ExcutePatentDataExcel excutePatentDataExcel;
-    private final ExcutePatentDataEpo excutePatentDataEpo;
+    //private final ExcutePatentDataEpo excutePatentDataEpo;
     private final ExcutePatentDataStar excutePatentDataStar;
     private final TaskConditionService taskConditionService;
     private final ProjectService projectService;
@@ -460,7 +460,7 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> implements ITaskS
             if (task.getType() == 1) {
                 excutePatentDataExcel.setTaskStatus(taskId, 4);
             } else if (task.getType() == 3) {
-                excutePatentDataEpo.setTaskStatus(taskId, 4);
+                //excutePatentDataEpo.setTaskStatus(taskId, 4);
             } else if (task.getType() == 4) {
                 excutePatentDataStar.setTaskStatus(taskId, 4);
             }
@@ -596,7 +596,7 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> implements ITaskS
         if (task.getType() == 1) {  //Excel导入
             excutePatentDataExcel.setTaskStatus(taskId, 4);
         } else if (task.getType() == 3) {  //欧专局
-            excutePatentDataEpo.setTaskStatus(taskId, 4);
+            //excutePatentDataEpo.setTaskStatus(taskId, 4);
         } else if (task.getType() == 4) {  //专利之星
             excutePatentDataStar.setTaskStatus(taskId, 4);
         }
@@ -655,8 +655,8 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> implements ITaskS
         //将生产者生产专利类中的公共任务状态从暂停改为0
         if (task.getType().equals(1) && excutePatentDataExcel.getpTaskId().equals(task.getId())) {
             excutePatentDataExcel.setTaskStatus(taskId, 0);
-        } else if (task.getType().equals(3) && excutePatentDataEpo.getpTaskId().equals(task.getId())) {
-            excutePatentDataEpo.setTaskStatus(taskId, 0);
+//        } else if (task.getType().equals(3) && excutePatentDataEpo.getpTaskId().equals(task.getId())) {
+//            excutePatentDataEpo.setTaskStatus(taskId, 0);
         } else if (task.getType().equals(4) && excutePatentDataStar.getpTaskId().equals(task.getId())) {
             excutePatentDataStar.setTaskStatus(taskId, 0);
         }

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

@@ -45,7 +45,7 @@ public class PantentQueueService {
     private final TaskService taskService;
     private final TaskConditionService taskConditionService;
     private final ExcutePatentDataExcel excutePatentDataExcel;
-    private final ExcutePatentDataEpo excutePatentDataEpo;
+    //private final ExcutePatentDataEpo excutePatentDataEpo;
     private final ExcutePatentDataStar excutePatentDataStar;
     private final PatentInstructionService patentInstructionService;
     private final OutInterfaceService outInterfaceService;
@@ -849,8 +849,8 @@ public class PantentQueueService {
         switch (task.getType()) {
             case 1:  //Excel导入专利
                 return excutePatentDataExcel;
-            case 3:  //欧专局网站导入
-                return excutePatentDataEpo;
+//            case 3:  //欧专局网站导入
+//                return excutePatentDataEpo;
             case 4:  //专利之星网站导入
                 return excutePatentDataStar;
             case 5:  //专利号导入（也是专利之星方式）

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

@@ -46,7 +46,7 @@ public class UploadTaskService {
     private final TaskService taskService;
     private final PantentQueueService pantentQueueService;
     private final TaskConditionService taskConditionService;
-    private final ExcutePatentDataEpo excutePatentDataEpo;
+    //private final ExcutePatentDataEpo excutePatentDataEpo;
     private final CacheUtils cacheUtils;
     private final LoginUtils loginUtils;
     private final WebLoginConfigService webLoginConfigService;
@@ -204,51 +204,51 @@ public class UploadTaskService {
      *
      * @param taskAddNewDTO 前台参数（检索信息conditions、专题库id、下载字段configCells等）
      */
-    public TaskCondition addEpoTask(TaskAddNewDTO taskAddNewDTO) throws IOException {
-        Integer webId = taskAddNewDTO.getConfigId();
-        PersonnelVO personnelVO = cacheUtils.getLoginUserPersonnel(loginUtils.getId());
-        //根据网站id获得配置
-        WebLoginConfig webLoginConfig = webLoginConfigService.getLoginConfig(webId, personnelVO.getTenantId());
-        if (webLoginConfig == null) {
-            ThrowException.throwXiaoShiException("未配置网站登录信息");
-        }
-
-        //检查任务合法性（检查当前检索式能否检索出专利）
-        //根据检索式conditions检索一件专利著录信息
-        SerachBiblioData serachBiblioData = excutePatentDataEpo.getSerachBiblioData(taskAddNewDTO.getConditions(), 1, 1);
-        if (serachBiblioData == null || serachBiblioData.getTotals() == 0) {
-            ThrowException.throwXiaoShiException("根据检索信息未检索到相关专利，请尝试更换检索信息");
-        }
-        //任务与任务条件关联表新增数据
-        TaskCondition taskCondition = new TaskCondition();
-        taskCondition
-                .setTaskType(taskAddNewDTO.getTaskType())
-                .setConditions(taskAddNewDTO.getConditions())
-                .setCrons(taskAddNewDTO.getCrons())
-                .setConfigId(taskAddNewDTO.getConfigId())
-                .setTaskName(taskAddNewDTO.getTaskName())
-                .setTotal(serachBiblioData.getTotals());
-        List<String> cells = taskAddNewDTO.getConfigCells();
-        if (cells == null) {
-            taskCondition.setConfigCells("");
-        } else {
-            taskCondition.setConfigCells(String.join(",", cells));
-        }
-        taskConditionService.save(taskCondition);
-
-        //任务表新增任务
-        Integer taskId = taskService.addTask3(taskAddNewDTO, serachBiblioData.getTotals(), taskCondition);
-
-        //任务与任务条件关联表更新数据
-        taskCondition.setTaskId(taskId);
-        taskConditionService.updateById(taskCondition);
-
-        //任务存入生产者任务队列并唤醒生产者线程
-        pantentQueueService.taskQueueListAddTask(Arrays.asList(taskId));
-        pantentQueueService.awakeTasktch();
-
-        return taskCondition;
-    }
+//    public TaskCondition addEpoTask(TaskAddNewDTO taskAddNewDTO) throws IOException {
+//        Integer webId = taskAddNewDTO.getConfigId();
+//        PersonnelVO personnelVO = cacheUtils.getLoginUserPersonnel(loginUtils.getId());
+//        //根据网站id获得配置
+//        WebLoginConfig webLoginConfig = webLoginConfigService.getLoginConfig(webId, personnelVO.getTenantId());
+//        if (webLoginConfig == null) {
+//            ThrowException.throwXiaoShiException("未配置网站登录信息");
+//        }
+//
+//        //检查任务合法性（检查当前检索式能否检索出专利）
+//        //根据检索式conditions检索一件专利著录信息
+//        SerachBiblioData serachBiblioData = excutePatentDataEpo.getSerachBiblioData(taskAddNewDTO.getConditions(), 1, 1);
+//        if (serachBiblioData == null || serachBiblioData.getTotals() == 0) {
+//            ThrowException.throwXiaoShiException("根据检索信息未检索到相关专利，请尝试更换检索信息");
+//        }
+//        //任务与任务条件关联表新增数据
+//        TaskCondition taskCondition = new TaskCondition();
+//        taskCondition
+//                .setTaskType(taskAddNewDTO.getTaskType())
+//                .setConditions(taskAddNewDTO.getConditions())
+//                .setCrons(taskAddNewDTO.getCrons())
+//                .setConfigId(taskAddNewDTO.getConfigId())
+//                .setTaskName(taskAddNewDTO.getTaskName())
+//                .setTotal(serachBiblioData.getTotals());
+//        List<String> cells = taskAddNewDTO.getConfigCells();
+//        if (cells == null) {
+//            taskCondition.setConfigCells("");
+//        } else {
+//            taskCondition.setConfigCells(String.join(",", cells));
+//        }
+//        taskConditionService.save(taskCondition);
+//
+//        //任务表新增任务
+//        Integer taskId = taskService.addTask3(taskAddNewDTO, serachBiblioData.getTotals(), taskCondition);
+//
+//        //任务与任务条件关联表更新数据
+//        taskCondition.setTaskId(taskId);
+//        taskConditionService.updateById(taskCondition);
+//
+//        //任务存入生产者任务队列并唤醒生产者线程
+//        pantentQueueService.taskQueueListAddTask(Arrays.asList(taskId));
+//        pantentQueueService.awakeTasktch();
+//
+//        return taskCondition;
+//    }
 
     public void addPatentNoTask(TaskAddNewDTO taskAddNewDTO) throws IOException {
         log.info("开始处理【根据专利号导入专利】的业务，参数为：{}", taskAddNewDTO);
@@ -283,7 +283,7 @@ public class UploadTaskService {
 
         //根据下载的网站类型新增任务
         if (taskAddNewDTO.getTaskType2().equals(3)) {
-            this.addEpoTask(taskAddNewDTO);
+            //this.addEpoTask(taskAddNewDTO);
         } else if (taskAddNewDTO.getTaskType2().equals(4) || taskAddNewDTO.getTaskType2().equals(5)) {
             this.addPatentStarTask(taskAddNewDTO);
         }