gfwleak/appsketch-works-asw-controller
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: mySession 返回 session 信息

Browse Source
This commit is contained in:
zhangshuai
2024-09-11 13:41:25 +08:00
parent b80b0fdf43
commit ed5dd781b4
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/net/geedge/asw/module/environment/service/impl/EnvironmentServiceImpl.java
View File

@@ -131,13 +131,14 @@ public class EnvironmentServiceImpl extends ServiceImpl<EnvironmentDao, Environm
params.put("currentUserId", currentUserId); params.put("currentUserId", currentUserId);
Page page = new Query(EnvironmentEntity.class).getPage(params); Page page = new Query(EnvironmentEntity.class).getPage(params);
List<EnvironmentSessionEntity> sessionEntityList = environmentSessionService.list(new LambdaQueryWrapper<EnvironmentSessionEntity>().eq(EnvironmentSessionEntity::getStatus, 1)); List<EnvironmentSessionEntity> sessionEntityList = environmentSessionService.queryListByUsed();
List<String> envIdList = sessionEntityList.stream().map(x -> x.getEnvId()).toList();
List<EnvironmentEntity> packageList = this.getBaseMapper().mySession(page, params); List<EnvironmentEntity> packageList = this.getBaseMapper().mySession(page, params);
List<String> envIdList = sessionEntityList.stream().map(x -> x.getEnvId()).toList();
Map<String, EnvironmentSessionEntity> sessionByEnvId = sessionEntityList.stream().collect(Collectors.toMap(EnvironmentSessionEntity::getEnvId, Function.identity()));
for (EnvironmentEntity entity : packageList) { for (EnvironmentEntity entity : packageList) {
entity.setParam(entity.getParamJSONObject()); entity.setParam(entity.getParamJSONObject());
entity.setStatus(envIdList.contains(entity.getId()) ? 2 : entity.getStatus()); entity.setStatus(envIdList.contains(entity.getId()) ? 2 : entity.getStatus());
entity.setSession(sessionByEnvId.get(entity.getId()));
} }
page.setRecords(packageList); page.setRecords(packageList);
return page; return page;