From 6ec9ba39817f440cbc723ded09e200f69fac79e0 Mon Sep 17 00:00:00 2001
From: zhangshuai <zhangshuai@geedgenetworks.com>
Date: Wed, 4 Sep 2024 15:50:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20env=20status=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EnvironmentServiceImpl.java          | 11 +++++++++++
 1 file changed, 11 insertions(+)

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<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;
     }