6.1

PAS/src/main/java/cn/cslg/pas/common/config/QuartzConfig.java

@@ -6,7 +6,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 /**
- * 定义任务描述和具体的执行时间
+ * job定义任务（任务描述和任务执行时间）
  */
 @Configuration
 public class QuartzConfig {

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

@@ -0,0 +1,38 @@
+package cn.cslg.pas.service.upLoadPatent;
+
+
+import cn.cslg.pas.common.model.vo.ProjectImportPatentVO;
+import cn.cslg.pas.domain.Task;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import java.io.IOException;
+
+/**
+ * 执行人物类
+ *
+ * @Author 李仁杰
+ */
+@Service
+@RequiredArgsConstructor(onConstructor_ = {@Lazy})
+public class ExcuteTaskService {
+    private final PantentQueueService pantentQueueService;
+
+    //执行Excel导入任务
+    public void executeExcelTask(Task task, ProjectImportPatentVO projectImportPatentVO) throws IOException {
+        //一个线程执行入队列
+        Thread thread1 = new Thread(() -> {
+            pantentQueueService.addPatnetToQueue(task, projectImportPatentVO);
+        });
+
+
+        //一个线程执行出队列
+        Thread thread2 = new Thread(() -> {
+
+
+        });
+
+
+    }
+}

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

@@ -38,7 +38,6 @@ public class PantentQueueService {
     //将专利信息存入队列
     public void addPatnetToQueue(Task task, ProjectImportPatentVO projectImportPatentVO) throws InterruptedException {
         try {
-
             //获得文件路径
             String filePath = task.getUrl();
             //检查文件合法性
@@ -81,7 +80,7 @@ public class PantentQueueService {
                         System.out.println("退出循环");
                         return;
                     } else {
-                        latch.countDown();
+                        latch.await();
                     }
                 } else {
                     UploadParamsVO uploadParamsVO = queue.remove();

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

@@ -1,34 +1,31 @@
 package cn.cslg.pas.service.upLoadPatent;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.quartz.DisallowConcurrentExecution;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.quartz.QuartzJobBean;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-
 /**
- * 定义任务
+ * 调度任务类
  */
 @Slf4j
 @DisallowConcurrentExecution
+@RequiredArgsConstructor
 public class PatentToDbTaskJob extends QuartzJobBean {
-
+    private final ExcuteTaskService excuteTaskService;
 
     @Override
     public void executeInternal(JobExecutionContext context) throws JobExecutionException {
 
-         //1获得任务信息
-        // 2根据不同的任务类型，选择不同方法上传任务
+        //1.获得任务信息
+
+        //2.根据不同的任务类型，选择不同方法上传任务
+        //2.1 Excel导入专利任务
+        excuteTaskService.executeExcelTask();
 
+        //2.2 网站导入专利任务
 
     }
 

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

@@ -1,45 +0,0 @@
-package cn.cslg.pas.service.upLoadPatent;
-
-
-import cn.cslg.pas.common.model.vo.UploadParamsVO;
-import cn.cslg.pas.common.model.vo.UploadSettingVO;
-import cn.cslg.pas.common.utils.ReadExcelUtils;
-import cn.cslg.pas.domain.PatentData;
-import cn.cslg.pas.domain.Task;
-import lombok.RequiredArgsConstructor;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-
-import java.io.IOException;
-import java.util.List;
-
-/**
- * 调度任务类
- * @autor 李仁杰
- */
-@Service
-@RequiredArgsConstructor(onConstructor_ = {@Lazy})
-public class scheduleTaskService {
- private final ExcuteDataToVOService excuteDataToVOService;
- private final ExcuteUploadSettingService excuteUploadSettingService;
-    //执行Excel导入任务
-    public void executeExcelTask(Task task) throws IOException {
-
-        //获得文件路径
-        String filePath=task.getUrl();
-        //检查文件合法性
-      Integer totalRow =  ReadExcelUtils.textExcel(filePath);
-         //解析配置信息
-        List<UploadSettingVO.Column> jsonData =excuteUploadSettingService.ExcuteUploadSetting(task.getProductId()+"");
-         for(int i=0;i<totalRow;i++){
-         PatentData patentData = ReadExcelUtils.readExcelOneRow(filePath,i);
-             UploadParamsVO  uploadParamsVO =excuteDataToVOService.fileToPatentVO(patentData,jsonData);
-
-         }
-
-
-
-
-
-    }
-}