From 6804ce99b45625383a41fcfce56de85f621790e0 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期四, 09 二月 2023 15:41:56 +0800
Subject: [PATCH] fix(quartz): 111

---
 src/main/java/com/integrated/zyyt/controller/ZyytController.java |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/integrated/zyyt/controller/ZyytController.java b/src/main/java/com/integrated/zyyt/controller/ZyytController.java
index b1b072d..34ba824 100644
--- a/src/main/java/com/integrated/zyyt/controller/ZyytController.java
+++ b/src/main/java/com/integrated/zyyt/controller/ZyytController.java
@@ -15,8 +15,6 @@
 import java.time.temporal.ChronoUnit;
 import java.util.Date;
 import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 
 /**
  * @ClassName ZyytController
@@ -29,7 +27,7 @@
 @Slf4j
 @RequestMapping("/api/zyyt")
 public class ZyytController {
-    private ExecutorService threadPool = Executors.newFixedThreadPool(6);
+//    private ExecutorService threadPool = Executors.newFixedThreadPool(6);
 
     @Resource
     private ZyytService zyytService;
@@ -58,13 +56,15 @@
 
 
     @GetMapping("/shkdrbTasksYear")
-    public String shkdrbTasksYear(int year) {
+    public String shkdrbTasksYear(int year) throws Exception {
         LocalDate startOfYear = LocalDate.of(year, 1, 1);
         LocalDate endOfYear = LocalDate.of(year, 12, 31);
         LocalDate now = LocalDate.now();
         for (LocalDate tmp = startOfYear; endOfYear.compareTo(tmp) > 0 && now.compareTo(tmp) > 0; tmp = tmp.plus(1, ChronoUnit.DAYS)) {
             Instant instant = tmp.atTime(LocalTime.MIDNIGHT).atZone(ZoneId.systemDefault()).toInstant();
-            threadPool.submit(new ZyytTask(Date.from(instant), zyytService, "shkdrbTasks"));
+//            threadPool.submit(new ZyytTask(Date.from(instant), zyytService, "shkdrbTasks"));
+            ZyytTask shkdrbTasks = new ZyytTask(Date.from(instant), zyytService, "shkdrbTasks");
+            shkdrbTasks.call();
         }
         return "鍚庡彴鎵ц涓� 锛岃涓嶈閲嶅璇锋眰";
 
@@ -88,15 +88,17 @@
      * @params isForece 1寮哄埗鏇存柊 2涓嶅己鍒�
      *
      */
-    public String djtjbTasksYear(int year) {
+    public String djtjbTasksYear(int year) throws Exception {
         LocalDate startOfYear = LocalDate.of(year, 1, 1);
         LocalDate endOfYear = LocalDate.of(year, 12, 31);
         LocalDate now = LocalDate.now();
         for (LocalDate tmp = startOfYear; endOfYear.compareTo(tmp) > 0 && now.compareTo(tmp) > 0; tmp = tmp.plus(1, ChronoUnit.DAYS)) {
             Instant instant = tmp.atTime(LocalTime.MIDNIGHT).atZone(ZoneId.systemDefault()).toInstant();
-            threadPool.submit(new ZyytTask(Date.from(instant), zyytService, "djtjbTasks"));
+//            threadPool.submit(new ZyytTask(Date.from(instant), zyytService, "djtjbTasks"));
+            ZyytTask djtjbTasks = new ZyytTask(Date.from(instant), zyytService, "djtjbTasks");
+            djtjbTasks.call();
         }
-        return "鍚庡彴鎵ц涓� 锛岃涓嶈閲嶅璇锋眰";
+        return "123";
     }
 
 }

--
Gitblit v1.9.1