素材列表返回值增加分组名称

eas-manager/src/main/java/com/mortals/xhx/module/picture/model/vo/PictureMaterialVo.java

@@ -15,4 +15,6 @@ import java.util.List;
 public class PictureMaterialVo extends BaseEntityLong {
 
     private String createTimeStr;
+    /** 素材分组名称 */
+    private String pictureGroupName;
 }
\ No newline at end of file

eas-manager/src/main/java/com/mortals/xhx/module/picture/service/impl/PictureMaterialServiceImpl.java

@@ -5,8 +5,10 @@ import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.util.DateUtils;
 import com.mortals.framework.util.StringUtils;
 import com.mortals.xhx.base.system.param.model.ParamEntity;
+import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.picture.model.vo.PictureGroupCountVo;
 import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.xhx.module.picture.dao.PictureMaterialDao;
@@ -28,6 +30,9 @@ import java.util.stream.Collectors;
 @Service("pictureMaterialService")
 public class PictureMaterialServiceImpl extends AbstractCRUDServiceImpl<PictureMaterialDao, PictureMaterialEntity, Long> implements PictureMaterialService {
 
+    @Autowired
+    private ParamService paramService;
+
     @Override
     protected PictureMaterialEntity findBefore(PictureMaterialEntity entity, PageInfo pageInfo, Context context) throws AppException {
         if(StringUtils.isNotEmpty(entity.getPictureName())){
@@ -39,8 +44,14 @@ public class PictureMaterialServiceImpl extends AbstractCRUDServiceImpl<PictureM
     @Override
     protected void findAfter(PictureMaterialEntity entity, PageInfo pageInfo, Context context, List<PictureMaterialEntity> list) throws AppException {
         if(CollectionUtils.isNotEmpty(list)){
+            Map<String,String> map = paramService.getParamBySecondOrganize("PictureMaterial","pictureGroupId");
             list.stream().forEach(item->{
                 item.setCreateTimeStr(DateUtils.getDateTime(item.getCreateTime(),DateUtils.P_yyyy_MM_dd_HH_mm_ss));
+                if(map.containsKey(item.getPictureGroupId().toString())) {
+                    item.setPictureGroupName(map.get(item.getPictureGroupId().toString()));
+                }else {
+                    item.setPictureGroupName(item.getPictureGroupId().toString());
+                }
             });
         }
     }
@@ -49,4 +60,5 @@ public class PictureMaterialServiceImpl extends AbstractCRUDServiceImpl<PictureM
     public List<PictureGroupCountVo> selectPictureGroupCount(int pictureType) {
         return dao.selectPictureGroupCount(pictureType);
     }
+
 }
\ No newline at end of file