Merge remote-tracking branch 'origin/fusion-1.8.0'

src/main/java/com/fdkankan/ucenter/controller/fire/FdUserCameraController.java

@@ -74,6 +74,12 @@ public class FdUserCameraController extends BaseController {
         }
 
         if(cameraDetailEntity.getUserId() != null){
+            User user = userService.getByUserName(userName);
+            if(user != null){
+                if(cameraDetailEntity.getUserId().equals(user.getId())){
+                    return Result.success();
+                }
+            }
             throw new BusinessException(AppConstant.FAILURE_CODE_4011, AppConstant.FAILURE_MSG_4011);
         }
 

src/main/java/com/fdkankan/ucenter/entity/ScenePlusExt.java

@@ -173,4 +173,16 @@ public class ScenePlusExt implements Serializable {
 
     @TableField("location")
     private Integer location;
+
+    /**
+     * 模型方向（只有激光场景才有）
+     */
+    @TableField("orientation")
+    private String orientation;
+
+    /**
+     * laser推送经纬度信息
+     */
+    @TableField("rtk_location")
+    private String rtkLocation;
 }

src/main/java/com/fdkankan/ucenter/vo/response/SceneProEntityVo.java

@@ -78,4 +78,14 @@ public class SceneProEntityVo  implements Serializable {
 
     private Integer shootCount;
 
+
+    /**
+     * 模型方向（只有激光场景才有）
+     */
+    private String orientation;
+
+    /**
+     * laser推送经纬度信息
+     */
+    private String rtkLocation;
 }