修改 发送消息和浏览量

ch-core/src/main/java/com/wwdz/ch/core/consts/MessageEnum.java

@@ -102,5 +102,38 @@ public class MessageEnum {
         }
     }
 
+    public enum ContentTextEnum {
+        ITEM_SHARE(1, "分享了您的藏品"),
+        ITEM_COLLECT(2, "收藏了您的藏品"),
+        FAVORITES_SHARE(3, "分享了您的收藏册"),
+        FAVORITES_COLLECT(3, "收藏了您的收藏册"),
+        ;
+
+        private int code;
+        private String des;
+
+        ContentTextEnum(int code, String des) {
+            this.code = code;
+            this.des = des;
+        }
+
+        public static String getNameByCode(int code) {
+            for (ContentTextEnum contentTextEnum : ContentTextEnum.values()) {
+                if (code == contentTextEnum.getCode()) {
+                    return contentTextEnum.getDes();
+                }
+            }
+            return null;
+        }
+
+        public int getCode() {
+            return code;
+        }
+
+        public String getDes() {
+            return des;
+        }
+    }
+
 
 }

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

@@ -39,7 +39,7 @@ public interface FootPrintDao {
      * @param itemIds
      * @return
      */
-    long countByItemIds(Long itemId, List<Long> itemIds);
+    long countByItemIds(Long userId, Long itemId, List<Long> itemIds);
 
     /**
      * 批量删除记录

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

@@ -58,11 +58,12 @@ public class FootPrintDaoImpl implements FootPrintDao {
     }
 
     @Override
-    public long countByItemIds(Long itemId, List<Long> itemIds) {
+    public long countByItemIds(Long userId, Long itemId, List<Long> itemIds) {
         FootprintExample example = new FootprintExample();
         FootprintExample.Criteria criteria = example.createCriteria();
         JdbcHelper.ifPresent(itemId, criteria::andItemIdEqualTo);
         JdbcHelper.ifPresent(itemIds, criteria::andItemIdIn);
+        JdbcHelper.ifPresent(userId, criteria::andUserIdNotEqualTo);
         criteria.andDeletedEqualTo(false);
         return footprintMapper.countByExample(example);
     }

ch-wx-api/src/main/java/com/wwdz/ch/wx/entity/request/ItemRequestDto.java

@@ -47,4 +47,6 @@ public class ItemRequestDto implements Entity {
     private Integer loginType;
     // 查看权限(0所有人,1仅自己可见)
     private Integer viewPermission;
+    // 分享类型（0、藏品，1、收藏册，2、用户主页）
+    private Integer shareType;
 }

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

@@ -273,7 +273,7 @@ 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.setViewsNumber(item.getViewPermission().equals(ViewPermissionEnum.ALL.getCode()) ? StringUtil.formatCount(footPrintDao.countByItemIds(vo.getItemUserId(), 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,11 +91,14 @@ public class ItemCommonServiceImpl implements ItemCommonService {
             List<Long> itemIds = userItemsRelations.stream()
                     .map(UserItemsRelation::getItemId).collect(Collectors.toList());
             collectionsNumber = favoritesItemsRelationDao.countByItemIds(itemIds);
-            viewsNumber = footPrintDao.countByItemIds(null, itemIds);
             CoinRequestDto coinRequestDto = new CoinRequestDto();
             coinRequestDto.setIds(itemIds);
             List<Item> itemList = itemDao.findListNotDeleted(coinRequestDto);
-            allNumber = itemList.stream().filter(s -> s.getViewPermission().equals(ViewPermissionEnum.ALL.getCode())).count();
+            List<Item> allItemList = itemList.stream().filter(s -> s.getViewPermission().equals(ViewPermissionEnum.ALL.getCode())).collect(Collectors.toList());
+            if (CollectionUtils.isNotEmpty(allItemList)) {
+                allNumber = allItemList.size();
+                viewsNumber = footPrintDao.countByItemIds(userInfo.getUserId(), null, allItemList.stream().map(Item::getId).collect(Collectors.toList()));
+            }
             privacyNumber = itemList.stream().filter(s -> s.getViewPermission().equals(ViewPermissionEnum.ONLY_ONESELF.getCode())).count();
         }
 

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

@@ -5,7 +5,6 @@ import com.wwdz.ch.wx.entity.request.ItemRequestDto;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 public interface ItemService {
     /**
@@ -93,18 +92,22 @@ public interface ItemService {
      *
      * @param page
      * @param scene
-     * @param response
+     * @param loginType
+     * @param request
      * @return
      */
-    Result getAcode(String page, String scene, Integer loginType, HttpServletRequest request, HttpServletResponse response);
+    Result getAcode(String page, String scene, Integer loginType, HttpServletRequest request);
 
     /**
      * 获取小程序链接
      *
      * @param pageUrl
+     * @param loginType
+     * @param shareType
+     * @param request
      * @return
      */
-    Result getLink(String pageUrl, Integer loginType, HttpServletRequest request);
+    Result getLink(String pageUrl, Integer loginType, Integer shareType, HttpServletRequest request);
 
     /**
      * 上传图片

ch-wx-api/src/main/java/com/wwdz/ch/wx/util/StringUtil.java

@@ -70,4 +70,8 @@ public class StringUtil {
     public static String formatMessageKey(long sendId, int type, long receiverId) {
         return "" + sendId + ":" + type + ":" + receiverId;
     }
+
+    public static String formatCollectMessageKey(long sendId, int type, long receiverId, int idType, long id) {
+        return "" + sendId + ":" + type + ":" + receiverId + ":" + idType + ":" + id;
+    }
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/WxItemController.java

@@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.Objects;
 
@@ -176,7 +175,7 @@ public class WxItemController {
 
     @ApiOperation(value = "小程序码")
     @GetMapping("/getAcode")
-    public Result getAcode(String page, String scene, Integer loginType, HttpServletRequest request, HttpServletResponse response) {
+    public Result getAcode(String page, String scene, Integer loginType, HttpServletRequest request) {
         logger.info("【请求开始】获小程序码,请求参数:{}", "page=" + page + ",scene=" + scene + ",loginType=" + loginType);
         if (StringUtils.isBlank(page)) {
             return Result.failed("页面路径不能为空");
@@ -187,7 +186,7 @@ public class WxItemController {
         if (Objects.isNull(loginType)) {
             return Result.failed("请提供请求的环境类型");
         }
-        return itemService.getAcode(page, scene, loginType, request, response);
+        return itemService.getAcode(page, scene, loginType, request);
     }
 
     @ApiOperation(value = "小程序链接")
@@ -200,15 +199,18 @@ public class WxItemController {
         if (Objects.isNull(dto.getLoginType())) {
             return Result.failed("请提供请求的环境类型");
         }
-        return itemService.getLink(dto.getPageUrl(), dto.getLoginType(), request);
+        if (Objects.isNull(dto.getShareType())) {
+            return Result.failed("请提供分享类型");
+        }
+        return itemService.getLink(dto.getPageUrl(), dto.getLoginType(), dto.getShareType(), request);
     }
 
     @ApiOperation(value = "分享发送消息")
     @PostMapping("/shareSendMessage")
     public Result shareSendMessage(@RequestBody ItemRequestDto dto, HttpServletRequest request) {
         logger.info("【请求开始】分享发送消息,请求参数:{}", JSON.toJSONString(dto));
-        if (Objects.isNull(dto.getItemId())) {
-            return Result.failed("请选择被分享的藏品");
+        if (Objects.isNull(dto.getId())) {
+            return Result.failed("请选择被分享的对象");
         }
         return itemService.shareSendMessage(dto, request);
     }