查看用户ecpm 增加adSourceType 非必传字段

yt-agent/agent-service/src/main/java/com/ytpm/controller/YtAppUserController.java

@@ -53,7 +53,7 @@ public class YtAppUserController {
      */
     @GetMapping("/ecpm")
     @ApiOperation(value = "查询用户ecpm数据")
-    public ResultTable<YtUserEcpmListView> ecpmList(@RequestParam("userId")String userId){
-        return appUserService.ecpmList(userId);
+    public ResultTable<YtUserEcpmListView> ecpmList(@RequestParam(value = "userId", required = true)String userId,@RequestParam(value = "adSourceType",required = false) Integer adSourceType){
+        return appUserService.ecpmList(userId,adSourceType);
     }
 }

yt-agent/agent-service/src/main/java/com/ytpm/service/YtAppUserService.java

@@ -25,5 +25,5 @@ public interface YtAppUserService {
     /**
      * 查询用户的ecpm列表
      */
-    ResultTable<YtUserEcpmListView> ecpmList(String userId);
+    ResultTable<YtUserEcpmListView> ecpmList(String userId, Integer adSourceType);
 }

yt-agent/agent-service/src/main/java/com/ytpm/service/impl/YtAppUserServiceImpl.java

@@ -141,8 +141,8 @@ public class YtAppUserServiceImpl implements YtAppUserService {
      * 查询用户的ecpm
      */
     @Override
-    public ResultTable<YtUserEcpmListView> ecpmList(String userId) {
-        ResultTable<YtDyzAdRecord> table = appFeign.adRecords(userId);
+    public ResultTable<YtUserEcpmListView> ecpmList(String userId,Integer adSourceType) {
+        ResultTable<YtDyzAdRecord> table = appFeign.adRecords(userId,adSourceType);
         List<YtDyzAdRecord> data = table.getData();
         return ResultTable.resultTableOk(new PageInfo<>(data));
     }

yt-app/app-feign/src/main/java/com/ytpm/feign/AppFeign.java

@@ -26,7 +26,7 @@ public interface AppFeign {
     @PostMapping("/user/updateUserInfo")
     Result<?> updateUserInfo(@RequestBody YtDyzUser dyzUser);
     @GetMapping("/user/adRecords")
-    ResultTable<YtDyzAdRecord> adRecords(@RequestParam("userId") String userId);
+    ResultTable<YtDyzAdRecord> adRecords(@RequestParam(value = "userId",required = true) String userId,@RequestParam(value = "adSourceType",required = false) Integer adSourceType);
 
     @PostMapping("/user/queryUserByTime")
     List<YtDyzUser> queryUserByTime(@RequestBody AppUserQueryParam appUserQueryParam);

yt-app/app-service/src/main/java/com/ytpm/controller/UserController.java

@@ -189,8 +189,8 @@ public class UserController {
      * 查询用户的广告记录
      */
     @GetMapping("/adRecords")
-    public ResultTable<YtDyzAdRecord> adRecords(@RequestParam("userId") String userId) {
-        return ResultTable.resultTableOk(new PageInfo<YtDyzAdRecord>(adRecordMapper.getByUserId(userId)));
+    public ResultTable<YtDyzAdRecord> adRecords(@RequestParam(value = "userId",required = true) String userId,@RequestParam(value = "adSourceType",required = false) Integer adSourceType) {
+        return ResultTable.resultTableOk(new PageInfo<YtDyzAdRecord>(adRecordMapper.getByUserId(userId,adSourceType)));
     }
 
     @PostMapping("/queryUserByTime")

yt-app/app-service/src/main/java/com/ytpm/dao/AdRecordMapper.java

@@ -15,7 +15,7 @@ public interface AdRecordMapper {
     /**
      * 查询用户的广告记录
      */
-    List<YtDyzAdRecord> getByUserId(@Param("userId") String userId);
+    List<YtDyzAdRecord> getByUserId(@Param("userId") String userId, @Param("adSourceType")Integer adSourceType);
 
     List<YtDyzAdRecord> getByUserIds(@Param("userIds") String userIds);
 }

yt-app/app-service/src/main/resources/mapper/AdRecordMapper.xml

@@ -45,6 +45,9 @@
             record_id, user_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
         from yt_dyz_ad_record
         where user_id = #{userId}
+          <if test="adSourceType != null">
+              and ad_source_type = #{adSourceType}
+          </if>
         order by finish_time desc
     </select>
     <select id="getByUserIds" resultType="com.ytpm.app.model.YtDyzAdRecord">

yt-risk/risk-manage/src/main/java/com/ytpm/service/impl/RiskServiceImpl.java

@@ -3,6 +3,7 @@ package com.ytpm.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageHelper;
@@ -147,7 +148,7 @@ public class RiskServiceImpl extends ReflectUtil implements RiskService {
             BeanUtil.copyProperties(listVO, config);
             config.setChannelId(param.getChannelId());
             String format = String.format(config.getFieldDesc(), config.getConfigVal());
-            if(StrUtil.isNotBlank(format)){
+            if(CharSequenceUtil.isNotBlank(format)&&configList.indexOf(listVO)!= (configList.size() - 1)){
                 content.append(format).append(",");
             }
             configs.add(config);
@@ -464,7 +465,7 @@ public class RiskServiceImpl extends ReflectUtil implements RiskService {
      */
     @Override
     public Result<?> checkAdRisk(YtDyzUser dyzUser) {
-        ResultTable<YtDyzAdRecord> table = appFeign.adRecords(dyzUser.getUserId());
+        ResultTable<YtDyzAdRecord> table = appFeign.adRecords(dyzUser.getUserId(),null);
         List<YtDyzAdRecord> records = table.getData();
         if(records.isEmpty()){
             return Result.resultOk(RepMessage.QUERY_SUCCESS);