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

main
zhaokai 2026-08-07 20:46:10 +08:00
parent 37098afd5c
commit b6f6cc31c2
3 changed files with 15 additions and 2 deletions

View File

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

View File

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

View File

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