Prechádzať zdrojové kódy

首页接口封禁数修改为统计当天封禁的

小杜 3 mesiacov pred
rodič
commit
95400755ed

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

@@ -5,6 +5,7 @@ import com.ytpm.app.model.YtDyzAdRecord;
 import com.ytpm.app.model.YtDyzUser;
 import com.ytpm.app.param.AppQueryUserTodayTimeParam;
 import com.ytpm.app.param.AppUserParam;
+import com.ytpm.app.param.AppUserTodayBannedParam;
 import com.ytpm.app.param.YtAppUserListParam;
 import com.ytpm.app.param.AppUserQueryParam;
 import com.ytpm.app.view.WxDefaultConfig;
@@ -52,4 +53,7 @@ public interface AppFeign {
     Result<String> saveAppConfig(@RequestBody YtAppDefaultConfig defaultConfig);
     @GetMapping("/wx/getConfigs")
     List<WxDefaultConfig> getConfigs(@RequestParam(name = "appIds")String appIds);
+
+    @PostMapping("/user/queryTodayBanned")
+    List<YtDyzUser> queryTodayBanned(@RequestBody AppUserTodayBannedParam appUserTodayBannedParam);
 }

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

@@ -9,6 +9,7 @@ import com.ytpm.app.model.YtDyzUser;
 import com.ytpm.app.param.AppQueryUserTodayTimeParam;
 import com.ytpm.app.param.AppUserParam;
 import com.ytpm.app.param.AppUserQueryParam;
+import com.ytpm.app.param.AppUserTodayBannedParam;
 import com.ytpm.app.param.YtAppUserListParam;
 import com.ytpm.app.view.HourCountView;
 import com.ytpm.app.view.YtAppUserListView;
@@ -251,4 +252,8 @@ public class UserController {
     public List<YtDyzUser> queryByOpenid(@RequestParam("openid") String openid){
         return appUserMapper.queryByOpenid(openid);
     }
+    @PostMapping("/queryTodayBanned")
+    public List<YtDyzUser> queryTodayBanned(@RequestBody AppUserTodayBannedParam appUserTodayBannedParam){
+        return appUserMapper.queryTodayBanned(appUserTodayBannedParam.getStartTime(), appUserTodayBannedParam.getEndTime(), appUserTodayBannedParam.getUserIdList());
+    }
 }

+ 2 - 0
yt-app/app-service/src/main/java/com/ytpm/dao/AppUserMapper.java

@@ -71,6 +71,8 @@ public interface AppUserMapper {
                                          @Param("appIdList") List<String> appIdList
     );
 
+    List<YtDyzUser> queryTodayBanned(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("userIdList") List<String> userIdList);
+
     /**
      * 查询用户信息
      */

+ 11 - 0
yt-app/app-service/src/main/resources/mapper/AppUserMapper.xml

@@ -291,6 +291,17 @@
         GROUP BY HOUR(registry_time)
     </select>
 
+    <select id="queryTodayBanned" resultType="com.ytpm.app.model.YtDyzUser">
+        select user_id from yt_dyz_user
+        where registry_time BETWEEN #{startTime} AND #{endTime}
+        and user_id in
+        <foreach collection="userIdList" item="item"
+                 open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </select>
+
+
     <select id="getDefaultConfig" resultType="com.ytpm.app.view.WxDefaultConfig">
         select
             config_id, config_name, open_id appId, secret, app_id platformAppId, app_key platformAppSecret, app_type

+ 13 - 0
yt-common/src/main/java/com/ytpm/app/param/AppUserTodayBannedParam.java

@@ -0,0 +1,13 @@
+package com.ytpm.app.param;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class AppUserTodayBannedParam {
+    private Date startTime;
+    private Date endTime;
+    private List<String> userIdList;
+}

+ 13 - 1
yt-risk/risk-manage/src/main/java/com/ytpm/controller/RiskManageController.java

@@ -8,6 +8,7 @@ import com.ytpm.app.model.YtDyzUser;
 import com.ytpm.app.param.AppQueryUserTodayTimeParam;
 import com.ytpm.app.param.AppUserParam;
 import com.ytpm.app.param.AppUserQueryParam;
+import com.ytpm.app.param.AppUserTodayBannedParam;
 import com.ytpm.feign.AppFeign;
 import com.ytpm.general.Result;
 import com.ytpm.general.ResultTable;
@@ -132,8 +133,19 @@ public class RiskManageController {
 //                riskService.queryBannedRecord(appUserQueryParam.getStartTime(), appUserQueryParam.getEndTime());
         List<YtPlatformBanned> bannedList =
                 riskService.queryBannedRecordGroupByUserId(appUserQueryParam.getStartTime(), appUserQueryParam.getEndTime(),appUserQueryParam.getAppIdList());
+
         if (bannedList!=null || !bannedList.isEmpty()){
-            map.put("lock", bannedList.size());
+            AppUserTodayBannedParam appUserTodayBannedParam = new AppUserTodayBannedParam();
+            appUserTodayBannedParam.setStartTime(appUserQueryParam.getStartTime());
+            appUserTodayBannedParam.setEndTime(appUserQueryParam.getEndTime());
+            appUserTodayBannedParam.setUserIdList(bannedList.stream().map(YtPlatformBanned::getUserId).collect(Collectors.toList()));
+            List<YtDyzUser> ytDyzUsers = appFeign.queryTodayBanned(appUserTodayBannedParam);
+            if (CollUtil.isNotEmpty(ytDyzUsers)){
+                map.put("lock", ytDyzUsers.size());
+            }
+            else {
+                map.put("lock", 0);
+            }
         }
         else {
             map.put("lock", 0);