2 Komitmen 340ab5627a ... d5bc6792b3

Pembuat SHA1 Pesan Tanggal
  小杜 d5bc6792b3 Merge remote-tracking branch 'origin/master' 4 bulan lalu
  小杜 59d427bea1 修改首页用户统计bug 4 bulan lalu

+ 2 - 8
yt-agent/agent-service/src/main/java/com/ytpm/service/impl/AdSourceServiceImpl.java

@@ -35,13 +35,7 @@ public class AdSourceServiceImpl implements AdSourceService {
 
     @Override
     public Result<?> addOne(AdSourceParam param) {
-        //todo 调用api接口进行广告源新增
-//        UnitsParam unitsParam = new UnitsParam();
-//        unitsParam.setPlacement_id(param.getPlacementId());
-//        UnitsItemParam unitsItemParam = new UnitsItemParam();
-//        BeanUtil.copyProperties(param,unitsItemParam);
-//        unitsItemParam.setAdsource_token();
-//        advertiseFeign.saveAdSource();
+        //调用api接口进行广告源新增
         YtAppAdSource ytAppAdSource = new YtAppAdSource();
         ytAppAdSource.setName(param.getName());
         ytAppAdSource.setType(param.getType());
@@ -54,7 +48,7 @@ public class AdSourceServiceImpl implements AdSourceService {
 
     @Override
     public Result<?> updateOne(AdSourceParam param) {
-        //todo 调用api接口进行广告源修改
+        //调用api接口进行广告源修改
         YtAppAdSource ytAppAdSource = new YtAppAdSource();
         ytAppAdSource.setAdSourceId(param.getAdSourceId());
         ytAppAdSource.setName(param.getName());

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

@@ -2,6 +2,7 @@ package com.ytpm.feign;
 
 import com.ytpm.app.model.YtDyzAdRecord;
 import com.ytpm.app.model.YtDyzUser;
+import com.ytpm.app.param.AppUserParam;
 import com.ytpm.app.param.YtAppUserListParam;
 import com.ytpm.app.param.AppUserQueryParam;
 import com.ytpm.app.view.YtAppUserListView;
@@ -21,8 +22,12 @@ public interface AppFeign {
     ResultTable<YtAppUserListView> queryAll(@RequestBody YtAppUserListParam param);
     @GetMapping("/user/getUserInfo")
     Result<YtDyzUser> getUserInfo(@RequestParam("userId") String userId);
-    @GetMapping("/user/getUserList")
-    ResultTable<YtDyzUser> getUserList(@RequestParam("userIds") String userIds);
+    @PostMapping("/user/getUserList")
+    ResultTable<YtDyzUser> getUserList(@RequestBody AppUserParam param);
+
+    @PostMapping("/user/getUserAll")
+    ResultTable<YtDyzUser> getUserAll(@RequestBody AppUserParam param);
+
     @PostMapping("/user/updateUserInfo")
     Result<?> updateUserInfo(@RequestBody YtDyzUser dyzUser);
     @GetMapping("/user/adRecords")

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

@@ -4,6 +4,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.ytpm.app.model.YtDyzAdRecord;
 import com.ytpm.app.model.YtDyzUser;
+import com.ytpm.app.param.AppUserParam;
 import com.ytpm.app.param.AppUserQueryParam;
 import com.ytpm.app.param.YtAppUserListParam;
 import com.ytpm.app.view.YtAppUserListView;
@@ -167,15 +168,21 @@ public class UserController {
     /**
      * 查询用户信息
      */
-    @GetMapping("/getUserList")
-    public ResultTable<YtDyzUser> getUserList(@RequestParam("userIds") String userIds) {
-        List<YtDyzUser> userList = appUserMapper.getUserList(userIds);
+    @PostMapping("/getUserList")
+    public ResultTable<YtDyzUser> getUserList(@RequestBody AppUserParam param) {
+        List<YtDyzUser> userList = appUserMapper.getUserList(param.getUserIds());
         for (YtDyzUser user : userList) {
             user.setLoginRecordList(loginRecordMapper.getLoginRecords(user.getUserId()));
         }
         return ResultTable.resultTableOk(new PageInfo<>(userList));
     }
 
+    @PostMapping("/getUserAll")
+    public ResultTable<YtDyzUser> getUserAll(@RequestBody AppUserParam param) {
+        List<YtDyzUser> userList = appUserMapper.getUserList(param.getUserIds());
+        return ResultTable.resultTableOk(new PageInfo<>(userList));
+    }
+
     /**
      * 修改用户信息
      */

+ 8 - 0
yt-common/src/main/java/com/ytpm/app/param/AppUserParam.java

@@ -0,0 +1,8 @@
+package com.ytpm.app.param;
+
+import lombok.Data;
+
+@Data
+public class AppUserParam {
+    private String userIds;
+}

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

@@ -5,6 +5,7 @@ import com.ytpm.agent.enums.UserStatusEnum;
 import com.ytpm.agent.model.YtPlatformBanned;
 import com.ytpm.agent.view.AgentUserInfo;
 import com.ytpm.app.model.YtDyzUser;
+import com.ytpm.app.param.AppUserParam;
 import com.ytpm.app.param.AppUserQueryParam;
 import com.ytpm.feign.AppFeign;
 import com.ytpm.general.Result;
@@ -132,7 +133,9 @@ public class RiskManageController {
             String userIds = ytPlatformBanneds.stream()
                     .map(YtPlatformBanned::getUserId)
                     .collect(Collectors.joining(","));
-            ResultTable<YtDyzUser> userList = appFeign.getUserList(userIds);
+            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) -> {
@@ -175,8 +178,11 @@ public class RiskManageController {
                     .map(YtPlatformBanned::getUserId)
                     .collect(Collectors.joining(","));
 
+
+            AppUserParam appUserParam = new AppUserParam();
+            appUserParam.setUserIds(userIds);
             // 查询用户状态
-            ResultTable<YtDyzUser> userList = appFeign.getUserList(userIds);
+            ResultTable<YtDyzUser> userList = appFeign.getUserAll(appUserParam);
             List<YtDyzUser> users = userList.getData();
 
             // 构建 userId -> user 映射,便于匹配

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

@@ -10,20 +10,16 @@ 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.model.YtAppUser;
 import com.ytpm.agent.model.YtPlatformBanned;
 import com.ytpm.agent.model.YtPlatformDeblocking;
 import com.ytpm.agent.view.AgentAppClassView;
 import com.ytpm.agent.view.AgentEnableAppView;
 import com.ytpm.agent.view.AgentUserInfo;
-import com.ytpm.app.model.DefaultRiskConfig;
-import com.ytpm.app.model.YtAppUserLoginRecord;
 import com.ytpm.app.model.YtDyzAdRecord;
 import com.ytpm.app.model.YtDyzLoginRecord;
 import com.ytpm.app.model.YtDyzUser;
-import com.ytpm.app.view.YtAppUserListView;
+import com.ytpm.app.param.AppUserParam;
 import com.ytpm.custom.CustomField;
-import com.ytpm.dao.AppLoginRecordMapper;
 import com.ytpm.dao.DictMapper;
 import com.ytpm.dao.RiskConfigMapper;
 import com.ytpm.dao.RiskManageMapper;
@@ -273,7 +269,9 @@ public class RiskServiceImpl extends ReflectUtil implements RiskService {
     private void setBannedLoginInfo(List<RiskBannedListView> bannedList) {
         String userIds = bannedList.stream().map(
                 RiskBannedListView::getUserId).distinct().collect(Collectors.joining(","));
-        List<YtDyzUser> data = appFeign.getUserList(userIds).getData();
+        AppUserParam appUserParam = new AppUserParam();
+        appUserParam.setUserIds(userIds);
+        List<YtDyzUser> data = appFeign.getUserList(appUserParam).getData();
         Map<String, YtDyzUser> collect = data.stream().collect(Collectors.toMap(YtDyzUser::getUserId, o->o));
         for (RiskBannedListView view : bannedList) {
             if(!collect.containsKey(view.getUserId()))continue;
@@ -302,7 +300,9 @@ public class RiskServiceImpl extends ReflectUtil implements RiskService {
     private void setDeblockLoginInfo(List<RiskDeblockingListView> deblockingList) {
         String userIds = deblockingList.stream().map(
                 RiskDeblockingListView::getUserId).distinct().collect(Collectors.joining(","));
-        List<YtDyzUser> data = appFeign.getUserList(userIds).getData();
+        AppUserParam appUserParam = new AppUserParam();
+        appUserParam.setUserIds(userIds);
+        List<YtDyzUser> data = appFeign.getUserList(appUserParam).getData();
         Map<String, YtDyzUser> collect = data.stream().collect(Collectors.toMap(YtDyzUser::getUserId, o->o));
         for (RiskDeblockingListView view : deblockingList) {
             if(!collect.containsKey(view.getUserId()))continue;