diff --git a/src/main/java/com/gitlink/softbot/controller/user/UserController.java b/src/main/java/com/gitlink/softbot/controller/user/UserController.java index 97d9aa6..69c5d0d 100644 --- a/src/main/java/com/gitlink/softbot/controller/user/UserController.java +++ b/src/main/java/com/gitlink/softbot/controller/user/UserController.java @@ -309,12 +309,12 @@ public class UserController { * @return */ @GetMapping("/getAllInstallBots") - public Result getAllInstallBots(@RequestParam("user_id") Integer userId, @RequestParam(value = "repos", required = false) String repos){ + public Result getAllInstallBots(@RequestParam("user_id") Integer userId, @RequestParam(value = "repoIds", required = false) String repoIds){ Result result = new Result<>(); - if(userId == null && (repos == null || "".equals(repos))) { + if(userId == null && (repoIds == null || "".equals(repoIds))) { return result.build("传入参数不能全空").build(500).build("fail!"); } - GetAllInstallBotsResponse getAllInstallBotsResponse = userService.getAllInstallBots(userId, repos); + GetAllInstallBotsResponse getAllInstallBotsResponse = userService.getAllInstallBots(userId, repoIds); return result. build(getAllInstallBotsResponse). build(200). diff --git a/src/main/java/com/gitlink/softbot/service/user/IUserService.java b/src/main/java/com/gitlink/softbot/service/user/IUserService.java index 397d218..a15eb91 100644 --- a/src/main/java/com/gitlink/softbot/service/user/IUserService.java +++ b/src/main/java/com/gitlink/softbot/service/user/IUserService.java @@ -53,7 +53,7 @@ public interface IUserService { //判断是否安装过此bot JudgeIsInstallBotResponse judgeIsInstallBot(String repos, Integer botId); - GetAllInstallBotsResponse getAllInstallBots(Integer userId, String repos); + GetAllInstallBotsResponse getAllInstallBots(Integer userId, String repoIds); GetStoreAllInstallBotResponse getStoreAllInstallBots(Integer storeId); diff --git a/src/main/java/com/gitlink/softbot/service/user/impl/UserService.java b/src/main/java/com/gitlink/softbot/service/user/impl/UserService.java index 86b5138..99757cc 100644 --- a/src/main/java/com/gitlink/softbot/service/user/impl/UserService.java +++ b/src/main/java/com/gitlink/softbot/service/user/impl/UserService.java @@ -1204,11 +1204,11 @@ public class UserService extends AbstractUserBot implements IUserService { /** * 获取用户安装所有bot信息 * @param userId - * @param repos + * @param repoIds * @return */ @Override - public GetAllInstallBotsResponse getAllInstallBots(Integer userId, String repos) { + public GetAllInstallBotsResponse getAllInstallBots(Integer userId, String repoIds) { List installBots = new ArrayList<>(); @@ -1216,22 +1216,22 @@ public class UserService extends AbstractUserBot implements IUserService { installBots = installMapper.selectList(Wrappers.lambdaQuery() .eq(InstallBot::getInstallerId,userId)); } - if(repos != null) { - List repoList = Arrays.asList(repos.split(",")); + if(repoIds != null) { + List repoList = Arrays.asList(repoIds.split(",")); installBots = installMapper.selectList(Wrappers.lambdaQuery() - .in(InstallBot::getStoreRepo, repoList)); + .in(InstallBot::getStoreId, repoList)); } - Map botAndAllRepoOwnerMap = new HashMap<>(); + Map botAndAllRepoIdMap = new HashMap<>(); for(InstallBot installBot : installBots) { StringJoiner s = new StringJoiner(","); - if(botAndAllRepoOwnerMap.containsKey(installBot.getBotId())){ - s = botAndAllRepoOwnerMap.get(installBot.getBotId()); + if(botAndAllRepoIdMap.containsKey(installBot.getBotId())){ + s = botAndAllRepoIdMap.get(installBot.getBotId()); } if (installBot.getStoreRepo() == null || (s.length() > 0 && s.toString().contains(installBot.getStoreRepo()))){ continue; } - botAndAllRepoOwnerMap.put(installBot.getBotId(), s.add(installBot.getStoreRepo())); + botAndAllRepoIdMap.put(installBot.getBotId(), s.add(installBot.getStoreId().toString())); } @@ -1247,7 +1247,7 @@ public class UserService extends AbstractUserBot implements IUserService { installBotInfo.setLimitVO(limitVO); BeanUtils.copyProperties(bot,installBotInfo); BeanUtils.copyProperties(installBot,installBotInfo); - installBotInfo.setStoreRepos(String.valueOf(botAndAllRepoOwnerMap.get(installBotInfo.getBotId()))); + installBotInfo.setStoreRepoIds(String.valueOf(botAndAllRepoIdMap.get(installBotInfo.getBotId()))); installBotInfos.add(installBotInfo); }); diff --git a/src/main/java/com/gitlink/softbot/vo/InstallBotInfo.java b/src/main/java/com/gitlink/softbot/vo/InstallBotInfo.java index 10a1893..3bccefc 100644 --- a/src/main/java/com/gitlink/softbot/vo/InstallBotInfo.java +++ b/src/main/java/com/gitlink/softbot/vo/InstallBotInfo.java @@ -32,5 +32,5 @@ public class InstallBotInfo { LimitVO limitVO; - String storeRepos; + String storeRepoIds; }