From 8551515a2fe8af7c07b9a136b16edcb64fe29e12 Mon Sep 17 00:00:00 2001
From: Cui YongXing <2835316714@qq.com>
Date: Thu, 5 Sep 2024 22:44:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BB=E6=89=BE=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TaskInfoServiceImpl.java     | 26 +++++++++----------
 .../OptimizedPrioritizedThreadPool.java       | 18 ++++++-------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/cloud-task-server/src/main/java/com/muyu/task/server/service/impl/TaskInfoServiceImpl.java b/cloud-task-server/src/main/java/com/muyu/task/server/service/impl/TaskInfoServiceImpl.java
index abd8c93..f8de73d 100644
--- a/cloud-task-server/src/main/java/com/muyu/task/server/service/impl/TaskInfoServiceImpl.java
+++ b/cloud-task-server/src/main/java/com/muyu/task/server/service/impl/TaskInfoServiceImpl.java
@@ -296,7 +296,7 @@ public class TaskInfoServiceImpl extends ServiceImpl<TaskInfoMapper, TaskInfo> i
 
         }
         long end = System.currentTimeMillis();
-        log.info("执行时间：{}",end-start);
+        //log.info("执行时间：{}",end-start);
         return null;
     }
 
@@ -304,18 +304,18 @@ public class TaskInfoServiceImpl extends ServiceImpl<TaskInfoMapper, TaskInfo> i
     @NotNull
     private void getString(Long pageNum,String fieName,String joint,Long basicId,Long newBasicId,Long tableId,HashMap<String, String> map ,Integer num) {
         String sqlSelect = " SELECT " + fieName + " FROM " + joint +" limit "+pageNum +","+PAGE_SIZE;
-        log.info(sqlSelect);
+        //log.info(sqlSelect);
 
-        log.info("执行{}查询的方法",sqlSelect);
+        //log.info("执行{}查询的方法",sqlSelect);
         Result<DataValue[][]> tableValueResult = datasourceFeign.findTableValueToArray(basicId, sqlSelect);
         DataValue[][] data = tableValueResult.getData();
-        if (pageNum==160000){
-            for (DataValue[] datum : data) {
-                for (DataValue dataValue : datum) {
-                    System.out.println(dataValue);
-                }
-            }
-        }
+//        if (pageNum==160000){
+//            for (DataValue[] datum : data) {
+//                for (DataValue dataValue : datum) {
+//                    System.out.println(dataValue);
+//                }
+//            }
+//        }
         for (DataValue[] datum : data) {
             for (DataValue dataValue : datum) {
                 String key = dataValue.getKey();
@@ -323,10 +323,10 @@ public class TaskInfoServiceImpl extends ServiceImpl<TaskInfoMapper, TaskInfo> i
                 dataValue.setKey(newKey);
             }
         }
-        log.info("{}查询结束",sqlSelect);
-        log.info("执行{}添加的方法",sqlSelect);
+        //log.info("{}查询结束",sqlSelect);
+        //log.info("执行{}添加的方法",sqlSelect);
         Result result = datasourceFeign.addProduct(newBasicId, tableId, data);
-        log.info("{}添加结束",sqlSelect);
+        //log.info("{}添加结束",sqlSelect);
 //        for (List<DataValue> dataValues : tableValue) {
 //            for (DataValue dataValue : dataValues) {
 //                String key = dataValue.getKey();
diff --git a/cloud-task-server/src/main/java/com/muyu/task/server/thread/OptimizedPrioritizedThreadPool.java b/cloud-task-server/src/main/java/com/muyu/task/server/thread/OptimizedPrioritizedThreadPool.java
index 95e80d0..8fe9775 100644
--- a/cloud-task-server/src/main/java/com/muyu/task/server/thread/OptimizedPrioritizedThreadPool.java
+++ b/cloud-task-server/src/main/java/com/muyu/task/server/thread/OptimizedPrioritizedThreadPool.java
@@ -57,7 +57,9 @@ public class OptimizedPrioritizedThreadPool {
             emergencySemaphore.acquire();
             executor.submit(() -> {
                 try {
+                    System.out.println("Starting emergency task...");
                     task.run();
+                    System.out.println("Finished emergency task.");
                 } finally {
                     emergencySemaphore.release();
                     if (remainingTasks.decrementAndGet() == 0) {
@@ -76,7 +78,9 @@ public class OptimizedPrioritizedThreadPool {
             highPrioritySemaphore.acquire();
             executor.submit(() -> {
                 try {
+                    System.out.println("Starting high priority task...");
                     task.run();
+                    System.out.println("Finished high priority task.");
                 } finally {
                     highPrioritySemaphore.release();
                 }
@@ -92,7 +96,9 @@ public class OptimizedPrioritizedThreadPool {
             mediumPrioritySemaphore.acquire();
             executor.submit(() -> {
                 try {
+                    System.out.println("Starting medium priority task...");
                     task.run();
+                    System.out.println("Finished medium priority task.");
                 } finally {
                     mediumPrioritySemaphore.release();
                 }
@@ -108,7 +114,9 @@ public class OptimizedPrioritizedThreadPool {
             lowPrioritySemaphore.acquire();
             executor.submit(() -> {
                 try {
+                    System.out.println("Starting low priority task...");
                     task.run();
+                    System.out.println("Finished low priority task.");
                 } finally {
                     lowPrioritySemaphore.release();
                 }
@@ -159,13 +167,5 @@ public class OptimizedPrioritizedThreadPool {
         }
     }
 
-    public static void shutdown() throws InterruptedException {
-        executor.shutdown();
-        if (!executor.awaitTermination(1, TimeUnit.HOURS)) {
-            executor.shutdownNow();
-            if (!executor.awaitTermination(1, TimeUnit.MINUTES)) {
-                System.err.println("Pool did not terminate");
-            }
-        }
-    }
+    // 移除shutdown方法
 }