From eae815e78497fbb6393060fdefd888b4a4c19048 Mon Sep 17 00:00:00 2001
From: houwei <houwei@jsspisoft.com>
Date: Fri, 25 Oct 2024 14:47:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=93=BE=E8=B7=AF=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=8F=8A=E6=98=A0=E5=B0=84=E8=A1=A8=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/das/modules/node/domain/vo/EquipmentVo.java | 2 ++
 .../com/das/modules/node/domain/vo/SysTabMappingVo.java  | 4 ++++
 .../das/modules/node/mapper/SysImpTabMappingMapper.java  | 9 ++-------
 .../modules/node/service/impl/SysNodeServiceImpl.java    | 3 ++-
 das/src/main/resources/mapper/SysImpTabMappingMapper.xml | 4 ++--
 das/src/main/resources/mapper/SysIotModelFieldMapper.xml | 2 +-
 .../main/resources/mapper/SysIotModelServiceMapper.xml   | 2 +-
 7 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/das/src/main/java/com/das/modules/node/domain/vo/EquipmentVo.java b/das/src/main/java/com/das/modules/node/domain/vo/EquipmentVo.java
index 101c6457..532c2825 100644
--- a/das/src/main/java/com/das/modules/node/domain/vo/EquipmentVo.java
+++ b/das/src/main/java/com/das/modules/node/domain/vo/EquipmentVo.java
@@ -1,5 +1,6 @@
 package com.das.modules.node.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
@@ -31,5 +32,6 @@ public class EquipmentVo {
     /**
      * 设备Iot 地址 对应设备表中的 iot_addr 字段
      */
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private String iotAddr;
 }
