浏览代码

feat:lime分页查询ecpm

hidewnd 1 月之前
父节点
当前提交
c25941719e

+ 31 - 0
yt-common/src/main/java/com/ytpm/agent/param/AdRecordListParam.java

@@ -0,0 +1,31 @@
+package com.ytpm.agent.param;
+
+
+import com.ytpm.general.PageMeta;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+/**
+ * 用户广告记录查询
+ * @author lih
+ * @date 2025-09-12 15:57
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel("广告源管理列表入参")
+public class AdRecordListParam extends PageMeta {
+
+    private String appId;
+
+    private String userId;
+
+    private String adsourceType;
+
+    private Integer loginStatus;
+}

+ 4 - 0
yt-lime/lime-feign/src/main/java/com/ytpm/lime/feign/LimeFeign.java

@@ -1,5 +1,6 @@
 package com.ytpm.lime.feign;
 
+import com.ytpm.agent.param.AdRecordListParam;
 import com.ytpm.agent.param.AuditCheckParam;
 import com.ytpm.agent.view.AgentAdGroupStaticsVO;
 import com.ytpm.agent.view.AgentTopCountView;
@@ -51,6 +52,9 @@ public interface LimeFeign {
     @GetMapping("/user/adRecords")
     ResultTable<YtDyzAdRecord> adRecords(@RequestParam(name = "userId",required = true) String userId, @RequestParam(name = "adsourceType",required = false)Integer adsourceType);
 
+    @GetMapping("/user/adRecords/page")
+    ResultTable<YtDyzAdRecord> adRecordsPage(@RequestBody AdRecordListParam param);
+
     @PostMapping("/user/queryUserByTime")
     List<YtDyzUser> queryUserByTime(@RequestBody AppUserQueryParam appUserQueryParam);
 

+ 10 - 0
yt-lime/lime-service/src/main/java/com/ytpm/lime/controller/UserController.java

@@ -3,9 +3,11 @@ package com.ytpm.lime.controller;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
+import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.ytpm.advertise.enums.AdSourceTypeEnum;
 import com.ytpm.agent.enums.UserStatusEnum;
+import com.ytpm.agent.param.AdRecordListParam;
 import com.ytpm.agent.param.AuditCheckParam;
 import com.ytpm.agent.param.AuditUserParam;
 import com.ytpm.agent.view.AgentAuditCheckVO;
@@ -224,6 +226,14 @@ public class UserController {
         return ResultTable.resultTableOk(new PageInfo<YtDyzAdRecord>(result));
     }
 
+    @PostMapping("/adRecords/page")
+    public ResultTable<YtDyzAdRecord> adRecordsPage(@RequestBody AdRecordListParam param) {
+        PageHelper.startPage(param.getPage(), param.getLimit());
+        List<YtDyzAdRecord> adrecords = adRecordMapper.getByUserByParam(param);
+        return ResultTable.resultTableOk(new PageInfo<>(adrecords));
+    }
+
+
     @PostMapping("/queryUserByTime")
     public List<YtDyzUser> queryUserByTime(@RequestBody AppUserQueryParam appUserQueryParam) {
         List<YtDyzUser> ytDyzUsers = appUserMapper.queryAllByTime(appUserQueryParam.getStartTime(), appUserQueryParam.getEndTime(),appUserQueryParam.getAppIdList());

+ 3 - 0
yt-lime/lime-service/src/main/java/com/ytpm/lime/dao/AdRecordMapper.java

@@ -1,5 +1,6 @@
 package com.ytpm.lime.dao;
 
+import com.ytpm.agent.param.AdRecordListParam;
 import com.ytpm.app.model.YtDyzAdRecord;
 import com.ytpm.app.param.YtAppUserListParam;
 import com.ytpm.middle.view.AppRevenueHourVO;
@@ -27,6 +28,8 @@ public interface AdRecordMapper {
      */
     List<YtDyzAdRecord> getByUserId(@Param("userId") String userId,@Param("adsourceType") Integer adsourceType);
 
+    List<YtDyzAdRecord> getByUserByParam(AdRecordListParam param);
+
     /**
      * 查询激励视频记录
      */

+ 3 - 3
yt-lime/lime-service/src/main/resources/bootstrap.yml

@@ -7,7 +7,7 @@ yt:
   prod_2: 146.56.196.49
 spring:
   profiles:
-    active: prod
+    active: local
 ---
 spring:
   profiles: local
@@ -19,11 +19,11 @@ spring:
     nacos:
       discovery:
         server-addr: ${yt.local}:${yt.port}
-        namespace: 52439154-ea03-4121-9759-44d0cacc4765
+        namespace: 1aff43c9-b617-4d0b-8c3a-9d8b44a8beae
       config:
         server-addr: ${yt.local}:${yt.port}
         file-extension: yml
-        namespace: 52439154-ea03-4121-9759-44d0cacc4765
+        namespace: 1aff43c9-b617-4d0b-8c3a-9d8b44a8beae
 ---
 spring:
   profiles: dev

+ 17 - 0
yt-lime/lime-service/src/main/resources/mapper/AdRecordMapper.xml

@@ -101,6 +101,23 @@
         </if>
         order by finish_time desc
     </select>
+    <select id="getByUserByParam" resultType="com.ytpm.app.model.YtDyzAdRecord">
+        select
+        record_id, user_id,app_id, nick_name, placement_id, ad_source_id, revenue, network_form_id, network_name,
+        network_placement_id, finish_time, begin_time,result_json,ad_source_type,ad_source_index,ecpm,
+        ifnull(#{loginStatus}, 2) as loginStatus
+        <if test="loginStatus != null and loginStatus == 1">
+            from yt_dyz_ad_record_visitor
+        </if>
+        <if test="loginStatus == null or loginStatus != 1">
+            from yt_dyz_ad_record
+        </if>
+        where user_id = #{userId}
+        <if test="adsourceType != null and adsourceType!=888">
+            and ad_source_type = #{adsourceType}
+        </if>
+        order by finish_time desc
+    </select>
     <select id="getByUserIds" resultType="com.ytpm.app.model.YtDyzAdRecord">
         select
         record_id, user_id,app_id, nick_name, placement_id, ad_source_id, revenue, network_form_id, network_name, network_placement_id, finish_time, begin_time,result_json,ad_source_type,ad_source_index,ecpm