From b6f6cc31c235ec247b5eea3b28874ac905a337e4 Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Fri, 7 Aug 2026 20:46:10 +0800
Subject: [PATCH] =?UTF-8?q?feat(project):=20=E6=B7=BB=E5=8A=A0=E5=8F=AF?=
 =?UTF-8?q?=E8=A7=86=E5=8C=96=E5=A4=A7=E5=B1=8F=E8=A7=86=E9=A2=91=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=9A=84=E4=BC=81=E4=B8=9A=E5=92=8C=E6=B8=AF=E5=8C=BA?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../command/query/project/KeyProjectQueryExe.java        | 1 -
 .../dto/project/KeyProjectLargeScreenVideoPageQry.java   | 7 +++++++
 .../src/main/resources/mapper/KeyProjectMapper.xml       | 9 ++++++++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectQueryExe.java b/web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectQueryExe.java
index c36d6ff..360234b 100644
--- a/web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectQueryExe.java
+++ b/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 -> {
diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectLargeScreenVideoPageQry.java b/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectLargeScreenVideoPageQry.java
index 00d30ce..41e52ae 100644
--- a/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectLargeScreenVideoPageQry.java
+++ b/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;
 }
diff --git a/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml b/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml
index 2d43962..b209c45 100644
--- a/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml
+++ b/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>