Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

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

 package com.yeejoin.equipmanage.common.entity.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -65,4 +66,11 @@ public class BuildingVideoListVO {
     @ApiModelProperty("机构编码")
     private String bizOrgCode;
 
+
+
+    private String type;
+
+
+    private String ip;
+
 }

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

@@ -50,6 +50,13 @@
         <if test="video!=null and video.bizOrgCode!=null and video.bizOrgCode!=''">
             and wlv.biz_org_code LIKE CONCAT(#{video.bizOrgCode}, '%')
         </if>
+        <if test="video!=null and video.ip!=null and video.ip!=''">
+            and wlv.ip like concat('%',#{video.ip},'%')
+        </if>
+        <if test="video!=null and video.type!=null and video.type!=''">
+            and wlv.type=#{video.type}
+        </if>
+
         group by  wlv.id
         order by wlv.create_date desc
     </select>
@@ -108,6 +115,15 @@
                     <if test="dto.code!=null and dto.code!=''">
                         and v.code like concat('%',#{dto.code},'%')
                     </if>
+                    <if test=" dto.ip!=null and dto.ip!=''">
+                        and v.ip like concat('%',#{dto.ip},'%')
+                    </if>
+                    <if test="dto.type!=null and dto.type!=''">
+                        and v.type = #{dto.type}
+                    </if>
+
+
+
                     GROUP BY id
                     order by v.create_date
                 </when>
@@ -122,6 +138,16 @@
                     <if test="dto.equipmentName!=null and dto.equipmentName!=''">
                         and v.name like concat('%',#{dto.equipmentName},'%')
                     </if>
+                     <if test=" dto.ip!=null and dto.ip!=''">
+                         and v.ip like concat('%',#{dto.ip},'%')
+                     </if>
+                     <if test="dto.type!=null and dto.type!=''">
+                         and v.type =#{dto.type}
+                     </if>
+
+
+
+
                  </where>
                     GROUP BY id
                     order by v.create_date