v1.9 发布，详情查看发行版说明

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

@@ -67,4 +67,17 @@ public class PictureController {
         pictureService.delete(pictureService.findById(id));
         return new ResponseEntity(HttpStatus.OK);
     }
+
+    /**
+     * 删除多张图片
+     * @param ids
+     * @return
+     */
+    @Log("删除图片")
+    @PreAuthorize("hasAnyRole('ADMIN','PICTURE_ALL','PICTURE_DELETE')")
+    @DeleteMapping(value = "/pictures")
+    public ResponseEntity deleteAll(@RequestBody Long[] ids) {
+        pictureService.deleteAll(ids);
+        return new ResponseEntity(HttpStatus.OK);
+    }
 }

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

@@ -8,15 +8,11 @@ import me.zhengjie.service.QiNiuService;
 import me.zhengjie.service.query.QiNiuQueryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
-import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-
-import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -108,4 +104,16 @@ public class QiniuController {
         qiNiuService.delete(qiNiuService.findByContentId(id),qiNiuService.find());
         return new ResponseEntity(HttpStatus.OK);
     }
+
+    /**
+     * 删除多张图片
+     * @param ids
+     * @return
+     */
+    @Log("删除图片")
+    @DeleteMapping(value = "/qiNiuContent")
+    public ResponseEntity deleteAll(@RequestBody Long[] ids) {
+        qiNiuService.deleteAll(ids, qiNiuService.find());
+        return new ResponseEntity(HttpStatus.OK);
+    }
 }

eladmin-tools/src/main/java/me/zhengjie/service/PictureService.java

@@ -36,4 +36,11 @@ public interface PictureService {
      */
     @CacheEvict(allEntries = true)
     void delete(Picture picture);
+
+    /**
+     * 删除图片
+     * @param ids
+     */
+    @CacheEvict(allEntries = true)
+    void deleteAll(Long[] ids);
 }

eladmin-tools/src/main/java/me/zhengjie/service/QiNiuService.java

@@ -69,4 +69,12 @@ public interface QiNiuService {
      */
     @CacheEvict(allEntries = true)
     void synchronize(QiniuConfig config);
+
+    /**
+     * 删除文件
+     * @param ids
+     * @return
+     */
+    @CacheEvict(allEntries = true)
+    void deleteAll(Long[] ids, QiniuConfig config);
 }

eladmin-tools/src/main/java/me/zhengjie/service/impl/PictureServiceImpl.java

@@ -84,4 +84,11 @@ public class PictureServiceImpl implements PictureService {
         }
 
     }
+
+    @Override
+    public void deleteAll(Long[] ids) {
+        for (Long id : ids) {
+            delete(findById(id));
+        }
+    }
 }

eladmin-tools/src/main/java/me/zhengjie/service/impl/QiNiuServiceImpl.java

@@ -179,4 +179,11 @@ public class QiNiuServiceImpl implements QiNiuService {
         }
 
     }
+
+    @Override
+    public void deleteAll(Long[] ids, QiniuConfig config) {
+        for (Long id : ids) {
+            delete(findByContentId(id), config);
+        }
+    }
 }

eladmin-tools/src/main/java/me/zhengjie/service/query/PictureQueryService.java

@@ -59,6 +59,13 @@ public class PictureQueryService {
                 list.add(cb.like(root.get("filename").as(String.class),"%"+picture.getFilename()+"%"));
             }
 
+            if(!ObjectUtils.isEmpty(picture.getUsername())){
+                /**
+                 * 模糊
+                 */
+                list.add(cb.like(root.get("username").as(String.class),"%"+picture.getUsername()+"%"));
+            }
+
             Predicate[] p = new Predicate[list.size()];
             return cb.and(list.toArray(p));
         }

pom.xml

@@ -7,7 +7,7 @@
     <groupId>me.zhengjie</groupId>
     <artifactId>eladmin</artifactId>
     <packaging>pom</packaging>
-    <version>1.8</version>
+    <version>1.9</version>
 
     <modules>
         <module>eladmin-common</module>