Browse Source

20250922-生成专利申请文档

lrj 1 month ago
parent
commit
c3386b77ce

+ 5 - 4
src/main/java/cn/cslg/pas/common/config/ThreadPoolConfig.java

@@ -10,10 +10,11 @@ public class ThreadPoolConfig {
     @Bean  
     public ThreadPoolTaskExecutor threadPoolTaskExecutor() {  
         ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();  
-        executor.setCorePoolSize(5); // 设置核心线程数  
-        executor.setMaxPoolSize(5); // 设置最大线程数
-        executor.setQueueCapacity(25); // 设置队列容量  
-        executor.setThreadNamePrefix("my-thread-pool-"); // 设置线程名称前缀  
+        executor.setCorePoolSize(1); // 设置核心线程数
+        executor.setMaxPoolSize(2); // 设置最大线程数
+        executor.setQueueCapacity(1); // 设置队列容量
+        executor.setThreadNamePrefix("my-thread-pool-");
+        executor.setAllowCoreThreadTimeOut(true);// 设置线程名称前缀
         executor.initialize(); // 初始化线程池  
         return executor;  
     }  

+ 7 - 4
src/main/java/cn/cslg/pas/service/importPatent/ImportFromExcelToEsService.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Service;
 @Scope("prototype")
 @Service
 public class ImportFromExcelToEsService implements PatentImportImp {
-private TaskThread taskThread;
+    private TaskThread taskThread;
 
     @Override
     public Boolean startPatentThread() {
@@ -17,14 +17,17 @@ private TaskThread taskThread;
         taskThread.getImportTaskAMVO().setThreadCounter(2);
         taskThread.getImportTaskAMVO().setThreadDoneCounter(0);
 
-        GetPatentPictureFromExcelThread getPatentPictureFromExcelThread =new GetPatentPictureFromExcelThread(taskThread);
-        SavePatentToEsThread savePatentToEsThread = new SavePatentToEsThread(taskThread,taskThread.getApplicationContext());
+        GetPatentPictureFromExcelThread getPatentPictureFromExcelThread = new GetPatentPictureFromExcelThread(taskThread);
+        SavePatentToEsThread savePatentToEsThread = new SavePatentToEsThread(taskThread, taskThread.getApplicationContext());
 
-        GetPatentFromExcelThread getPatentFromExcelThread = new GetPatentFromExcelThread(taskThread, savePatentToEsThread,getPatentPictureFromExcelThread);
+        GetPatentFromExcelThread getPatentFromExcelThread = new GetPatentFromExcelThread(taskThread, savePatentToEsThread, getPatentPictureFromExcelThread);
 
         savePatentToEsThread.start();
+        System.out.println(savePatentToEsThread.getName());
         getPatentFromExcelThread.start();
+        System.out.println(getPatentFromExcelThread.getName());
         getPatentPictureFromExcelThread.start();
+        System.out.println(getPatentPictureFromExcelThread.getName());
         return true;
     }
 

+ 1 - 0
src/main/java/cn/cslg/pas/service/importPatent/SchedulingTaskService.java

@@ -78,6 +78,7 @@ public class SchedulingTaskService {
                     importTaskAMVOFromDbs.get(i).setState(1);
                     importTaskAMVOFromDbs.get(i).setThreadCounter(0);
                     TaskThread taskThread = new TaskThread(importTaskAMVOFromDbs.get(i), applicationContext);
+                    System.out.println(taskThread.getName());
                     threadPoolTaskExecutor.execute(taskThread);
                     importTaskAMVOS.add(importTaskAMVOFromDbs.get(i));
                 }

+ 2 - 1
src/main/resources/application-dev.yml

@@ -91,7 +91,8 @@ DIFY:
   OAApiKey: app-NvKwdHvEK2UmJdmjTGDR0xu6
   checkApiKey: aa
   cliamKey: app-jF3akhYKgljPLdpeIpTNbs6f
-  gInstructionKey: app-7ImBmlr7kvBTSvBj1mTvgKyp
+#  gInstructionKey: app-7ImBmlr7kvBTSvBj1mTvgKyp
+  gInstructionKey: app-HuhT7taopBI3fnxdB6Hgq7ov
   discoveryResultKey: app-G5gnZ4s7GlMEIft79fk7hUR7
   aiPatentResultKey: app-KLneZ6O7qXL2DjKm169ltxJI
   url: http://192.168.2.24/v1/