接口修改

ruoyi-admin/src/main/java/com/ruoyi/api/controller/clock/ApiActivityController.java

@@ -29,7 +29,6 @@ import java.util.List;
  * @author pengc
  * @date 2026-03-04
  */
-@Validated
 @Api(value = "活动信息控制器", tags = {"活动信息管理"})
 @RequiredArgsConstructor
 @RestController
@@ -42,7 +41,6 @@ public class ApiActivityController extends AbstractApiController {
     /**
      * 查询活动信息列表
      */
-    @ApiOperation("查询活动信息列表")
     @FilePathSplicing(type = FilePathSplicingType.RESPONSE)
     @GetMapping("/list")
     public R<List<ActivityVo>> list(@Validated(QueryGroup.class) ActivityBo bo) {

ruoyi-admin/src/main/java/com/ruoyi/api/controller/clock/ApiAdController.java

@@ -21,7 +21,6 @@ import javax.validation.constraints.NotNull;
  * @author pengc
  * @date 2026-03-04
  */
-@Validated
 @Api(value = "广告控制器", tags = {"广告管理"})
 @RequiredArgsConstructor
 @RestController
@@ -33,7 +32,6 @@ public class ApiAdController extends AbstractApiController {
     /**
      * 获取广告详细信息
      */
-    @ApiOperation("获取广告详细信息")
     @FilePathSplicing(type = FilePathSplicingType.RESPONSE)
     @GetMapping("/info/{locationCode}")
     public R<AdVo> info(@ApiParam("主键")

ruoyi-framework/src/main/java/com/ruoyi/framework/config/InterceptorConfiguration.java

@@ -20,7 +20,7 @@ public class InterceptorConfiguration implements WebMvcConfigurer {
         registry.addInterceptor(loginApiInterceptor)
                 .addPathPatterns("/api/**")
                 //放行的接口
-                .excludePathPatterns("/**/login");
+                .excludePathPatterns("/**/login", "/**/ad/info/**","/**/activity/**","/**/clockRecord/**");
 
     }
 

ruoyi-system/src/main/java/com/ruoyi/clock/mapper/ClockRecordMapper.java

@@ -9,7 +9,7 @@ import com.ruoyi.clock.domain.bo.AnalysisQueryBo;
 import com.ruoyi.clock.domain.bo.SaleStatisticBo;
 import com.ruoyi.clock.domain.vo.*;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
-import org.springframework.data.repository.query.Param;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -23,20 +23,19 @@ public interface ClockRecordMapper extends BaseMapperPlus<ClockRecordMapper, Clo
 
     ClockStatisticRecordVo queryClockStatisticRecord(@Param("employeeId") Long employeeId);
 
-    List<SaleStatisticRecordVo> querySaleStatisticRecordList(SaleStatisticBo saleStatisticBo);
+    List<SaleStatisticRecordVo> querySaleStatisticRecordList(@Param("bo")SaleStatisticBo saleStatisticBo);
 
-    MySaleStatisticRecordVo mySaleRank(SaleStatisticBo saleStatisticBo);
+    MySaleStatisticRecordVo mySaleRank(@Param("bo")SaleStatisticBo saleStatisticBo);
 
-    MyActivityStatisticVo myActivityStatistic(SaleStatisticBo saleStatisticBo);
+    MyActivityStatisticVo myActivityStatistic(@Param("bo")SaleStatisticBo saleStatisticBo);
 
     /**
      * 分页查询活动打卡记录列表
      */
-    Page<ActivityClockRecordVo> queryActivityClockRecordPage(Page<ActivityClockRecordVo> page,
-                                                              @Param("bo") ActivityClockRecordBo bo);
+    Page<ActivityClockRecordVo> queryActivityClockRecordPage(Page<?> page,@Param("bo") ActivityClockRecordBo bo);
 
 
-    Page<SaleStatisticRecordVo> querySaleStatisticRecordList(Page<ActivityClockRecordVo> page,@Param("bo") SaleStatisticBo saleStatisticBo);
+    Page<SaleStatisticRecordVo> querySaleStatisticRecordList(Page<?> page,@Param("bo") SaleStatisticBo saleStatisticBo);
 
 
     /**
@@ -47,7 +46,7 @@ public interface ClockRecordMapper extends BaseMapperPlus<ClockRecordMapper, Clo
     /**
      * 分页查询活动店铺销量列表（销量活动 type=1）
      */
-    Page<ActivityShopSaleVo> queryActivityShopSalePage(Page<ActivityShopSaleVo> page,
+    Page<ActivityShopSaleVo> queryActivityShopSalePage(Page<?> page,
                                                         @Param("bo") ActivityShopSaleBo bo);
 
     /**
@@ -73,17 +72,17 @@ public interface ClockRecordMapper extends BaseMapperPlus<ClockRecordMapper, Clo
     /**
      * 查询门店活跃度排行
      */
-    List<ShopActivityRankVo> queryShopActivityRank(AnalysisQueryBo bo);
+    List<ShopActivityRankVo> queryShopActivityRank(@Param("bo")AnalysisQueryBo bo);
 
     /**
      * 查询参与人数与销量趋势
      */
-    List<TrendVo> queryTrend(AnalysisQueryBo bo);
+    List<TrendVo> queryTrend(@Param("bo")AnalysisQueryBo bo);
 
     /**
      * 查询月度参与人数与销量对比
      */
-    List<MonthlyComparisonVo> queryMonthlyComparison(AnalysisQueryBo bo);
+    List<MonthlyComparisonVo> queryMonthlyComparison(@Param("bo")AnalysisQueryBo bo);
 
     /**
      * 查询门店销量排行榜 TOP 6

ruoyi-system/src/main/resources/mapper/clock/ClockRecordMapper.xml

@@ -62,14 +62,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN tb_shop s ON e.shop_id = s.shop_id
         WHERE
            r.status = 0 and act.type = 1
-          <if test="activityId != null">
-            AND r.activity_id = #{activityId}
+          <if test="bo.activityId != null">
+            AND r.activity_id = #{bo.activityId}
           </if>
-         <if test="agentId != null">
-              AND e.agent_id = #{agentId}
+         <if test="bo.agentId != null">
+              AND e.agent_id = #{bo.agentId}
           </if>
-        <if test="employeeName != null and employeeName != ''">
-            AND e.employee_name LIKE CONCAT('%', #{employeeName}, '%')
+        <if test="bo.employeeName != null and bo.employeeName != ''">
+            AND e.employee_name LIKE CONCAT('%', #{bo.employeeName}, '%')
         </if>
         GROUP BY
             r.employee_id
@@ -90,11 +90,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     LEFT JOIN tb_clock_product_record p2 ON r2.record_id = p2.record_id
                      LEFT JOIN tb_employee e   ON r2.employee_id = e.employee_id
                     WHERE r2.status = 0
-                    <if test="activityId != null">
-                        AND  r2.activity_id = #{activityId}
+                    <if test="bo.activityId != null">
+                        AND  r2.activity_id = #{bo.activityId}
                     </if>
-                    <if test="agentId != null">
-                        AND e.agent_id = #{agentId}
+                    <if test="bo.agentId != null">
+                        AND e.agent_id = #{bo.agentId}
                     </if>
                     AND act2.status = 0
                     AND act2.del_flag = '0'
@@ -108,13 +108,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  LEFT JOIN tb_employee e   ON r.employee_id = e.employee_id
                  WHERE
                  r.status = 0
-                 <if test="activityId != null">
-                    AND r.activity_id = #{activityId}
+                 <if test="bo.activityId != null">
+                    AND r.activity_id = #{bo.activityId}
                  </if>
-                 <if test="agentId != null">
-                     AND e.agent_id = #{agentId}
+                 <if test="bo.agentId != null">
+                     AND e.agent_id = #{bo.agentId}
                  </if>
-                 AND r.employee_id = #{employeeId}
+                 AND r.employee_id = #{bo.employeeId}
                  AND act.status = 0
                  AND act.del_flag = '0'
                  GROUP BY r.employee_id
@@ -127,12 +127,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN tb_employee e   ON r.employee_id = e.employee_id
         WHERE
             r.status = 0
-            AND r.employee_id = #{employeeId}
-            <if test="activityId != null">
-                AND r.activity_id = #{activityId}
+            AND r.employee_id = #{bo.employeeId}
+            <if test="bo.activityId != null">
+                AND r.activity_id = #{bo.activityId}
             </if>
-            <if test="agentId != null">
-                AND e.agent_id = #{agentId}
+            <if test="bo.agentId != null">
+                AND e.agent_id = #{bo.agentId}
             </if>
             AND act.status = 0
             AND act.del_flag = '0'
@@ -148,9 +148,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 FROM
                     tb_clock_record
                 WHERE
-                    employee_id =#{employeeId}
+                    employee_id =#{bo.employeeId}
                   AND status = 0
-                  AND activity_id =#{activityId}
+                  AND activity_id =#{bo.activityId}
             ) as clockCount,
                (
                 SELECT
@@ -159,9 +159,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     tb_clock_record r
                 LEFT JOIN tb_clock_product_record p ON r.record_id = p.record_id
                 WHERE
-                    r.employee_id =#{employeeId}
+                    r.employee_id =#{bo.employeeId}
                   AND r.status = 0
-                  AND r.activity_id =#{activityId}
+                  AND r.activity_id =#{bo.activityId}
             ) AS saleCount
     </select>
 
@@ -304,8 +304,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN tb_employee e ON r.employee_id = e.employee_id
         LEFT JOIN tb_shop s ON e.shop_id = s.shop_id
         WHERE r.status = 0
-        <if test="activityId != null">
-            AND r.activity_id = #{activityId}
+        <if test="bo.activityId != null">
+            AND r.activity_id = #{bo.activityId}
         </if>
         GROUP BY s.shop_id, s.shop_name
         ORDER BY clockCount DESC
@@ -322,8 +322,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN tb_clock_product_record p ON r.record_id = p.record_id
         WHERE r.status = 0
           AND r.clock_date >= DATE_SUB(CURDATE(), INTERVAL 30 DAY)
-        <if test="activityId != null">
-            AND r.activity_id = #{activityId}
+        <if test="bo.activityId != null">
+            AND r.activity_id = #{bo.activityId}
         </if>
         GROUP BY DATE(r.clock_date)
         ORDER BY DATE(r.clock_date)
@@ -339,8 +339,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN tb_clock_product_record p ON r.record_id = p.record_id
         WHERE r.status = 0
           AND r.clock_date >= DATE_SUB(CURDATE(), INTERVAL 6 MONTH)
-        <if test="activityId != null">
-            AND r.activity_id = #{activityId}
+        <if test="bo.activityId != null">
+            AND r.activity_id = #{bo.activityId}
         </if>
         GROUP BY DATE_FORMAT(r.clock_date, '%Y-%m')
         ORDER BY DATE_FORMAT(r.clock_date, '%Y-%m')