代码优化

eladmin-tools/src/main/java/me/zhengjie/rest/QiniuController.java

@@ -52,7 +52,7 @@ public class QiniuController {
 
     @Log("导出数据")
     @ApiOperation("导出数据")
-    @GetMapping(value = "/download/list")
+    @GetMapping(value = "/download")
     public void download(HttpServletResponse response, QiniuQueryCriteria criteria) throws IOException {
         qiNiuService.downloadList(qiNiuService.queryAll(criteria), response);
     }

eladmin-tools/src/main/java/me/zhengjie/service/dto/LocalStorageQueryCriteria.java

@@ -2,6 +2,8 @@ package me.zhengjie.service.dto;
 
 import lombok.Data;
 import java.sql.Timestamp;
+import java.util.List;
+
 import me.zhengjie.annotation.Query;
 
 /**
@@ -15,9 +17,6 @@ public class LocalStorageQueryCriteria{
     @Query(blurry = "name,suffix,type,operate,size")
     private String blurry;
 
-    @Query(type = Query.Type.GREATER_THAN,propName = "createTime")
-    private Timestamp startTime;
-
-    @Query(type = Query.Type.LESS_THAN,propName = "createTime")
-    private Timestamp endTime;
+    @Query(type = Query.Type.BETWEEN)
+    private List<Timestamp> createTime;
 }
\ No newline at end of file

eladmin-tools/src/main/java/me/zhengjie/service/dto/PictureQueryCriteria.java

@@ -4,6 +4,7 @@ import lombok.Data;
 import me.zhengjie.annotation.Query;
 
 import java.sql.Timestamp;
+import java.util.List;
 
 /**
  * sm.ms图床
@@ -20,9 +21,6 @@ public class PictureQueryCriteria{
     @Query(type = Query.Type.INNER_LIKE)
     private String username;
 
-    @Query(type = Query.Type.GREATER_THAN,propName = "createTime")
-    private Timestamp startTime;
-
-    @Query(type = Query.Type.LESS_THAN,propName = "createTime")
-    private Timestamp endTime;
+    @Query(type = Query.Type.BETWEEN)
+    private List<Timestamp> createTime;
 }

eladmin-tools/src/main/java/me/zhengjie/service/dto/QiniuQueryCriteria.java

@@ -4,6 +4,7 @@ import lombok.Data;
 import me.zhengjie.annotation.Query;
 
 import java.sql.Timestamp;
+import java.util.List;
 
 /**
  * @author Zheng Jie
@@ -15,9 +16,6 @@ public class QiniuQueryCriteria{
     @Query(type = Query.Type.INNER_LIKE)
     private String key;
 
-    @Query(type = Query.Type.GREATER_THAN,propName = "updateTime")
-    private Timestamp startTime;
-
-    @Query(type = Query.Type.LESS_THAN,propName = "updateTime")
-    private Timestamp endTime;
+    @Query(type = Query.Type.BETWEEN)
+    private List<Timestamp> createTime;
 }