Merge branch '0214_visitlog_fix' into 'dev'

0214 visitlog fix

See merge request !40

community-service/src/main/java/com/tanpu/community/dao/mapper/community/VisitLogMapper.java

@@ -21,11 +21,11 @@ import java.util.List;
  * @since 2021-07-28
  */
 public interface VisitLogMapper extends BaseMapper<VisitLogEntity> {
-    @Select("select * from visit_log where ident=#{ident} and ref_id=#{refId} and ref_type=#{refType}")
+    @Select("select * from visit_log where ident=#{ident} and ref_id=#{refId} and ref_type=#{refType} for update")
     VisitLogEntity selectByIdentAndRefId(@Param("ident") String ident, @Param("refId") String refId, @Param("refType") String refType);
 
-    @Update("update visit_log set duration=duration+#{duration} where ident=#{ident}")
-    void updateDurByIdent(@Param("duration") Integer dur, @Param("ident") String ident);
+    @Update("update visit_log set duration=duration+#{duration} where ident=#{ident} and ref_id=#{refId} and ref_type=#{refType}")
+    void updateDurByIdent(@Param("duration") Integer dur, @Param("ident") String ident, @Param("refId") String refId, @Param("refType") String refType);
 
     @Select("select ref_id as id,  count(1) as times from visit_log ${ew.customSqlSegment}")
     List<TimesCountEntity> selectCountByThemeIds(@Param(Constants.WRAPPER) LambdaQueryWrapper wrapper);

community-service/src/main/java/com/tanpu/community/service/VisitLogService.java

@@ -65,18 +65,23 @@ public class VisitLogService {
     @Transactional
     public void insertOrUpdateDur(VisitLogEntity vs) {
         // 分布式锁
-        for (;;) {
+        for (int i = 0; i < 5 * 10; i++) {
             String key = getVisitLogRedisKey(vs);
-            if (redisCache.setIfAbsent(key, "1", 15)) {
+            String rand = String.valueOf((int) Math.floor(Math.random() * 100));
+            if (redisCache.setIfAbsent(key, rand, 15)) {
                 if (visitLogMapper.selectByIdentAndRefId(vs.getIdent(), vs.getRefId(), vs.getRefType()) == null) {
                     visitLogMapper.insert(vs);
                 } else {
-                    visitLogMapper.updateDurByIdent(vs.getDuration(), vs.getIdent());
+                    visitLogMapper.updateDurByIdent(vs.getDuration(), vs.getIdent(), vs.getRefId(), vs.getRefType());
                 }
-                // 如果执行超时,会删除别的实例的key
-                redisCache.evict(key);
+                redisCache.evict(key + ":" + rand);
                 return;
             }
+            try {
+                Thread.sleep(200);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
         }
     }
 
@@ -119,17 +124,6 @@ public class VisitLogService {
                 .eq(VisitLogEntity::getRefType, PageEnum.COMM_VISIT_THEME.getId()));
     }
 
-//    public LocalDateTime queryLatestViewFollow(String userId) {
-//        List<VisitLogEntity> visitSummaryEntities = visitLogMapper.selectList(new LambdaQueryWrapper<VisitLogEntity>()
-//                .eq(VisitLogEntity::getVisitorId, userId)
-//                .eq(VisitLogEntity::getRefType, VisitTypeEnum.FOLLOW_THEME_VIEW.getCode())
-//                .orderByDesc(VisitLogEntity::getCreateTime));
-//        if (CollectionUtils.isEmpty(visitSummaryEntities)) {
-//            return null;
-//        } else {
-//            return visitSummaryEntities.get(0).getCreateTime();
-//        }
-//    }
 
     //统计行为集合的浏览量
     public Map<String, Integer> getCountMapByTargetIds(List<String> refIds, String refType) {