diff --git a/das/src/main/java/com/das/modules/node/domain/vo/SysTabMappingVo.java b/das/src/main/java/com/das/modules/node/domain/vo/SysTabMappingVo.java
index f74498a5..fbb218e0 100644
--- a/das/src/main/java/com/das/modules/node/domain/vo/SysTabMappingVo.java
+++ b/das/src/main/java/com/das/modules/node/domain/vo/SysTabMappingVo.java
@@ -35,6 +35,10 @@ public class SysTabMappingVo {
      * 设备名称
      */
     private String equipmentName;
+    /**
+     * 设备编码
+     */
+    private String equipmentCode;
     /**
      * 测点类型
      */
diff --git a/das/src/main/java/com/das/modules/node/mapper/SysImpTabMappingMapper.java b/das/src/main/java/com/das/modules/node/mapper/SysImpTabMappingMapper.java
index 6076381a..e3e7406a 100644
--- a/das/src/main/java/com/das/modules/node/mapper/SysImpTabMappingMapper.java
+++ b/das/src/main/java/com/das/modules/node/mapper/SysImpTabMappingMapper.java
@@ -14,7 +14,7 @@ import java.util.List;
  * @description: 映射表相关操作Mapper
  */
 @Mapper
-public interface SysImpTabMappingMapper extends BaseMapperPlus<SysTabMapping, SysTabMapping> {
+public interface SysImpTabMappingMapper extends BaseMapperPlus<SysTabMapping, SysTabMappingVo> {
     /**
      * 根据linkeId 获取该链路下所有的映射表配置信息
      * @param linkId 链路id
@@ -30,12 +30,7 @@ public interface SysImpTabMappingMapper extends BaseMapperPlus<SysTabMapping, Sy
      */
     List<SysTabMappingVo> getMappingInfoListByLinkIdAndType(@Param("linkId") Long linkId, @Param("type") Integer type);
 
-    /**
-     * 根据linkId 和设备id 获取该链路下 对应类型的映射表配置信息
-     * @param linkId 链路id
-     * @param deviceId 设备id
-     * @return 映射表记录列表
-     */
+
     List<SysTabMappingVo> getMappingInfoListByLinkIdAndDeviceId(@Param("linkId") Long linkId, @Param("deviceId") Long deviceId);
 
     /**
diff --git a/das/src/main/java/com/das/modules/node/service/impl/SysNodeServiceImpl.java b/das/src/main/java/com/das/modules/node/service/impl/SysNodeServiceImpl.java
index ce3af2a8..29b8b5bc 100644
--- a/das/src/main/java/com/das/modules/node/service/impl/SysNodeServiceImpl.java
+++ b/das/src/main/java/com/das/modules/node/service/impl/SysNodeServiceImpl.java
@@ -190,7 +190,8 @@ public class SysNodeServiceImpl implements SysNodeService {
      */
     @Override
     public List<SysTabMappingVo> getMappingList(QueryTabMappingParamDto queryParam) {
-        return sysImptabmappingMapper.getMappingInfoListByLinkIdAndType(queryParam.getLinkId(),queryParam.getType());
+        List<SysTabMappingVo> list =sysImptabmappingMapper.getMappingInfoListByLinkIdAndType(queryParam.getLinkId(),queryParam.getType());
+        return list;
     }
 
     /**
diff --git a/das/src/main/resources/mapper/SysImpTabMappingMapper.xml b/das/src/main/resources/mapper/SysImpTabMappingMapper.xml
index f6b09211..dd60aa76 100644
--- a/das/src/main/resources/mapper/SysImpTabMappingMapper.xml
+++ b/das/src/main/resources/mapper/SysImpTabMappingMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.das.modules.node.mapper.SysImpTabMappingMapper">
 
     <resultMap type="com.das.modules.node.domain.vo.SysTabMappingVo" id="SysImpTabMappingMap">
-        <result property="id" column="id" jdbcType="BIGINT"/>
+        <id property="id" column="id" jdbcType="BIGINT"/>
 
         <result property="linkId" column="link_id" jdbcType="BIGINT"/>
         <result property="linkName" column="link_name" jdbcType="VARCHAR"/>
@@ -22,7 +22,7 @@
     </resultMap>
 
     <resultMap type="com.das.modules.node.domain.vo.EquipmentVo" id="EquipmentMap">
-        <result property="id" column="id" jdbcType="BIGINT"/>
+        <id property="id" column="id" jdbcType="BIGINT"/>
         <result property="name" column="name" jdbcType="VARCHAR"/>
         <result property="iotModelId" column="iot_model_id" jdbcType="BIGINT"/>
         <result property="iotAddr" column="iot_addr" jdbcType="VARCHAR"/>
diff --git a/das/src/main/resources/mapper/SysIotModelFieldMapper.xml b/das/src/main/resources/mapper/SysIotModelFieldMapper.xml
index cbd5de72..8c16429c 100644
--- a/das/src/main/resources/mapper/SysIotModelFieldMapper.xml
+++ b/das/src/main/resources/mapper/SysIotModelFieldMapper.xml
@@ -53,6 +53,6 @@
     </select>
 
     <select id="selectModelFieldListByModelId" resultMap="SysIotModelFieldMap">
-        select * from sys_iot_model_field  where iot_model_id  = #{iotModelId} order by porder
+        select * from sys_iot_model_field  where iot_model_id  = #{modelId} order by porder
     </select>
 </mapper>
diff --git a/das/src/main/resources/mapper/SysIotModelServiceMapper.xml b/das/src/main/resources/mapper/SysIotModelServiceMapper.xml
index a836b3e4..6f662887 100644
--- a/das/src/main/resources/mapper/SysIotModelServiceMapper.xml
+++ b/das/src/main/resources/mapper/SysIotModelServiceMapper.xml
@@ -42,6 +42,6 @@
     </select>
 
     <select id="selectModelServiceListByModelId" resultMap="SysIotModelServiceMap">
-        select * from sys_iot_model_service  where iot_model_id  = #{iotModelId} order by porder
+        select * from sys_iot_model_service  where iot_model_id  = #{modelId} order by porder
     </select>
 </mapper>