Merge branch 'dev_visual_page' into dev

web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectQueryExe.java

@@ -330,6 +330,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());

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;
 }

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;
 }

web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml

@@ -674,7 +674,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'