From 1c0ab0ab190ff3fe19fd101beeac8f41ae555b44 Mon Sep 17 00:00:00 2001
From: chenhaojie <hjchencq@isoftstone.com>
Date: Mon, 8 Jul 2024 13:46:33 +0800
Subject: [PATCH 1/3] =?UTF-8?q?das=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 das/src/main/resources/mapper/SysEquipmentMapper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/das/src/main/resources/mapper/SysEquipmentMapper.xml b/das/src/main/resources/mapper/SysEquipmentMapper.xml
index 4ce92ee0..272ba657 100644
--- a/das/src/main/resources/mapper/SysEquipmentMapper.xml
+++ b/das/src/main/resources/mapper/SysEquipmentMapper.xml
@@ -59,7 +59,7 @@
 
 
     <select id="queryEquipmentTree" resultMap="SysEquipmentMap">
-        select t.* from sys_equipment t  WHERE t.org_id = #{id} and t.object_type in (10001,10002) and t.parent_equipment_id = 0
+        select t.* from sys_equipment t  WHERE t.object_type in (10001,10002) and t.parent_equipment_id = 0
     </select>
 
     <select id="queryInfoById" resultMap="SysEquipmentExcelMap">

From 4f6cc3ce201e926708a34eb350f2b51889a494c9 Mon Sep 17 00:00:00 2001
From: chenhaojie <hjchencq@isoftstone.com>
Date: Mon, 8 Jul 2024 14:32:23 +0800
Subject: [PATCH 2/3] =?UTF-8?q?das=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/das/modules/auth/entity/SysOrg.java   |  4 +--
 .../equipment/domain/vo/SysEquipmentVo.java   |  9 ++++++
 .../equipment/mapper/SysEquipmentMapper.java  |  2 +-
 .../service/impl/SysEquipmentServiceImpl.java | 28 ++++++++++---------
 4 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/das/src/main/java/com/das/modules/auth/entity/SysOrg.java b/das/src/main/java/com/das/modules/auth/entity/SysOrg.java
index b47663cf..1dbbe1d8 100644
--- a/das/src/main/java/com/das/modules/auth/entity/SysOrg.java
+++ b/das/src/main/java/com/das/modules/auth/entity/SysOrg.java
@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.das.common.constant.BaseEntity;
-import com.das.modules.equipment.entity.SysEquipment;
+import com.das.modules.equipment.domain.vo.SysEquipmentVo;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.AllArgsConstructor;
@@ -106,7 +106,7 @@ public class SysOrg extends BaseEntity {
      * 子设备节点
      */
     @TableField(exist = false)
-    private List<SysEquipment> equipChildren;
+    private List<SysEquipmentVo> equipChildren;
 
     /**
      * 子设备节点
diff --git a/das/src/main/java/com/das/modules/equipment/domain/vo/SysEquipmentVo.java b/das/src/main/java/com/das/modules/equipment/domain/vo/SysEquipmentVo.java
index 42f8b813..1cf7deec 100644
--- a/das/src/main/java/com/das/modules/equipment/domain/vo/SysEquipmentVo.java
+++ b/das/src/main/java/com/das/modules/equipment/domain/vo/SysEquipmentVo.java
@@ -1,11 +1,14 @@
 package com.das.modules.equipment.domain.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.das.modules.equipment.entity.SysEquipment;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
 import java.io.Serial;
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -93,4 +96,10 @@ public class SysEquipmentVo{
      */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long iotModelId;
+
+    /**
+     * 子设备节点
+     */
+    @TableField(exist = false)
+    private List<SysEquipment> equipChildren;
 }
