From 3cbe646757a5b8f922e73ca325e4edc5306235aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Sun, 23 Apr 2023 08:30:34 +0800
Subject: [PATCH] 'commit'

---
 .../com/dsideal/FengHuang/Util/RedisUtil.java  |  2 +-
 .../FengHuang/Yp/Controller/YpController.java  | 18 ++++++++++++++----
 .../dsideal/FengHuang/Yp/Model/YpModel.java    |  9 +++++++++
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/dsideal/FengHuang/Util/RedisUtil.java b/src/main/java/com/dsideal/FengHuang/Util/RedisUtil.java
index ab47638..0cfd2e5 100644
--- a/src/main/java/com/dsideal/FengHuang/Util/RedisUtil.java
+++ b/src/main/java/com/dsideal/FengHuang/Util/RedisUtil.java
@@ -41,7 +41,7 @@ public final class RedisUtil {
             JedisPoolConfig config = new JedisPoolConfig();
             config.setMaxTotal(MAX_ACTIVE);
             config.setMaxIdle(MAX_IDLE);
-            config.setMaxWaitMillis(MAX_WAIT);
+            //config.setMaxWaitMillis(MAX_WAIT);
             config.setTestOnBorrow(TEST_ON_BORROW);
             jedisPool = new JedisPool(config, ADDR, PORT, TIMEOUT, null);
         } catch (Exception e) {
diff --git a/src/main/java/com/dsideal/FengHuang/Yp/Controller/YpController.java b/src/main/java/com/dsideal/FengHuang/Yp/Controller/YpController.java
index 35e5a7c..513f1d9 100644
--- a/src/main/java/com/dsideal/FengHuang/Yp/Controller/YpController.java
+++ b/src/main/java/com/dsideal/FengHuang/Yp/Controller/YpController.java
@@ -93,6 +93,16 @@ public class YpController extends Controller {
         renderJson(kv);
     }
 
+    /**
+     * 功能：获取任务信息
+     * @param task_id
+     */
+    @Before(GET.class)
+    @IsNumericInterface({"task_id"})
+    public void getTask(int task_id) {
+        Record record = model.getTask(task_id);
+        renderJson(record);
+    }
 
     /**
      * 功能：启动任务
@@ -193,18 +203,18 @@ public class YpController extends Controller {
      * 功能：导出excel
      *
      * @param task_id
-     * @param bx_id 0:全部，否则指定的班型ID
+     * @param bx_id   0:全部，否则指定的班型ID
      */
     @Before(GET.class)
     @IsNumericInterface({"task_id", "page", "limit"})
-    public void exportExcel(int task_id,int bx_id) {
+    public void exportExcel(int task_id, int bx_id) {
         //模板文件
         String excelPath = PathKit.getRootClassPath() + PropKit.get("excelExportTemplatePathSuffix").replace("\\", "/");
         String filePath = excelPath + "YangPuZhaoShengExcel.json";
         //转成 json对象
         JSONObject jo = FileUtil.readJsonFile(filePath);
         //导出
-        Page<Record> rs = model.getTaskInfo(task_id, bx_id,1, 99999);
+        Page<Record> rs = model.getTaskInfo(task_id, bx_id, 1, 99999);
         String excelFile = excelPath + "excelTemp/" + UUID.randomUUID().toString().toUpperCase() + ".xls";
         ExcelExportUtil.export(rs, jo, excelFile);
         //提供下载
@@ -291,7 +301,7 @@ public class YpController extends Controller {
     }
 
     /**
-    功能：获取指定任务下的班型选择情况
+     * 功能：获取指定任务下的班型选择情况
      */
     @Before(GET.class)
     @IsNumericInterface({"task_id"})
diff --git a/src/main/java/com/dsideal/FengHuang/Yp/Model/YpModel.java b/src/main/java/com/dsideal/FengHuang/Yp/Model/YpModel.java
index 79d3a7c..80af741 100644
--- a/src/main/java/com/dsideal/FengHuang/Yp/Model/YpModel.java
+++ b/src/main/java/com/dsideal/FengHuang/Yp/Model/YpModel.java
@@ -40,6 +40,15 @@ public class YpModel {
         return r1.getInt("count");
     }
 
+    /**
+     * 功能：获取任务信息
+     * @param task_id
+     */
+    public Record getTask(int task_id) {
+        Record record = Db.findById("t_yp_task", "task_id", task_id);
+        return record;
+    }
+
     /**
      * 功能：增加任务
      */