修改 藏馆的收藏品和收藏册数量

ch-core/src/main/java/com/wwdz/ch/core/util/MediaUtil.java

@@ -139,6 +139,55 @@ public class MediaUtil {
         return map;
     }
 
+    /**
+     * 通过文件头判断图片格式
+     *
+     * @param inputStream
+     * @return
+     * @throws IOException
+     */
+    public static String imgType(InputStream inputStream) throws IOException {
+        // 读取文件前几位
+        byte[] fileHeader = new byte[4];
+        int read = inputStream.read(fileHeader, 0, fileHeader.length);
+        inputStream.close();
+
+        // 转为十六进制字符串
+        String header = bytes2Hex(fileHeader);
+
+        if (header.contains("FFD8FF")) {
+            return "jpg";
+        } else if (header.contains("89504E47")) {
+            return "png";
+        } else if (header.contains("47494638")) {
+            return "gif";
+        } else if (header.contains("424D")) {
+            return "bmp";
+        } else if (header.contains("52494646")) {
+            return "webp";
+        } else if (header.contains("49492A00")) {
+            return "tif";
+        } else {
+            return "unknown";
+        }
+
+    }
+
+    /**
+     * 转为十六进制字符串
+     *
+     * @param bytes
+     * @return
+     */
+    public static String bytes2Hex(byte[] bytes) {
+        StringBuilder sb = new StringBuilder();
+        for (byte b : bytes) {
+            String hex = Integer.toHexString(b & 0xff);
+            sb.append(hex.length() == 2 ? hex : ("0" + hex));
+        }
+        return sb.toString();
+    }
+
     public static void main(String[] args) {
         String vedioUrl = "https://cdn.wanwudezhi.com/static/web-static/video/53596700878a572ca4fae35243aaa819.mp4";
         String url = getImageByCutVedio(vedioUrl);

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

@@ -128,7 +128,7 @@ public interface FavoritesItemsRelationDao {
      * @param userId
      * @return
      */
-    long countByUserId(Long userId);
+    long countByUserId(Long userId, List<Long> itemIds);
 
     /**
      * 连表查询获取藏品的图片

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

@@ -15,7 +15,6 @@ import org.springframework.util.CollectionUtils;
 
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 @Repository
 public class FavoritesItemsRelationDaoImpl implements FavoritesItemsRelationDao {
@@ -143,10 +142,11 @@ public class FavoritesItemsRelationDaoImpl implements FavoritesItemsRelationDao
     }
 
     @Override
-    public long countByUserId(Long userId) {
+    public long countByUserId(Long userId, List<Long> itemIds) {
         FavoritesItemsRelationExample example = new FavoritesItemsRelationExample();
         FavoritesItemsRelationExample.Criteria criteria = example.createCriteria();
         JdbcHelper.ifPresent(userId, criteria::andUserIdEqualTo);
+        JdbcHelper.ifPresent(itemIds, criteria::andItemIdNotIn);
         return favoritesItemsRelationMapper.countByExample(example);
     }
 

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

@@ -209,7 +209,8 @@ public class FavoritesServiceImpl implements FavoritesService {
     @Override
     public Result favoritesNum(FavoritesRequestDto dto) {
         try {
-            long itemNum = favoritesItemsRelationDao.countByUserId(dto.getUserId());
+            List<Long> itemIds = itemCommonService.getOnlyOneselfItemIdsByUserId(dto.getUserId());
+            long itemNum = favoritesItemsRelationDao.countByUserId(dto.getUserId(), itemIds);
             long favoritesNum = favoritesDao.countByUserId(dto.getUserId());
             Map<String, Object> map = new HashMap<>();
             map.put("itemNum", itemNum);

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

@@ -68,6 +68,11 @@ public class ItemCommonServiceImpl implements ItemCommonService {
         return itemDao.findOnlyOneselfItems(userId);
     }
 
+    @Override
+    public List<Long> getOnlyOneselfItemIdsByUserId(Long userId) {
+        return itemDao.findOnlyOneselfItems(userId);
+    }
+
     @Override
     public void getPageViews(UserInfo userInfo) {
         long followersNumber = 0;

ch-wx-api/src/main/java/com/wwdz/ch/wx/service/ItemCommonService.java

@@ -15,13 +15,21 @@ public interface ItemCommonService {
     void getNicknameAvatar(Long itemId, ItemResponseVo vo);
 
     /**
-     * 获取仅自己可见的用户发布的藏品
+     * 获取登录用户仅自己可见的用户发布的藏品
      *
      * @param token
      * @return
      */
     List<Long> getOnlyOneselfItemIds(String token);
 
+    /**
+     * 获取被查询用户仅自己可见的用户发布的藏品
+     *
+     * @param userId
+     * @return
+     */
+    List<Long> getOnlyOneselfItemIdsByUserId(Long userId);
+
     /**
      * 获取关注粉丝收藏和浏览量
      *