feat(project): 添加可视化大屏视频查询的企业和港区筛选功能

web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectQueryExe.java

@@ -315,7 +315,6 @@ public class KeyProjectQueryExe {
 
     public PageResponse<KeyProjectLargeScreenVideoCO> largeScreenVideoPage(KeyProjectLargeScreenVideoPageQry qry) {
         Map<String, Object> params = PageQueryHelper.toHashMap(qry);
-        params.put("corpinfoId", AuthContext.getTenantId());
         params.put("cameraType", KeyProjectCameraTypeEnum.FIXED_CAMERA.getCode());
         PageResponse<KeyProjectLargeScreenVideoDO> pageResponse = keyProjectRepository.largeScreenVideoPage(params);
         List<KeyProjectLargeScreenVideoCO> result = pageResponse.getData().stream().map(data -> {

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

@@ -2,6 +2,7 @@ package com.zcloud.key.project.dto.project;
 
 import com.alibaba.cola.dto.PageQuery;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -13,4 +14,10 @@ import lombok.Data;
 @Data
 @ApiModel("可视化大屏固定摄像头视频分页请求")
 public class KeyProjectLargeScreenVideoPageQry extends PageQuery {
+
+    @ApiModelProperty(value = "企业id", name = "corpinfoId")
+    private Long corpinfoId;
+
+    @ApiModelProperty(value = "港区，1:秦皇岛港区,2:秦皇岛东,3:秦皇岛西", name = "portArea")
+    private Integer portArea;
 }

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

@@ -683,9 +683,16 @@
             AND kpc.camera_type = #{params.cameraType}
         INNER JOIN fixed_camera fc ON kpc.camera_id = fc.fixed_camera_id
             AND fc.delete_enum = 'FALSE'
+        LEFT JOIN corp_info cp ON kp.jurisdiction_corpinfo_id = cp.id
         WHERE kp.delete_enum = 'FALSE'
           AND kp.apply_status IN (2, 4, 5)
-          AND kp.jurisdiction_corpinfo_id = #{params.corpinfoId}
+         
+        <if test="params.corpinfoId != null">
+            AND kp.jurisdiction_corpinfo_id = #{params.corpinfoId}
+        </if>
+        <if test="params.portArea != null">
+            AND cp.port_area = #{params.portArea}
+        </if>
         ORDER BY kp.apply_status ASC, kp.create_time DESC, kpc.create_time DESC
     </select>