Merge remote-tracking branch 'origin/quanku_0930' into quanku_0930

ch-dao/src/main/java/com/wwdz/ch/db/dao/FootPrintDao.java

@@ -35,10 +35,11 @@ public interface FootPrintDao {
     /**
      * 通过藏品id列表统计记录数
      *
+     * @param itemId
      * @param itemIds
      * @return
      */
-    long countByItemIds(List<Long> itemIds);
+    long countByItemIds(Long itemId, List<Long> itemIds);
 
     /**
      * 批量删除记录

ch-dao/src/main/java/com/wwdz/ch/db/impl/FootPrintDaoImpl.java

@@ -6,6 +6,7 @@ import com.wwdz.ch.db.dao.FootPrintDao;
 import com.wwdz.ch.db.domain.Footprint;
 import com.wwdz.ch.db.domain.FootprintExample;
 import com.wwdz.ch.db.mapper.FootprintMapper;
+import com.xxdxxs.db.component.JdbcHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
@@ -57,10 +58,11 @@ public class FootPrintDaoImpl implements FootPrintDao {
     }
 
     @Override
-    public long countByItemIds(List<Long> itemIds) {
+    public long countByItemIds(Long itemId, List<Long> itemIds) {
         FootprintExample example = new FootprintExample();
         FootprintExample.Criteria criteria = example.createCriteria();
-        criteria.andItemIdIn(itemIds);
+        JdbcHelper.ifPresent(itemId, criteria::andItemIdEqualTo);
+        JdbcHelper.ifPresent(itemIds, criteria::andItemIdIn);
         criteria.andDeletedEqualTo(false);
         return footprintMapper.countByExample(example);
     }

ch-dao/src/main/java/com/wwdz/ch/db/impl/ItemDaoImpl.java

@@ -68,13 +68,15 @@ public class ItemDaoImpl implements ItemDao {
         ItemExample.Criteria criteria = example.createCriteria();
         JdbcHelper.ifPresent(coinRequestDto.getIds(), criteria::andIdIn);
         criteria.andIsDeletedEqualTo(false);
+        int viewPermission = 0;
         if (Objects.nonNull(coinRequestDto.getViewPermission())) {
-            criteria.andViewPermissionEqualTo(coinRequestDto.getViewPermission());
+            viewPermission = coinRequestDto.getViewPermission();
         }
         // 如果是客态则筛选所有人可见
         if (Objects.nonNull(coinRequestDto.getIsGuest()) && coinRequestDto.getIsGuest()) {
-            criteria.andViewPermissionEqualTo(0);
+            viewPermission = 0;
         }
+        criteria.andViewPermissionEqualTo(viewPermission);
         example.orderBy("update_time desc");
         PageHelper.startPage(coinRequestDto.getPage(), coinRequestDto.getLimit());
         List<Item> list = itemMapper.selectByExampleWithBLOBs(example);

ch-wx-api/src/main/java/com/wwdz/ch/wx/entity/vo/ItemResponseVo.java

@@ -35,4 +35,5 @@ public class ItemResponseVo implements Entity {
     private Integer viewPermission;
     private Boolean isFollowed;
     private Integer followedId;
+    private String viewsNumber;
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/FavoritesServiceImpl.java

 package com.wwdz.ch.wx.impl;
 
 import com.github.pagehelper.PageInfo;
+import com.wwdz.ch.core.consts.ViewPermissionEnum;
 import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.core.util.MediaUtil;
-import com.wwdz.ch.db.dao.FavoritesDao;
-import com.wwdz.ch.db.dao.FavoritesItemsRelationDao;
-import com.wwdz.ch.db.dao.ItemDao;
-import com.wwdz.ch.db.dao.UserItemsRelationDao;
+import com.wwdz.ch.db.dao.*;
 import com.wwdz.ch.db.domain.*;
 import com.wwdz.ch.db.dto.FavoritesItemsDto;
 import com.wwdz.ch.db.dto.request.CoinRequestDto;
@@ -43,6 +41,8 @@ public class FavoritesServiceImpl implements FavoritesService {
     @Autowired
     private ItemDao itemDao;
     @Autowired
+    private FootPrintDao footPrintDao;
+    @Autowired
     private ItemCommonService itemCommonService;
 
     @Override
@@ -260,6 +260,8 @@ public class FavoritesServiceImpl implements FavoritesService {
                 // 设置藏品发布用户的昵称和头像
                 itemCommonService.getNicknameAvatar(item.getId(), vo);
                 vo.setViewPermission(item.getViewPermission());
+                // 设置浏览量
+                vo.setViewsNumber(item.getViewPermission().equals(ViewPermissionEnum.ALL.getCode()) ? StringUtil.formatCount(footPrintDao.countByItemIds(item.getId(), null)) : "0");
 
                 // 设置图片或视频
                 vo.setHomePageImage(MediaUtil.getHomePageImage(item.getImages(), item.getVideos()));

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/ItemCommonServiceImpl.java

@@ -91,7 +91,7 @@ public class ItemCommonServiceImpl implements ItemCommonService {
             List<Long> itemIds = userItemsRelations.stream()
                     .map(UserItemsRelation::getItemId).collect(Collectors.toList());
             collectionsNumber = favoritesItemsRelationDao.countByItemIds(itemIds);
-            viewsNumber = footPrintDao.countByItemIds(itemIds);
+            viewsNumber = footPrintDao.countByItemIds(null, itemIds);
             CoinRequestDto coinRequestDto = new CoinRequestDto();
             coinRequestDto.setIds(itemIds);
             List<Item> itemList = itemDao.findListNotDeleted(coinRequestDto);

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/ItemServiceImpl.java

@@ -176,7 +176,6 @@ public class ItemServiceImpl implements ItemService {
                 vo.setCollectCount(StringUtil.formatCount(count));
                 // 设置藏品发布用户的昵称和头像
                 itemCommonService.getNicknameAvatar(es.getId(), vo);
-                //TODO 从es里获取
                 vo.setViewPermission(0);
 
                 AgentTranceResponseVo agentTranceResponseVo = new AgentTranceResponseVo();
@@ -259,6 +258,8 @@ public class ItemServiceImpl implements ItemService {
                     vo.setItemNickname(nickname);
                     vo.setItemAvatar(avatar);
                     vo.setViewPermission(item.getViewPermission());
+                    // 设置浏览量
+                    vo.setViewsNumber(item.getViewPermission().equals(ViewPermissionEnum.ALL.getCode()) ? StringUtil.formatCount(footPrintDao.countByItemIds(item.getId(), null)) : "0");
 
                     AgentTranceResponseVo agentTranceResponseVo = new AgentTranceResponseVo();
                     agentTranceResponseVo.setAgentTraceInfo_("");
@@ -304,7 +305,9 @@ public class ItemServiceImpl implements ItemService {
                         // 设置藏品发布用户的昵称和头像
                         vo.setItemNickname(itemNickname);
                         vo.setItemAvatar(itemAvatar);
-                        vo.setViewPermission(es.getViewPermission());
+                        vo.setViewPermission(0);
+                        // 设置浏览量
+                        vo.setViewsNumber(StringUtil.formatCount(footPrintDao.countByItemIds(es.getId(), null)));
 
                         AgentTranceResponseVo agentTranceResponseVo = new AgentTranceResponseVo();
                         agentTranceResponseVo.setAgentTraceInfo_("");