diff --git a/das/src/main/java/com/das/modules/equipment/mapper/SysEquipmentMapper.java b/das/src/main/java/com/das/modules/equipment/mapper/SysEquipmentMapper.java
index 8df78cfe..ebd8f2dd 100644
--- a/das/src/main/java/com/das/modules/equipment/mapper/SysEquipmentMapper.java
+++ b/das/src/main/java/com/das/modules/equipment/mapper/SysEquipmentMapper.java
@@ -20,7 +20,7 @@ public interface SysEquipmentMapper extends BaseMapper<SysEquipment> {
 
     IPage<SysEquipmentVo> querySysEquipmentList(IPage<SysEquipmentVo> page, @Param("info") SysEquipmentDto sysEquipmentDto);
 
-    List<SysEquipment> queryEquipmentTree(@Param("id")Long id);
+    List<SysEquipmentVo> queryEquipmentTree(@Param("id")Long id);
 
     List<SysEquipmentExcel> queryInfoById (@Param("info") SysEquipmentDto sysEquipmentDto);
 
diff --git a/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java b/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java
index 691c6cef..2854c0ea 100644
--- a/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java
+++ b/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java
@@ -1,30 +1,20 @@
 package com.das.modules.equipment.service.impl;
 
-import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelReader;
 import com.alibaba.excel.read.metadata.ReadSheet;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.das.common.config.SessionUtil;
 import com.das.common.exceptions.ServiceException;
 import com.das.common.utils.*;
-import com.das.modules.auth.domain.vo.SysUserVo;
 import com.das.modules.auth.entity.SysOrg;
 import com.das.modules.auth.mapper.SysOrgMapper;
 import com.das.modules.equipment.domain.dto.SysEquipmentDto;
-import com.das.modules.equipment.domain.dto.SysIotModelDto;
 import com.das.modules.equipment.domain.excel.SheetInfoBean;
 import com.das.modules.equipment.domain.excel.SysEquipmentExcel;
-import com.das.modules.equipment.domain.excel.SysIotModelFieldExcel;
-import com.das.modules.equipment.domain.excel.SysIotModelServiceExcel;
 import com.das.modules.equipment.domain.vo.SysEquipmentVo;
-import com.das.modules.equipment.domain.vo.SysIotModelServiceVo;
-import com.das.modules.equipment.domain.vo.SysIotModelVo;
 import com.das.modules.equipment.entity.SysEquipment;
-import com.das.modules.equipment.entity.SysIotModel;
-import com.das.modules.equipment.entity.SysIotModelField;
 import com.das.modules.equipment.listener.ExcelListener;
 import com.das.modules.equipment.mapper.SysEquipmentMapper;
 import com.das.modules.equipment.mapper.SysIotModelMapper;
@@ -34,6 +24,7 @@ import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
@@ -42,8 +33,6 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import static com.das.modules.auth.mapper.BaseMapperPlus.log;
-
 @Transactional(rollbackFor = Exception.class)
 @Service
 public class SysEquipmentServiceImpl implements SysEquipmentService {
@@ -126,7 +115,20 @@ public class SysEquipmentServiceImpl implements SysEquipmentService {
         if (sysOrg == null) {
             throw new ServiceException("机构不存在");
         }
-        List<SysEquipment> equipList = sysEquipmentMapper.queryEquipmentTree(sysEquipmentDto.getOrgId());
+        List<SysEquipmentVo> equipList = sysEquipmentMapper.queryEquipmentTree(sysEquipmentDto.getOrgId());
+        // 根据ordId和设备编码查出对应的子设备
+        List<SysEquipmentVo> newEquipList = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(equipList)) {
+            for(SysEquipmentVo info : equipList) {
+                QueryWrapper<SysEquipment> queryEquipWrapper = new QueryWrapper<>();
+                queryEquipWrapper.eq("parent_equipment_id", info.getId());
+                queryEquipWrapper.eq("object_type", info.getObjectType());
+                queryEquipWrapper.eq("org_id", sysEquipmentDto.getOrgId());
+                List<SysEquipment> children = sysEquipmentMapper.selectList(queryEquipWrapper);
+                info.setEquipChildren(children);
+                newEquipList.add(info);
+            }
+        }
         List<SysOrg> orgList = sysOrgMapper.queryAllOrgTree(sysEquipmentDto.getOrgId());
         sysOrg.setEquipChildren(equipList);
         sysOrg.setOrgChildren(orgList);

From f1506a233db1e3247f95e3102a611108dd5ebb3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=B7=E6=88=90=E4=BC=9F?= <guchengwei@jsspisoft.com>
Date: Mon, 8 Jul 2024 14:47:06 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/datacollect/README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/datacollect/README.md b/docs/datacollect/README.md
index 79cc696e..e5a42800 100644
--- a/docs/datacollect/README.md
+++ b/docs/datacollect/README.md
@@ -10,7 +10,7 @@
 
 采集程序建立连接时，需要带上自身节点ID，连接URL如下所示:
 
-`ws://127.0.0.1:7790/gate/{nodeId}/{version}`
+`ws://127.0.0.1:7790/node/{nodeId}/{version}`
 
 * `nodeId`: 采集节点ID
 * `version`: 采集节点配置版本号,无配置时为0
@@ -135,12 +135,12 @@ PS: 同一节点只允许建立一条连接。
     "links": [
         {
             //通讯链路IRN
-            "linkId": 3444,
+            "linkId": "3444",
             //通讯链路状态
             "online": true
         },
         {
-            "linkId": 123,
+            "linkId": "123",
             "online": false
         }
     ]