feat: page view count

novohit · Nov 11, 2023 · da241f8 · da241f8
1 parent db10fe5
commit da241f8
Show file tree

Hide file tree

Showing 8 changed files with 95 additions and 10 deletions.
diff --git a/cloudshare-frontend/src/views/list-page/share/index.vue b/cloudshare-frontend/src/views/list-page/share/index.vue
@@ -91,13 +91,13 @@
                     min-width="100"
                     align="center">
                 </el-table-column>
-                <el-table-column
+                <!-- <el-table-column
                     prop="download"
                     sortable
                     label="下载量"
                     min-width="100"
                     align="center">
-                </el-table-column>
+                </el-table-column> -->
                 <el-table-column
                     prop="shareStatus"
                     sortable

diff --git a/server/src/main/java/com/cloudshare/server/common/constant/BizConstant.java b/server/src/main/java/com/cloudshare/server/common/constant/BizConstant.java
@@ -6,6 +6,10 @@
  */
 public final class BizConstant {
 
+    private BizConstant() {
+
+    }
+
     public static final String LINUX_SEPARATOR = "/";
 
     public static final String DOT = ".";
@@ -29,4 +33,6 @@ public final class BizConstant {
     public static final String SEARCH_HISTORY_PREFIX = "cloudshare:search_history:";
 
     public static final String DATETIME_PATTERN = "yyyy-MM-dd HH:mm:ss";
+
+    public static final String LINK_PV_PREFIX = "cloudshare:pv:";
 }
diff --git a/server/src/main/java/com/cloudshare/server/common/pvcount/PVCountTask.java b/server/src/main/java/com/cloudshare/server/common/pvcount/PVCountTask.java
@@ -0,0 +1,45 @@
+package com.cloudshare.server.common.pvcount;
+
+import com.cloudshare.server.common.constant.BizConstant;
+import com.cloudshare.server.link.service.ShortLinkService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * @author novo
+ * @since 2023/11/7
+ */
+@Component
+@Slf4j
+public class PVCountTask {
+
+    private final ShortLinkService shortLinkService;
+
+    private final StringRedisTemplate stringRedisTemplate;
+
+    public PVCountTask(ShortLinkService shortLinkService, StringRedisTemplate stringRedisTemplate) {
+        this.shortLinkService = shortLinkService;
+        this.stringRedisTemplate = stringRedisTemplate;
+    }
+
+
+    @Scheduled(cron = "0 */5 * * * ?")
+    public void dataSync() {
+        Set<String> keys = stringRedisTemplate.keys(BizConstant.LINK_PV_PREFIX + "*");
+        if (!CollectionUtils.isEmpty(keys)) {
+            List<String> strings = keys.stream().toList();
+            List<String> values = stringRedisTemplate.opsForValue().multiGet(strings);
+            for (int i = 0; i < strings.size(); i++) {
+                String key = strings.get(i);
+                String code = key.replaceFirst(BizConstant.LINK_PV_PREFIX, "");
+                shortLinkService.savePV(code, Long.parseLong(values.get(i)));
+            }
+        }
+    }
+}
diff --git a/server/src/main/java/com/cloudshare/server/link/controller/ShortLinkController.java b/server/src/main/java/com/cloudshare/server/link/controller/ShortLinkController.java
@@ -54,6 +54,7 @@ public void dispatch(@PathVariable("code") String code, HttpServletRequest reque
         if (CheckUtil.isLetterOrDigit(code)) {
             ShortLink shortLink = shortLinkService.findOneByCode(code);
             if (shortLink != null) {
+                shortLinkService.incrementPV(code);
                 response.setHeader("Location", shortLink.getOriginalUrl());
                 // 302跳转
                 response.setStatus(HttpStatus.FOUND.value());

diff --git a/server/src/main/java/com/cloudshare/server/link/service/ShortLinkService.java b/server/src/main/java/com/cloudshare/server/link/service/ShortLinkService.java
@@ -1,10 +1,13 @@
 package com.cloudshare.server.link.service;
 
+import com.cloudshare.server.common.constant.BizConstant;
 import com.cloudshare.server.link.model.ShortLink;
 import com.cloudshare.server.link.repository.ShortLinkRepository;
 import com.google.common.hash.Hashing;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 /**
  * @author novo
@@ -15,13 +18,16 @@ public class ShortLinkService {
 
     private final ShortLinkRepository shortLinkRepository;
 
+    private final StringRedisTemplate stringRedisTemplate;
+
     private static final String CHARS = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
 
     @Value("${cloudshare.short-link.url}")
     private String domain;
 
-    public ShortLinkService(ShortLinkRepository shortLinkRepository) {
+    public ShortLinkService(ShortLinkRepository shortLinkRepository, StringRedisTemplate stringRedisTemplate) {
         this.shortLinkRepository = shortLinkRepository;
+        this.stringRedisTemplate = stringRedisTemplate;
     }
 
 
@@ -39,18 +45,43 @@ public String create(Long shareId, String url) {
         shortLink.setShortUrl(domain + code62);
         shortLink.setOriginalUrl(url);
         shortLink.setShareId(shareId);
+        shortLink.setPv(0L);
+        shortLink.setUv(0L);
         shortLinkRepository.save(shortLink);
         return shortLink.getShortUrl();
     }
 
+
+    public void incrementPV(String code) {
+        stringRedisTemplate.opsForValue().increment(BizConstant.LINK_PV_PREFIX + code);
+    }
+
+    public Long getPV(String code) {
+        String pv = stringRedisTemplate.opsForValue().get(BizConstant.LINK_PV_PREFIX + code);
+        if (!StringUtils.hasText(pv)) {
+            ShortLink shortLink = shortLinkRepository.findOneByCode(code);
+            return shortLink.getPv();
+        }
+        return Long.parseLong(pv);
+    }
+
+
+    public void savePV(String code, Long pv) {
+        ShortLink shortLink = shortLinkRepository.findOneByCode(code);
+        shortLink.setPv(pv);
+        shortLinkRepository.save(shortLink);
+    }
+
+    // =================================================================================================================
+
     /**
      * google murmurhash算法
      *
      * @param value
      * @return
      */
     @SuppressWarnings(value = {"all"})
-    public static long murmurHash32(String value) {
+    private long murmurHash32(String value) {
         long murmurHash32 = Hashing.murmur3_32().hashUnencodedChars(value).padToLong();
         return murmurHash32;
     }

diff --git a/server/src/main/java/com/cloudshare/server/share/controller/response/ShareVO.java b/server/src/main/java/com/cloudshare/server/share/controller/response/ShareVO.java
@@ -18,8 +18,7 @@ public record ShareVO(
         String code,
         LocalDateTime expiredAt,
         String fileName,
-        Integer pv,
-        Integer download,
+        Long pv,
         LocalDateTime createdAt
 ) {
 }
diff --git a/server/src/main/java/com/cloudshare/server/share/convert/ShareConverter.java b/server/src/main/java/com/cloudshare/server/share/convert/ShareConverter.java
@@ -14,11 +14,10 @@
 @Mapper(componentModel = "spring")
 public interface ShareConverter {
 
-    @Mapping(target = "pv", constant = "0")
-    @Mapping(target = "download", constant = "0")
+    @Mapping(target = "pv", expression = "java(pv)")
     @Mapping(target = "fileName", expression = "java(share.getFileDocument().getName())")
     @Mapping(target = "url", expression = "java(share.getShortLink().getShortUrl())")
-    ShareVO DO2VO(Share share);
+    ShareVO DO2VO(Share share, Long pv);
 
 
     List<ShareVO> DOList2VOList(List<Share> shareList);

diff --git a/server/src/main/java/com/cloudshare/server/share/service/impl/ShareServiceImpl.java b/server/src/main/java/com/cloudshare/server/share/service/impl/ShareServiceImpl.java
@@ -105,7 +105,11 @@ public ShareCreateRespVO create(ShareCreateReqDTO reqDTO) {
     public List<ShareVO> list() {
         Long userId = UserContextThreadHolder.getUserId();
         List<Share> shareList = shareRepository.findByUserId(userId);
-        List<ShareVO> resp = shareConverter.DOList2VOList(shareList);
+        List<ShareVO> resp = new ArrayList<>();
+        for (Share share : shareList) {
+            resp.add(shareConverter.DO2VO(share, shortLinkService.getPV(share.getShortLink().getCode())));
+        }
+//        List<ShareVO> resp = shareConverter.DOList2VOList(shareList);
         return resp;
     }