From fb46bad74cfd783cf35c0b6b7256991c62326ec4 Mon Sep 17 00:00:00 2001
From: huguanghan <ghhul@isoftstone.com>
Date: Mon, 28 Oct 2024 09:24:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A3=8E=E6=9C=BA=E5=88=97=E8=A1=A8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/das/modules/page/domian/WindTurbinesPageVo.java   | 3 +++
 das/src/main/resources/mapper/SysEquipmentMapper.xml           | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/das/src/main/java/com/das/modules/page/domian/WindTurbinesPageVo.java b/das/src/main/java/com/das/modules/page/domian/WindTurbinesPageVo.java
index 32662435..b6629105 100644
--- a/das/src/main/java/com/das/modules/page/domian/WindTurbinesPageVo.java
+++ b/das/src/main/java/com/das/modules/page/domian/WindTurbinesPageVo.java
@@ -14,6 +14,9 @@ public class WindTurbinesPageVo {
 
     private String name;
 
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long modelId;
+
     private String model;
 
     private String belongLine;
diff --git a/das/src/main/resources/mapper/SysEquipmentMapper.xml b/das/src/main/resources/mapper/SysEquipmentMapper.xml
index a61ac316..aefc6c71 100644
--- a/das/src/main/resources/mapper/SysEquipmentMapper.xml
+++ b/das/src/main/resources/mapper/SysEquipmentMapper.xml
@@ -166,7 +166,7 @@
         select distinct belong_line as name  from sys_equipment t where t.object_type = 10002 and belong_line !='';
     </select>
     <select id="queryAllWindList" resultType="com.das.modules.page.domian.WindTurbinesPageVo">
-        select se.id as irn,se.name,se.model,se.belong_line as belongLine from sys_equipment se where se.object_type = #{objectType} order by se.name
+        select se.id as irn,se.name,se.model,se.belong_line as belongLine se.iot_model_id as modelId from sys_equipment se where se.object_type = #{objectType} order by se.name
     </select>