From 30ceea5b7d2c892ad467df94d1cb2971a10d7d33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Fri, 22 Dec 2023 15:50:12 +0800
Subject: [PATCH] 'commit'

---
 .../Collect/Controller/CollectController.java | 13 ++++++++++++
 .../QingLong/Collect/Model/CollectModel.java  | 21 ++++++++++++++++++-
 src/main/resource/Sql/collect.sql             |  9 ++++++++
 3 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 src/main/resource/Sql/collect.sql

diff --git a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java
index f6b37018..ccce0953 100644
--- a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java
+++ b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java
@@ -16,6 +16,7 @@ import com.jfinal.ext.interceptor.GET;
 import com.jfinal.ext.interceptor.POST;
 import com.jfinal.kit.Kv;
 import com.jfinal.kit.StrKit;
+import com.jfinal.plugin.activerecord.Page;
 import com.jfinal.plugin.activerecord.Record;
 import com.jfinal.upload.UploadFile;
 import org.apache.poi.openxml4j.util.ZipSecureFile;
@@ -479,4 +480,16 @@ public class CollectController extends Controller {
         kv.set("message", "所有数据成功导入！");
         renderJson(kv);
     }
+
+    /**
+     * 功能：获取任务列表，支持关键字查询
+     *
+     * @param job_name
+     */
+    @Before({GET.class})
+    @IsLoginInterface({})
+    public void getJobList(String job_name, int page, int limit) {
+        Page<Record> list = cm.getJobList(job_name, page, limit);
+        renderJson(CommonUtil.renderJsonForLayUI(list));
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java
index 83a4e137..aecaa5af 100644
--- a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java
+++ b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java
@@ -3,12 +3,17 @@ package com.dsideal.QingLong.Collect.Model;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.io.FileUtil;
 import com.dsideal.QingLong.Collect.Const.DataTypeConst;
+import com.dsideal.QingLong.Interceptor.IsLoginInterface;
 import com.dsideal.QingLong.Util.ChineseCharacterUtil;
 import com.dsideal.QingLong.Util.CommonUtil;
+import com.jfinal.aop.Before;
+import com.jfinal.ext.interceptor.GET;
 import com.jfinal.kit.Kv;
 import com.jfinal.kit.StrKit;
 import com.jfinal.plugin.activerecord.Db;
+import com.jfinal.plugin.activerecord.Page;
 import com.jfinal.plugin.activerecord.Record;
+import com.jfinal.plugin.activerecord.SqlPara;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.ss.util.CellRangeAddressList;
@@ -80,7 +85,7 @@ public class CollectModel {
             rSheet.set("end_column", end_column);
             rSheet.set("data_start_row", data_start_row);
             rSheet.set("column_num", column_num);
-            rSheet.set("upload_excel_filename",upload_excel_filename);
+            rSheet.set("upload_excel_filename", upload_excel_filename);
             Db.save("t_collect_job_sheet", "job_id,sheet_index", rSheet);
         }
 
@@ -842,4 +847,18 @@ public class CollectModel {
         }
         return false;
     }
+
+    /**
+     * 功能：获取任务列表，支持关键字查询
+     *
+     * @param job_name
+     */
+    public Page<Record> getJobList(String job_name, int page, int limit) {
+        Kv kv = Kv.create();
+        if (!StrKit.isBlank(job_name)) kv.set("job_name", job_name);
+        SqlPara sqlPara = Db.getSqlPara("Collect.getJobList", kv);
+        String sql = sqlPara.getSql();
+        Page<Record> pageRecord = Db.paginateByFullSql(page, limit, CommonUtil.getTotalSql(sql), sql);
+        return pageRecord;
+    }
 }
\ No newline at end of file
diff --git a/src/main/resource/Sql/collect.sql b/src/main/resource/Sql/collect.sql
new file mode 100644
index 00000000..2e618240
--- /dev/null
+++ b/src/main/resource/Sql/collect.sql
@@ -0,0 +1,9 @@
+#namespace("Collect")
+    #sql("getJobList")
+        select * from t_collect_job where 1=1
+        #if(job_name)
+            and job_name like #para(job_name, "like")
+        #end
+        order by job_id desc
+    #end
+#end