Merge branch 'dev_visual_page' into dev

# Conflicts:
#	web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectLargeScreenMobileMonitoringQry.java
#	web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml

web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectLargeScreenMobileMonitoringQry.java

@@ -18,4 +18,7 @@ public class KeyProjectLargeScreenMobileMonitoringQry extends PageQuery {
 
     @ApiModelProperty(value = "港区，1:秦皇岛港区,2:秦皇岛东,3:秦皇岛西", name = "portArea")
     private Integer portArea;
+
+    @ApiModelProperty(value = "摄像头类型，1:固定摄像头，2:移动摄像头", name = "cameraType")
+    private Integer cameraType;
 }

web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml

@@ -879,6 +879,9 @@
         <if test="params.portArea != null">
             AND cp.port_area = #{params.portArea}
         </if>
+        <if test="params.cameraType != null">
+            AND kpc.camera_type = #{params.cameraType}
+        </if>
         ORDER BY kp.create_time DESC, kpc.camera_type ASC, kpc.create_time DESC
     </select>
 </mapper>