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

fix: env status 调整

Browse Source
This commit is contained in:
zhangshuai
2024-09-04 15:50:30 +08:00
parent b6fa061aae
commit 6ec9ba3981
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,8 +71,12 @@ public class EnvironmentServiceImpl extends ServiceImpl<EnvironmentDao, Environm
Page page = T.PageUtil.getPage(params);
List<EnvironmentEntity> packageList = this.getBaseMapper().queryList(page, params);
List<EnvironmentSessionEntity> sessionEntityList = deviceSessionService.list(new LambdaQueryWrapper<EnvironmentSessionEntity>().eq(EnvironmentSessionEntity::getStatus, 1));
List<String> envIdList = sessionEntityList.stream().map(x -> x.getEnvId()).toList();
for (EnvironmentEntity entity : packageList) {
entity.setParam(entity.getParamJSONObject());
entity.setStatus(envIdList.contains(entity.getId()) ? 2 : entity.getStatus());
}
page.setRecords(packageList);
return page;
@@ -121,7 +125,14 @@ public class EnvironmentServiceImpl extends ServiceImpl<EnvironmentDao, Environm
params.put("currentUserId", currentUserId);
Page page = new Query(EnvironmentEntity.class).getPage(params);
List<EnvironmentSessionEntity> sessionEntityList = deviceSessionService.list(new LambdaQueryWrapper<EnvironmentSessionEntity>().eq(EnvironmentSessionEntity::getStatus, 1));
List<String> envIdList = sessionEntityList.stream().map(x -> x.getEnvId()).toList();
List<EnvironmentEntity> packageList = this.getBaseMapper().mySession(page, params);
for (EnvironmentEntity entity : packageList) {
entity.setParam(entity.getParamJSONObject());
entity.setStatus(envIdList.contains(entity.getId()) ? 2 : entity.getStatus());
}
page.setRecords(packageList);
return page;
}