修改背景图片查询提交

src/main/java/com/rf/check/picture/dao/repository/PictureRepository.java

@@ -17,8 +17,12 @@ public interface PictureRepository extends BaseRepository<PictureEntity, String>
             countQuery = "select * from t_picture_info where 1=1 and if(?1 is not null and ?1 !='',(category = ?1),1=1) ", nativeQuery = true)
     Page<PictureEntity> findPictureList(String category, PageRequest of);
 
-    @Query(value = "select * from t_picture_info ORDER BY RAND() LIMIT 1 ",nativeQuery = true)
+    @Query(value = "select * from t_picture_info where category in ('1','2','3','4','5','6') ORDER BY RAND() LIMIT 1 ",nativeQuery = true)
     PictureEntity recommendPicture();
 
     PictureEntity findPictureByCategory(String category);
+
+    @Query(value = "select * from t_picture_info where category not in ('1','2','3','4','5','6') ",
+            countQuery = "select * from t_picture_info where category not in ('1','2','3','4','5','6') ", nativeQuery = true)
+    Page<PictureEntity> findPictureOtherList(PageRequest of);
 }

src/main/java/com/rf/check/picture/rest/PictureController.java

@@ -32,9 +32,14 @@ public class PictureController extends BaseController {
     private PictureService pictureService;
 
     @GetMapping("/findPictureList")
-    @ApiOperation(value = "背景图片列表查询", notes = "参数包括：beginNum:页码，pageSize：每页条数，category：图片分类(四季-1；风景-2；旅行-3；生活-4；宠物-5；卡通-6)")
+    @ApiOperation(value = "背景图片列表查询", notes = "参数包括：beginNum:页码，pageSize：每页条数，category：图片分类(四季-1；风景-2；旅行-3；生活-4；宠物-5；卡通-6；其他-7)")
     public Result findPictureList(String category, int beginNum, int pageSize) {
-        Page<PictureEntity> pictureEntities = this.pictureService.findPictureList(category, beginNum, pageSize);
+        Page<PictureEntity> pictureEntities = null;
+        if (category.equals("7")) {
+            pictureEntities = this.pictureService.findPictureOtherList(beginNum, pageSize);
+        }else {
+            pictureEntities = this.pictureService.findPictureList(category, beginNum, pageSize);
+        }
         return success(pictureEntities);
     }
 

src/main/java/com/rf/check/picture/service/PictureService.java

@@ -16,4 +16,6 @@ public interface PictureService {
     PictureEntity recommendPicture();
 
     PictureEntity findPictureByCategory(String category);
+
+    Page<PictureEntity> findPictureOtherList(int beginNum, int pageSize);
 }

src/main/java/com/rf/check/picture/service/impl/PictureServiceImpl.java

@@ -25,6 +25,11 @@ public class PictureServiceImpl implements PictureService {
         return this.pictureRepository.findPictureList(category, PageRequest.of(beginNum - 1, pageSize));
     }
 
+    @Override
+    public Page<PictureEntity> findPictureOtherList(int beginNum, int pageSize) {
+        return this.pictureRepository.findPictureOtherList(PageRequest.of(beginNum - 1, pageSize));
+    }
+
     @Override
     public PictureEntity recommendPicture() {
         return this.pictureRepository.recommendPicture();