zcloud_gbs
/
zcloud_gbs_key_project
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
dev
zhaokai 2026-08-06 13:43:29 +08:00
parent c25b00b360 15b3337d9d
commit 5563d57194
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

3
web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml
View File

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