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

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

PAS/src/main/java/cn/cslg/pas/common/model/dto/QrtzTaskAddNewDTO.java

@@ -15,7 +15,7 @@ import java.util.List;
  */
 @Accessors(chain = true)
 @Data
-public class QrtzTaskAddNewDTO {
+public class TaskAddNewDTO {
     /**
      * 检索信息
      */

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

@@ -1,16 +1,12 @@
 package cn.cslg.pas.controller;
 
 import cn.cslg.pas.common.core.base.Constants;
-import cn.cslg.pas.common.model.dto.PageDTO2;
-import cn.cslg.pas.common.model.dto.QrtzTaskAddNewDTO;
+import cn.cslg.pas.common.model.dto.TaskAddNewDTO;
 import cn.cslg.pas.common.model.dto.QueryTaskDTO;
-import cn.cslg.pas.common.model.vo.ProjectImportPatentVO;
 import cn.cslg.pas.common.model.vo.TaskVO;
-import cn.cslg.pas.common.utils.JsonUtils;
 import cn.cslg.pas.common.utils.Response;
-import cn.cslg.pas.domain.QrtzTask;
 import cn.cslg.pas.domain.Task;
-import cn.cslg.pas.domain.asso.AssoOsTaskQrtzTask;
+import cn.cslg.pas.domain.asso.TaskCondition;
 import cn.cslg.pas.service.TaskService;
 import cn.cslg.pas.service.upLoadPatent.JobService;
 import cn.cslg.pas.service.upLoadPatent.UploadTaskService;
@@ -21,7 +17,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.quartz.SchedulerException;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 
@@ -49,7 +44,6 @@ public class TaskController {
         return Response.success(taskService.getPageList(params));
     }
 
-
     @PostMapping("/queryTasks")
     @Operation(summary = "查询任务列表")
     public String queryTasks(@RequestBody QueryTaskDTO queryTaskDTO) throws IOException {
@@ -77,21 +71,21 @@ public class TaskController {
 
     @PostMapping("addTask")
     @Operation(summary = "新增网站导入专利任务")
-    public String add(@RequestBody QrtzTaskAddNewDTO qrtzTaskAddNewDTO) throws IOException, SchedulerException {
-        log.info("开始处理【新增网站导入专利任务】的请求，请求参数为：{}", qrtzTaskAddNewDTO);
+    public String add(@RequestBody TaskAddNewDTO taskAddNewDTO) throws IOException, SchedulerException {
+        log.info("开始处理【新增网站导入专利任务】的请求，请求参数为：{}", taskAddNewDTO);
 
-        AssoOsTaskQrtzTask assoOsTaskQrtzTask = new AssoOsTaskQrtzTask();
+        TaskCondition taskCondition = new TaskCondition();
         //新增欧专局网站导入任务
-        if (qrtzTaskAddNewDTO.getTaskType2().equals(3)) {
-            assoOsTaskQrtzTask = uploadTaskService.addEpoTask(qrtzTaskAddNewDTO);
+        if (taskAddNewDTO.getTaskType2().equals(3)) {
+            taskCondition = uploadTaskService.addEpoTask(taskAddNewDTO);
             //新增专利之星网站导入任务
-        } else if (qrtzTaskAddNewDTO.getTaskType2().equals(4)) {
-            assoOsTaskQrtzTask = uploadTaskService.addPatentStarTask(qrtzTaskAddNewDTO);
+        } else if (taskAddNewDTO.getTaskType2().equals(4)) {
+            taskCondition = uploadTaskService.addPatentStarTask(taskAddNewDTO);
         }
 
         //若是定时任务，则新增添加定时任务的job
-        if (assoOsTaskQrtzTask.getTaskType() == 1) {
-            jobService.addJob(assoOsTaskQrtzTask);
+        if (taskCondition.getTaskType() == 1) {
+            jobService.addJob(taskCondition);
         }
         return Response.success("添加任务完成");
     }

PAS/src/main/java/cn/cslg/pas/domain/Task.java

@@ -122,8 +122,8 @@ public class Task extends BaseEntity<Task> {
     /**
      * 所属任务条件id
      */
-    @TableField("qrtz_task_id")
-    private Integer qrtzTaskId;
+    @TableField("task_condition_id")
+    private Integer taskConditionId;
     /**
      * 创建时间
      */

PAS/src/main/java/cn/cslg/pas/domain/asso/AssoOsTaskQrtzTask.java

@@ -16,10 +16,10 @@ import java.util.List;
  * @Author chenyu
  * @Date 2023/6/12
  */
-@TableName(value = "asso_osTask_qrtzTask")
+@TableName(value = "task_condition")
 @Accessors(chain = true)
 @Data
-public class AssoOsTaskQrtzTask implements Serializable {
+public class TaskCondition implements Serializable {
     /**
      * 主键id
      */

PAS/src/main/java/cn/cslg/pas/mapper/asso/AssoOsTaskQrtzTaskMapper.java

@@ -1,6 +1,6 @@
 package cn.cslg.pas.mapper.asso;
 
-import cn.cslg.pas.domain.asso.AssoOsTaskQrtzTask;
+import cn.cslg.pas.domain.asso.TaskCondition;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.stereotype.Repository;
 
@@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository;
  * @Date 2023/6/12
  */
 @Repository
-public interface AssoOsTaskQrtzTaskMapper extends BaseMapper<AssoOsTaskQrtzTask> {
+public interface AssoOsTaskQrtzTaskMapper extends BaseMapper<TaskCondition> {
 
 }

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

@@ -8,9 +8,7 @@ import cn.cslg.pas.common.model.vo.*;
 import cn.cslg.pas.common.utils.*;
 import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.pas.domain.*;
-import cn.cslg.pas.domain.asso.AssoOsTaskQrtzTask;
 import cn.cslg.pas.exception.XiaoShiException;
-import cn.cslg.pas.mapper.asso.AssoEventProjectMapper;
 import cn.cslg.pas.mapper.ProductMapper;
 import cn.cslg.pas.mapper.ProjectMapper;
 import cn.cslg.pas.mapper.asso.AssoStructurePatentMapper;
@@ -550,7 +548,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
         List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getProjectId, id));
         taskService.removeByIds(tasks.stream().map(Task::getId).collect(Collectors.toList()));
         //陈宇 ↓ 删除任务和任务条件关联表（asso_osTask_qrtzTask）数据
-        assoOsTaskQrtzTaskService.removeByIds(tasks.stream().map(Task::getQrtzTaskId).collect(Collectors.toList()));
+        assoOsTaskQrtzTaskService.removeByIds(tasks.stream().map(Task::getTaskConditionId).collect(Collectors.toList()));
 
         return Response.success();
     }

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

@@ -1,8 +1,7 @@
 package cn.cslg.pas.service;
 
 
-import cn.cslg.pas.common.model.dto.PageDTO2;
-import cn.cslg.pas.common.model.dto.QrtzTaskAddNewDTO;
+import cn.cslg.pas.common.model.dto.TaskAddNewDTO;
 
 import cn.cslg.pas.common.model.dto.QueryTaskDTO;
 import cn.cslg.pas.common.model.vo.*;
@@ -10,9 +9,8 @@ import cn.cslg.pas.common.utils.*;
 import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
 
 import cn.cslg.pas.domain.Personnel;
-import cn.cslg.pas.domain.ProjectField;
 import cn.cslg.pas.domain.Task;
-import cn.cslg.pas.domain.asso.AssoOsTaskQrtzTask;
+import cn.cslg.pas.domain.asso.TaskCondition;
 import cn.cslg.pas.mapper.TaskMapper;
 import cn.cslg.pas.common.model.dto.UploadFileDTO;
 import cn.cslg.pas.service.asso.AssoOsTaskQrtzTaskService;
@@ -27,7 +25,6 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
@@ -35,7 +32,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -43,7 +39,6 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * <p>
@@ -166,10 +161,10 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> implements ITaskS
     /**
      * 新增网站导入专利任务
      *
-     * @param qrtzTaskAddNewDTO 前台参数
+     * @param taskAddNewDTO 前台参数
      * @return 返回任务id
      */
-    public Integer addTask3(QrtzTaskAddNewDTO qrtzTaskAddNewDTO, Integer total, AssoOsTaskQrtzTask assoOsTaskQrtzTask) {
+    public Integer addTask3(TaskAddNewDTO taskAddNewDTO, Integer total, TaskCondition taskCondition) {
         //创建任务表实体类，准备装载数据 ↓
         Task task = new Task();
 
@@ -178,17 +173,17 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> implements ITaskS
         //任务状态（0.队列中 1.进行中 2.成功 3.失败）
         task.setStatus(0);
         //判断当前导入专利任务是与专题库关联还是与报告关联
-        if (qrtzTaskAddNewDTO.getProjectId() != null && qrtzTaskAddNewDTO.getReportId() == null) {
+        if (taskAddNewDTO.getProjectId() != null && taskAddNewDTO.getReportId() == null) {
             //专题库id
-            task.setProjectId(qrtzTaskAddNewDTO.getProjectId());
-        } else if (qrtzTaskAddNewDTO.getProjectId() == null && qrtzTaskAddNewDTO.getReportId() != null) {
+            task.setProjectId(taskAddNewDTO.getProjectId());
+        } else if (taskAddNewDTO.getProjectId() == null && taskAddNewDTO.getReportId() != null) {
             //报告id
-            task.setReportId(qrtzTaskAddNewDTO.getReportId());
+            task.setReportId(taskAddNewDTO.getReportId());
         }
         //专利总数量
         task.setTotal(total);
         //任务类型 （1Excel导入 2导出 3欧专局导入 4专利之星导入）
-        task.setType(qrtzTaskAddNewDTO.getTaskType2());
+        task.setType(taskAddNewDTO.getTaskType2());
         //导入导出字段数量
         task.setFieldNum(0);
         //创建人id
@@ -198,9 +193,9 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> implements ITaskS
         //失败条数
         task.setDefaultNum(0);
         //所属任务条件id
-        task.setQrtzTaskId(assoOsTaskQrtzTask.getId());
+        task.setTaskConditionId(taskCondition.getId());
         ProjectImportPatentVO projectImportPatentVO = new ProjectImportPatentVO();
-        BeanUtils.copyProperties(qrtzTaskAddNewDTO, projectImportPatentVO);
+        BeanUtils.copyProperties(taskAddNewDTO, projectImportPatentVO);
         String pramJson = JSONObject.toJSONString(projectImportPatentVO);
         task.setPramJson(pramJson);
 
@@ -266,17 +261,21 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> implements ITaskS
         if (queryTaskDTO.getCreateName() != null && !queryTaskDTO.getCreateName().equals("")) {
             String res = outInterfaceService.getPersonIdByNamePCS(queryTaskDTO.getCreateName());
             List<Integer> personIds = JSON.parseArray(res, Integer.class);
+            //若没有，则ids集合添加一个元素-1（防止执行时sql报错：where uid in ()）
+            if (personIds == null || personIds.size() == 0) {
+                personIds.add(-1);
+            }
             wrapper.in(Task::getCreateBy, personIds);
         }
         //根据任务类型1（0普通任务 1定时任务）查询
         if (queryTaskDTO.getTaskType() != null) {
-            List<AssoOsTaskQrtzTask> assoOsTaskQrtzTasks = assoOsTaskQrtzTaskService.list(new LambdaQueryWrapper<AssoOsTaskQrtzTask>().eq(AssoOsTaskQrtzTask::getTaskType, queryTaskDTO.getTaskType()));
-            List<Integer> taskIds = assoOsTaskQrtzTasks.stream().map(AssoOsTaskQrtzTask::getTaskId).collect(Collectors.toList());
-            //若没有该普通任务或定时任务对应的任务表数据，手动将查询的id设为-1（即查询不到任务）
-            if (taskIds.size() == 0) {
-                taskIds.add(-1);
+            List<TaskCondition> taskConditions = assoOsTaskQrtzTaskService.list(new LambdaQueryWrapper<TaskCondition>().eq(TaskCondition::getTaskType, queryTaskDTO.getTaskType()));
+            List<Integer> assoOsTaskQrtzTaskIds = taskConditions.stream().map(TaskCondition::getId).collect(Collectors.toList());
+            //若没有，则ids集合添加一个元素-1（防止执行时sql报错：where qrtz_task_id in ()）
+            if (assoOsTaskQrtzTaskIds.size() == 0) {
+                assoOsTaskQrtzTaskIds.add(-1);
             }
-            wrapper.in(Task::getId, taskIds);
+            wrapper.in(Task::getTaskConditionId, assoOsTaskQrtzTaskIds);
         }
         //根据任务类型2（1Excel导入 3欧专局导入 4专利之星导入）查询
         if (queryTaskDTO.getTaskType2() != null) {
@@ -287,19 +286,15 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> implements ITaskS
             wrapper.in(Task::getStatus, queryTaskDTO.getTaskStatus());
         }
 
+
         List<Task> tasks;
         Page<Task> pageList = new Page<>();
         //若要分页查询
         if (queryTaskDTO.getCurrent() != null) {
             //若要排序
             if (queryTaskDTO.getOrderBy() != null && !queryTaskDTO.getOrderBy().equals("")) {
-                OrderItem orderItem;
-                if (queryTaskDTO.getOrderType().equals("asc")) {
-                    orderItem = OrderItem.asc("create_time");
-                } else {
-                    orderItem = OrderItem.desc("create_time");
-                }
-                pageList = this.page(new Page<>(queryTaskDTO.getCurrent(), queryTaskDTO.getSize()), wrapper).addOrder(orderItem);
+                wrapper.last("order by create_time " + queryTaskDTO.getOrderType() + ", id " + queryTaskDTO.getOrderType());
+                pageList = this.page(new Page<>(queryTaskDTO.getCurrent(), queryTaskDTO.getSize()), wrapper);
             } else {
                 //若不要排序
                 pageList = this.page(new Page<>(queryTaskDTO.getCurrent(), queryTaskDTO.getSize()), wrapper);
@@ -307,14 +302,15 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> implements ITaskS
             tasks = pageList.getRecords();
         } else {
             //若不要分页查询
+            pageList.setCurrent(0).setSize(0).setTotal(0);
+            //若要排序
             if (queryTaskDTO.getOrderBy() != null && !queryTaskDTO.getOrderBy().equals("")) {
-                //若要排序
-                wrapper.last("order by create_time " + queryTaskDTO.getOrderType());
+                wrapper.last("order by create_time " + queryTaskDTO.getOrderType() + ", id " + queryTaskDTO.getOrderType());
             }
             tasks = this.list(wrapper);
         }
 
-        //调用权限系统接口，根据创建人ids查询出人员列表
+        //装载创建人名称（调用权限系统接口，根据创建人ids查询出人员列表）
         List<Integer> createPersonIds = tasks.stream().map(Task::getCreateBy).collect(Collectors.toList());
         String res = outInterfaceService.getPersonnelByIdsFromPCS(createPersonIds);
         com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(res);
@@ -324,45 +320,43 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> implements ITaskS
             for (Personnel personnel : personnels) {
                 if (personnel.getId().equals(task.getCreateBy())) {
                     task.setCreateName(personnel.getPersonnelName());
+                    break;
                 }
             }
         }
 
-
         List<QueryTaskVO> queryTaskVOS = new ArrayList<>();
-        List<Integer> assoOsTaskQrtzTaskIds = tasks.stream().filter(item -> item.getType().equals(3) || item.getType().equals(4)).map(Task::getQrtzTaskId).collect(Collectors.toList());
+        List<Integer> assoOsTaskQrtzTaskIds = tasks.stream().filter(item -> item.getType().equals(3) || item.getType().equals(4)).map(Task::getTaskConditionId).collect(Collectors.toList());
         //若有网站导入的任务
         if (assoOsTaskQrtzTaskIds.size() > 0) {
-            List<AssoOsTaskQrtzTask> assoOsTaskQrtzTasks = assoOsTaskQrtzTaskService.list(new LambdaQueryWrapper<AssoOsTaskQrtzTask>().in(AssoOsTaskQrtzTask::getId, assoOsTaskQrtzTaskIds));
-            //遍历已分页查询并排序好了的所有任务，将里面是网站导入的任务的任务条件数据整合进去
-            if (assoOsTaskQrtzTasks != null && assoOsTaskQrtzTasks.size() > 0) {
-                for (Task task : tasks) {
-                    QueryTaskVO queryTaskVO = new QueryTaskVO();
-                    if (task.getQrtzTaskId() == null) {
-                        BeanUtils.copyProperties(task, queryTaskVO);
-                        //将Excel文件原名称赋值给任务名称
-                        queryTaskVO.setTaskName(task.getOldName());
-                        queryTaskVOS.add(queryTaskVO);
-                    } else {
-                        for (AssoOsTaskQrtzTask assoOsTaskQrtzTask : assoOsTaskQrtzTasks) {
-                            //若当前任务是网站导入任务，并且任务条件是当前遍历到的任务条件
-                            if (task.getQrtzTaskId().equals(assoOsTaskQrtzTask.getId())) {
-                                BeanUtils.copyProperties(assoOsTaskQrtzTask, queryTaskVO);
-                                BeanUtils.copyProperties(task, queryTaskVO);
-                                //当前任务条件与当前任务匹配完成，结束当前这层任务条件循环，继续下一次循环跟下一个任务匹配
-                                queryTaskVOS.add(queryTaskVO);
-                                break;
-                            }
+            List<TaskCondition> taskConditions = assoOsTaskQrtzTaskService.list(new LambdaQueryWrapper<TaskCondition>().in(TaskCondition::getId, assoOsTaskQrtzTaskIds));
+            //遍历装载
+            for (Task task : tasks) {
+                QueryTaskVO queryTaskVO = new QueryTaskVO();
+                if (!task.getType().equals(3) && !task.getType().equals(4)) {  //若不是网站导入任务
+                    BeanUtils.copyProperties(task, queryTaskVO);
+                    queryTaskVO.setTaskName(task.getOldName());  //将Excel文件原名称赋值给taskName
+                    queryTaskVO.setTaskType(0);  //将任务类型1设置为普通任务（所有Excel任务默认为普通任务）
+                    queryTaskVOS.add(queryTaskVO);
+                } else {  //若是网站导入任务
+                    for (TaskCondition taskCondition : taskConditions) {
+                        //找到当前外层遍历到的 task任务的所属任务条件 assoOsTaskQrtzTask
+                        if (taskCondition.getId().equals(task.getTaskConditionId())) {
+                            BeanUtils.copyProperties(taskCondition, queryTaskVO);
+                            BeanUtils.copyProperties(task, queryTaskVO);
+                            //当前任务条件与当前任务匹配完成，结束当前这层任务条件循环，继续下一次循环跟下一个任务匹配
+                            queryTaskVOS.add(queryTaskVO);
+                            break;
                         }
                     }
-
                 }
+
             }
-        } else {
+        } else {  //若没有网站导入任务
             //若查询的不是网站导入的任务（即是Excel导入任务的话）
             String tasksStr = JSONObject.toJSONString(tasks);
             queryTaskVOS = JSON.parseArray(tasksStr, QueryTaskVO.class);
-            //遍历，将Excel文件原名称赋值给任务名称
+            //遍历，将Excel文件原名称赋值给taskName，将任务类型1设置为普通任务（所有Excel任务默认为普通任务）
             for (QueryTaskVO queryTaskVO : queryTaskVOS) {
                 queryTaskVO.setTaskName(queryTaskVO.getOldName());
                 queryTaskVO.setTaskType(0);

PAS/src/main/java/cn/cslg/pas/service/asso/AssoOsTaskQrtzTaskService.java

@@ -1,6 +1,6 @@
 package cn.cslg.pas.service.asso;
 
-import cn.cslg.pas.domain.asso.AssoOsTaskQrtzTask;
+import cn.cslg.pas.domain.asso.TaskCondition;
 import cn.cslg.pas.mapper.asso.AssoOsTaskQrtzTaskMapper;
 import cn.cslg.pas.service.IAssoOsTaskQrtzTaskService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -15,7 +15,7 @@ import org.springframework.stereotype.Service;
  */
 @Slf4j
 @Service
-public class AssoOsTaskQrtzTaskService extends ServiceImpl<AssoOsTaskQrtzTaskMapper, AssoOsTaskQrtzTask> implements IAssoOsTaskQrtzTaskService {
+public class AssoOsTaskQrtzTaskService extends ServiceImpl<AssoOsTaskQrtzTaskMapper, TaskCondition> implements IAssoOsTaskQrtzTaskService {
 
 
 }

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

@@ -7,7 +7,7 @@ import cn.cslg.pas.common.utils.FileUtils;
 import cn.cslg.pas.common.utils.StringUtils;
 import cn.cslg.pas.common.utils.ThrowException;
 import cn.cslg.pas.domain.*;
-import cn.cslg.pas.domain.asso.AssoOsTaskQrtzTask;
+import cn.cslg.pas.domain.asso.TaskCondition;
 import cn.cslg.pas.exception.XiaoShiException;
 import cn.cslg.pas.service.*;
 import cn.cslg.pas.service.asso.AssoOsTaskQrtzTaskService;
@@ -63,13 +63,13 @@ public class ExcutePatentDataEpo implements IExcutePatentData {
     @Override
     public void startExcute(Task task) throws IOException {
         //从任务关联网站导入任务表中取出当前任务
-        List<AssoOsTaskQrtzTask> assoOsTaskQrtzTasks = assoOsTaskQrtzTaskService.list(new LambdaQueryWrapper<AssoOsTaskQrtzTask>().eq(AssoOsTaskQrtzTask::getTaskId, task.getId()));
-        AssoOsTaskQrtzTask assoOsTaskQrtzTask = assoOsTaskQrtzTasks.get(0);
+        List<TaskCondition> taskConditions = assoOsTaskQrtzTaskService.list(new LambdaQueryWrapper<TaskCondition>().eq(TaskCondition::getTaskId, task.getId()));
+        TaskCondition taskCondition = taskConditions.get(0);
 
         //从任务数据中获取下载字段、检索式
-        String cellsStr = assoOsTaskQrtzTask.getConfigCells();
+        String cellsStr = taskCondition.getConfigCells();
         List<String> cells = Arrays.asList(cellsStr.split(","));
-        String conditions = assoOsTaskQrtzTask.getConditions();
+        String conditions = taskCondition.getConditions();
 
         //定义每次检索的专利数量(每次检索50件)
         int size = 50;

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

@@ -1,6 +1,5 @@
 package cn.cslg.pas.service.upLoadPatent;
 
-import cn.cslg.pas.common.model.dto.PatentDTO;
 import cn.cslg.pas.common.model.dto.UploadFileDTO;
 import cn.cslg.pas.common.model.outApi.PatentStarListDto;
 import cn.cslg.pas.common.model.vo.KeyValueVO;
@@ -10,14 +9,10 @@ import cn.cslg.pas.common.utils.FileUtils;
 import cn.cslg.pas.common.utils.RemoveHtmlTagsUtils;
 import cn.cslg.pas.common.utils.ThrowException;
 import cn.cslg.pas.domain.*;
-import cn.cslg.pas.domain.asso.AssoOsTaskQrtzTask;
-import cn.cslg.pas.service.TaskService;
 import cn.cslg.pas.service.UploadPatentBatchService;
-import cn.cslg.pas.service.asso.AssoOsTaskQrtzTaskService;
 import cn.cslg.pas.service.outApi.PatentStarApiService;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson2.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.fileupload.FileItem;

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

@@ -3,7 +3,7 @@ package cn.cslg.pas.service.upLoadPatent;
 import cn.cslg.pas.common.model.vo.QuartzVO;
 import cn.cslg.pas.domain.QrtzTask;
 import cn.cslg.pas.domain.Task;
-import cn.cslg.pas.domain.asso.AssoOsTaskQrtzTask;
+import cn.cslg.pas.domain.asso.TaskCondition;
 import cn.cslg.pas.service.TaskService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.RequiredArgsConstructor;
@@ -39,7 +39,7 @@ public class JobService {
         qrTaskService.removeById(taskId);
         //同时删除该任务条件的所有任务执行情况记录
         LambdaQueryWrapper<Task> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(Task::getQrtzTaskId, taskId);
+        queryWrapper.eq(Task::getTaskConditionId, taskId);
         taskService.remove(queryWrapper);
     }
 
@@ -96,12 +96,12 @@ public class JobService {
      * @throws SchedulerException
      */
     @Transactional
-    public void addJob(AssoOsTaskQrtzTask assoOsTaskQrtzTask) throws SchedulerException {
+    public void addJob(TaskCondition taskCondition) throws SchedulerException {
         //添加一条任务记录
-        QuartzVO quartzVO = this.generateQuartzVO(assoOsTaskQrtzTask.getId());
+        QuartzVO quartzVO = this.generateQuartzVO(taskCondition.getId());
         JobDataMap jobDataMap = new JobDataMap();
-        jobDataMap.put("assoOsTaskQrtzTask", assoOsTaskQrtzTask);
-        CronScheduleBuilder cronScheduleBuilder = CronScheduleBuilder.cronSchedule(assoOsTaskQrtzTask.getCrons());
+        jobDataMap.put("assoOsTaskQrtzTask", taskCondition);
+        CronScheduleBuilder cronScheduleBuilder = CronScheduleBuilder.cronSchedule(taskCondition.getCrons());
         JobDetail jobDetail = JobBuilder
                 .newJob(TaskAddJob.class)
                 .withIdentity(quartzVO.getJobName(), quartzVO.getJobGroupName())

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

@@ -4,23 +4,19 @@ import cn.cslg.pas.common.model.vo.ProjectImportPatentVO;
 import cn.cslg.pas.common.model.vo.UploadParamsVO;
 import cn.cslg.pas.common.utils.DateUtils;
 import cn.cslg.pas.common.utils.JsonUtils;
-import cn.cslg.pas.common.utils.StringUtils;
 import cn.cslg.pas.domain.PQueueData;
 import cn.cslg.pas.domain.QueueData;
 import cn.cslg.pas.domain.Task;
-import cn.cslg.pas.domain.asso.AssoOsTaskQrtzTask;
+import cn.cslg.pas.domain.asso.TaskCondition;
 import cn.cslg.pas.service.OutInterfaceService;
 import cn.cslg.pas.service.PatentInstructionService;
 import cn.cslg.pas.service.TaskService;
 import cn.cslg.pas.service.UploadPatentBatchService;
 import cn.cslg.pas.service.asso.AssoOsTaskQrtzTaskService;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
-import java.io.IOException;
 import java.util.*;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
@@ -103,23 +99,23 @@ public class PantentQueueService {
 
                     //若是网站导入任务，则将网站导入相关信息存入task对象中（方便生产与消费时使用）
                     if (task.getType().equals(3) || task.getType().equals(4)) {
-                        AssoOsTaskQrtzTask assoOsTaskQrtzTask = assoOsTaskQrtzTaskService.getById(task.getQrtzTaskId());
-                        List<String> configCells = Arrays.asList(assoOsTaskQrtzTask.getConfigCells().split(","));
+                        TaskCondition taskCondition = assoOsTaskQrtzTaskService.getById(task.getTaskConditionId());
+                        List<String> configCells = Arrays.asList(taskCondition.getConfigCells().split(","));
                         task.setConfigCellsNum(configCells.size());  //将下载字段数量存入task对象中（为了在后面发送进度时可以根据下载字段的数量来对应消费者数量，从而确定是否完成了一个专利的下载）
                         task.setConfigCells(configCells);
-                        task.setOrderBy(assoOsTaskQrtzTask.getOrderBy());
-                        task.setOrderByType(assoOsTaskQrtzTask.getOrderByType());
-                        task.setDBType(assoOsTaskQrtzTask.getDBType());
-                        task.setStartNumber(assoOsTaskQrtzTask.getStartNumber());
-                        task.setEndNumber(assoOsTaskQrtzTask.getEndNumber());
-                        task.setEndTime(assoOsTaskQrtzTask.getEndNumber());
-                        if (assoOsTaskQrtzTask.getIsAddPatentNos() != null && !assoOsTaskQrtzTask.getIsAddPatentNos().equals("")) {
-                            task.setIsAddPatentNos(Arrays.asList(assoOsTaskQrtzTask.getIsAddPatentNos().split(",")));
+                        task.setOrderBy(taskCondition.getOrderBy());
+                        task.setOrderByType(taskCondition.getOrderByType());
+                        task.setDBType(taskCondition.getDBType());
+                        task.setStartNumber(taskCondition.getStartNumber());
+                        task.setEndNumber(taskCondition.getEndNumber());
+                        task.setEndTime(taskCondition.getEndNumber());
+                        if (taskCondition.getIsAddPatentNos() != null && !taskCondition.getIsAddPatentNos().equals("")) {
+                            task.setIsAddPatentNos(Arrays.asList(taskCondition.getIsAddPatentNos().split(",")));
                         }
-                        if (assoOsTaskQrtzTask.getIsDeletePatentNos() != null && !assoOsTaskQrtzTask.getIsDeletePatentNos().equals("")) {
-                            task.setIsDeletePatentNos(Arrays.asList(assoOsTaskQrtzTask.getIsDeletePatentNos().split(",")));
+                        if (taskCondition.getIsDeletePatentNos() != null && !taskCondition.getIsDeletePatentNos().equals("")) {
+                            task.setIsDeletePatentNos(Arrays.asList(taskCondition.getIsDeletePatentNos().split(",")));
                         }
-                        task.setConditions(assoOsTaskQrtzTask.getConditions());
+                        task.setConditions(taskCondition.getConditions());
                     }
 
                     //TODO 调用工厂方法，工厂方法会根据任务类型创建并返回对应的生产专利方法的对象
@@ -155,8 +151,6 @@ public class PantentQueueService {
                     //if (task.getType() == 4) {
                     //excutePatentDataStar.setPatentZhuLu(pQueueData.getStarPatent(), pQueueData.getUploadParamsVO());
                     //}
-                    ProjectImportPatentVO projectImportPatentVO = new ProjectImportPatentVO();
-                    projectImportPatentVO.setProjectId(task.getProjectId());
                     QueueData queueData = new QueueData()
                             .setTask(task)
                             .setUploadParamsVO(pQueueData.getUploadParamsVO());

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

@@ -1,35 +1,12 @@
 package cn.cslg.pas.service.upLoadPatent;
 
-import cn.cslg.pas.common.model.PersonnelVO;
-import cn.cslg.pas.common.model.dto.QrtzTaskAddNewDTO;
-import cn.cslg.pas.common.utils.CacheUtils;
-import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.pas.domain.QrtzTask;
-import cn.cslg.pas.domain.WebLoginConfig;
 import cn.cslg.pas.mapper.QrtzTaskMapper;
-import cn.cslg.pas.service.OutInterfaceService;
-import cn.cslg.pas.service.WebLoginConfigService;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.quartz.SchedulerException;
-import org.springframework.beans.BeanUtils;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 
 /**
  * @author admin

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

@@ -1,7 +1,7 @@
 package cn.cslg.pas.service.upLoadPatent;
 
 import cn.cslg.pas.domain.Task;
-import cn.cslg.pas.domain.asso.AssoOsTaskQrtzTask;
+import cn.cslg.pas.domain.asso.TaskCondition;
 import cn.cslg.pas.service.TaskService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.RequiredArgsConstructor;
@@ -31,14 +31,14 @@ public class TaskAddJob extends QuartzJobBean {
     @Override
     public void executeInternal(JobExecutionContext context) throws JobExecutionException {
         JobDataMap jobDataMap = context.getTrigger().getJobDataMap();
-        AssoOsTaskQrtzTask assoOsTaskQrtzTask = (AssoOsTaskQrtzTask) jobDataMap.get("assoOsTaskQrtzTask");
-        List<Task> list = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getQrtzTaskId, assoOsTaskQrtzTask.getId()));
+        TaskCondition taskCondition = (TaskCondition) jobDataMap.get("assoOsTaskQrtzTask");
+        List<Task> list = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskConditionId, taskCondition.getId()));
         Task task = new Task();
         if (list != null && list.size() > 0) {
             task.setType(list.get(0).getType());
         }
-        task.setQrtzTaskId(assoOsTaskQrtzTask.getId());
-        task.setTotal(assoOsTaskQrtzTask.getTotal());
+        task.setTaskConditionId(taskCondition.getId());
+        task.setTotal(taskCondition.getTotal());
         task.setStatus(0);
         task.setSuccessNum(0);
         task.setDefaultNum(0);

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

@@ -6,30 +6,26 @@ import cn.cslg.pas.common.model.dto.UploadFileDTO;
 import cn.cslg.pas.common.model.outApi.PatentStarListDto;
 import cn.cslg.pas.common.utils.*;
 import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
-import cn.cslg.pas.domain.Patent;
+import cn.cslg.pas.domain.Project;
 import cn.cslg.pas.domain.SerachBiblioData;
-import cn.cslg.pas.domain.Patent;
 import cn.cslg.pas.domain.WebLoginConfig;
 import cn.cslg.pas.domain.asso.AssoOsTaskQrtzTask;
-import cn.cslg.pas.service.PatentService;
+import cn.cslg.pas.service.ProjectService;
 import cn.cslg.pas.service.TaskService;
 import cn.cslg.pas.service.WebLoginConfigService;
 import cn.cslg.pas.service.asso.AssoOsTaskQrtzTaskService;
 import cn.cslg.pas.service.outApi.PatentStarApiService;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.function.Function;
-import java.util.function.Function;
 
 /**
  * 导入专利任务的业务层
@@ -50,7 +46,8 @@ public class UploadTaskService {
     private final LoginUtils loginUtils;
     private final WebLoginConfigService webLoginConfigService;
     private final PatentStarApiService patentStarApiService;
-    private final PatentService patentService;
+    private final ProjectService projectService;
+
     /**
      * 新增Excel导入任务
      *
@@ -129,16 +126,28 @@ public class UploadTaskService {
      * @param qrtzTaskAddNewDTO 前台参数（检索信息conditions、专题库id、下载字段configCells等）
      */
     public AssoOsTaskQrtzTask addPatentStarTask(QrtzTaskAddNewDTO qrtzTaskAddNewDTO) throws IOException {
-        Integer webId = qrtzTaskAddNewDTO.getConfigId();  //取出网站id
+        log.info("开始处理【新增专利之星下载接口导入专利】的业务，参数为：{}", qrtzTaskAddNewDTO);
 
-        //检查任务合法性1（根据网站配置id和登陆人所属租户id，看是否有网站导入任务的权限）
+        //检查任务合法性1（判断要导入的专题库或报告是否存在）
+        if (qrtzTaskAddNewDTO.getProjectId() != null) {
+            Project project = projectService.getById(qrtzTaskAddNewDTO.getProjectId());
+            if (project == null) {
+                ThrowException.throwXiaoShiException("该专题库已不存在，请尝试刷新页面");
+            }
+        }
+        if (qrtzTaskAddNewDTO.getReportId() != null) {
+            //查询报告是否存在，若不存在则抛出异常信息 "该报告已不存在，请尝试刷新页面"
+        }
+
+        //检查任务合法性2（根据网站配置id和登陆人所属租户id，看是否有网站导入任务的权限）
+        Integer webId = qrtzTaskAddNewDTO.getConfigId();
         PersonnelVO personnelVO = cacheUtils.getLoginUserPersonnel(loginUtils.getId());  //获取登陆人信息
         WebLoginConfig webLoginConfig = webLoginConfigService.getLoginConfig(webId, personnelVO.getTenantId());  //根据网站id获得配置
         if (webLoginConfig == null) {
             ThrowException.throwXiaoShiException("未配置网站登录信息");
         }
 
-        //检查任务合法性2（根据检索式信息调用一般检索接口，看是否能检索出专利）
+        //检查任务合法性3（根据检索式信息调用一般检索接口，看是否能检索出专利）
         PatentStarListDto patentStarListDto = new PatentStarListDto()
                 .setCurrentQuery(qrtzTaskAddNewDTO.getConditions())
                 .setOrderBy(qrtzTaskAddNewDTO.getOrderBy())
@@ -152,7 +161,18 @@ public class UploadTaskService {
         }
 
         //获取专利总数量
-        Integer total = (Integer) resultMap.get("total");
+        Integer total;
+        if (qrtzTaskAddNewDTO.getEndNumber() != 0) {
+            total = qrtzTaskAddNewDTO.getEndNumber() - qrtzTaskAddNewDTO.getStartNumber() + 1;
+            if (qrtzTaskAddNewDTO.getIsDeletePatentNos() != null) {
+                total = total - qrtzTaskAddNewDTO.getIsDeletePatentNos().size();
+            }
+            if (qrtzTaskAddNewDTO.getIsAddPatentNos() != null) {
+                total = total + qrtzTaskAddNewDTO.getIsAddPatentNos().size();
+            }
+        } else {
+            total = qrtzTaskAddNewDTO.getIsAddPatentNos().size();
+        }
 
         //新增任务与任务条件关联表（"asso_osTask_qrtzTask"）数据
         AssoOsTaskQrtzTask assoOsTaskQrtzTask = new AssoOsTaskQrtzTask();
@@ -169,9 +189,13 @@ public class UploadTaskService {
                 .setOrderByType(qrtzTaskAddNewDTO.getOrderByType())
                 .setDBType(qrtzTaskAddNewDTO.getDBType())
                 .setStartNumber(qrtzTaskAddNewDTO.getStartNumber())
-                .setEndNumber(qrtzTaskAddNewDTO.getEndNumber())
-                .setIsAddPatentNos(qrtzTaskAddNewDTO.getIsAddPatentNos())
-                .setIsDeletePatentNos(qrtzTaskAddNewDTO.getIsDeletePatentNos());
+                .setEndNumber(qrtzTaskAddNewDTO.getEndNumber());
+        if (qrtzTaskAddNewDTO.getIsAddPatentNos() != null && qrtzTaskAddNewDTO.getIsAddPatentNos().size() > 0) {
+            assoOsTaskQrtzTask.setIsAddPatentNos(StringUtils.join(qrtzTaskAddNewDTO.getIsAddPatentNos(), ","));
+        }
+        if (qrtzTaskAddNewDTO.getIsDeletePatentNos() != null && qrtzTaskAddNewDTO.getIsDeletePatentNos().size() > 0) {
+            assoOsTaskQrtzTask.setIsDeletePatentNos(StringUtils.join(qrtzTaskAddNewDTO.getIsDeletePatentNos(), ","));
+        }
         List<String> cells = qrtzTaskAddNewDTO.getConfigCells();
         if (cells == null) {
             assoOsTaskQrtzTask.setConfigCells("");