Merge remote-tracking branch 'origin/V1.0.11' into V1.0.11

project_data/sql/1.0.11/soc/soc.sql

@@ -328,7 +328,7 @@ CREATE TABLE `iot_dvs_plantype` (
 drop table if exists `iot_dvs_template`;
 CREATE TABLE `iot_dvs_template` (
                                     `id` bigint NOT NULL,
-                                    `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '录像模板名称',
+                                    `name` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '录像模板名称',
                                     `type` int DEFAULT NULL COMMENT '生成类型：0.系统 1.手动',
                                     `template_md5` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'name生成的MD5',
                                     `iot_token` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,

soc-modules/soc-modules-iot/src/main/resources/mapper/IotDvsTemplateChannelMapper.xml

@@ -24,7 +24,7 @@
             LEFT JOIN iot_dvs_template a ON t.iot_token = a.iot_token and t.template_md5 = a.template_md5
             LEFT JOIN iot_dvs_plantype p ON d.iot_token = p.iot_token and d.host_code = p.dvs_code and d.device_code = p.channel_code
         WHERE
-            d.device_type = 3
+            (d.device_type = 3 or d.device_type = 2)
             and d.deleted = 0
             <choose>
                 <when test="req.checkSub == false">