From c7fd55a58a11aa3936350a9c0353e0922d399b96 Mon Sep 17 00:00:00 2001
From: huangzj <826100833@qq.com>
Date: Wed, 16 Aug 2023 09:16:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=91=E6=B5=8B=E7=82=B9?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../csdevice/mapper/AppLineTopologyDiagramMapper.java  |  2 ++
 .../mapper/mapping/AppLineTopologyDiagramMapper.xml    |  7 +++++++
 .../impl/AppLineTopologyDiagramServiceImpl.java        | 10 +++++++++-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/AppLineTopologyDiagramMapper.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/AppLineTopologyDiagramMapper.java
index e89f80a..934f5dd 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/AppLineTopologyDiagramMapper.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/AppLineTopologyDiagramMapper.java
@@ -18,4 +18,6 @@ import java.util.List;
  */
 public interface AppLineTopologyDiagramMapper extends BaseMapper<AppLineTopologyDiagramPO> {
     List<AppLineTopologyDiagramVO> queryByTopoId(@Param("id") String id);
+
+    List<AppLineTopologyDiagramVO> queryByLineIds(@Param("lineIds")List<String> lineIds);
 }
\ No newline at end of file
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 0ad16d3..eb6938a 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
@@ -20,4 +20,11 @@
   <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>
+
+  <select id="queryByLineIds" 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.line_id in
+    <foreach collection='lineIds' item='item' index="index" open='(' separator=',' close=')'>
+      #{item}
+    </foreach>
+  </select>
 </mapper>
\ No newline at end of file
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppLineTopologyDiagramServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppLineTopologyDiagramServiceImpl.java
index 2c56d7d..d652089 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppLineTopologyDiagramServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppLineTopologyDiagramServiceImpl.java
@@ -58,7 +58,7 @@ public class AppLineTopologyDiagramServiceImpl extends ServiceImpl<AppLineTopolo
             throw new BusinessException("设备下未找到拓扑图信息");
         }
         AppTopologyDiagramVO appTopologyDiagramVO = appTopologyDiagramVOS.get(0);
-        appTopologyDiagramVO.setAppsLineTopologyDiagramPO(this.queryByTopoId(appTopologyDiagramVO.getId()));
+        appTopologyDiagramVO.setAppsLineTopologyDiagramPO(this.queryByLineIds(collect));
         appTopologyDiagramVO.setDevName(one.getName());
         return appTopologyDiagramVO;
     }
@@ -69,6 +69,14 @@ public class AppLineTopologyDiagramServiceImpl extends ServiceImpl<AppLineTopolo
         result = this.getBaseMapper().queryByTopoId( id);
         return result;
     }
+    public List<AppLineTopologyDiagramVO> queryByLineIds(List<String> lineIds) {
+        List<AppLineTopologyDiagramVO> result = new ArrayList<>();
+        if (lineIds != null && lineIds.size() > 0) {
+            result = this.getBaseMapper().queryByLineIds( lineIds);
+        }
+        return result;
+    }
+
 
     @Override
     @Transactional(rollbackFor = Exception.class)