From 8f2ce95165f90e51d41b083610d00ae346f3a852 Mon Sep 17 00:00:00 2001
From: kunlong-luo <kunlong_luo@163.com>
Date: 星期四, 02 二月 2023 14:36:19 +0800
Subject: [PATCH] fix: 修复空指针和类型转换问题
---
src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
index b98b948..35a42c5 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
@@ -107,4 +107,11 @@
"DELETE FROM platform_gb_channel WHERE platformId=#{platformId} and catalogId=#{catalogId}" +
"</script>")
int delChannelForGBByCatalogId(String platformId, String catalogId);
+
+ @Select("select dc.channelId deviceId,dc.name,d.manufacturer,d.model,d.firmware\n" +
+ "from platform_gb_channel pgc\n" +
+ " left join device_channel dc on dc.id = pgc.deviceChannelId\n" +
+ " left join device d on dc.deviceId = d.deviceId\n" +
+ "where dc.channelId = #{channelId} and pgc.platformId=#{platformId}")
+ List<Device> queryDeviceInfoByPlatformIdAndChannelId(String platformId, String channelId);
}
--
Gitblit v1.8.0