From 715f73ca2fe5b8b3d994fb0926144e7607fdbc4d Mon Sep 17 00:00:00 2001
From: huangzj <826100833@qq.com>
Date: Wed, 25 Oct 2023 19:56:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/mapping/AppLineTopologyDiagramMapper.xml         | 6 ++++--
 .../com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java | 2 +-
 .../njcn/csharmonic/service/impl/StableDataServiceImpl.java | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/AppLineTopologyDiagramMapper.xml b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/AppLineTopologyDiagramMapper.xml
index 1d6c5d1..91234ab 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/AppLineTopologyDiagramMapper.xml
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/AppLineTopologyDiagramMapper.xml
@@ -18,11 +18,13 @@
   </sql>
 
   <select id="queryByTopoId" resultType="com.njcn.csdevice.pojo.vo.AppLineTopologyDiagramVO">
-    select a.*,b.position linePostion  from cs_line_topology_diagram a LEFT JOIN cs_line  b on a.line_id=b.line_id where a.id=#{id}
+    select a.*,b.position linePostion  from cs_line_topology_diagram a LEFT JOIN cs_line  b on a.line_id=b.line_id where  a.status="1" and b.status="1" and a.id=#{id}
   </select>
 
   <select id="queryByLineIds" resultType="com.njcn.csdevice.pojo.vo.AppLineTopologyDiagramVO">
-    select a.*,b.position linePostion,b.name name  from cs_line_topology_diagram a LEFT JOIN cs_line  b on a.line_id=b.line_id where a.line_id in
+    select a.*,b.position linePostion,b.name name  from cs_line_topology_diagram a LEFT JOIN cs_line  b on a.line_id=b.line_id where
+    a.status="1" and b.status="1" and
+    a.line_id in
     <foreach collection='lineIds' item='item' index="index" open='(' separator=',' close=')'>
       #{item}
     </foreach>
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java
index c7943a3..9969905 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java
@@ -49,7 +49,7 @@ public class CsLinePOServiceImpl extends ServiceImpl<CsLinePOMapper, CsLinePO> i
         if(CollectionUtil.isEmpty(csPairList)){
             return new ArrayList<>();
         }
-        List<CsLinePO> csLinePOS = this.listByIds(csPairList);
+        List<CsLinePO> csLinePOS = this.lambdaQuery().in(CsLinePO::getLineId,csPairList).eq(CsLinePO::getStatus,1).list();
         csLinePOS.forEach(temp->temp.setDevId(devId));
         return csLinePOS;
     }
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StableDataServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StableDataServiceImpl.java
index a3bc812..252a7ef 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StableDataServiceImpl.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StableDataServiceImpl.java
@@ -191,7 +191,7 @@ public class StableDataServiceImpl implements StableDataService {
         String areaId =  dicDataFeignClient.getDicDataByCode(DicDataEnum.OUTPUT_SIDE.getCode()).getData().getId();
 
         Optional.ofNullable(csLinePOList).orElseThrow(()-> new BusinessException(AlgorithmResponseEnum.LINE_DATA_ERROR));
-        collect = csLinePOList.stream().filter(temp->Objects.equals(areaId,temp.getPosition())).map(CsLinePO::getLineId).collect(Collectors.toList());
+        collect = csLinePOList.stream().filter(temp->Objects.equals(areaId,temp.getPosition())).map(CsLinePO::getLineId).distinct().collect(Collectors.toList());