From b6f6cc31c235ec247b5eea3b28874ac905a337e4 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Fri, 7 Aug 2026 20:46:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat(project):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E5=A4=A7=E5=B1=8F=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=9A=84=E4=BC=81=E4=B8=9A=E5=92=8C=E6=B8=AF?= =?UTF-8?q?=E5=8C=BA=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 largeScreenVideoPage(KeyProjectLargeScreenVideoPageQry qry) { Map params = PageQueryHelper.toHashMap(qry); - params.put("corpinfoId", AuthContext.getTenantId()); params.put("cameraType", KeyProjectCameraTypeEnum.FIXED_CAMERA.getCode()); PageResponse pageResponse = keyProjectRepository.largeScreenVideoPage(params); List 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} + + + AND kp.jurisdiction_corpinfo_id = #{params.corpinfoId} + + + AND cp.port_area = #{params.portArea} + ORDER BY kp.apply_status ASC, kp.create_time DESC, kpc.create_time DESC From 431b05bf94aefca802a296a1d26bb9fa5ed356ba Mon Sep 17 00:00:00 2001 From: lishiwei <3230787218@qq.com> Date: Sat, 8 Aug 2026 09:05:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat():=20=E6=B7=BB=E5=8A=A0editFlag?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=8C=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E6=91=84=E5=83=8F=E5=A4=B4corpinfoId?= =?UTF-8?q?=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../key/project/command/query/project/KeyProjectQueryExe.java | 1 + .../src/main/resources/mapper/HiddenPenaltyMapper.xml | 3 +++ .../src/main/resources/mapper/KeyProjectCameraMapper.xml | 3 --- 3 files changed, 4 insertions(+), 3 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 360234b..429469f 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 @@ -264,6 +264,7 @@ public class KeyProjectQueryExe { penaltyParams.put("pageIndex", 1); penaltyParams.put("pageSize", 1); penaltyParams.put("fineFlag", "0"); + penaltyParams.put("editFlag", "0"); penaltyParams.put("currentUserId", id); int pCount = hiddenPenaltyRepository.listPage(penaltyParams).getTotalCount(); Long penaltyCount = (long) pCount; diff --git a/web-infrastructure/src/main/resources/mapper/HiddenPenaltyMapper.xml b/web-infrastructure/src/main/resources/mapper/HiddenPenaltyMapper.xml index 0a39c00..93cb52c 100644 --- a/web-infrastructure/src/main/resources/mapper/HiddenPenaltyMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/HiddenPenaltyMapper.xml @@ -104,6 +104,9 @@ AND hp.fine_flag = #{params.fineFlag} + + AND hp.edit_flag = #{params.editFlag} + AND ( hp.create_id = #{params.currentUserId} diff --git a/web-infrastructure/src/main/resources/mapper/KeyProjectCameraMapper.xml b/web-infrastructure/src/main/resources/mapper/KeyProjectCameraMapper.xml index 610cb81..84d1437 100644 --- a/web-infrastructure/src/main/resources/mapper/KeyProjectCameraMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/KeyProjectCameraMapper.xml @@ -75,9 +75,6 @@ SELECT mc.fixed_camera_id as cameraId, mc.video_name as cameraName, 1 as cameraType FROM fixed_camera mc WHERE mc.delete_enum = 'FALSE' - - AND mc.corpinfo_id = #{params.corpinfoId} - UNION ALL SELECT mc.mobile_camera_id as cameraId, mc.video_name as cameraName, 2 as cameraType FROM mobile_camera mc From 7bee0918803beb81e71ccfb386ec3dd2d9c8c631 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Wed, 19 Aug 2026 17:57:58 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat(project):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5=E6=94=AF?= =?UTF-8?q?=E6=8C=81=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 --- .../dto/clientobject/project/CorpStatisticsCO.java | 3 +++ .../key/project/dto/project/CorpStatisticsPageQry.java | 3 +++ .../dataobject/project/CorpStatisticsDO.java | 3 +++ .../src/main/resources/mapper/KeyProjectMapper.xml | 10 +++++++++- 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/CorpStatisticsCO.java b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/CorpStatisticsCO.java index 416214b..543b4a7 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/CorpStatisticsCO.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/CorpStatisticsCO.java @@ -22,6 +22,9 @@ public class CorpStatisticsCO implements Serializable { @ApiModelProperty(value = "企业名称") private String corpinfoName; + @ApiModelProperty(value = "企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)") + private Integer type; + @ApiModelProperty(value = "重点作业总数") private Integer totalProjectCount; diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/project/CorpStatisticsPageQry.java b/web-client/src/main/java/com/zcloud/key/project/dto/project/CorpStatisticsPageQry.java index a1f3d11..3340c4a 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/project/CorpStatisticsPageQry.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/project/CorpStatisticsPageQry.java @@ -27,5 +27,8 @@ public class CorpStatisticsPageQry extends PageQuery { @ApiModelProperty(value = "公司名称") private String corpinfoName; + @ApiModelProperty(value = "企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)") + private Integer type; + } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/CorpStatisticsDO.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/CorpStatisticsDO.java index d3595f6..82042ba 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/CorpStatisticsDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/CorpStatisticsDO.java @@ -21,6 +21,9 @@ public class CorpStatisticsDO implements Serializable { @ApiModelProperty(value = "企业名称") private String corpinfoName; + @ApiModelProperty(value = "企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)") + private Integer type; + @ApiModelProperty(value = "重点作业总数") private Integer totalProjectCount; diff --git a/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml b/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml index b209c45..779adea 100644 --- a/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml @@ -221,6 +221,7 @@