From a2f2a595bb568d1a0a6282e6c1fc7e301e78b136 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Fri, 7 Aug 2026 18:33:58 +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=E5=9B=BA=E5=AE=9A=E6=91=84?= =?UTF-8?q?=E5=83=8F=E5=A4=B4=E8=A7=86=E9=A2=91=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/command/query/project/KeyProjectQueryExe.java | 2 ++ .../clientobject/project/KeyProjectLargeScreenVideoCO.java | 6 ++++++ .../dataobject/project/KeyProjectLargeScreenVideoDO.java | 4 ++++ .../src/main/resources/mapper/KeyProjectMapper.xml | 4 +++- 4 files changed, 15 insertions(+), 1 deletion(-) 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 c485798..cb369c7 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 @@ -306,6 +306,8 @@ public class KeyProjectQueryExe { item.setDeviceGbNumber(data.getDeviceGbNumber()); item.setDeviceModel(data.getDeviceModel()); item.setIsOnline(data.getIsOnline()); + item.setLongitude(data.getLongitude()); + item.setLatitude(data.getLatitude()); return item; }).collect(Collectors.toList()); return PageResponse.of(result, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectLargeScreenVideoCO.java b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectLargeScreenVideoCO.java index 8bc179d..bc0ba19 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectLargeScreenVideoCO.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/KeyProjectLargeScreenVideoCO.java @@ -45,4 +45,10 @@ public class KeyProjectLargeScreenVideoCO implements Serializable { @ApiModelProperty("在线状态，0：离线，1：在线") private Integer isOnline; + + @ApiModelProperty("经度") + private String longitude; + + @ApiModelProperty("纬度") + private String latitude; } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/KeyProjectLargeScreenVideoDO.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/KeyProjectLargeScreenVideoDO.java index 9fd50d3..5a54ee4 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/KeyProjectLargeScreenVideoDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/KeyProjectLargeScreenVideoDO.java @@ -32,4 +32,8 @@ public class KeyProjectLargeScreenVideoDO implements Serializable { private String deviceModel; private Integer isOnline; + + private String longitude; + + private String latitude; } diff --git a/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml b/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml index f971a30..e1a067c 100644 --- a/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml @@ -599,7 +599,9 @@ fc.camera_number AS cameraNumber, fc.device_gb_number AS deviceGbNumber, fc.device_model AS deviceModel, - fc.is_online AS isOnline + fc.is_online AS isOnline, + fc.longitude AS longitude, + fc.latitude AS latitude FROM key_project kp INNER JOIN key_project_camera kpc ON kp.key_project_id = kpc.key_project_id AND kpc.delete_enum = 'FALSE'