增加广告源类型筛选 增加业务节点

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

@@ -125,6 +125,15 @@ public class RiskController {
         return riskFeign.getRiskConfig(appIds);
     }
 
+    /**
+     * 查询配置字段选项
+     */
+    @ApiOperation("查询配置字段选项")
+    @GetMapping("/getByNode")
+    public ResultTable<RiskConfigView> getRiskConfig(@RequestParam(name = "effectNode", required = false) Integer effectNode) {
+        return riskFeign.getByNode(effectNode);
+    }
+
     /**
      * 启用或关闭风控配置
      */

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(name = "userId", required = true) String userId){
-        return appUserService.ecpmList(userId);
+    public ResultTable<YtUserEcpmListView> ecpmList(@RequestParam(name = "userId", required = true) String userId, @RequestParam(name = "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(name = "userId",required = true) String userId);
+    ResultTable<YtDyzAdRecord> adRecords(@RequestParam(name = "userId",required = true) String userId,@RequestParam(name = "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(name = "userId",required = true) String userId) {
-        return ResultTable.resultTableOk(new PageInfo<YtDyzAdRecord>(adRecordMapper.getByUserId(userId)));
+    public ResultTable<YtDyzAdRecord> adRecords(@RequestParam(name = "userId",required = true) String userId,@RequestParam(name = "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,9 +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>-->
+          <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-feign/src/main/java/com/ytpm/feign/RiskFeign.java

@@ -60,6 +60,9 @@ public interface RiskFeign {
     @GetMapping("/riskConfig/options")
     ResultTable<RiskConfigView> getRiskConfig(@RequestParam("appIds")String appIds);
 
+    @GetMapping("/riskConfig/getByNode")
+    ResultTable<RiskConfigView> getByNode(@RequestParam("effectNode")Integer effectNode);
+
     @GetMapping("/riskConfig/enabledConfig")
     Result<?> isEnabledConfig(@RequestParam("templateId")String templateId);
 

yt-risk/risk-manage/src/main/java/com/ytpm/controller/RiskConfigController.java

@@ -39,6 +39,15 @@ public class RiskConfigController {
         return riskService.getRiskConfig(appIds);
     }
 
+    /**
+     * 查询配置字段选项
+     */
+    @ApiOperation("查询配置字段选项")
+    @GetMapping("/getByNode")
+    public ResultTable<RiskConfigView> getByNode(@RequestParam("effectNode")Integer effectNode) {
+        return riskService.getFieldConfigByNode(effectNode);
+    }
+
     /**
      * 保存风控配置
      */

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

@@ -489,7 +489,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(),AdSourceTypeEnum.rewarded_video.getAdSourceType());
         List<YtDyzAdRecord> records = table.getData();
         if(records.isEmpty()){
             return Result.resultOk(RepMessage.QUERY_SUCCESS);
@@ -497,8 +497,6 @@ public class RiskServiceImpl extends ReflectUtil implements RiskService {
         //过滤出当日的激励视频数据 按照时间正序排以便筛选每日前几条激励视频
         records = records.stream().filter(s->
             DateUtil.isSameDay(DateUtil.parse(s.getFinishTime()), new Date())
-                &&
-                    AdSourceTypeEnum.rewarded_video.getAdSourceType() == s.getAdSourceType()
         ).sorted(Comparator.comparing(YtDyzAdRecord::getFinishTime)).collect(Collectors.toList());
         //校验风控742规则
         RiskTemplateView ecpmLimit= configMapper.getByCode("742");