首页接口修改

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

@@ -345,12 +345,24 @@ public class AgentIndexController {
         // 1. 查询今日数据
         param.setStartTime(DateUtil.getTodayStart());
         param.setEndTime(DateUtil.getTodayEnd());
+        long startTodayUsers = System.currentTimeMillis() ;
         List<YtDyzUser> todayUsers = appFeign.queryUserByTime(param);
+        long endTodayUsers = System.currentTimeMillis();
+        log.info("查询用户的时间{}",endTodayUsers-startTodayUsers);
         //每个小时的用户数
         int[] todayUser = appFeign.queryUserByTodayTime();
+        long endTodayUser = System.currentTimeMillis() ;
+        log.info("每个小时的用户数{}",endTodayUser-endTodayUsers);
+        //今日登入
         List<String> todayLogin = appFeign.queryLoginRecords(param);
+        long timeMillis = System.currentTimeMillis() ;
+        log.info("今日登入{}",timeMillis-endTodayUser);
         Result<Map<String, Integer>> mapResult = riskFeign.queryBanned(param);
+        long timeMillis1 = System.currentTimeMillis() ;
+        log.info("今日封禁数据{}",timeMillis1-timeMillis);
         Map<String, int[]> data = riskFeign.queryBannedByHourToday().getData();
+        long timeMillis2 = System.currentTimeMillis() ;
+        log.info("今日封禁小时数据{}",timeMillis2-timeMillis1);
         Map<String, Integer> todayMap = mapResult.getData();
         //用户新增数
         result.put("today", todayUsers.size());
@@ -378,8 +390,10 @@ public class AgentIndexController {
         param.setEndTime(DateUtil.getMonthEnd());
         List<String> monthLogin = appFeign.queryLoginRecords(param);
         List<YtDyzUser> monthUsers = appFeign.queryUserByTime(param);
+        long currentTimeMillis = System.currentTimeMillis();
         Map<String, Integer> monthMap = riskFeign.queryBanned(param).getData();
-
+        long currentTimeMillis1 = System.currentTimeMillis();
+        log.info("当月数据{}",currentTimeMillis1-currentTimeMillis);
         result.put("month", monthUsers.size());
         result.put("monthLogin", monthLogin.size());
         result.put("monthRisk", monthMap.get("risk"));

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

@@ -127,31 +127,33 @@ public class RiskManageController {
     @PostMapping("/queryBanned")
     public Result<Map<String, Integer>> queryBanned(@RequestBody AppUserQueryParam appUserQueryParam) {
         Map<String, Integer> map = new HashMap<>();
-        List<YtPlatformBanned> ytPlatformBanneds =
-                riskService.queryBannedRecord(appUserQueryParam.getStartTime(), appUserQueryParam.getEndTime());
-        if (!ytPlatformBanneds.isEmpty()) {
-            String userIds = ytPlatformBanneds.stream()
-                    .map(YtPlatformBanned::getUserId)
-                    .collect(Collectors.joining(","));
-            AppUserParam appUserParam = new AppUserParam();
-            appUserParam.setUserIds(userIds);
-            ResultTable<YtDyzUser> userList = appFeign.getUserAll(appUserParam);
-            List<YtDyzUser> data = userList.getData();
-            //锁定数
-            List<YtDyzUser> lockList = data.stream().filter((item) -> {
-                return item.getUserStatus() == UserStatusEnum.LOCK.getCode();
-            }).collect(Collectors.toList());
-            //封禁数
-            List<YtDyzUser> riskList = data.stream().filter((item) -> {
-                return item.getUserStatus() == UserStatusEnum.RISK.getCode();
-            }).collect(Collectors.toList());
-            map.put("lock", lockList.size());
-            map.put("risk", riskList.size());
+//        List<YtPlatformBanned> ytPlatformBanneds =
+//                riskService.queryBannedRecord(appUserQueryParam.getStartTime(), appUserQueryParam.getEndTime());
+        List<YtPlatformBanned> bannedList =
+                riskService.queryBannedRecordGroupByUserId(appUserQueryParam.getStartTime(), appUserQueryParam.getEndTime());
+        if (bannedList!=null || !bannedList.isEmpty()){
+            map.put("lock", bannedList.size());
         }
         else {
             map.put("lock", 0);
-            map.put("risk", 0);
         }
+//        if (!ytPlatformBanneds.isEmpty()) {
+//            String userIds = ytPlatformBanneds.stream()
+//                    .map(YtPlatformBanned::getUserId)
+//                    .collect(Collectors.joining(","));
+//            AppUserParam appUserParam = new AppUserParam();
+//            appUserParam.setUserIds(userIds);
+//            ResultTable<YtDyzUser> userList = appFeign.getUserAll(appUserParam);
+//            List<YtDyzUser> data = userList.getData();
+//            //锁定数
+//            List<YtDyzUser> lockList = data.stream().filter((item) -> {
+//                return item.getUserStatus() == UserStatusEnum.RISK.getCode();
+//            }).collect(Collectors.toList());
+//            map.put("risk", lockList.size());
+//        }
+//        else {
+            map.put("risk", 0);
+//        }
         return Result.resultObjOk(map);
     }
 

yt-risk/risk-manage/src/main/java/com/ytpm/dao/RiskManageMapper.java

@@ -46,4 +46,6 @@ public interface RiskManageMapper {
     void deleteRelatives(@Param("templateId") String templateId);
 
     List<YtPlatformBanned> queryBannedRecord(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+
+    List<YtPlatformBanned> queryBannedRecordGroupByUserId(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
 }

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

@@ -102,4 +102,6 @@ public interface RiskService {
     Result<?> checkAdRisk(YtDyzUser dyzUser);
 
     List<YtPlatformBanned> queryBannedRecord(Date startTime,Date endTime);
+
+    List<YtPlatformBanned> queryBannedRecordGroupByUserId(Date startTime,Date endTime);
 }

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

@@ -749,4 +749,10 @@ public class RiskServiceImpl extends ReflectUtil implements RiskService {
         List<YtPlatformBanned> ytPlatformBanneds = riskManageMapper.queryBannedRecord(startTime, endTime);
         return ytPlatformBanneds;
     }
+
+    @Override
+    public List<YtPlatformBanned> queryBannedRecordGroupByUserId(Date startTime, Date endTime) {
+        List<YtPlatformBanned> bannedList = riskManageMapper.queryBannedRecordGroupByUserId(startTime, endTime);
+        return bannedList;
+    }
 }

yt-risk/risk-manage/src/main/resources/mapper/RiskManageMapper.xml

@@ -143,5 +143,23 @@
     </select>
 
 
+    <select id="queryBannedRecordGroupByUserId" resultType="com.ytpm.agent.model.YtPlatformBanned">
+        select
+        banned_id, user_id, channel_id,agent_id, banned_time, banned_reason, banned_type, banned_limit, operator, operator_name
+        from yt_platform_banned
+        <where>
+            <if test="startTime != null">
+                AND banned_time >= #{startTime}
+            </if>
+            <if test="endTime != null">
+                AND banned_time &lt;= #{endTime}
+            </if>
+        </where>
+        group by user_id
+    </select>
+
+
+
+
 
 </mapper>