1

README.md

@@ -156,7 +156,7 @@
     3(SFM架站式-看看场景), 
     4(SFM架站式-看见/深时/深光场景),
     5(SLAM移动定位模式) , 
-    6(SLAM移动定位模式-有点位)
+    6(SLAM移动定位模式)
    
     mixture     是否为混合类型   0 无点位， 
                                 1 有点位，

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

@@ -158,4 +158,10 @@ public class ScenePlusExt implements Serializable {
     @TableField("algorithm_time")
     private String algorithmTime;
 
+    @TableField("mixture")
+    private Integer mixture;
+
+    @TableField("location")
+    private Integer location;
+
 }

src/main/resources/mapper/manage/SceneProMapper.xml

@@ -24,7 +24,7 @@
         SELECT * FROM(
         select s.scene_name ,s.num,s.create_time,s.space as sceneSize
         ,s.view_count,s.status,s.pay_status,'v3' as scene_version ,s.web_site , s.thumb
-        ,null as algorithmTime,data_source,s.shoot_count,s.gps,s.user_id,s.camera_id,s.compute_time,null as location
+        ,null as algorithmTime,data_source,s.shoot_count,s.gps,s.user_id,s.camera_id,s.compute_time,null as location,null as mixture
         from t_scene_pro s
         <include refid="commonWhere"></include>
         <if test="param.sceneName != null and param.sceneName!='' ">
@@ -43,7 +43,7 @@
         UNION ALL
         select s.title as sceneName ,s.num,s.create_time,e.space as sceneSize
         ,e.view_count,s.scene_status as status,s.pay_status,'v4' as scene_version,e.web_site,e.thumb
-        ,algorithm_time,data_source,e.shoot_count,e.gps,s.user_id,s.camera_id,e.compute_time,e.location
+        ,algorithm_time,data_source,e.shoot_count,e.gps,s.user_id,s.camera_id,e.compute_time,e.location,e.mixture
         from t_scene_plus s
         left join t_scene_plus_ext e on s.id = e.plus_id
         <include refid="commonWhere"></include>