Merge branch 'develop' of http://39.101.216.213/gogs/liuhuijin/lineage into develop

ruoyi-system/src/main/java/com/ruoyi/app/family/album/domain/TbFamilyAlbum.java

@@ -101,4 +101,8 @@ public class TbFamilyAlbum implements Serializable {
     @ApiModelProperty(value = "家族信息")
     @TableField(exist = false)
     private TbFamily family;
+
+    @ApiModelProperty(value = "相簿图片数量")
+    @TableField(exist = false)
+    private Integer photoCount;
 }

ruoyi-system/src/main/java/com/ruoyi/app/family/album/service/impl/TbFamilyAlbumServiceImpl.java

@@ -2,6 +2,7 @@ package com.ruoyi.app.family.album.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.app.domain.TbFamily;
+import com.ruoyi.app.family.photo.service.ITbFamilyPhotoService;
 import com.ruoyi.app.service.ITbFamilyService;
 import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,6 +11,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.app.family.album.mapper.TbFamilyAlbumMapper;
 import com.ruoyi.app.family.album.domain.TbFamilyAlbum;
 import com.ruoyi.app.family.album.service.ITbFamilyAlbumService;
+import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;
 
@@ -23,7 +25,8 @@ import java.util.List;
 public class TbFamilyAlbumServiceImpl extends ServiceImpl<TbFamilyAlbumMapper, TbFamilyAlbum> implements ITbFamilyAlbumService {
     @Autowired
     private ITbFamilyService familyService;
-
+    @Autowired
+    private ITbFamilyPhotoService familyPhotoService;
 
     @Override
     public List<TbFamilyAlbum> queryList(TbFamilyAlbum  entity) {
@@ -41,6 +44,10 @@ public class TbFamilyAlbumServiceImpl extends ServiceImpl<TbFamilyAlbumMapper, T
         list.forEach(item->{
            TbFamily family = familyService.getById(item.getFamilyId());
            item.setFamily(family);
+           Integer count = familyPhotoService.getAlbumPhotoCount(item.getId());
+           item.setPhotoCount(count);
+
+
         });
 
         return list;
@@ -52,6 +59,8 @@ public class TbFamilyAlbumServiceImpl extends ServiceImpl<TbFamilyAlbumMapper, T
         if (item!=null){
             TbFamily family = familyService.getById(item.getFamilyId());
             item.setFamily(family);
+            Integer count = familyPhotoService.getAlbumPhotoCount(item.getId());
+            item.setPhotoCount(count);
         }
         return item;
     }

ruoyi-system/src/main/java/com/ruoyi/app/family/photo/service/ITbFamilyPhotoService.java

@@ -21,6 +21,9 @@ public interface ITbFamilyPhotoService extends IService<TbFamilyPhoto> {
 
     TbFamilyPhoto getEntityById(Long id);
 
+
+    Integer getAlbumPhotoCount(Long albumId);
+
     /**
      * 批量上传图片
      * @param albumId

ruoyi-system/src/main/java/com/ruoyi/app/family/photo/service/impl/TbFamilyPhotoServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ruoyi.app.family.photo.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.app.domain.TbFamily;
 import com.ruoyi.app.family.album.domain.TbFamilyAlbum;
 import com.ruoyi.app.family.album.service.ITbFamilyAlbumService;
@@ -71,6 +72,13 @@ public class TbFamilyPhotoServiceImpl extends ServiceImpl<TbFamilyPhotoMapper, T
     }
 
     @Override
+    public Integer getAlbumPhotoCount(Long albumId) {
+        LambdaQueryWrapper<TbFamilyPhoto> queryWrapper = new LambdaQueryWrapper<TbFamilyPhoto>()
+                .eq(TbFamilyPhoto::getAlbumId,albumId);
+        return this.count(queryWrapper);
+    }
+
+    @Override
     public TbFamilyPhoto getEntityById(Long id) {
         TbFamilyPhoto entity = this.getById(id);
         if (entity!=null){

ruoyi-system/src/main/java/com/ruoyi/app/service/impl/TbFamilyEventsServiceImpl.java

@@ -44,23 +44,26 @@ public class TbFamilyEventsServiceImpl extends ServiceImpl<TbFamilyEventsMapper,
             item.setFamily(family);
         });
 
-        List<Long> ids = new ArrayList<>();
-        list.forEach(item -> {
-            ids.add(item.getId());
-        });
-        List<TbEventsImg> imgList = eventsImgService.list(new LambdaQueryWrapper<TbEventsImg>()
-                .in(TbEventsImg::getEventsId, ids)
-        );
-        list.forEach(item -> {
-            // 加入图片列表
-            List<TbEventsImg> imgs = new ArrayList<>();
-            imgList.forEach(img -> {
-                if (img.getEventsId().equals(item.getId())) {
-                    imgs.add(img);
-                }
+        if (entity.getId() != null){
+            List<Long> ids = new ArrayList<>();
+            list.forEach(item -> {
+                ids.add(item.getId());
             });
-            item.setImgList(imgs);
-        });
+            List<TbEventsImg> imgList = eventsImgService.list(new LambdaQueryWrapper<TbEventsImg>()
+                    .in(TbEventsImg::getEventsId, ids)
+            );
+            list.forEach(item -> {
+                // 加入图片列表
+                List<TbEventsImg> imgs = new ArrayList<>();
+                imgList.forEach(img -> {
+                    if (img.getEventsId().equals(item.getId())) {
+                        imgs.add(img);
+                    }
+                });
+                item.setImgList(imgs);
+            });
+        }
+
 
         return list;
     }

ruoyi-system/src/main/java/com/ruoyi/app/service/impl/TbFamilyGardenServiceImpl.java

@@ -43,23 +43,27 @@ public class TbFamilyGardenServiceImpl extends ServiceImpl<TbFamilyGardenMapper,
             item.setFamily(family);
         });
 
-        List<Long> ids = new ArrayList<>();
-        list.forEach(item -> {
-            ids.add(item.getId());
-        });
-        List<TbGardenImg> imgList = gardenImgService.list(new LambdaQueryWrapper<TbGardenImg>()
-                .in(TbGardenImg::getGardenId, ids)
-        );
-        list.forEach(item -> {
-            // 加入图片列表
-            List<TbGardenImg> imgs = new ArrayList<>();
-            imgList.forEach(img -> {
-                if (img.getGardenId().equals(item.getId())) {
-                    imgs.add(img);
-                }
+        if(entity.getId() != null)
+        {
+            List<Long> ids = new ArrayList<>();
+            list.forEach(item -> {
+                ids.add(item.getId());
             });
-            item.setImgList(imgs);
-        });
+            List<TbGardenImg> imgList = gardenImgService.list(new LambdaQueryWrapper<TbGardenImg>()
+                    .in(TbGardenImg::getGardenId, ids)
+            );
+            list.forEach(item -> {
+                // 加入图片列表
+                List<TbGardenImg> imgs = new ArrayList<>();
+                imgList.forEach(img -> {
+                    if (img.getGardenId().equals(item.getId())) {
+                        imgs.add(img);
+                    }
+                });
+                item.setImgList(imgs);
+            });
+
+        }
 
         return list;
     }