From 1c3c5089f6b58e52cb3f0406d3d471afb73e096d Mon Sep 17 00:00:00 2001 From: wangqx Date: Thu, 18 Sep 2025 10:57:17 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E4=BF=AE=E6=94=B9pom=E5=92=8C=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .run/ruoyi-server.run.xml | 2 +- ruoyi-modules/pom.xml | 2 +- ruoyi-modules/ruoyi-statistics/pom.xml | 4 + .../soopin/statistics/aop/PageViewPoint.java | 4 +- .../aop/aspect/PageViewInterceptor.java | 110 +++++++++--------- 5 files changed, 61 insertions(+), 61 deletions(-) diff --git a/.run/ruoyi-server.run.xml b/.run/ruoyi-server.run.xml index 6c5031edb..17e86fe1c 100644 --- a/.run/ruoyi-server.run.xml +++ b/.run/ruoyi-server.run.xml @@ -3,7 +3,7 @@ diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml index 0cfce22fb..e038cbff7 100644 --- a/ruoyi-modules/pom.xml +++ b/ruoyi-modules/pom.xml @@ -22,7 +22,7 @@ ruoyi-im ruoyi-auth ruoyi-transaction - + ruoyi-statistics ruoyi-modules diff --git a/ruoyi-modules/ruoyi-statistics/pom.xml b/ruoyi-modules/ruoyi-statistics/pom.xml index 776bafa20..ef3a12345 100644 --- a/ruoyi-modules/ruoyi-statistics/pom.xml +++ b/ruoyi-modules/ruoyi-statistics/pom.xml @@ -26,6 +26,10 @@ org.dromara ruoyi-member + + org.dromara + ruoyi-order + org.dromara ruoyi-content diff --git a/ruoyi-modules/ruoyi-statistics/src/main/java/com/wzj/soopin/statistics/aop/PageViewPoint.java b/ruoyi-modules/ruoyi-statistics/src/main/java/com/wzj/soopin/statistics/aop/PageViewPoint.java index a2e8788c2..0fe3634fd 100644 --- a/ruoyi-modules/ruoyi-statistics/src/main/java/com/wzj/soopin/statistics/aop/PageViewPoint.java +++ b/ruoyi-modules/ruoyi-statistics/src/main/java/com/wzj/soopin/statistics/aop/PageViewPoint.java @@ -1,6 +1,7 @@ package com.wzj.soopin.statistics.aop; -import cn.lili.modules.statistics.aop.enums.PageViewEnum; + +import com.wzj.soopin.statistics.aop.enums.PageViewEnum; import java.lang.annotation.*; @@ -10,6 +11,7 @@ import java.lang.annotation.*; * @author Bulbasaur * @since 2021/7/9 1:47 上午 */ + @Target({ElementType.PARAMETER, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) @Documented diff --git a/ruoyi-modules/ruoyi-statistics/src/main/java/com/wzj/soopin/statistics/aop/aspect/PageViewInterceptor.java b/ruoyi-modules/ruoyi-statistics/src/main/java/com/wzj/soopin/statistics/aop/aspect/PageViewInterceptor.java index e95109b02..907446fb8 100644 --- a/ruoyi-modules/ruoyi-statistics/src/main/java/com/wzj/soopin/statistics/aop/aspect/PageViewInterceptor.java +++ b/ruoyi-modules/ruoyi-statistics/src/main/java/com/wzj/soopin/statistics/aop/aspect/PageViewInterceptor.java @@ -1,15 +1,9 @@ package com.wzj.soopin.statistics.aop.aspect; -import cn.lili.cache.Cache; -import cn.lili.cache.CachePrefix; -import cn.lili.common.context.ThreadContextHolder; -import cn.lili.common.utils.IpUtils; -import cn.lili.common.utils.SpelUtil; -import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.goods.entity.vos.GoodsSkuVO; -import cn.lili.modules.statistics.aop.PageViewPoint; -import cn.lili.modules.statistics.aop.enums.PageViewEnum; -import cn.lili.modules.statistics.util.StatisticsSuffix; + +import com.wzj.soopin.statistics.aop.PageViewPoint; +import com.wzj.soopin.statistics.aop.enums.PageViewEnum; +import jakarta.persistence.Cache; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.AfterReturning; @@ -28,8 +22,8 @@ import java.util.Map; * @author Chopper * @since 2021-01-14 18:01 */ -@Aspect -@Configuration +//@Aspect +//@Configuration @Slf4j public class PageViewInterceptor { @@ -38,54 +32,54 @@ public class PageViewInterceptor { - @AfterReturning(returning = "rvt", pointcut = "@annotation(cn.lili.modules.statistics.aop.PageViewPoint)") +// @AfterReturning(returning = "rvt", pointcut = "@annotation(cn.lili.modules.statistics.aop.PageViewPoint)") public void interceptor(JoinPoint point, Object rvt) { MethodSignature signature = (MethodSignature) point.getSignature(); Method method = signature.getMethod(); PageViewPoint pageViewPoint = method.getAnnotation(PageViewPoint.class); - PageViewEnum pageViewEnum = pageViewPoint.type(); - //store id 为-1 代表平台访问 - String storeId; - //商品访问 - String goodsId = null; - - switch (pageViewEnum) { - case SKU: - ResultMessage> skuRvt = (ResultMessage>) rvt; - if (skuRvt != null && skuRvt.getResult() != null && skuRvt.getResult().containsKey("data")) { - GoodsSkuVO goodsSkuDetail = (GoodsSkuVO) skuRvt.getResult().get("data"); - storeId = goodsSkuDetail.getStoreId(); - goodsId = goodsSkuDetail.getGoodsId(); - break; - } - case STORE: - Map map = null; - try { - map = spelFormat(point); - } catch (Exception e) { - return; - } - storeId = map.get("id"); - break; - default: - storeId = "-1"; - } - String ip = IpUtils.getIpAddress(ThreadContextHolder.getHttpRequest()); - try { - //PV 统计48小时过期 留下一定时间予以统计累计数据库 - cache.incr(CachePrefix.PV.getPrefix() + StatisticsSuffix.suffix(), 60 * 60 * 48); - - //平台UV统计 - cache.cumulative(CachePrefix.UV.getPrefix() + StatisticsSuffix.suffix(), ip); - - //PV 统计48小时过期 留下一定时间予以统计累计数据库 - cache.incr(CachePrefix.STORE_PV.getPrefix() + StatisticsSuffix.suffix(storeId), 60 * 60 * 48); - - //店铺UV 统计，则需要对id去重复，所以如下处理 - cache.cumulative(CachePrefix.STORE_UV.getPrefix() + StatisticsSuffix.suffix(storeId), ip); - } catch (Exception e) { - log.error("页面出错", e); - } +// PageViewEnum pageViewEnum = pageViewPoint.type(); +// //store id 为-1 代表平台访问 +// String storeId; +// //商品访问 +// String goodsId = null; +// +// switch (pageViewEnum) { +// case SKU: +// ResultMessage> skuRvt = (ResultMessage>) rvt; +// if (skuRvt != null && skuRvt.getResult() != null && skuRvt.getResult().containsKey("data")) { +// GoodsSkuVO goodsSkuDetail = (GoodsSkuVO) skuRvt.getResult().get("data"); +// storeId = goodsSkuDetail.getStoreId(); +// goodsId = goodsSkuDetail.getGoodsId(); +// break; +// } +// case STORE: +// Map map = null; +// try { +// map = spelFormat(point); +// } catch (Exception e) { +// return; +// } +// storeId = map.get("id"); +// break; +// default: +// storeId = "-1"; +// } +// String ip = IpUtils.getIpAddress(ThreadContextHolder.getHttpRequest()); +// try { +// //PV 统计48小时过期 留下一定时间予以统计累计数据库 +// cache.incr(CachePrefix.PV.getPrefix() + StatisticsSuffix.suffix(), 60 * 60 * 48); +// +// //平台UV统计 +// cache.cumulative(CachePrefix.UV.getPrefix() + StatisticsSuffix.suffix(), ip); +// +// //PV 统计48小时过期 留下一定时间予以统计累计数据库 +// cache.incr(CachePrefix.STORE_PV.getPrefix() + StatisticsSuffix.suffix(storeId), 60 * 60 * 48); +// +// //店铺UV 统计，则需要对id去重复，所以如下处理 +// cache.cumulative(CachePrefix.STORE_UV.getPrefix() + StatisticsSuffix.suffix(storeId), ip); +// } catch (Exception e) { +// log.error("页面出错", e); +// } } @@ -101,8 +95,8 @@ public class PageViewInterceptor { Map result = new HashMap<>(2); MethodSignature signature = (MethodSignature) joinPoint.getSignature(); PageViewPoint pageViewPoint = signature.getMethod().getAnnotation(PageViewPoint.class); - String id = SpelUtil.compileParams(joinPoint, pageViewPoint.id()); - result.put("id", id); +// String id = SpelUtil.compileParams(joinPoint, pageViewPoint.id()); +// result.put("id", id); return result; } }