feat: 互动记录

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/InteractRecordController.java

@@ -9,6 +9,7 @@ import com.gic.content.api.dto.material.ContentMaterialBaseDTO;
 import com.gic.haoban.manage.api.dto.qdto.content.InteractRecordQDTO;
 import com.gic.haoban.manage.api.enums.content.InteractRecordExtendInfoDTO;
 import com.gic.haoban.manage.api.enums.content.InteractRecordInfoDTO;
+import com.gic.haoban.manage.api.enums.content.ShareBizType;
 import com.gic.haoban.manage.api.service.content.InteractRecordApiService;
 import com.gic.haoban.manage.web.controller.content.adaptor.ContentMaterialAdaptor;
 import com.gic.haoban.manage.web.qo.content.InteractRecordQO;
@@ -59,6 +60,7 @@ public class InteractRecordController {
         List<Long> materialIds = serviceResponse.getResult()
                 .getResult()
                 .stream()
+                .filter(item -> ShareBizType.MATERIAL.getCode().equals(item.getBizType()))
                 .map(item -> Long.parseLong(item.getBizId()))
                 .distinct()
                 .collect(Collectors.toList());
@@ -74,17 +76,19 @@ public class InteractRecordController {
                         InteractRecordExtendInfoVO extendInfoVO = EntityUtil.changeEntityByJSON(InteractRecordExtendInfoVO.class, item.getExtendInfo());
                         interactRecordVO.setExtendInfo(extendInfoVO);
                     }
-                    ContentMaterialBaseDTO materialBaseInfo = materialBaseMap.get(Long.parseLong(item.getBizId()));
-                    if (materialBaseInfo != null) {
-                        ContentMaterialInfoVO temp = new ContentMaterialInfoVO();
-                        BeanUtils.copyProperties(materialBaseInfo, temp);
-                        if (StringUtils.isNotBlank(materialBaseInfo.getMaterialThumbnailImageUrls())) {
-                            temp.setMaterialThumbnailImageUrls(StrSpliter.split(materialBaseInfo.getMaterialThumbnailImageUrls(), ",", true, true));
+                    if (ShareBizType.MATERIAL.getCode().equals(item.getBizType())) {
+                        ContentMaterialBaseDTO materialBaseInfo = materialBaseMap.get(Long.parseLong(item.getBizId()));
+                        if (materialBaseInfo != null) {
+                            ContentMaterialInfoVO temp = new ContentMaterialInfoVO();
+                            BeanUtils.copyProperties(materialBaseInfo, temp);
+                            if (StringUtils.isNotBlank(materialBaseInfo.getMaterialThumbnailImageUrls())) {
+                                temp.setMaterialThumbnailImageUrls(StrSpliter.split(materialBaseInfo.getMaterialThumbnailImageUrls(), ",", true, true));
+                            }
+                            if (StringUtils.isNotBlank(materialBaseInfo.getMaterialImageUrls())) {
+                                temp.setMaterialImageUrls(StrSpliter.split(materialBaseInfo.getMaterialImageUrls(), ",", true, true));
+                            }
+                            interactRecordVO.setContentMaterialInfoVO(temp);
                         }
-                        if (StringUtils.isNotBlank(materialBaseInfo.getMaterialImageUrls())) {
-                            temp.setMaterialImageUrls(StrSpliter.split(materialBaseInfo.getMaterialImageUrls(), ",", true, true));
-                        }
-                        interactRecordVO.setContentMaterialInfoVO(temp);
                     }
                     return interactRecordVO;
                 })

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/adaptor/ContentMaterialAdaptor.java

@@ -35,6 +35,9 @@ public class ContentMaterialAdaptor {
      * @return
      */
     public Map<Long, ContentMaterialBaseDTO> queryMaterialInfoMap(String enterpriseId, List<Long> materialIds) {
+        if (CollectionUtils.isEmpty(materialIds)) {
+            return Collections.emptyMap();
+        }
         ServiceResponse<List<ContentMaterialBaseDTO>> serviceResponse = contentMaterialApiService.listMaterialIdByMaterialIdList(enterpriseId, materialIds, null);
         if (!serviceResponse.isSuccess()) {
             return Collections.emptyMap();