From c71c03bf5578c36f1e26d57640a25fda828a2190 Mon Sep 17 00:00:00 2001
From: chenhaojie <hjchencq@isoftstone.com>
Date: Mon, 12 Aug 2024 14:58:26 +0800
Subject: [PATCH] =?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/modules/node/controller/SysNodeController.java    | 8 ++++----
 .../das/modules/node/mapper/SysImptabmappingMapper.java   | 4 ++--
 .../das/modules/node/service/impl/SysNodeServiceImpl.java | 7 ++-----
 das/src/main/resources/mapper/SysImptabmappingMapper.xml  | 4 ++--
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/das/src/main/java/com/das/modules/node/controller/SysNodeController.java b/das/src/main/java/com/das/modules/node/controller/SysNodeController.java
index fabc90b3..edcf98fa 100644
--- a/das/src/main/java/com/das/modules/node/controller/SysNodeController.java
+++ b/das/src/main/java/com/das/modules/node/controller/SysNodeController.java
@@ -165,10 +165,10 @@ public class SysNodeController {
     public R<?> getMappingList(@RequestBody SysImptabmappingDto sysImptabmappingDto) {
 
         //判断是否有权限
-//        boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_DEVICE_MGR.toString());
-//        if(!hasPermission){
-//            return R.fail("没有节点管理权限");
-//        }
+        boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_DEVICE_MGR.toString());
+        if(!hasPermission){
+            return R.fail("没有节点管理权限");
+        }
         if (sysImptabmappingDto.getLinkId() == null) {
             throw new ServiceException("参数缺失");
         }
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 8c2a9915..a42fa3a9 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
@@ -18,9 +18,9 @@ import java.util.List;
 
 @Mapper
 public interface SysImptabmappingMapper extends BaseMapperPlus<SysImptabmapping, SysImptabmapping> {
-    List<ImptabmappingVo> getMappingList(Long linkId, String code);
+    List<ImptabmappingVo> getMappingList(Long linkId, Integer type);
 
-    List<ImptabmappingVo> getMappingControlList(Long linkId, String code);
+    List<ImptabmappingVo> getMappingControlList(Long linkId, Integer type);
 
     List<SysImptabmappingVo> getBindDevice(Long linkId);
 
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 723ca06f..1cf80b3d 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
@@ -192,13 +192,10 @@ public class SysNodeServiceImpl implements SysNodeService {
         Integer type = sysImptabmappingDto.getType();
         List<ImptabmappingVo> list = new ArrayList<>();
         // 根据类型获取物模型属性或者动作编码
-        String code = "";
         if (type == 138 || type == 139 || type == 140) {
-            code = sysIotModelMapper.getIotModelFieldCode(type);
-            list = sysImptabmappingMapper.getMappingList(sysImptabmappingDto.getLinkId(), code);
+            list = sysImptabmappingMapper.getMappingList(sysImptabmappingDto.getLinkId(), type);
         } else if (type == 146 || type == 147) {
-            code = sysIotModelMapper.getIotModelServiceCode(type);
-            list = sysImptabmappingMapper.getMappingControlList(sysImptabmappingDto.getLinkId(), code);
+            list = sysImptabmappingMapper.getMappingControlList(sysImptabmappingDto.getLinkId(), type);
         }
 
         return list;
diff --git a/das/src/main/resources/mapper/SysImptabmappingMapper.xml b/das/src/main/resources/mapper/SysImptabmappingMapper.xml
index f50128c6..db80b535 100644
--- a/das/src/main/resources/mapper/SysImptabmappingMapper.xml
+++ b/das/src/main/resources/mapper/SysImptabmappingMapper.xml
@@ -26,7 +26,7 @@
         select si.id, se."name" as equipmentName, simf.attribute_name as name,si.params,se.id as equipmentId from sys_imptabmapping si
         left join sys_equipment se on si.equipment_id = se.id
          left join sys_iot_model_field simf on se.iot_model_id  = simf.iot_model_id
-        where si.link_id = #{linkId} and si.equipment_attribute = #{code}
+        where si.link_id = #{linkId} and simf.attribute_type = #{type}
         order by si.porder
     </select>
 
@@ -34,7 +34,7 @@
         select si.id, se."name" as equipmentName, sims.service_name as name,si.params,se.id as equipmentId   from sys_imptabmapping si
         left join sys_equipment se on si.equipment_id = se.id
         left join sys_iot_model_service sims on se.iot_model_id  = sims.iot_model_id
-        where si.link_id = #{linkId} and si.equipment_service = #{code}
+        where si.link_id = #{linkId} and sims.service_type = #{type}
         order by si.porder
     </select>