1.点位图摄像头点击绑定问题bug5331

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/vo/AlamVideoVO.java

@@ -25,4 +25,9 @@ public class AlamVideoVO {
 
     private String vedioFormat;
 
+    /**
+     * 是否绑定设备
+     */
+    private Boolean isBonded = true;
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java

@@ -1063,7 +1063,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
         if (BitmapEnum.video.getKey().equals(type)) {
             AlamVideoVO video = videoMapper.getVideoById(id);
             if (!ObjectUtils.isEmpty(video)) {
-                video.setUrl(videoService.getVideoUrl(video.getName().toString(), video.getPresetPosition(), video.getUrl(), video.getCode()));
+                video.setUrl(videoService.getVideoUrl(video.getName(), video.getPresetPosition(), video.getUrl(), video.getCode()));
                 video.setId(id);
                 video.setVedioFormat(vedioFormat);
             }

amos-boot-system-equip/src/main/resources/application-dev.properties

 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url = jdbc:mysql://172.16.10.215/dl_business_v3.0.1.3?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+spring.datasource.url = jdbc:mysql://172.16.10.215:3307/dl_business_v3.0.1.3?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
 spring.datasource.username=root
 spring.datasource.password=Yeejoin@2020
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource

amos-boot-system-equip/src/main/resources/mapper/VideoMapper.xml

@@ -182,13 +182,15 @@
         where equipment_specific_id = #{id}
     </select>
     <select id="getVideoById" resultType="com.yeejoin.equipmanage.common.entity.vo.AlamVideoVO">
-        SELECT v.`name`,
+        SELECT
+               v.`name`,
                v.`code`,
                v.url,
                v.token,
                CONCAT_WS(' ', ws.full_name, v.address) AS address,
                v.img,
-               v.preset_position                       as presetPosition
+               v.preset_position as presetPosition,
+               false as isBonded
         FROM wl_video v
                  LEFT JOIN wl_video_source vs ON vs.video_id = v.id
                  LEFT JOIN wl_warehouse_structure ws ON ws.id = vs.source_id