From b34f141181072f3ae20aa68abc4234e753020ebc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=BF=8A?= <873019219@qq.com>
Date: Sun, 30 May 2021 16:21:11 +0800
Subject: [PATCH] =?UTF-8?q?:fire:=20=E7=A7=BB=E9=99=A4=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zfile/controller/home/FileController.java  | 18 ------------------
 .../repository/ShortLinkConfigRepository.java  | 12 ++++++++++++
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/main/java/im/zhaojun/zfile/controller/home/FileController.java b/src/main/java/im/zhaojun/zfile/controller/home/FileController.java
index ce14071..dbd576f 100644
--- a/src/main/java/im/zhaojun/zfile/controller/home/FileController.java
+++ b/src/main/java/im/zhaojun/zfile/controller/home/FileController.java
@@ -137,24 +137,6 @@ public class FileController {
     }
 
 
-    /**
-     * 获取指定路径下的文件信息内容
-     *
-     * @param   driveId
-     *          驱动器 ID
-     *
-     * @param   path
-     *          文件全路径
-     *
-     * @return  该文件的名称, 路径, 大小, 下载地址等信息.
-     */
-    @GetMapping("/directlink/{driveId}")
-    public ResultBean directlink(@PathVariable(name = "driveId") Integer driveId, String path) {
-        AbstractBaseFileService fileService = driveContext.get(driveId);
-        return ResultBean.successData(fileService.getFileItem(path));
-    }
-
-
     /**
      * 校验密码
      * @param   fileItemList
diff --git a/src/main/java/im/zhaojun/zfile/repository/ShortLinkConfigRepository.java b/src/main/java/im/zhaojun/zfile/repository/ShortLinkConfigRepository.java
index 2513a13..4cf3357 100644
--- a/src/main/java/im/zhaojun/zfile/repository/ShortLinkConfigRepository.java
+++ b/src/main/java/im/zhaojun/zfile/repository/ShortLinkConfigRepository.java
@@ -37,6 +37,18 @@ public interface ShortLinkConfigRepository extends JpaRepository<ShortLinkConfig
                     " and (:dateFrom is null or create_date >= :dateFrom" +
                     " and (:dateTo is null or create_date <= :dateTo) "
     )
+    // @Query(nativeQuery = true,
+    //         value = " select * from SHORT_LINK where " +
+    //                 " key like concat('%', :key,'%') " +
+    //                 " and url like concat('%', :url,'%') " +
+    //                 " and (:dateFrom is null or date_format(create_date, '%Y-%m-%d') >= date_format(:dateFrom, '%Y-%m-%d'))" +
+    //                 " and (:dateTo is null or date_format(create_date, '%Y-%m-%d') <= date_format(:dateTo, '%Y-%m-%d')) ) ",
+    //         countQuery =  " select count(1) from SHORT_LINK where " +
+    //                 " key like concat('%', :key,'%') " +
+    //                 " and url like concat('%', :url,'%') " +
+    //                 " and (:dateFrom  is null or date_format(create_date, '%Y-%m-%d') >= date_format(:dateFrom, '%Y-%m-%d'))" +
+    //                 " and (:dateTo is null or date_format(create_date, '%Y-%m-%d') <= date_format(:dateTo, '%Y-%m-%d')) ) "
+    // )
     Page<ShortLinkConfig> findByPage(String key, String url, Date dateFrom, Date dateTo, Pageable pageable);
 
     /**