diff --git a/src/main/java/net/geedge/asw/module/environment/service/impl/EnvironmentServiceImpl.java b/src/main/java/net/geedge/asw/module/environment/service/impl/EnvironmentServiceImpl.java index f060734..98d7928 100644 --- a/src/main/java/net/geedge/asw/module/environment/service/impl/EnvironmentServiceImpl.java +++ b/src/main/java/net/geedge/asw/module/environment/service/impl/EnvironmentServiceImpl.java @@ -71,8 +71,12 @@ public class EnvironmentServiceImpl extends ServiceImpl packageList = this.getBaseMapper().queryList(page, params); + List sessionEntityList = deviceSessionService.list(new LambdaQueryWrapper().eq(EnvironmentSessionEntity::getStatus, 1)); + List 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 sessionEntityList = deviceSessionService.list(new LambdaQueryWrapper().eq(EnvironmentSessionEntity::getStatus, 1)); + List envIdList = sessionEntityList.stream().map(x -> x.getEnvId()).toList(); + List 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; }